diff --git a/common/type_system/TypeSpec.cpp b/common/type_system/TypeSpec.cpp index fa64b41509d..c570e29394f 100644 --- a/common/type_system/TypeSpec.cpp +++ b/common/type_system/TypeSpec.cpp @@ -136,3 +136,12 @@ void TypeSpec::add_or_modify_tag(const std::string& tag_name, const std::string& } m_tags.push_back({tag_name, tag_value}); } + +void TypeSpec::delete_tag(const std::string& tag_name) { + for (size_t i = 0; i < m_tags.size(); ++i) { + if (m_tags.at(i).name == tag_name) { + m_tags.erase(m_tags.begin() + i); + return; + } + } +} diff --git a/common/type_system/TypeSpec.h b/common/type_system/TypeSpec.h index 4e117dc58da..c4c5de9d6e7 100644 --- a/common/type_system/TypeSpec.h +++ b/common/type_system/TypeSpec.h @@ -94,6 +94,7 @@ class TypeSpec { const std::string& get_tag(const std::string& tag_name) const; void modify_tag(const std::string& tag_name, const std::string& tag_value); void add_or_modify_tag(const std::string& tag_name, const std::string& tag_value); + void delete_tag(const std::string& tag_name); const std::string& base_type() const { return m_type; } diff --git a/common/type_system/TypeSystem.cpp b/common/type_system/TypeSystem.cpp index 3dd4fd6f4b3..13bf4a5a340 100644 --- a/common/type_system/TypeSystem.cpp +++ b/common/type_system/TypeSystem.cpp @@ -1590,7 +1590,7 @@ bool TypeSystem::typecheck_and_throw(const TypeSpec& expected, if (!got) { success = false; } else { - if (*got != tag.value) { + if (!tc(tag.value, *got)) { success = false; } } diff --git a/decompiler/IR2/FormExpressionAnalysis.cpp b/decompiler/IR2/FormExpressionAnalysis.cpp index 9d80f7a9000..13b2f7f2d7c 100644 --- a/decompiler/IR2/FormExpressionAnalysis.cpp +++ b/decompiler/IR2/FormExpressionAnalysis.cpp @@ -3881,7 +3881,7 @@ void FunctionCallElement::update_from_stack(const Env& env, macro.push_back(rate); } - if (env.version > GameVersion::Jak1) { + if (env.version != GameVersion::Jak1) { macro.push_back(pool.form(":origin-is-matrix")); macro.push_back(pool.form("#t")); } @@ -3918,10 +3918,8 @@ ConstantTokenElement* DerefElement::try_as_art_const(const Env& env, FormPool& p if (elt_name) { return pool.alloc_element(*elt_name); } else { - if (env.version != GameVersion::Jak2) { - lg::error("function {}: did not find art element {} in {}", env.func->name(), - mr.maps.ints.at(0), env.art_group()); - } + lg::error("function `{}`: did not find art element {} in {}", env.func->name(), + mr.maps.ints.at(0), env.art_group()); } } @@ -4841,7 +4839,6 @@ FormElement* try_make_logtest_mouse_macro(Form* in, FormPool& pool) { t = REL; } - printf("t is %d\n", t); if (t != NIL) { auto logtest_elt = dynamic_cast(in->at(0)); if (logtest_elt) { diff --git a/decompiler/ObjectFile/ObjectFileDB.cpp b/decompiler/ObjectFile/ObjectFileDB.cpp index 2febc5271e2..e864f20a205 100644 --- a/decompiler/ObjectFile/ObjectFileDB.cpp +++ b/decompiler/ObjectFile/ObjectFileDB.cpp @@ -878,11 +878,12 @@ void get_art_info(ObjectFileDB& db, ObjectFileData& obj) { const auto& words = obj.linked_data.words_by_seg.at(MAIN_SEGMENT); if (words.at(0).kind() == LinkedWord::Kind::TYPE_PTR && words.at(0).symbol_name() == "art-group") { + auto obj_unique_name = obj.to_unique_name(); + // lg::print("art-group {}:\n", obj.to_unique_name()); auto name = obj.linked_data.get_goal_string_by_label(words.at(2).label_id()); int length = words.at(3).data; // lg::print(" length: {}\n", length); - std::unordered_map art_group_elts; for (int i = 0; i < length; ++i) { const auto& word = words.at(8 + i); if (word.kind() == LinkedWord::Kind::SYM_PTR && word.symbol_name() == "#f") { @@ -891,8 +892,19 @@ void get_art_info(ObjectFileDB& db, ObjectFileData& obj) { const auto& label = obj.linked_data.labels.at(word.label_id()); auto elt_name = obj.linked_data.get_goal_string_by_label(words.at(label.offset / 4 + 1).label_id()); + auto unique_name = elt_name; + + auto ag_name = obj_unique_name; + int elt_index = i; + auto& word_master_ag = words.at(label.offset / 4 + 7); + auto& word_master_idx = words.at(label.offset / 4 + 8); + if (word_master_ag.kind() == LinkedWord::Kind::PTR && + word_master_idx.kind() == LinkedWord::Kind::PLAIN_DATA) { + ag_name = obj.linked_data.get_goal_string_by_label(word_master_ag.label_id()) + "-ag"; + elt_index = word_master_idx.data; + } + std::string elt_type = words.at(label.offset / 4 - 1).symbol_name(); - std::string unique_name = elt_name; if (elt_type == "art-joint-geo") { // the skeleton! unique_name += "-jg"; @@ -908,10 +920,9 @@ void get_art_info(ObjectFileDB& db, ObjectFileData& obj) { throw std::runtime_error( fmt::format("unknown art elt type {} in {}", elt_type, obj.to_unique_name())); } - art_group_elts[i] = unique_name; - // lg::print(" {}: {} ({}) -> {}\n", i, elt_name, elt_type, unique_name); + // lg::print(" {}: {} ({}) -> {} @ {}\n", i, elt_name, elt_type, unique_name, elt_index); + db.dts.add_art_group_elt(ag_name, unique_name, elt_index); } - db.dts.art_group_info[obj.to_unique_name()] = art_group_elts; } } } diff --git a/decompiler/analysis/expression_build.cpp b/decompiler/analysis/expression_build.cpp index 99c397b1bbd..fa8f53a5ed4 100644 --- a/decompiler/analysis/expression_build.cpp +++ b/decompiler/analysis/expression_build.cpp @@ -111,8 +111,8 @@ bool convert_to_expressions( // the return value of this function is not an exact match // we cast it to avoid complicated issues with polymorphism (e.g. methods) - // we don't run this if we find a (return statement because we do not handle - // type checking on those at the moment. + // we don't run this if we find a (return statement for unknown reasons + // TODO : remove this and check? if (!found_early_return && f.type.last_arg() != return_type) { needs_cast = true; } diff --git a/decompiler/analysis/find_defstates.cpp b/decompiler/analysis/find_defstates.cpp index db431da6446..f68e689f164 100644 --- a/decompiler/analysis/find_defstates.cpp +++ b/decompiler/analysis/find_defstates.cpp @@ -94,8 +94,8 @@ std::vector get_defstate_entries( temp.to_string(env)); } - auto var = mr.maps.regs.at(0); - auto name = mr.maps.strings.at(1); + auto& var = mr.maps.regs.at(0); + auto& name = mr.maps.strings.at(1); auto val = mr.maps.forms.at(2); auto handler_kind = handler_name_to_kind(name); @@ -149,12 +149,35 @@ std::vector get_defstate_entries( // hack - lets pretend every handler (except event) returns none but remove the (none) at the // end since the 'real' return type is object and thus anything is valid in the final form handler_func->ir2.skip_final_none = true; - } else if (handler_atom && handler_atom->is_sym_val()) { + } else if (handler_atom && handler_atom->is_sym_val() && !handler_atom->is_sym_val("#f")) { + // value of a symbol. + // NOTE : we auto sym_type = env.dts->lookup_symbol_type(handler_atom->get_str()); - auto expected_type = get_state_handler_type(handler_kind, state_type); - if (!env.dts->ts.tc(expected_type, sym_type)) { + auto handler_type = get_state_handler_type(handler_kind, state_type); + // NOTE : we set the return value of the handlers to "none" for a sneaky hack (see right + // above) however we only need that when decompiling lambdas. so we revert that hack here. + if (handler_type.last_arg() == TypeSpec("none")) { + handler_type.last_arg() = TypeSpec("object"); + } + // hack : delete the behavior tags and typecheck them separately. + auto sym_behavior = sym_type.try_get_tag("behavior"); + handler_type.delete_tag("behavior"); + sym_type.delete_tag("behavior"); + + // finally do typecheck. does argument typecheck, then we do process typecheck separately. + // this is because the logic has to be kind of backwards: + // - the process type in the symbol's behavior tag can be more generic; but + // - the arguments can be more specific. + // for example, a process of type `enemy` can run a behavior for `process-drawable` just fine + // but a behavior for `process-drawable` that requires a more specific argument than `enemy` + // would be bad. + // in practice this just allows us to use more specific types for functions in the decompiler + // without trigger extraneous casts. + if (!env.dts->ts.tc(handler_type, sym_type) || + (sym_behavior.has_value() && + !env.dts->ts.tc(*sym_behavior, state_type.last_arg().base_type()))) { this_entry.val = - pool.alloc_single_element_form(nullptr, expected_type, this_entry.val); + pool.alloc_single_element_form(nullptr, handler_type, this_entry.val); } } // name = code/event/etc diff --git a/decompiler/analysis/insert_lets.cpp b/decompiler/analysis/insert_lets.cpp index b6554e2742e..141498171ed 100644 --- a/decompiler/analysis/insert_lets.cpp +++ b/decompiler/analysis/insert_lets.cpp @@ -1330,14 +1330,19 @@ FormElement* rewrite_joint_macro(LetElement* in, const Env& env, FormPool& pool) Matcher::any_reg(0), false, {DerefTokenMatcher::string("frame-group"), DerefTokenMatcher::string("frames"), DerefTokenMatcher::string("num-frames")}); + auto matcher_new_group_max_frames = + env.version == GameVersion::Jak1 + ? Matcher::deref(Matcher::any(1), false, + {DerefTokenMatcher::string("data"), DerefTokenMatcher::integer(0), + DerefTokenMatcher::string("length")}) + : Matcher::deref( + Matcher::any(1), false, + {DerefTokenMatcher::string("frames"), DerefTokenMatcher::string("num-frames")}); auto matcher_max_num = Matcher::cast( - "float", Matcher::op_fixed(FixedOperatorKind::ADDITION, - {form_fg ? Matcher::deref(Matcher::any(1), false, - {DerefTokenMatcher::string("data"), - DerefTokenMatcher::integer(0), - DerefTokenMatcher::string("length")}) - : matcher_cur_group_max_frames, - Matcher::integer(-1)})); + "float", + Matcher::op_fixed(FixedOperatorKind::ADDITION, + {form_fg ? matcher_new_group_max_frames : matcher_cur_group_max_frames, + Matcher::integer(-1)})); // DONE CHECKING EVERYTHING!!! Now write the goddamn macro. std::vector args; diff --git a/decompiler/config/jak1/all-types.gc b/decompiler/config/jak1/all-types.gc index b35c12a37af..cdd9e75fd63 100644 --- a/decompiler/config/jak1/all-types.gc +++ b/decompiler/config/jak1/all-types.gc @@ -33724,7 +33724,7 @@ ;; - Functions (define-extern minershort-trans-hook (function none :behavior minershort)) -(define-extern miners-anim-loop (function none :behavior minershort)) +(define-extern miners-anim-loop (function object :behavior process-taskable)) ;; - Unknowns diff --git a/decompiler/config/jak1/ntsc_v1/art-group-info.min.json b/decompiler/config/jak1/ntsc_v1/art-group-info.min.json index 422f8c93ad1..e26dbc9a352 100644 --- a/decompiler/config/jak1/ntsc_v1/art-group-info.min.json +++ b/decompiler/config/jak1/ntsc_v1/art-group-info.min.json @@ -1 +1 @@ -{"accordian-ag":[[0,"accordian-lod0-jg"],[1,"accordian-lod0-mg"],[2,"accordian-lod1-mg"],[3,"accordian-idle-ja"]],"allpontoons-ag":[[0,"allpontoons-lod0-jg"],[1,"allpontoons-lod0-mg"],[2,"allpontoons-idle-ja"]],"aphid-lurker-ag":[[0,"aphid-lurker-lod0-jg"],[1,"aphid-lurker-lod0-mg"],[2,"aphid-lurker-shadow-mg"],[3,"aphid-lurker-idle-ja"],[4,"aphid-lurker-walk-ja"],[5,"aphid-lurker-walk-deadly-ja"],[6,"aphid-lurker-spike-out-ja"],[7,"aphid-lurker-give-up-ja"],[8,"aphid-lurker-give-up-hop-ja"],[9,"aphid-lurker-turn-ja"],[10,"aphid-lurker-win-ja"],[11,"aphid-lurker-die-ja"]],"assistant-ag":[[0,"assistant-lod0-jg"],[1,"assistant-lod0-mg"],[2,"assistant-shadow-mg"],[3,"assistant-idle-leaning-right-ja"],[4,"assistant-idle-transition-right-to-left-ja"],[5,"assistant-idle-leaning-left-ja"],[6,"assistant-idle-transition-left-to-right-ja"],[7,"assistant-idle-wiping-brow-ja"],[8,"assistant-idle-transition-to-welding-ja"],[9,"assistant-idle-welding-ja"]],"assistant-firecanyon-ag":[[0,"assistant-firecanyon-lod0-jg"],[1,"assistant-firecanyon-lod0-mg"],[2,"assistant-firecanyon-shadow-mg"],[3,"assistant-firecanyon-idle-twist-ja"],[4,"assistant-firecanyon-idle-down-ja"],[5,"assistant-firecanyon-idle-examine-ja"],[6,"assistant-firecanyon-idle-up-ja"],[7,"assistant-firecanyon-idle-fiddle-ja"],[8,"assistant-firecanyon-idle-a-ja"],[9,"assistant-firecanyon-idle-to-b-ja"],[10,"assistant-firecanyon-idle-b-ja"],[11,"assistant-firecanyon-idle-to-a-ja"],[12,"assistant-firecanyon-idle-wipe-brow-ja"]],"assistant-lavatube-end-ag":[[0,"assistant-lavatube-end-lod0-jg"],[1,"assistant-lavatube-end-lod0-mg"],[2,"assistant-lavatube-end-shadow-mg"],[3,"assistant-lavatube-end-idle-ja"]],"assistant-lavatube-start-ag":[[0,"assistant-lavatube-start-lod0-jg"],[1,"assistant-lavatube-start-lod0-mg"],[2,"assistant-lavatube-start-shadow-mg"],[3,"assistant-lavatube-start-idle-ja"],[4,"assistant-lavatube-start-idle-b-ja"]],"assistant-village2-ag":[[0,"assistant-village2-lod0-jg"],[1,"assistant-village2-lod0-mg"],[2,"assistant-village2-lod1-mg"],[3,"assistant-village2-lod2-mg"],[4,"assistant-village2-shadow-mg"],[5,"assistant-village2-idle-a-ja"],[6,"assistant-village2-idle-to-b-ja"],[7,"assistant-village2-idle-b-ja"],[8,"assistant-village2-idle-to-a-ja"],[9,"assistant-village2-idle-after-ja"],[10,"assistant-village2-idle-hut-breath-ja"],[11,"assistant-village2-idle-hut-look-right-ja"],[12,"assistant-village2-idle-hut-start-welding-ja"],[13,"assistant-village2-idle-hut-welding-ja"],[14,"assistant-village2-idle-hut-stop-welding-ja"]],"assistant-village3-ag":[[0,"assistant-village3-lod0-jg"],[1,"assistant-village3-lod0-mg"],[2,"assistant-village3-shadow-mg"],[3,"assistant-village3-idle-ja"]],"babak-ag":[[0,"babak-lod0-jg"],[1,"babak-lod0-mg"],[2,"babak-lod1-mg"],[3,"babak-lod2-mg"],[4,"babak-shadow-mg"],[5,"babak-idle-ja"],[6,"babak-walk-ja"],[7,"babak-spot-ja"],[8,"babak-charge-ja"],[9,"babak-give-up-ja"],[10,"babak-give-up-hop-ja"],[11,"babak-win-ja"],[12,"babak-death-ja"],[13,"babak-jump-ja"],[14,"babak-jump-land-ja"],[15,"babak-taunt-ja"],[16,"babak-turn-ja"],[17,"babak-look-ja"],[18,"babak-stop-look-ja"]],"baby-spider-ag":[[0,"baby-spider-lod0-jg"],[1,"baby-spider-lod0-mg"],[2,"baby-spider-lod1-mg"],[3,"baby-spider-lod2-mg"],[4,"baby-spider-shadow-mg"],[5,"baby-spider-birth-ja"],[6,"baby-spider-idle-ja"],[7,"baby-spider-run-ja"],[8,"baby-spider-walk-ja"],[9,"baby-spider-jump-up-ja"],[10,"baby-spider-jump-land-ja"],[11,"baby-spider-notice-ja"],[12,"baby-spider-celebrate-ja"],[13,"baby-spider-die-ja"]],"balance-plat-ag":[[0,"balance-plat-lod0-jg"],[1,"balance-plat-lod0-mg"],[2,"balance-plat-lod1-mg"],[3,"balance-plat-lod2-mg"],[4,"balance-plat-idle-ja"]],"balloon-ag":[[0,"balloon-lod0-jg"],[1,"balloon-lod0-mg"],[2,"balloon-lod1-mg"],[3,"balloon-idle-ja"]],"balloonlurker-ag":[[0,"balloonlurker-lod0-jg"],[1,"balloonlurker-lod0-mg"],[2,"balloonlurker-lod1-mg"],[3,"balloonlurker-lod2-mg"],[4,"balloonlurker-idle-ja"],[5,"balloonlurker-death-ja"],[6,"balloonlurker-pilot-lod0-jg"],[7,"balloonlurker-pilot-lod0-mg"],[8,"balloonlurker-pilot-lod1-mg"],[9,"balloonlurker-pilot-lod2-mg"],[10,"balloonlurker-pilot-idle-ja"],[11,"balloonlurker-pilot-death-ja"]],"barrel-ag":[[0,"barrel-lod0-jg"],[1,"barrel-lod0-mg"],[2,"barrel-idle-ja"]],"beachcam-ag":[[0,"beachcam-lod0-jg"],[8,"beachcam-ecoventrock-7-ja"],[1,"beachcam-lod0-mg"],[2,"beachcam-anim-ja"],[4,"beachcam-ecoventrock-4-ja"],[5,"beachcam-ecoventrock-5-ja"],[6,"beachcam-ecoventrock-6-ja"],[7,"beachcam-ecoventrock-3-ja"]],"billy-ag":[[0,"billy-lod0-jg"],[1,"billy-lod0-mg"],[2,"billy-shadow-mg"],[10,"billy-billy-after-ja"],[3,"billy-idle-breath-ja"],[4,"billy-idle-shoo-ja"]],"billy-sidekick-ag":[[0,"billy-sidekick-lod0-jg"],[1,"billy-sidekick-lod0-mg"],[2,"billy-sidekick-idle-ja"],[3,"billy-sidekick-billy-after-ja"]],"bird-lady-ag":[[0,"bird-lady-lod0-jg"],[1,"bird-lady-lod0-mg"],[2,"bird-lady-shadow-mg"],[3,"bird-lady-idle-ja"]],"bird-lady-beach-ag":[[0,"bird-lady-beach-lod0-jg"],[1,"bird-lady-beach-lod0-mg"],[2,"bird-lady-beach-shadow-mg"],[3,"bird-lady-beach-idle-ja"]],"bladeassm-ag":[[0,"bladeassm-lod0-jg"],[1,"bladeassm-lod0-mg"],[2,"bladeassm-lod1-mg"],[3,"bladeassm-lod2-mg"],[4,"bladeassm-idle-ja"]],"blue-eco-charger-ag":[[0,"blue-eco-charger-lod0-jg"],[1,"blue-eco-charger-lod0-mg"],[2,"blue-eco-charger-open-ja"]],"blue-eco-charger-orb-ag":[[0,"blue-eco-charger-orb-lod0-jg"],[1,"blue-eco-charger-orb-lod0-mg"],[2,"blue-eco-charger-orb-idle-ja"]],"bluesage-ag":[[0,"bluesage-lod0-jg"],[1,"bluesage-lod0-mg"],[2,"bluesage-lod1-mg"],[3,"bluesage-shadow-mg"],[4,"bluesage-bluesage-idle-ja"],[5,"bluesage-bluesage-attack-start-ja"],[6,"bluesage-bluesage-attack-loop-ja"]],"boatpaddle-ag":[[0,"boatpaddle-lod0-jg"],[1,"boatpaddle-lod0-mg"],[2,"boatpaddle-lod1-mg"],[3,"boatpaddle-idle-ja"]],"bonelurker-ag":[[0,"bonelurker-lod0-jg"],[1,"bonelurker-lod0-mg"],[2,"bonelurker-lod1-mg"],[3,"bonelurker-lod2-mg"],[4,"bonelurker-shadow-mg"],[5,"bonelurker-idle-ja"],[6,"bonelurker-walk-ja"],[7,"bonelurker-spot-ja"],[8,"bonelurker-charge-ja"],[9,"bonelurker-charge-left-ja"],[10,"bonelurker-charge-right-ja"],[11,"bonelurker-give-up-ja"],[12,"bonelurker-give-up-hop-ja"],[13,"bonelurker-win-ja"],[14,"bonelurker-death-ja"],[15,"bonelurker-stun-ja"],[16,"bonelurker-turn-ja"],[17,"bonelurker-jump-ja"],[18,"bonelurker-jump-land-ja"]],"bounceytarp-ag":[[0,"bounceytarp-lod0-jg"],[1,"bounceytarp-lod0-mg"],[2,"bounceytarp-idle-ja"]],"breakaway-left-ag":[[0,"breakaway-left-lod0-jg"],[1,"breakaway-left-lod0-mg"],[2,"breakaway-left-idle-ja"]],"breakaway-mid-ag":[[0,"breakaway-mid-lod0-jg"],[1,"breakaway-mid-lod0-mg"],[2,"breakaway-mid-idle-ja"]],"breakaway-right-ag":[[0,"breakaway-right-lod0-jg"],[1,"breakaway-right-lod0-mg"],[2,"breakaway-right-idle-ja"]],"bully-ag":[[0,"bully-lod0-jg"],[1,"bully-lod0-mg"],[2,"bully-lod1-mg"],[3,"bully-lod2-mg"],[4,"bully-shadow-mg"],[5,"bully-idle-ja"],[6,"bully-notice-jump-up-ja"],[7,"bully-notice-land-ja"],[8,"bully-start-spin-ja"],[9,"bully-spin-ja"],[10,"bully-die-ja"],[11,"bully-idle-bounced-ja"],[12,"bully-spin-bounced-ja"],[13,"bully-dizzy-ja"],[14,"bully-broken-cage-lod0-jg"],[15,"bully-broken-cage-lod0-mg"],[16,"bully-broken-cage-explode-ja"]],"buzzer-ag":[[0,"buzzer-lod0-jg"],[1,"buzzer-lod0-mg"],[2,"buzzer-idle-ja"]],"catch-fisha-ag":[[0,"catch-fisha-lod0-jg"],[1,"catch-fisha-lod0-mg"],[2,"catch-fisha-idle-ja"]],"catch-fishb-ag":[[0,"catch-fishb-lod0-jg"],[1,"catch-fishb-lod0-mg"],[2,"catch-fishb-idle-ja"]],"catch-fishc-ag":[[0,"catch-fishc-lod0-jg"],[1,"catch-fishc-lod0-mg"],[2,"catch-fishc-idle-ja"]],"cavecrusher-ag":[[0,"cavecrusher-lod0-jg"],[1,"cavecrusher-lod0-mg"],[2,"cavecrusher-lod1-mg"],[3,"cavecrusher-lod2-mg"],[4,"cavecrusher-idle-ja"]],"cavecrystal-ag":[[0,"cavecrystal-lod0-jg"],[1,"cavecrystal-lod0-mg"],[2,"cavecrystal-lod1-mg"],[3,"cavecrystal-idle-ja"]],"caveelevator-ag":[[0,"caveelevator-lod0-jg"],[1,"caveelevator-lod0-mg"],[2,"caveelevator-cycle-12m-ja"],[3,"caveelevator-one-way-58m-ja"],[4,"caveelevator-one-way-58m-reverse-ja"],[5,"caveelevator-cycle-3-floors-36m-ja"]],"cavegem-ag":[[0,"cavegem-lod0-jg"],[1,"cavegem-lod0-mg"],[2,"cavegem-idle-ja"]],"cavespatula-darkcave-ag":[[0,"cavespatula-darkcave-lod0-jg"],[1,"cavespatula-darkcave-lod0-mg"],[2,"cavespatula-darkcave-lod1-mg"],[3,"cavespatula-darkcave-idle-ja"]],"cavespatulatwo-ag":[[0,"cavespatulatwo-lod0-jg"],[1,"cavespatulatwo-lod0-mg"],[2,"cavespatulatwo-lod1-mg"],[3,"cavespatulatwo-idle-ja"]],"cavetrapdoor-ag":[[0,"cavetrapdoor-lod0-jg"],[1,"cavetrapdoor-lod0-mg"],[2,"cavetrapdoor-lod1-mg"],[3,"cavetrapdoor-lod2-mg"],[4,"cavetrapdoor-idle-ja"],[5,"cavetrapdoor-bob-ja"],[6,"cavetrapdoor-swing-ja"],[7,"cavetrapdoor-idle-down-ja"],[8,"cavetrapdoor-reset-ja"]],"ceilingflag-ag":[[0,"ceilingflag-geo-jg"],[1,"ceilingflag-geo-mg"],[2,"ceilingflag-idle-ja"]],"chainmine-ag":[[0,"chainmine-lod0-jg"],[1,"chainmine-lod0-mg"],[2,"chainmine-idle-ja"]],"citadelcam-ag":[[0,"citadelcam-lod0-jg"],[1,"citadelcam-lod0-mg"],[2,"citadelcam-idle-ja"],[3,"citadelcam-stair-plats-ja"],[4,"citadelcam-citadel-bunnies-ja"]],"citb-arm-ag":[[0,"citb-arm-a-lod0-jg"],[1,"citb-arm-a-lod0-mg"],[2,"citb-arm-a-lod1-mg"],[3,"citb-arm-a-idle-ja"],[4,"citb-arm-b-lod0-jg"],[5,"citb-arm-b-lod0-mg"],[6,"citb-arm-b-lod1-mg"],[7,"citb-arm-b-idle-ja"],[8,"citb-arm-c-lod0-jg"],[9,"citb-arm-c-lod0-mg"],[10,"citb-arm-c-lod1-mg"],[11,"citb-arm-c-idle-ja"],[12,"citb-arm-d-lod0-jg"],[13,"citb-arm-d-lod0-mg"],[14,"citb-arm-d-lod1-mg"],[15,"citb-arm-d-idle-ja"]],"citb-arm-shoulder-ag":[[0,"citb-arm-shoulder-a-lod0-jg"],[1,"citb-arm-shoulder-a-lod0-mg"],[2,"citb-arm-shoulder-a-idle-ja"],[3,"citb-arm-shoulder-b-lod0-jg"],[4,"citb-arm-shoulder-b-lod0-mg"],[5,"citb-arm-shoulder-b-idle-ja"]],"citb-bunny-ag":[[0,"citb-bunny-lod0-jg"],[1,"citb-bunny-lod0-mg"],[2,"citb-bunny-shadow-mg"],[3,"citb-bunny-idle-ja"],[4,"citb-bunny-attack-ja"],[5,"citb-bunny-big-hop-ja"],[6,"citb-bunny-small-hop-ja"],[7,"citb-bunny-sees-player-ja"],[8,"citb-bunny-sees-player-land-ja"],[9,"citb-bunny-die-ja"]],"citb-button-ag":[[0,"citb-button-lod0-jg"],[1,"citb-button-lod0-mg"],[2,"citb-button-idle-ja"]],"citb-chain-plat-ag":[[0,"citb-chain-plat-lod0-jg"],[1,"citb-chain-plat-lod0-mg"],[2,"citb-chain-plat-lod1-mg"],[3,"citb-chain-plat-idle-ja"]],"citb-chains-ag":[[0,"citb-chains-lod0-jg"],[1,"citb-chains-lod0-mg"],[2,"citb-chains-lod1-mg"],[3,"citb-chains-lod2-mg"],[4,"citb-chains-idle-ja"]],"citb-coil-ag":[[0,"citb-coil-lod0-jg"],[1,"citb-coil-lod0-mg"],[2,"citb-coil-lod1-mg"],[3,"citb-coil-idle-ja"],[4,"citb-coil-die-ja"],[5,"citb-coil-dead-ja"]],"citb-disc-ag":[[0,"citb-disc-a-lod0-jg"],[1,"citb-disc-a-lod0-mg"],[2,"citb-disc-a-lod1-mg"],[3,"citb-disc-a-lod2-mg"],[4,"citb-disc-a-idle-ja"],[5,"citb-disc-b-lod0-jg"],[6,"citb-disc-b-lod0-mg"],[7,"citb-disc-b-lod1-mg"],[8,"citb-disc-b-lod2-mg"],[9,"citb-disc-b-idle-ja"],[10,"citb-disc-c-lod0-jg"],[11,"citb-disc-c-lod0-mg"],[12,"citb-disc-c-lod1-mg"],[13,"citb-disc-c-lod2-mg"],[14,"citb-disc-c-idle-ja"],[15,"citb-disc-d-lod0-jg"],[16,"citb-disc-d-lod0-mg"],[17,"citb-disc-d-lod1-mg"],[18,"citb-disc-d-lod2-mg"],[19,"citb-disc-d-idle-ja"]],"citb-donut-ag":[[0,"citb-donut-lod0-jg"],[1,"citb-donut-lod0-mg"],[2,"citb-donut-lod1-mg"],[3,"citb-donut-idle-ja"]],"citb-drop-plat-ag":[[0,"citb-drop-plat-lod0-jg"],[1,"citb-drop-plat-lod0-mg"],[2,"citb-drop-plat-lod1-mg"],[3,"citb-drop-plat-idle-ja"],[4,"citb-drop-plat-red-lod0-jg"],[5,"citb-drop-plat-red-lod0-mg"],[6,"citb-drop-plat-red-lod1-mg"],[7,"citb-drop-plat-red-idle-ja"],[8,"citb-drop-plat-green-lod0-jg"],[9,"citb-drop-plat-green-lod0-mg"],[10,"citb-drop-plat-green-lod1-mg"],[11,"citb-drop-plat-green-idle-ja"],[12,"citb-drop-plat-blue-lod0-jg"],[13,"citb-drop-plat-blue-lod0-mg"],[14,"citb-drop-plat-blue-lod1-mg"],[15,"citb-drop-plat-blue-idle-ja"],[16,"citb-drop-plat-yellow-lod0-jg"],[17,"citb-drop-plat-yellow-lod0-mg"],[18,"citb-drop-plat-yellow-lod1-mg"],[19,"citb-drop-plat-yellow-idle-ja"]],"citb-exit-plat-ag":[[0,"citb-exit-plat-lod0-jg"],[1,"citb-exit-plat-lod0-mg"],[2,"citb-exit-plat-idle-ja"]],"citb-firehose-ag":[[0,"citb-firehose-lod0-jg"],[1,"citb-firehose-lod0-mg"],[2,"citb-firehose-idle-ja"],[3,"citb-firehose-start-ja"],[4,"citb-firehose-loopflame-ja"],[5,"citb-firehose-end-ja"]],"citb-generator-ag":[[0,"citb-generator-lod0-jg"],[1,"citb-generator-lod0-mg"],[2,"citb-generator-broken-lod0-jg"],[3,"citb-generator-broken-lod0-mg"],[4,"citb-generator-idle-ja"]],"citb-hose-ag":[[0,"citb-hose-lod0-jg"],[1,"citb-hose-lod0-mg"],[2,"citb-hose-lod1-mg"],[3,"citb-hose-idle-ja"],[4,"citb-hose-spit-ja"],[5,"citb-hose-die-ja"]],"citb-iris-door-ag":[[0,"citb-iris-door-lod0-jg"],[1,"citb-iris-door-lod0-mg"],[2,"citb-iris-door-lod1-mg"],[3,"citb-iris-door-idle-ja"]],"citb-launcher-ag":[[0,"citb-launcher-lod0-jg"],[1,"citb-launcher-lod0-mg"],[2,"citb-launcher-idle-ja"]],"citb-robotboss-ag":[[0,"citb-robotboss-lod0-jg"],[1,"citb-robotboss-lod0-mg"],[2,"citb-robotboss-idle-ja"],[3,"citb-robotboss-nose-lod0-jg"],[4,"citb-robotboss-nose-lod0-mg"],[5,"citb-robotboss-nose-idle-ja"],[6,"citb-robotboss-head-lod0-jg"],[7,"citb-robotboss-head-lod0-mg"],[8,"citb-robotboss-head-idle-ja"],[9,"citb-robotboss-gun-lod0-jg"],[10,"citb-robotboss-gun-lod0-mg"],[11,"citb-robotboss-gun-idle-ja"],[12,"citb-robotboss-leftshoulder-lod0-jg"],[13,"citb-robotboss-leftshoulder-lod0-mg"],[14,"citb-robotboss-leftshoulder-idle-ja"],[15,"citb-robotboss-rightshoulder-lod0-jg"],[16,"citb-robotboss-rightshoulder-lod0-mg"],[17,"citb-robotboss-rightshoulder-idle-ja"],[18,"citb-robotboss-leftarm-lod0-jg"],[19,"citb-robotboss-leftarm-lod0-mg"],[20,"citb-robotboss-leftarm-idle-ja"],[21,"citb-robotboss-rightarm-lod0-jg"],[22,"citb-robotboss-rightarm-lod0-mg"],[23,"citb-robotboss-rightarm-idle-ja"],[24,"citb-robotboss-belly-lod0-jg"],[25,"citb-robotboss-belly-lod0-mg"],[26,"citb-robotboss-belly-idle-ja"]],"citb-rotatebox-ag":[[0,"citb-rotatebox-lod0-jg"],[1,"citb-rotatebox-lod0-mg"],[2,"citb-rotatebox-idle-ja"]],"citb-sagecage-ag":[[8,"citb-sagecage-bluesage-idle-ja"],[0,"citb-sagecage-lod0-jg"],[1,"citb-sagecage-lod0-mg"],[2,"citb-sagecage-lod1-mg"],[3,"citb-sagecage-idle-ja"],[4,"citb-sagecage-redsage-idle-ja"],[5,"citb-sagecage-redsage-attack-start-ja"],[6,"citb-sagecage-redsage-attack-loop-ja"],[9,"citb-sagecage-bluesage-attack-start-ja"],[10,"citb-sagecage-bluesage-attack-loop-ja"],[12,"citb-sagecage-yellowsage-idle-ja"],[13,"citb-sagecage-yellowsage-attack-start-ja"],[14,"citb-sagecage-yellowsage-attack-loop-ja"],[16,"citb-sagecage-green-sagecage-idle-ja"]],"citb-stopbox-ag":[[0,"citb-stopbox-lod0-jg"],[1,"citb-stopbox-lod0-mg"],[2,"citb-stopbox-lod1-mg"],[3,"citb-stopbox-idle-ja"]],"crate-ag":[[0,"crate-wood-lod0-jg"],[1,"crate-wood-lod0-mg"],[2,"crate-wood-lod1-mg"],[3,"crate-wood-lod2-mg"],[4,"crate-iron-lod0-jg"],[5,"crate-iron-lod0-mg"],[6,"crate-iron-lod1-mg"],[7,"crate-iron-lod2-mg"],[8,"crate-steel-lod0-jg"],[9,"crate-steel-lod0-mg"],[10,"crate-steel-lod1-mg"],[11,"crate-steel-lod2-mg"],[12,"crate-darkeco-lod0-jg"],[13,"crate-darkeco-lod0-mg"],[14,"crate-darkeco-lod1-mg"],[15,"crate-darkeco-lod2-mg"],[16,"crate-idle-ja"],[17,"crate-barrel-lod0-jg"],[18,"crate-barrel-lod0-mg"],[19,"crate-barrel-lod1-mg"],[20,"crate-barrel-lod2-mg"],[21,"crate-barrel-idle-ja"],[22,"crate-bucket-lod0-jg"],[23,"crate-bucket-lod0-mg"],[24,"crate-bucket-idle-ja"]],"crate-darkeco-cluster-ag":[[0,"crate-darkeco-cluster-lod0-jg"],[1,"crate-darkeco-cluster-lod0-mg"],[2,"crate-darkeco-cluster-lod1-mg"],[3,"crate-darkeco-cluster-idle-ja"]],"dark-crystal-ag":[[0,"dark-crystal-lod0-jg"],[1,"dark-crystal-lod0-mg"],[2,"dark-crystal-idle-ja"],[3,"dark-crystal-explode-lod0-jg"],[4,"dark-crystal-explode-lod0-mg"],[5,"dark-crystal-explode-idle-ja"]],"dark-plant-ag":[[0,"dark-plant-lod0-jg"],[1,"dark-plant-lod0-mg"],[2,"dark-plant-idle-ja"],[3,"dark-plant-death-ja"],[4,"dark-plant-sprout-ja"]],"darkecobarrel-ag":[[0,"darkecobarrel-lod0-jg"],[1,"darkecobarrel-lod0-mg"],[2,"darkecobarrel-idle-ja"]],"darkecobomb-ag":[[0,"darkecobomb-lod0-jg"],[1,"darkecobomb-lod0-mg"],[2,"darkecobomb-idle-ja"],[3,"darkecobomb-blast-ja"],[4,"darkecobomb-open-ja"],[5,"darkecobomb-spin-cycle-ja"]],"darkecocan-ag":[[0,"darkecocan-lod0-jg"],[1,"darkecocan-lod0-mg"],[2,"darkecocan-glow-lod0-jg"],[3,"darkecocan-glow-lod0-mg"],[4,"darkecocan-idle-ja"]],"darkvine-ag":[[0,"darkvine-lod0-jg"],[1,"darkvine-lod0-mg"],[2,"darkvine-lod1-mg"],[3,"darkvine-idle-ja"],[4,"darkvine-retreat-ja"],[5,"darkvine-pushup-ja"],[6,"darkvine-dead-ja"]],"deathcam-ag":[[0,"deathcam-lod0-jg"],[1,"deathcam-lod0-mg"],[2,"deathcam-idle-ja"]],"double-lurker-ag":[[0,"double-lurker-lod0-jg"],[1,"double-lurker-lod0-mg"],[2,"double-lurker-lod1-mg"],[3,"double-lurker-lod2-mg"],[4,"double-lurker-shadow-mg"],[5,"double-lurker-both-idle-ja"],[6,"double-lurker-both-patrol-ja"],[7,"double-lurker-both-spot-ja"],[8,"double-lurker-both-charge-ja"],[9,"double-lurker-both-celebrate-ja"],[10,"double-lurker-both-break-apart-ja"],[11,"double-lurker-both-take-hit-ja"],[12,"double-lurker-idle-ja"],[13,"double-lurker-patrol-ja"],[14,"double-lurker-spot-ja"],[15,"double-lurker-charge-ja"],[16,"double-lurker-celebrate-ja"],[17,"double-lurker-die-ja"],[18,"double-lurker-bottom-take-hit-ja"]],"double-lurker-top-ag":[[0,"double-lurker-top-lod0-jg"],[1,"double-lurker-top-lod0-mg"],[2,"double-lurker-top-lod1-mg"],[3,"double-lurker-top-lod2-mg"],[4,"double-lurker-top-shadow-mg"],[5,"double-lurker-top-both-idle-ja"],[6,"double-lurker-top-both-patrol-ja"],[7,"double-lurker-top-both-spot-ja"],[8,"double-lurker-top-both-charge-ja"],[9,"double-lurker-top-both-celebrate-ja"],[10,"double-lurker-top-both-break-apart-ja"],[11,"double-lurker-top-both-take-hit-ja"],[12,"double-lurker-top-idle-ja"],[13,"double-lurker-top-patrol-ja"],[14,"double-lurker-top-spot-ja"],[15,"double-lurker-top-charge-ja"],[16,"double-lurker-top-celebrate-ja"],[17,"double-lurker-top-die-ja"],[18,"double-lurker-top-on-shoulders-die-ja"]],"driller-lurker-ag":[[0,"driller-lurker-lod0-jg"],[1,"driller-lurker-lod0-mg"],[2,"driller-lurker-lod1-mg"],[3,"driller-lurker-lod2-mg"],[4,"driller-lurker-shadow-mg"],[5,"driller-lurker-idle-ja"],[6,"driller-lurker-idle-look-left-ja"],[7,"driller-lurker-idle-look-right-ja"],[8,"driller-lurker-walk-ja"],[9,"driller-lurker-walk-up-ja"],[10,"driller-lurker-drill-jams-ja"],[11,"driller-lurker-run-ja"],[12,"driller-lurker-run-up-ja"],[13,"driller-lurker-attack-ja"],[14,"driller-lurker-attack-up-ja"],[15,"driller-lurker-idle-drilling-ja"],[16,"driller-lurker-die-ja"]],"ecoclaw-ag":[[0,"ecoclaw-lod0-jg"],[1,"ecoclaw-lod0-mg"],[2,"ecoclaw-idle-ja"]],"ecovalve-ag":[[0,"ecovalve-geo-jg"],[1,"ecovalve-geo-mg"],[2,"ecovalve-idle-ja"]],"ecoventrock-ag":[[0,"ecoventrock-lod0-jg"],[1,"ecoventrock-lod0-mg"],[2,"ecoventrock-lod1-mg"],[3,"ecoventrock-idle-ja"]],"ef-plane-ag":[[0,"ef-plane-lod0-jg"],[1,"ef-plane-lod0-mg"],[2,"ef-plane-idle-ja"]],"eggtop-ag":[[0,"eggtop-lod0-jg"],[1,"eggtop-lod0-mg"],[2,"eggtop-idle-ja"]],"eichar-ag":[[0,"eichar-lod0-jg"],[1,"eichar-lod0-mg"],[2,"eichar-shadow-mg"],[3,"eichar-run-to-stance-ja"],[4,"eichar-run-to-stance-loop-ja"],[5,"eichar-stance-loop-ja"],[6,"eichar-run-to-stance-left-ja"],[7,"eichar-run-to-stance-loop-left-ja"],[8,"eichar-stance-loop-left-ja"],[9,"eichar-run-to-stance-right-ja"],[10,"eichar-run-to-stance-loop-right-ja"],[11,"eichar-stance-loop-right-ja"],[12,"eichar-run-to-stance-up-ja"],[13,"eichar-run-to-stance-loop-up-ja"],[14,"eichar-stance-loop-up-ja"],[15,"eichar-run-to-stance-down-ja"],[16,"eichar-run-to-stance-loop-down-ja"],[17,"eichar-stance-loop-down-ja"],[18,"eichar-run-ja"],[19,"eichar-run-up-ja"],[20,"eichar-run-down-ja"],[21,"eichar-run-right-ja"],[22,"eichar-run-left-ja"],[23,"eichar-walk-ja"],[24,"eichar-walk-up-ja"],[25,"eichar-walk-down-ja"],[26,"eichar-walk-right-ja"],[27,"eichar-walk-left-ja"],[28,"eichar-run-squash-ja"],[29,"eichar-run-squash-weak-ja"],[30,"eichar-stance-to-duck-ja"],[31,"eichar-duck-stance-ja"],[32,"eichar-duck-walk-ja"],[33,"eichar-turn-around-ja"],[34,"eichar-jump-ja"],[35,"eichar-jump-land-ja"],[36,"eichar-painful-land-ja"],[37,"eichar-painful-land-end-ja"],[38,"eichar-jump-loop-ja"],[39,"eichar-jump-short-land-ja"],[40,"eichar-jump-forward-ja"],[41,"eichar-duck-high-jump-ja"],[42,"eichar-launch-jump-ja"],[43,"eichar-launch-jump-loop-ja"],[44,"eichar-edge-grab-stance0-ja"],[45,"eichar-edge-grab-stance1-ja"],[46,"eichar-falling-to-edge-grab-ja"],[47,"eichar-edge-grab-swing-left-ja"],[48,"eichar-edge-grab-swing-right-ja"],[49,"eichar-edge-grab-to-jump-ja"],[50,"eichar-edge-grab-off-ja"],[51,"eichar-attack-from-stance-ja"],[52,"eichar-attack-from-stance-end-ja"],[53,"eichar-attack-from-stance-alt-end-ja"],[54,"eichar-attack-from-stance-run-end-ja"],[55,"eichar-attack-from-stance-run-alt-end-ja"],[56,"eichar-attack-from-jump-ja"],[57,"eichar-attack-from-jump-loop-ja"],[58,"eichar-attack-from-jump-end-ja"],[59,"eichar-attack-punch-ja"],[60,"eichar-attack-punch-end-ja"],[61,"eichar-attack-punch-alt-end-ja"],[62,"eichar-attack-uppercut-ja"],[63,"eichar-flop-down-ja"],[64,"eichar-flop-down-loop-ja"],[65,"eichar-flop-down-land-ja"],[66,"eichar-moving-flop-down-ja"],[67,"eichar-moving-flop-down-loop-ja"],[68,"eichar-moving-flop-down-land-ja"],[69,"eichar-duck-roll-ja"],[70,"eichar-duck-roll-end-ja"],[71,"eichar-wheel-flip-ja"],[72,"eichar-wheel-flip-land-ja"],[73,"eichar-hit-from-front-ja"],[74,"eichar-hit-from-back-ja"],[75,"eichar-hit-up-ja"],[76,"eichar-deatha-ja"],[77,"eichar-death-painful-land-ja"],[78,"eichar-smack-surface-ja"],[79,"eichar-smack-surface-end-ja"],[84,"eichar-yellow-running-blast-ja"],[85,"eichar-yellow-running-blast-end-ja"],[86,"eichar-yellow-jumping-blast-ja"],[87,"eichar-powerup-ja"],[88,"eichar-shocked-ja"],[89,"eichar-wade-shallow-walk-ja"],[90,"eichar-wade-deep-walk-ja"],[91,"eichar-swim-stance-ja"],[92,"eichar-swim-walk-ja"],[93,"eichar-swim-walk-to-down-ja"],[94,"eichar-swim-down-ja"],[95,"eichar-swim-down-to-up-ja"],[96,"eichar-swim-up-ja"],[97,"eichar-swim-up-to-stance-ja"],[98,"eichar-swim-jump-ja"],[101,"eichar-periscope-grab-ja"],[112,"eichar-trip-ja"],[121,"eichar-fuel-cell-victory-9-ja"]],"eichar-fish+0-ag":[[0,"eichar-fishing-ja"],[1,"eichar-fishing-lose-ja"],[2,"sidekick-fishing-ja"],[3,"sidekick-fishing-lose-ja"]],"eichar-flut+0-ag":[[0,"eichar-flut-idle-ja"],[1,"eichar-flut-walk-ja"],[2,"eichar-flut-run-ja"],[3,"eichar-flut-jump-ja"],[4,"eichar-flut-jump-loop-ja"],[5,"eichar-flut-jump-land-ja"],[6,"eichar-flut-jump-forward-ja"],[7,"eichar-flut-jump-forward-loop-ja"],[8,"eichar-flut-jump-forward-land-ja"],[9,"eichar-flut-double-jump-ja"],[10,"eichar-flut-running-attack-ja"],[11,"eichar-flut-running-attack-end-ja"],[12,"eichar-flut-air-attack-ja"],[13,"eichar-flut-air-attack-loop-ja"],[14,"eichar-flut-air-attack-land-ja"],[15,"eichar-flut-get-on-ja"],[16,"eichar-flut-get-off-ja"],[17,"eichar-flut-hit-back-ja"],[18,"eichar-flut-smack-surface-ja"],[19,"eichar-flut-smack-surface-end-ja"],[20,"eichar-flut-deatha-ja"],[21,"eichar-flut-squash-run-ja"],[22,"flut-saddle-flut-idle-ja"],[23,"flut-saddle-flut-walk-ja"],[24,"flut-saddle-flut-run-ja"],[25,"flut-saddle-flut-jump-ja"],[26,"flut-saddle-flut-jump-loop-ja"],[27,"flut-saddle-flut-jump-land-ja"],[28,"flut-saddle-flut-jump-forward-ja"],[29,"flut-saddle-flut-jump-forward-loop-ja"],[30,"flut-saddle-flut-jump-forward-land-ja"],[31,"flut-saddle-flut-double-jump-ja"],[32,"flut-saddle-flut-running-attack-ja"],[33,"flut-saddle-flut-running-attack-end-ja"],[34,"flut-saddle-flut-air-attack-ja"],[35,"flut-saddle-flut-air-attack-loop-ja"],[36,"flut-saddle-flut-air-attack-land-ja"],[37,"flut-saddle-flut-get-on-ja"],[38,"flut-saddle-flut-get-off-ja"],[39,"flut-saddle-flut-hit-back-ja"],[40,"flut-saddle-flut-smack-surface-ja"],[41,"flut-saddle-flut-smack-surface-end-ja"],[42,"flut-saddle-flut-deatha-ja"],[43,"flut-saddle-flut-squash-run-ja"],[44,"sidekick-flut-idle-ja"],[45,"sidekick-flut-walk-ja"],[46,"sidekick-flut-run-ja"],[47,"sidekick-flut-jump-ja"],[48,"sidekick-flut-jump-loop-ja"],[49,"sidekick-flut-jump-land-ja"],[50,"sidekick-flut-jump-forward-ja"],[51,"sidekick-flut-jump-forward-loop-ja"],[52,"sidekick-flut-jump-forward-land-ja"],[53,"sidekick-flut-double-jump-ja"],[54,"sidekick-flut-running-attack-ja"],[55,"sidekick-flut-running-attack-end-ja"],[56,"sidekick-flut-air-attack-ja"],[57,"sidekick-flut-air-attack-loop-ja"],[58,"sidekick-flut-air-attack-land-ja"],[59,"sidekick-flut-get-on-ja"],[60,"sidekick-flut-get-off-ja"],[61,"sidekick-flut-hit-back-ja"],[62,"sidekick-flut-smack-surface-ja"],[63,"sidekick-flut-smack-surface-end-ja"],[64,"sidekick-flut-deatha-ja"],[65,"sidekick-flut-squash-run-ja"]],"eichar-ice+0-ag":[[0,"eichar-ice-skate-ja"],[1,"eichar-ice-slide-ja"],[2,"eichar-ice-stance-ja"],[3,"sidekick-ice-skate-ja"],[4,"sidekick-ice-slide-ja"],[5,"sidekick-ice-stance-ja"]],"eichar-pole+0-ag":[[0,"eichar-pole-cycle-ja"],[1,"eichar-pole-flip-up-ja"],[2,"eichar-pole-flip-forward-ja"],[3,"eichar-pole-jump-loop-ja"],[4,"sidekick-pole-cycle-ja"],[5,"sidekick-pole-cycle2-ja"],[6,"sidekick-pole-flip-up-ja"],[7,"sidekick-pole-flip-forward-ja"],[8,"sidekick-pole-jump-loop-ja"]],"eichar-racer+0-ag":[[0,"eichar-racer-idle-ja"],[1,"eichar-racer-turn-ja"],[2,"eichar-racer-turn2-ja"],[3,"eichar-racer-dig-ja"],[4,"eichar-racer-dig2-ja"],[5,"eichar-racer-jump-ja"],[6,"eichar-racer-jump-loop-ja"],[7,"eichar-racer-jump-land-ja"],[8,"eichar-racer-jump-small-ja"],[9,"eichar-racer-jump-small-loop-ja"],[10,"eichar-racer-jump-small-land-ja"],[11,"eichar-racer-stance-ja"],[12,"eichar-racer-jump-high-loop-ja"],[13,"eichar-racer-jump-high-land-ja"],[14,"eichar-racer-smack-ja"],[15,"eichar-racer-get-off-ja"],[16,"eichar-racer-get-on-ja"],[17,"eichar-racer-death-explode-ja"],[18,"racer-racer-idle-ja"],[19,"racer-racer-turn-ja"],[20,"racer-racer-turn2-ja"],[21,"racer-racer-dig-ja"],[22,"racer-racer-dig2-ja"],[23,"racer-racer-jump-ja"],[24,"racer-racer-jump-loop-ja"],[25,"racer-racer-jump-land-ja"],[26,"racer-racer-jump-small-ja"],[27,"racer-racer-jump-small-loop-ja"],[28,"racer-racer-jump-small-land-ja"],[29,"racer-racer-stance-ja"],[30,"racer-racer-jump-high-loop-ja"],[31,"racer-racer-jump-high-land-ja"],[32,"racer-racer-smack-ja"],[33,"racer-racer-get-off-ja"],[34,"racer-racer-get-on-ja"],[35,"racer-racer-death-explode-ja"],[36,"sidekick-racer-idle-ja"],[37,"sidekick-racer-turn-ja"],[38,"sidekick-racer-turn2-ja"],[39,"sidekick-racer-dig-ja"],[40,"sidekick-racer-dig2-ja"],[41,"sidekick-racer-jump-ja"],[42,"sidekick-racer-jump-loop-ja"],[43,"sidekick-racer-jump-land-ja"],[44,"sidekick-racer-jump-small-ja"],[45,"sidekick-racer-jump-small-loop-ja"],[46,"sidekick-racer-jump-small-land-ja"],[47,"sidekick-racer-stance-ja"],[48,"sidekick-racer-jump-high-loop-ja"],[49,"sidekick-racer-jump-high-land-ja"],[50,"sidekick-racer-smack-ja"],[51,"sidekick-racer-get-off-ja"],[52,"sidekick-racer-get-on-ja"],[53,"sidekick-racer-death-explode-ja"]],"eichar-tube+0-ag":[[0,"eichar-tube-turn-ja"],[1,"eichar-tube-jump-land-ja"],[2,"eichar-tube-dummy2-ja"],[3,"eichar-tube-dummy3-ja"],[4,"eichar-tube-dummy4-ja"],[5,"eichar-tube-dummy5-ja"],[6,"eichar-tube-dummy6-ja"],[7,"sidekick-tube-turn-ja"],[8,"sidekick-tube-jump-land-ja"],[9,"sidekick-tube-dummy2-ja"],[10,"sidekick-tube-dummy3-ja"],[11,"sidekick-tube-dummy4-ja"],[12,"sidekick-tube-dummy5-ja"],[13,"sidekick-tube-dummy6-ja"]],"energyarm-ag":[[0,"energyarm-lod0-jg"],[1,"energyarm-lod0-mg"],[2,"energyarm-lod1-mg"],[3,"energyarm-idle-ja"]],"energyball-ag":[[0,"energyball-lod0-jg"],[1,"energyball-lod0-mg"],[2,"energyball-idle-ja"]],"energybase-ag":[[0,"energybase-lod0-jg"],[1,"energybase-lod0-mg"],[2,"energybase-idle-ja"]],"energydoor-ag":[[0,"energydoor-lod0-jg"],[1,"energydoor-lod0-mg"],[2,"energydoor-idle-ja"]],"energyhub-ag":[[0,"energyhub-lod0-jg"],[1,"energyhub-lod0-mg"],[2,"energyhub-idle-ja"]],"evilbro-ag":[[0,"evilbro-lod0-jg"],[1,"evilbro-lod0-mg"],[2,"evilbro-shadow-mg"],[3,"evilbro-idle-ja"]],"evilbro-citadel-ag":[[0,"evilbro-citadel-lod0-jg"],[1,"evilbro-citadel-lod0-mg"],[2,"evilbro-citadel-shadow-mg"],[3,"evilbro-citadel-idle-ja"]],"evilbro-village3-ag":[[0,"evilbro-village3-lod0-jg"],[1,"evilbro-village3-lod0-mg"],[2,"evilbro-village3-shadow-mg"],[3,"evilbro-village3-idle-ja"]],"evilplant-ag":[[0,"evilplant-lod0-jg"],[1,"evilplant-lod0-mg"],[2,"evilplant-idle-ja"]],"evilsis-ag":[[0,"evilsis-lod0-jg"],[1,"evilsis-lod0-mg"],[2,"evilsis-shadow-mg"],[3,"evilsis-idle-ja"]],"evilsis-citadel-ag":[[0,"evilsis-citadel-lod0-jg"],[1,"evilsis-citadel-lod0-mg"],[2,"evilsis-citadel-shadow-mg"],[3,"evilsis-citadel-idle-ja"]],"evilsis-village3-ag":[[0,"evilsis-village3-lod0-jg"],[1,"evilsis-village3-lod0-mg"],[2,"evilsis-village3-shadow-mg"],[3,"evilsis-village3-idle-ja"]],"exit-chamber-ag":[[0,"exit-chamber-lod0-jg"],[1,"exit-chamber-lod0-mg"],[2,"exit-chamber-idle-ja"],[3,"exit-chamber-start-door-shut-ja"],[4,"exit-chamber-start-in-room-ja"],[5,"exit-chamber-middle-in-water-ja"],[6,"exit-chamber-end-out-of-water-ja"],[7,"exit-chamber-dive-start-ja"],[8,"exit-chamber-dive-middle-ja"],[9,"exit-chamber-dive-end-ja"]],"exit-chamber-dummy-ag":[[0,"exit-chamber-dummy-lod0-jg"],[1,"exit-chamber-dummy-lod0-mg"],[2,"exit-chamber-dummy-idle-ja"]],"explorer-ag":[[0,"explorer-lod0-jg"],[1,"explorer-lod0-mg"],[2,"explorer-shadow-mg"],[3,"explorer-idle-ja"],[4,"explorer-idle2-look-at-map-ja"],[5,"explorer-idle2-look-right-map-ja"],[6,"explorer-idle3-step-right-ja"],[7,"explorer-idle3-looking-ja"],[8,"explorer-idle3-step-left-ja"]],"farmer-ag":[[0,"farmer-lod0-jg"],[1,"farmer-lod0-mg"],[2,"farmer-lod1-mg"],[3,"farmer-shadow-mg"],[4,"farmer-sitting-cycle-ja"],[5,"farmer-standing-cycle-ja"]],"farthy-snack-ag":[[0,"farthy-snack-lod0-jg"],[1,"farthy-snack-lod0-mg"],[2,"farthy-snack-idle-ja"],[3,"farthy-snack-eat-ja"]],"finalbosscam-ag":[[0,"finalbosscam-lod0-jg"],[1,"finalbosscam-lod0-mg"],[2,"finalbosscam-idle-ja"]],"fireboulder-ag":[[0,"fireboulder-lod0-jg"],[1,"fireboulder-lod0-mg"],[2,"fireboulder-idle-ja"],[3,"fireboulder-hover-ja"],[4,"fireboulder-boulder1-ja"],[5,"fireboulder-boulder2-ja"],[6,"fireboulder-boulder3-ja"],[7,"fireboulder-boulder3b-ja"],[8,"fireboulder-boulder4-ja"],[10,"fireboulder-pre-throw-ja"]],"fish-net-ag":[[0,"fish-net-lod0-jg"],[1,"fish-net-lod0-mg"],[2,"fish-net-fishing-ja"]],"fisher-ag":[[0,"fisher-lod0-jg"],[1,"fisher-lod0-mg"],[2,"fisher-lod1-mg"],[3,"fisher-lod2-mg"],[4,"fisher-shadow-mg"],[5,"fisher-idle-less-often-ja"],[6,"fisher-idle-more-often-ja"],[7,"fisher-idle-win-ja"]],"fishermans-boat-ag":[[0,"fishermans-boat-lod0-jg"],[1,"fishermans-boat-lod0-mg"],[2,"fishermans-boat-lod1-mg"],[3,"fishermans-boat-idle-ja"]],"floating-launcher-ag":[[0,"floating-launcher-lod0-jg"],[1,"floating-launcher-lod0-mg"],[2,"floating-launcher-idle-ja"]],"flut-saddle-ag":[[0,"flut-saddle-lod0-jg"],[1,"flut-saddle-lod0-mg"],[2,"flut-saddle-shadow-mg"]],"flutflut-ag":[[0,"flutflut-lod0-jg"],[1,"flutflut-lod0-mg"],[2,"flutflut-flutflut-idle-ja"]],"flutflut-bluehut-ag":[[0,"flutflut-bluehut-lod0-jg"],[1,"flutflut-bluehut-lod0-mg"],[2,"flutflut-bluehut-idle-breathe-ja"],[3,"flutflut-bluehut-idle-start-scratch-ja"],[4,"flutflut-bluehut-idle-scratch-ja"]],"flutflut-plat-large-ag":[[0,"flutflut-plat-large-lod0-jg"],[1,"flutflut-plat-large-lod0-mg"],[2,"flutflut-plat-large-idle-ja"]],"flutflut-plat-med-ag":[[0,"flutflut-plat-med-lod0-jg"],[1,"flutflut-plat-med-lod0-mg"],[2,"flutflut-plat-med-idle-ja"]],"flutflut-plat-small-ag":[[0,"flutflut-plat-small-lod0-jg"],[1,"flutflut-plat-small-lod0-mg"],[2,"flutflut-plat-small-idle-ja"]],"flutflutegg-ag":[[0,"flutflutegg-lod0-jg"],[1,"flutflutegg-lod0-mg"],[2,"flutflutegg-lod1-mg"],[3,"flutflutegg-lod2-mg"],[4,"flutflutegg-idle-ja"],[5,"flutflutegg-crack-ja"],[6,"flutflutegg-broke-ja"]],"flying-lurker-ag":[[0,"flying-lurker-lod0-jg"],[1,"flying-lurker-lod0-mg"],[2,"flying-lurker-lod1-mg"],[3,"flying-lurker-lod2-mg"],[4,"flying-lurker-shadow-mg"],[5,"flying-lurker-fly-ja"],[6,"flying-lurker-look-ja"]],"fuel-cell-ag":[[0,"fuel-cell-lod0-jg"],[1,"fuel-cell-lod0-mg"],[2,"fuel-cell-idle-ja"],[11,"fuel-cell-fuel-cell-victory-9-ja"]],"fuelcell-naked-ag":[[0,"fuelcell-naked-lod0-jg"],[1,"fuelcell-naked-lod0-mg"],[2,"fuelcell-naked-idle-ja"]],"gambler-ag":[[0,"gambler-lod0-jg"],[1,"gambler-lod0-mg"],[2,"gambler-lod1-mg"],[3,"gambler-lod2-mg"],[4,"gambler-shadow-mg"],[5,"gambler-idle-tiptoe-ja"],[6,"gambler-idle-look-1-ja"],[7,"gambler-idle-fidget-ja"],[8,"gambler-idle-scratch-1-ja"],[9,"gambler-idle-look-2-ja"],[10,"gambler-idle-scratch-2-ja"]],"generic-button-ag":[[0,"generic-button-lod0-jg"],[1,"generic-button-lod0-mg"],[2,"generic-button-idle-ja"]],"geologist-ag":[[0,"geologist-lod0-jg"],[1,"geologist-lod0-mg"],[2,"geologist-lod1-mg"],[3,"geologist-lod2-mg"],[4,"geologist-shadow-mg"],[5,"geologist-idle-ja"]],"gnawer-ag":[[0,"gnawer-lod0-jg"],[1,"gnawer-lod0-mg"],[2,"gnawer-lod1-mg"],[3,"gnawer-lod2-mg"],[4,"gnawer-idle-ja"],[5,"gnawer-run-ja"],[6,"gnawer-takes-hit-ja"],[7,"gnawer-die-ja"],[8,"gnawer-tear-side-to-side-ja"],[9,"gnawer-tug-ja"],[10,"gnawer-up-to-chew-ja"],[11,"gnawer-chew-ja"],[12,"gnawer-notice-ja"],[13,"gnawer-down-from-chew-ja"],[14,"gnawer-segment-lod0-jg"],[15,"gnawer-segment-lod0-mg"],[16,"gnawer-segment-idle-ja"],[17,"gnawer-segment-die-ja"]],"gondola-ag":[[0,"gondola-lod0-jg"],[1,"gondola-lod0-mg"],[2,"gondola-shadow-mg"],[3,"gondola-idle-down-ja"],[4,"gondola-idle-up-ja"]],"gondolacables-ag":[[0,"gondolacables-lod0-jg"],[1,"gondolacables-lod0-mg"],[2,"gondolacables-idle-ja"]],"green-eco-lurker-ag":[[0,"green-eco-lurker-lod0-jg"],[1,"green-eco-lurker-lod0-mg"],[2,"green-eco-lurker-shadow-mg"],[3,"green-eco-lurker-idle-ja"],[4,"green-eco-lurker-charge-ja"],[5,"green-eco-lurker-win-ja"],[6,"green-eco-lurker-death-ja"],[7,"green-eco-lurker-jump-ja"],[8,"green-eco-lurker-jump-land-ja"],[9,"green-eco-lurker-spot-ja"],[10,"green-eco-lurker-turn-ja"],[11,"green-eco-lurker-jump-with-flip-ja"]],"green-sagecage-ag":[[0,"green-sagecage-lod0-jg"],[1,"green-sagecage-lod0-mg"],[2,"green-sagecage-lod1-mg"],[3,"green-sagecage-shadow-mg"],[4,"green-sagecage-green-sagecage-idle-ja"]],"greenshot-ag":[[0,"greenshot-lod0-jg"],[1,"greenshot-lod0-mg"],[2,"greenshot-idle-ja"]],"grottopole-ag":[[0,"grottopole-lod0-jg"],[1,"grottopole-lod0-mg"],[2,"grottopole-lod1-mg"],[3,"grottopole-idle-ja"]],"happy-plant-ag":[[0,"happy-plant-lod0-jg"],[1,"happy-plant-lod0-mg"],[2,"happy-plant-lod1-mg"],[3,"happy-plant-init-ja"],[4,"happy-plant-idle-ja"]],"harvester-ag":[[0,"harvester-lod0-jg"],[1,"harvester-lod0-mg"],[2,"harvester-lod1-mg"],[3,"harvester-lod2-mg"],[4,"harvester-idle-ja"],[5,"harvester-inflate-ja"]],"helix-button-ag":[[0,"helix-button-lod0-jg"],[1,"helix-button-lod0-mg"],[2,"helix-button-idle-ja"]],"helix-slide-door-ag":[[0,"helix-slide-door-lod0-jg"],[1,"helix-slide-door-lod0-mg"],[2,"helix-slide-door-idle-ja"]],"hopper-ag":[[0,"hopper-lod0-jg"],[1,"hopper-lod0-mg"],[2,"hopper-lod1-mg"],[3,"hopper-lod2-mg"],[4,"hopper-shadow-mg"],[5,"hopper-idle-ja"],[6,"hopper-burp-ja"],[7,"hopper-jump-long-ja"],[8,"hopper-jump-long-land-ja"],[9,"hopper-jump-short-ja"],[10,"hopper-jump-short-land-ja"],[11,"hopper-death-ja"]],"hutlamp-ag":[[0,"hutlamp-lod0-jg"],[1,"hutlamp-lod0-mg"],[2,"hutlamp-idle-ja"]],"ice-cube-ag":[[0,"ice-cube-lod0-jg"],[1,"ice-cube-lod0-mg"],[2,"ice-cube-lod1-mg"],[3,"ice-cube-lod2-mg"],[4,"ice-cube-shadow-mg"],[5,"ice-cube-vuln-idle-ja"],[6,"ice-cube-vuln-walk-ja"],[7,"ice-cube-appear-jump-up-ja"],[8,"ice-cube-appear-land-ja"],[9,"ice-cube-extend-spikes-ja"],[10,"ice-cube-turn-on-player-ja"],[11,"ice-cube-turn-on-player-land-ja"],[12,"ice-cube-invuln-run-ja"],[13,"ice-cube-invuln-stopping-ja"],[14,"ice-cube-retract-spikes-ja"],[15,"ice-cube-breathing-ja"],[16,"ice-cube-head-wipe-ja"],[17,"ice-cube-invuln-stopping-upright-ja"]],"ice-cube-break-ag":[[0,"ice-cube-break-lod0-jg"],[1,"ice-cube-break-lod0-mg"],[2,"ice-cube-break-idle-ja"]],"jak-white-ag":[[0,"jak-white-lod0-jg"],[1,"jak-white-lod0-mg"],[2,"jak-white-idle-ja"]],"jaws-ag":[[0,"jaws-lod0-jg"],[1,"jaws-lod0-mg"],[2,"jaws-idle-ja"]],"jng-iris-door-ag":[[0,"jng-iris-door-lod0-jg"],[1,"jng-iris-door-lod0-mg"],[2,"jng-iris-door-lod1-mg"],[3,"jng-iris-door-idle-ja"]],"junglecam-ag":[[0,"junglecam-lod0-jg"],[1,"junglecam-lod0-mg"],[2,"junglecam-beamcam-ja"],[3,"junglecam-tower1-ja"],[4,"junglecam-tower2-ja"],[5,"junglecam-tower3-ja"],[6,"junglecam-tower4-ja"],[7,"junglecam-tower5-ja"],[8,"junglecam-precurbridgecam-ja"]],"junglefish-ag":[[0,"junglefish-lod0-jg"],[1,"junglefish-lod0-mg"],[2,"junglefish-lod1-mg"],[3,"junglefish-lod2-mg"],[4,"junglefish-swim-ja"],[5,"junglefish-chomp-ja"],[6,"junglefish-death-ja"]],"junglesnake-ag":[[0,"junglesnake-lod0-jg"],[1,"junglesnake-lod0-mg"],[2,"junglesnake-idle-ja"],[3,"junglesnake-strike-close-ja"],[4,"junglesnake-strike-far-ja"],[5,"junglesnake-drop-down-ja"],[6,"junglesnake-death-ja"],[7,"junglesnake-give-up-ja"]],"keg-ag":[[0,"keg-lod0-jg"],[1,"keg-lod0-mg"],[2,"keg-lod1-mg"],[3,"keg-lod2-mg"],[4,"keg-shadow-mg"],[5,"keg-idle-ja"]],"keg-conveyor-ag":[[0,"keg-conveyor-lod0-jg"],[1,"keg-conveyor-lod0-mg"],[2,"keg-conveyor-idle-ja"]],"keg-conveyor-paddle-ag":[[0,"keg-conveyor-paddle-lod0-jg"],[1,"keg-conveyor-paddle-lod0-mg"],[2,"keg-conveyor-paddle-idle-ja"]],"kermit-ag":[[0,"kermit-lod0-jg"],[1,"kermit-lod0-mg"],[2,"kermit-lod1-mg"],[3,"kermit-lod2-mg"],[4,"kermit-idle-ja"],[5,"kermit-hop-ja"],[6,"kermit-longhop-ja"],[7,"kermit-lash-ja"],[8,"kermit-miss-ja"],[9,"kermit-pull-ja"],[10,"kermit-turn-ja"],[11,"kermit-die-ja"]],"kickrock-ag":[[0,"kickrock-lod0-jg"],[1,"kickrock-lod0-mg"],[2,"kickrock-idle-ja"]],"launcherdoor-ag":[[0,"launcherdoor-geo-jg"],[1,"launcherdoor-geo-mg"],[2,"launcherdoor-lod1-mg"],[3,"launcherdoor-idle-ja"]],"launcherdoor-maincave-ag":[[0,"launcherdoor-maincave-geo-jg"],[1,"launcherdoor-maincave-geo-mg"],[2,"launcherdoor-maincave-lod1-mg"],[3,"launcherdoor-maincave-idle-ja"]],"lavaballoon-ag":[[0,"lavaballoon-lod0-jg"],[1,"lavaballoon-lod0-mg"],[2,"lavaballoon-lod1-mg"],[3,"lavaballoon-idle-ja"]],"lavabase-ag":[[0,"lavabase-lod0-jg"],[1,"lavabase-lod0-mg"],[2,"lavabase-idle-ja"]],"lavafall-ag":[[0,"lavafall-lod0-jg"],[1,"lavafall-lod0-mg"],[2,"lavafall-idle-ja"]],"lavafallsewera-ag":[[0,"lavafallsewera-lod0-jg"],[1,"lavafallsewera-lod0-mg"],[2,"lavafallsewera-idle-ja"]],"lavafallsewerb-ag":[[0,"lavafallsewerb-lod0-jg"],[1,"lavafallsewerb-lod0-mg"],[2,"lavafallsewerb-idle-ja"]],"lavashortcut-ag":[[0,"lavashortcut-lod0-jg"],[1,"lavashortcut-lod0-mg"],[2,"lavashortcut-idle-ja"]],"lavaspoutdrip-ag":[[0,"lavaspoutdrip-lod0-jg"],[1,"lavaspoutdrip-lod0-mg"],[2,"lavaspoutdrip-idle-ja"]],"lavayellowtarp-ag":[[0,"lavayellowtarp-lod0-jg"],[1,"lavayellowtarp-lod0-mg"],[2,"lavayellowtarp-idle-ja"]],"light-eco-ag":[[0,"light-eco-big-lod0-jg"],[1,"light-eco-big-lod0-mg"],[2,"light-eco-big-idle-ja"],[3,"light-eco-small-lod0-jg"],[4,"light-eco-small-lod0-mg"],[5,"light-eco-small-idle-ja"]],"lightning-mole-ag":[[0,"lightning-mole-lod0-jg"],[1,"lightning-mole-lod0-mg"],[2,"lightning-mole-lod1-mg"],[3,"lightning-mole-lod2-mg"],[4,"lightning-mole-shadow-mg"],[5,"lightning-mole-idle-ja"],[6,"lightning-mole-spots-ja"],[7,"lightning-mole-run-ja"],[8,"lightning-mole-run-right-ja"],[9,"lightning-mole-run-left-ja"],[10,"lightning-mole-yelp-ja"],[11,"lightning-mole-run-to-idle-ja"],[12,"lightning-mole-dive-ja"],[13,"lightning-mole-peep-ja"]],"logo-ag":[[0,"logo-english-lod0-jg"],[8,"logo-logo-loop-pre-ja"],[1,"logo-english-lod0-mg"],[2,"logo-japan-lod0-jg"],[3,"logo-japan-lod0-mg"],[4,"logo-idle-ja"],[6,"logo-logo-intro-2-pre-ja"]],"logo-black-ag":[[0,"logo-black-lod0-jg"],[1,"logo-black-lod0-mg"],[2,"logo-black-idle-ja"]],"logo-cam-ag":[[0,"logo-cam-lod0-jg"],[1,"logo-cam-lod0-mg"],[2,"logo-cam-idle-ja"],[4,"logo-cam-logo-intro-2-pre-ja"],[6,"logo-cam-logo-loop-pre-ja"]],"logo-volumes-ag":[[0,"logo-volumes-english-lod0-jg"],[1,"logo-volumes-english-lod0-mg"],[2,"logo-volumes-japan-lod0-jg"],[3,"logo-volumes-japan-lod0-mg"],[4,"logo-volumes-idle-ja"]],"logtrap-ag":[[0,"logtrap-lod0-jg"],[1,"logtrap-lod0-mg"],[2,"logtrap-lod1-mg"],[3,"logtrap-shadow-mg"],[4,"logtrap-idle-ja"]],"lrocklrg-ag":[[0,"lrocklrg-lod0-jg"],[1,"lrocklrg-lod0-mg"],[2,"lrocklrg-idle-ja"],[3,"lrocklrg-fallen-ja"]],"lurkercrab-ag":[[0,"lurkercrab-lod0-jg"],[1,"lurkercrab-lod0-mg"],[2,"lurkercrab-lod1-mg"],[3,"lurkercrab-lod2-mg"],[4,"lurkercrab-idle-ja"],[5,"lurkercrab-idle-to-walk-ja"],[6,"lurkercrab-walk-ja"],[7,"lurkercrab-peek-ja"],[8,"lurkercrab-peek-to-walk-ja"],[9,"lurkercrab-snip-ja"],[10,"lurkercrab-kickback-ja"],[11,"lurkercrab-die-ja"]],"lurkerm-piston-ag":[[0,"lurkerm-piston-geo-jg"],[1,"lurkerm-piston-geo-mg"],[2,"lurkerm-piston-idle-ja"]],"lurkerm-tall-sail-ag":[[0,"lurkerm-tall-sail-lod0-jg"],[1,"lurkerm-tall-sail-lod0-mg"],[2,"lurkerm-tall-sail-lod1-mg"],[3,"lurkerm-tall-sail-lod2-mg"],[4,"lurkerm-tall-sail-idle-ja"]],"lurkerpuppy-ag":[[0,"lurkerpuppy-lod0-jg"],[1,"lurkerpuppy-lod0-mg"],[2,"lurkerpuppy-lod1-mg"],[3,"lurkerpuppy-lod2-mg"],[4,"lurkerpuppy-shadow-mg"],[5,"lurkerpuppy-idle-ja"],[6,"lurkerpuppy-walk-ja"],[7,"lurkerpuppy-run-ja"],[8,"lurkerpuppy-celebrate-ja"],[9,"lurkerpuppy-jump-ja"],[10,"lurkerpuppy-jump-land-ja"],[11,"lurkerpuppy-die-ja"]],"lurkerworm-ag":[[0,"lurkerworm-lod0-jg"],[1,"lurkerworm-lod0-mg"],[2,"lurkerworm-lod1-mg"],[3,"lurkerworm-idle-ja"],[4,"lurkerworm-rise-ja"],[5,"lurkerworm-sink-ja"],[6,"lurkerworm-chomp-ja"],[7,"lurkerworm-die-ja"]],"maincavecam-ag":[[0,"maincavecam-lod0-jg"],[1,"maincavecam-lod0-mg"],[2,"maincavecam-dummy-ja"]],"maindoor-ag":[[0,"maindoor-lod0-jg"],[1,"maindoor-lod0-mg"],[2,"maindoor-lod1-mg"],[3,"maindoor-idle-ja"]],"mayor-ag":[[0,"mayor-lod0-jg"],[1,"mayor-lod0-mg"],[2,"mayor-shadow-mg"],[3,"mayor-idle-ja"]],"mayorgears-ag":[[0,"mayorgears-geo-jg"],[1,"mayorgears-geo-mg"],[2,"mayorgears-idle-ja"]],"medres-beach-ag":[[0,"medres-beach-lod0-jg"],[1,"medres-beach-lod0-mg"],[2,"medres-beach-idle-ja"]],"medres-beach1-ag":[[0,"medres-beach1-lod0-jg"],[1,"medres-beach1-lod0-mg"],[2,"medres-beach1-idle-ja"]],"medres-beach2-ag":[[0,"medres-beach2-lod0-jg"],[1,"medres-beach2-lod0-mg"],[2,"medres-beach2-idle-ja"]],"medres-beach3-ag":[[0,"medres-beach3-lod0-jg"],[1,"medres-beach3-lod0-mg"],[2,"medres-beach3-idle-ja"]],"medres-finalboss-ag":[[0,"medres-finalboss-lod0-jg"],[1,"medres-finalboss-lod0-mg"],[2,"medres-finalboss-idle-ja"]],"medres-firecanyon-ag":[[0,"medres-firecanyon-lod0-jg"],[1,"medres-firecanyon-lod0-mg"],[2,"medres-firecanyon-idle-ja"]],"medres-jungle-ag":[[0,"medres-jungle-lod0-jg"],[1,"medres-jungle-lod0-mg"],[2,"medres-jungle-idle-ja"]],"medres-jungle1-ag":[[0,"medres-jungle1-lod0-jg"],[1,"medres-jungle1-lod0-mg"],[2,"medres-jungle1-idle-ja"]],"medres-jungle2-ag":[[0,"medres-jungle2-lod0-jg"],[1,"medres-jungle2-lod0-mg"],[2,"medres-jungle2-idle-ja"]],"medres-misty-ag":[[0,"medres-misty-lod0-jg"],[1,"medres-misty-lod0-mg"],[2,"medres-misty-idle-ja"]],"medres-ogre-ag":[[0,"medres-ogre-lod0-jg"],[1,"medres-ogre-lod0-mg"],[2,"medres-ogre-idle-ja"]],"medres-ogre2-ag":[[0,"medres-ogre2-lod0-jg"],[1,"medres-ogre2-lod0-mg"],[2,"medres-ogre2-idle-ja"]],"medres-ogre3-ag":[[0,"medres-ogre3-lod0-jg"],[1,"medres-ogre3-lod0-mg"],[2,"medres-ogre3-idle-ja"]],"medres-rolling-ag":[[0,"medres-rolling-lod0-jg"],[1,"medres-rolling-lod0-mg"],[2,"medres-rolling-idle-ja"]],"medres-rolling1-ag":[[0,"medres-rolling1-lod0-jg"],[1,"medres-rolling1-lod0-mg"],[2,"medres-rolling1-idle-ja"]],"medres-snow-ag":[[0,"medres-snow-lod0-jg"],[1,"medres-snow-lod0-mg"],[2,"medres-snow-idle-ja"]],"medres-training-ag":[[0,"medres-training-lod0-jg"],[1,"medres-training-lod0-mg"],[2,"medres-training-idle-ja"]],"medres-village11-ag":[[0,"medres-village11-lod0-jg"],[1,"medres-village11-lod0-mg"],[2,"medres-village11-idle-ja"]],"medres-village12-ag":[[0,"medres-village12-lod0-jg"],[1,"medres-village12-lod0-mg"],[2,"medres-village12-idle-ja"]],"medres-village13-ag":[[0,"medres-village13-lod0-jg"],[1,"medres-village13-lod0-mg"],[2,"medres-village13-idle-ja"]],"medres-village2-ag":[[0,"medres-village2-lod0-jg"],[1,"medres-village2-lod0-mg"],[2,"medres-village2-idle-ja"]],"minecartsteel-ag":[[0,"minecartsteel-lod0-jg"],[1,"minecartsteel-lod0-mg"],[2,"minecartsteel-lod1-mg"],[3,"minecartsteel-lod2-mg"],[4,"minecartsteel-idle-ja"],[5,"minecartsteel-rail0-ja"],[6,"minecartsteel-rail1-ja"],[7,"minecartsteel-rail2-ja"]],"minershort-ag":[[0,"minershort-lod0-jg"],[1,"minershort-lod0-mg"],[2,"minershort-shadow-mg"],[3,"minershort-idle-ja"]],"minertall-ag":[[0,"minertall-lod0-jg"],[1,"minertall-lod0-mg"],[2,"minertall-shadow-mg"],[3,"minertall-idle-ja"]],"mis-bone-bridge-ag":[[0,"mis-bone-bridge-lod0-jg"],[1,"mis-bone-bridge-lod0-mg"],[2,"mis-bone-bridge-idle-ja"],[3,"mis-bone-bridge-idle2-ja"],[4,"mis-bone-bridge-idle7-ja"],[5,"mis-bone-bridge-kicked-ja"],[6,"mis-bone-bridge-bumped-ja"]],"mis-bone-platform-ag":[[0,"mis-bone-platform-lod0-jg"],[1,"mis-bone-platform-lod0-mg"],[2,"mis-bone-platform-idle-ja"]],"mistycam-ag":[[0,"mistycam-lod0-jg"],[1,"mistycam-lod0-mg"],[2,"mistycam-anim-ja"],[3,"mistycam-lurkerattack-ja"],[4,"mistycam-balloon-fuel-cell-ja"],[6,"mistycam-cannon-fuel-cell-ja"]],"mistycannon-ag":[[0,"mistycannon-lod0-jg"],[1,"mistycannon-lod0-mg"],[2,"mistycannon-lod1-mg"],[3,"mistycannon-idle-ja"]],"money-ag":[[0,"money-lod0-jg"],[1,"money-lod0-mg"],[2,"money-lod1-mg"],[3,"money-lod2-mg"],[4,"money-idle-ja"]],"mother-spider-ag":[[0,"mother-spider-lod0-jg"],[1,"mother-spider-lod0-mg"],[2,"mother-spider-lod1-mg"],[3,"mother-spider-lod2-mg"],[4,"mother-spider-shadow-mg"],[5,"mother-spider-idle-ja"],[6,"mother-spider-birth-ja"],[7,"mother-spider-lowering-ja"],[8,"mother-spider-stopped-lowering-ja"],[9,"mother-spider-takes-hit-ja"],[10,"mother-spider-spit-ja"],[11,"mother-spider-die-ja"],[12,"mother-spider-die-from-uppercut-ja"],[13,"mother-spider-leg-lod0-jg"],[14,"mother-spider-leg-lod0-mg"],[15,"mother-spider-leg-twitching-ja"],[16,"mother-spider-leg-die-ja"]],"muse-ag":[[0,"muse-lod0-jg"],[1,"muse-lod0-mg"],[2,"muse-shadow-mg"],[3,"muse-idle-ja"],[4,"muse-run-ja"],[5,"muse-idle-to-run-ja"],[6,"muse-run-to-idle-ja"],[7,"muse-jump-ja"],[8,"muse-jump-land-ja"]],"ndi-ag":[[0,"ndi-lod0-jg"],[1,"ndi-lod0-mg"],[2,"ndi-idle-ja"]],"ndi-cam-ag":[[0,"ndi-cam-lod0-jg"],[1,"ndi-cam-lod0-mg"],[2,"ndi-cam-idle-ja"]],"ndi-volumes-ag":[[0,"ndi-volumes-lod0-jg"],[1,"ndi-volumes-lod0-mg"],[2,"ndi-volumes-idle-ja"]],"ogre-bridge-ag":[[0,"ogre-bridge-lod0-jg"],[1,"ogre-bridge-lod0-mg"],[2,"ogre-bridge-idle-ja"],[3,"ogre-bridge-assemble-ja"],[4,"ogre-bridge-break-ja"]],"ogre-bridgeend-ag":[[0,"ogre-bridgeend-lod0-jg"],[1,"ogre-bridgeend-lod0-mg"],[2,"ogre-bridgeend-idle-ja"]],"ogre-isle-ag":[[0,"ogre-isle-a-lod0-jg"],[1,"ogre-isle-a-lod0-mg"],[2,"ogre-isle-a-idle-ja"],[3,"ogre-isle-b-lod0-jg"],[4,"ogre-isle-b-lod0-mg"],[5,"ogre-isle-b-idle-ja"],[6,"ogre-isle-c-lod0-jg"],[7,"ogre-isle-c-lod0-mg"],[8,"ogre-isle-c-idle-ja"],[9,"ogre-isle-d-lod0-jg"],[10,"ogre-isle-d-lod0-mg"],[11,"ogre-isle-d-idle-ja"]],"ogre-step-ag":[[0,"ogre-step-a-lod0-jg"],[1,"ogre-step-a-lod0-mg"],[2,"ogre-step-a-idle-ja"],[3,"ogre-step-b-lod0-jg"],[4,"ogre-step-b-lod0-mg"],[5,"ogre-step-b-idle-ja"],[6,"ogre-step-c-lod0-jg"],[7,"ogre-step-c-lod0-mg"],[8,"ogre-step-c-idle-ja"],[9,"ogre-step-d-lod0-jg"],[10,"ogre-step-d-lod0-mg"],[11,"ogre-step-d-idle-ja"]],"ogreboss-ag":[[0,"ogreboss-lod0-jg"],[1,"ogreboss-lod0-mg"],[2,"ogreboss-idle-ja"],[3,"ogreboss-idle-bored-ja"],[4,"ogreboss-idle-alt-ja"],[5,"ogreboss-roar-ja"],[6,"ogreboss-attack2-start-ja"],[7,"ogreboss-attack2-loop-ja"],[8,"ogreboss-attack2-last-ja"],[9,"ogreboss-attack3-throw-ja"],[10,"ogreboss-hit-chest-ja"],[11,"ogreboss-hit-crotch-ja"],[12,"ogreboss-hit-ja"],[13,"ogreboss-dive-ja"],[14,"ogreboss-rise-ja"],[15,"ogreboss-recover-ja"],[16,"ogreboss-victory-ja"],[17,"ogreboss-shuffle-prepare-ja"],[18,"ogreboss-shuffle-right-start-ja"],[19,"ogreboss-shuffle-right-loop-ja"],[20,"ogreboss-shuffle-right-stop-ja"],[21,"ogreboss-shuffle-left-start-ja"],[22,"ogreboss-shuffle-left-loop-ja"],[23,"ogreboss-shuffle-left-stop-ja"],[24,"ogreboss-intro-ja"],[25,"ogreboss-cam-lod0-jg"],[26,"ogreboss-cam-lod0-mg"],[27,"ogreboss-cam-idle-ja"],[28,"ogreboss-cam-intro-ja"],[29,"ogreboss-shoot-boulder-lod0-jg"],[30,"ogreboss-shoot-boulder-lod0-mg"],[31,"ogreboss-shoot-boulder-shadow-mg"],[32,"ogreboss-shoot-boulder-idle-ja"],[33,"ogreboss-shoot-boulder-break-lod0-jg"],[34,"ogreboss-shoot-boulder-break-lod0-mg"],[35,"ogreboss-shoot-boulder-break-idle-ja"],[36,"ogreboss-bounce-boulder-lod0-jg"],[37,"ogreboss-bounce-boulder-lod0-mg"],[38,"ogreboss-bounce-boulder-idle-ja"],[39,"ogreboss-super-boulder-lod0-jg"],[40,"ogreboss-super-boulder-lod0-mg"],[41,"ogreboss-super-boulder-idle-ja"],[42,"ogreboss-super-boulder-throw-ja"],[43,"ogreboss-super-boulder-hit-ja"],[44,"ogreboss-super-boulder-roll-ja"],[45,"ogreboss-column-lod0-jg"],[46,"ogreboss-column-lod0-mg"],[47,"ogreboss-column-idle-ja"],[48,"ogreboss-column-intro-ja"]],"ogreboss-village2-ag":[[0,"ogreboss-village2-lod0-jg"],[1,"ogreboss-village2-lod0-mg"],[2,"ogreboss-village2-idle-ja"],[3,"ogreboss-village2-idle-bored-ja"],[4,"ogreboss-village2-idle-alt-ja"],[5,"ogreboss-village2-throw-ja"],[6,"ogreboss-village2-victory-ja"],[7,"ogreboss-village2-pre-throw-ja"]],"ogrecam-ag":[[0,"ogrecam-lod0-jg"],[1,"ogrecam-lod0-mg"]],"oracle-ag":[[0,"oracle-lod0-jg"],[1,"oracle-lod0-mg"],[2,"oracle-idle-ja"]],"orb-cache-top-ag":[[0,"orb-cache-top-lod0-jg"],[1,"orb-cache-top-lod0-mg"],[2,"orb-cache-top-lod1-mg"],[3,"orb-cache-top-idle-ja"]],"orbit-plat-ag":[[0,"orbit-plat-lod0-jg"],[1,"orbit-plat-lod0-mg"],[2,"orbit-plat-idle-ja"]],"orbit-plat-bottom-ag":[[0,"orbit-plat-bottom-lod0-jg"],[1,"orbit-plat-bottom-lod0-mg"],[2,"orbit-plat-bottom-idle-ja"]],"pelican-ag":[[0,"pelican-lod0-jg"],[1,"pelican-lod0-mg"],[2,"pelican-lod1-mg"],[3,"pelican-lod2-mg"],[4,"pelican-shadow-mg"],[5,"pelican-fly-ja"],[6,"pelican-glide-ja"],[7,"pelican-swoop-ja"],[8,"pelican-fly-down-ja"],[9,"pelican-land-ja"],[10,"pelican-sleep-ja"]],"periscope-ag":[[0,"periscope-base-lod0-jg"],[1,"periscope-base-lod0-mg"],[2,"periscope-base-lod1-mg"],[3,"periscope-base-idle-ja"],[4,"periscope-mirror-lod0-jg"],[5,"periscope-mirror-lod0-mg"],[6,"periscope-mirror-lod1-mg"],[7,"periscope-mirror-idle-ja"]],"pistons-ag":[[0,"pistons-lod0-jg"],[1,"pistons-lod0-mg"],[2,"pistons-idle-ja"]],"plant-boss-ag":[[0,"plant-boss-main-lod0-jg"],[1,"plant-boss-main-lod0-mg"],[2,"plant-boss-main-shadow-mg"],[3,"plant-boss-main-idle-ja"],[4,"plant-boss-main-idle-alt-ja"],[5,"plant-boss-main-attack-ja"],[6,"plant-boss-main-attack-close-ja"],[7,"plant-boss-main-reset-ja"],[8,"plant-boss-main-eat-ja"],[9,"plant-boss-main-initial-ja"],[10,"plant-boss-main-intro-ja"],[11,"plant-boss-main-idle2vulnerable-ja"],[12,"plant-boss-main-vulnerable-ja"],[13,"plant-boss-main-vulnerable2idle-ja"],[14,"plant-boss-main-hit-ja"],[15,"plant-boss-main-hit-kick-ja"],[16,"plant-boss-main-hit-jumpkick-ja"],[17,"plant-boss-main-die-ja"],[20,"plant-boss-main-swallow-ja"],[21,"plant-boss-main-bounce-ja"],[22,"plant-boss-arms-lod0-jg"],[23,"plant-boss-arms-lod0-mg"],[24,"plant-boss-arms-shadow-mg"],[25,"plant-boss-arms-idle-ja"],[26,"plant-boss-arms-still-ja"],[27,"plant-boss-arms-die-ja"],[28,"plant-boss-arms-die-right-ja"],[29,"plant-boss-arms-hit-ja"],[30,"plant-boss-back-arms-lod0-jg"],[31,"plant-boss-back-arms-lod0-mg"],[32,"plant-boss-back-arms-shadow-mg"],[33,"plant-boss-back-arms-idle-ja"],[34,"plant-boss-back-arms-die-ja"],[35,"plant-boss-back-arms-hit-ja"],[36,"plant-boss-back-arms-hit-kick-ja"],[37,"plant-boss-leaf-lod0-jg"],[38,"plant-boss-leaf-lod0-mg"],[39,"plant-boss-leaf-shadow-mg"],[40,"plant-boss-leaf-stubby-left-ja"],[41,"plant-boss-leaf-grow-left-ja"],[42,"plant-boss-leaf-idle-left-ja"],[43,"plant-boss-leaf-stubby-right-ja"],[44,"plant-boss-leaf-grow-right-ja"],[45,"plant-boss-leaf-idle-right-ja"],[46,"plant-boss-leaf-left-bounce-ja"],[47,"plant-boss-leaf-right-bounce-ja"],[48,"plant-boss-vine-lod0-jg"],[49,"plant-boss-vine-lod0-mg"],[50,"plant-boss-vine-idle-ja"],[51,"plant-boss-vine-die-ja"],[52,"plant-boss-vine-hit-ja"],[53,"plant-boss-root-lod0-jg"],[54,"plant-boss-root-lod0-mg"],[55,"plant-boss-root-idle-ja"]],"plant-boss-main+0-ag":[[0,"eichar-main-plant-boss-kill-ja"],[1,"eichar-main-plant-boss-kill-close-ja"],[2,"plant-boss-main-plant-boss-kill-ja"],[3,"plant-boss-main-plant-boss-kill-close-ja"],[4,"sidekick-main-plant-boss-kill-ja"],[5,"sidekick-main-plant-boss-kill-close-ja"]],"plat-ag":[[0,"plat-lod0-jg"],[1,"plat-lod0-mg"],[2,"plat-lod1-mg"],[3,"plat-lod2-mg"],[4,"plat-idle-ja"]],"plat-button-ag":[[0,"plat-button-geo-jg"],[1,"plat-button-geo-mg"],[2,"plat-button-pressed-ja"]],"plat-citb-ag":[[0,"plat-citb-lod0-jg"],[1,"plat-citb-lod0-mg"],[2,"plat-citb-lod1-mg"],[3,"plat-citb-idle-ja"]],"plat-eco-ag":[[0,"plat-eco-lod0-jg"],[1,"plat-eco-lod0-mg"],[2,"plat-eco-lod1-mg"],[3,"plat-eco-lod2-mg"],[4,"plat-eco-lit-lod0-jg"],[5,"plat-eco-lit-lod0-mg"],[6,"plat-eco-lit-lod1-mg"],[7,"plat-eco-lit-lod2-mg"],[8,"plat-eco-idle-ja"]],"plat-eco-citb-ag":[[0,"plat-eco-citb-lod0-jg"],[1,"plat-eco-citb-lod0-mg"],[2,"plat-eco-citb-lod1-mg"],[3,"plat-eco-citb-lod2-mg"],[4,"plat-eco-citb-lit-lod0-jg"],[5,"plat-eco-citb-lit-lod0-mg"],[6,"plat-eco-citb-lit-lod1-mg"],[7,"plat-eco-citb-lit-lod2-mg"],[8,"plat-eco-citb-idle-ja"]],"plat-eco-finalboss-ag":[[0,"plat-eco-finalboss-lod0-jg"],[1,"plat-eco-finalboss-lod0-mg"],[2,"plat-eco-finalboss-lod1-mg"],[3,"plat-eco-finalboss-lod2-mg"],[4,"plat-eco-finalboss-lit-lod0-jg"],[5,"plat-eco-finalboss-lit-lod0-mg"],[6,"plat-eco-finalboss-lit-lod1-mg"],[7,"plat-eco-finalboss-lit-lod2-mg"],[8,"plat-eco-finalboss-idle-ja"]],"plat-flip-ag":[[0,"plat-flip-geo-jg"],[1,"plat-flip-geo-mg"],[2,"plat-flip-turn-down-ja"],[3,"plat-flip-turn-up-ja"]],"plat-jungleb-ag":[[0,"plat-jungleb-lod0-jg"],[1,"plat-jungleb-lod0-mg"],[2,"plat-jungleb-lod1-mg"],[3,"plat-jungleb-lod2-mg"],[4,"plat-jungleb-idle-ja"]],"plat-sunken-ag":[[0,"plat-sunken-lod0-jg"],[1,"plat-sunken-lod0-mg"],[2,"plat-sunken-lod1-mg"],[3,"plat-sunken-lod2-mg"],[4,"plat-sunken-idle-ja"]],"plunger-lurker-ag":[[0,"plunger-lurker-lod0-jg"],[1,"plunger-lurker-lod0-mg"],[2,"plunger-lurker-lod1-mg"],[3,"plunger-lurker-lod2-mg"],[4,"plunger-lurker-idle-ja"],[5,"plunger-lurker-notice-ja"],[6,"plunger-lurker-death-ja"]],"pontoonfive-ag":[[0,"pontoonfive-lod0-jg"],[1,"pontoonfive-lod0-mg"],[2,"pontoonfive-lod1-mg"],[3,"pontoonfive-lod2-mg"],[4,"pontoonfive-idle-ja"]],"pontoonten-ag":[[0,"pontoonten-lod0-jg"],[1,"pontoonten-lod0-mg"],[2,"pontoonten-lod1-mg"],[3,"pontoonten-lod2-mg"],[4,"pontoonten-idle-ja"]],"power-left-ag":[[0,"power-left-lod0-jg"],[1,"power-left-lod0-mg"],[2,"power-left-idle-ja"]],"power-right-ag":[[0,"power-right-lod0-jg"],[1,"power-right-lod0-mg"],[2,"power-right-idle-ja"]],"powercellalt-ag":[[0,"powercellalt-lod0-jg"],[1,"powercellalt-lod0-mg"],[2,"powercellalt-idle-ja"]],"precurbridge-ag":[[0,"precurbridge-geo-jg"],[1,"precurbridge-geo-mg"],[2,"precurbridge-lod1-mg"],[3,"precurbridge-idle-ja"],[4,"precurbridge-float-ja"],[5,"precurbridge-static-ja"]],"precursor-arm-ag":[[0,"precursor-arm-lod0-jg"],[1,"precursor-arm-lod0-mg"],[2,"precursor-arm-idle-ja"]],"puffer-ag":[[0,"puffer-main-lod0-jg"],[1,"puffer-main-lod0-mg"],[2,"puffer-main-lod1-mg"],[3,"puffer-main-lod2-mg"],[4,"puffer-main-shadow-mg"],[5,"puffer-mean-lod0-jg"],[6,"puffer-mean-lod0-mg"],[7,"puffer-mean-lod1-mg"],[8,"puffer-mean-lod2-mg"],[9,"puffer-hover-unpuffed-ja"],[10,"puffer-hover-puffed-ja"],[11,"puffer-fly-unpuffed-ja"],[12,"puffer-fly-puffed-ja"],[13,"puffer-puff-up-ja"],[14,"puffer-puff-down-ja"],[15,"puffer-die-ja"]],"pusher-ag":[[0,"pusher-lod0-jg"],[1,"pusher-lod0-mg"],[2,"pusher-idle-ja"]],"qbert-plat-ag":[[0,"qbert-plat-lod0-jg"],[1,"qbert-plat-lod0-mg"],[2,"qbert-plat-idle-ja"]],"qbert-plat-on-ag":[[0,"qbert-plat-on-lod0-jg"],[1,"qbert-plat-on-lod0-mg"],[2,"qbert-plat-on-idle-ja"]],"quicksandlurker-ag":[[0,"quicksandlurker-lod0-jg"],[1,"quicksandlurker-lod0-mg"],[2,"quicksandlurker-idle-ja"],[3,"quicksandlurker-yawn-ja"],[4,"quicksandlurker-spit-ja"],[5,"quicksandlurker-hide-ja"],[6,"quicksandlurker-victory-ja"],[7,"quicksandlurker-victory2-ja"],[8,"quicksandlurker-popup-ja"],[9,"quicksandlurker-die-ja"]],"race-ring-ag":[[0,"race-ring-lod0-jg"],[1,"race-ring-lod0-mg"],[2,"race-ring-race-ring-idle-ja"]],"racer-ag":[[0,"racer-geo-jg"],[24,"racer-explode-idle-ja"],[1,"racer-geo-mg"],[2,"racer-shadow-mg"],[22,"racer-explode-lod0-jg"],[23,"racer-explode-lod0-mg"]],"ram-ag":[[0,"ram-lod0-jg"],[1,"ram-lod0-mg"],[2,"ram-lod1-mg"],[3,"ram-lod2-mg"],[4,"ram-cock-ja"],[5,"ram-release-ja"],[6,"ram-idle-ja"]],"ram-boss-ag":[[0,"ram-boss-lod0-jg"],[1,"ram-boss-lod0-mg"],[2,"ram-boss-lod1-mg"],[3,"ram-boss-lod2-mg"],[4,"ram-boss-cock-ja"],[5,"ram-boss-release-ja"],[6,"ram-boss-forward-defend-ja"],[7,"ram-boss-forward-defend-tracking-ja"],[8,"ram-boss-forward-defend-block-ja"],[9,"ram-boss-up-defend-block-ja"],[10,"ram-boss-throw-ja"],[11,"ram-boss-run-ja"],[12,"ram-boss-run-no-shield-ja"],[13,"ram-boss-far-idle-ja"],[14,"ram-boss-celebrate-ja"],[15,"ram-boss-die-ja"],[16,"ram-boss-dismount-start-ja"],[17,"ram-boss-dismount-hit-ground-ja"],[18,"ram-boss-lose-shield-ja"],[19,"ram-boss-sees-player-ja"],[20,"ram-boss-forward-defend-tracking-no-shield-ja"],[21,"ram-boss-up-defend-ja"],[22,"ram-boss-up-defend-tracking-ja"],[23,"ram-boss-throw-no-shield-ja"],[24,"ram-boss-forward-defend-no-shield-ja"]],"redring-ag":[[0,"redring-lod0-jg"],[1,"redring-lod0-mg"],[2,"redring-idle-ja"]],"redsage-ag":[[0,"redsage-lod0-jg"],[1,"redsage-lod0-mg"],[2,"redsage-lod1-mg"],[3,"redsage-shadow-mg"],[4,"redsage-redsage-idle-ja"],[5,"redsage-redsage-attack-start-ja"],[6,"redsage-redsage-attack-loop-ja"]],"reflector-middle-ag":[[0,"reflector-middle-geo-jg"],[1,"reflector-middle-geo-mg"],[2,"reflector-middle-idle-ja"]],"reflector-mirror-ag":[[0,"reflector-mirror-lod0-jg"],[1,"reflector-mirror-lod0-mg"],[2,"reflector-mirror-lod1-mg"],[3,"reflector-mirror-idle-ja"],[4,"reflector-mirror-break-lod0-jg"],[5,"reflector-mirror-break-lod0-mg"],[6,"reflector-mirror-break-break-ja"]],"revcycle-ag":[[0,"revcycle-geo-jg"],[1,"revcycle-geo-mg"],[2,"revcycle-idle-ja"]],"revcycleprop-ag":[[0,"revcycleprop-lod0-jg"],[1,"revcycleprop-lod0-mg"],[2,"revcycleprop-idle-ja"]],"robber-ag":[[0,"robber-lod0-jg"],[1,"robber-lod0-mg"],[2,"robber-lod1-mg"],[3,"robber-lod2-mg"],[4,"robber-shadow-mg"],[5,"robber-idle-ja"],[6,"robber-spots-ja"],[7,"robber-fly-ja"],[8,"robber-death-ja"],[9,"robber-taunt-ja"],[10,"robber-idle-hover-ja"],[11,"robber-ambient-look-ja"]],"robotboss-ag":[[0,"robotboss-basic-lod0-jg"],[1,"robotboss-basic-lod0-mg"],[2,"robotboss-idle-ja"],[3,"robotboss-idle-blue-ja"],[4,"robotboss-blue-hit-ja"],[5,"robotboss-blue-roar-ja"],[6,"robotboss-idle-hover-no-blue-ja"],[7,"robotboss-idle-hover-lookup-no-blue-ja"],[8,"robotboss-dark-reveal-ja"],[9,"robotboss-dark-shoot-ja"],[10,"robotboss-dark-return-ja"],[11,"robotboss-green-spawn-ja"],[12,"robotboss-green-idle-ja"],[13,"robotboss-green-roar-ja"],[14,"robotboss-dark-reveal-green-ja"],[15,"robotboss-dark-return-after-green-ja"],[16,"robotboss-red-idle-ja"],[17,"robotboss-red-charge-ja"],[18,"robotboss-red-blast-ja"],[19,"robotboss-red-hit-ja"],[20,"robotboss-red-roar-ja"],[21,"robotboss-idle-hover-no-red-ja"],[22,"robotboss-dark-reveal-no-red-ja"],[23,"robotboss-idle-hover-lookup-no-red-ja"],[24,"robotboss-dark-shoot-no-red-ja"],[25,"robotboss-dark-return-after-red-ja"],[26,"robotboss-yellow-idle-ja"],[27,"robotboss-yellow-blast-ja"],[28,"robotboss-yellow-hit-ja"],[29,"robotboss-yellow-roar-ja"],[30,"robotboss-idle-hover-no-yellow-ja"],[31,"robotboss-dark-reveal-no-yellow-ja"],[32,"robotboss-dark-shoot-no-yellow-ja"],[33,"robotboss-blue-last-hit-ja"],[34,"robotboss-red-last-hit-ja"],[35,"robotboss-yellow-last-hit-ja"]],"robotboss-blueeco-ag":[[0,"robotboss-blueeco-lod0-jg"],[1,"robotboss-blueeco-lod0-mg"],[2,"robotboss-blueeco-idle-ja"],[3,"robotboss-blueeco-blue-last-hit-ja"]],"robotboss-cinematic-ag":[[0,"robotboss-cinematic-lod0-jg"],[1,"robotboss-cinematic-lod0-mg"],[2,"robotboss-cinematic-idle-ja"]],"robotboss-redeco-ag":[[0,"robotboss-redeco-lod0-jg"],[1,"robotboss-redeco-lod0-mg"],[2,"robotboss-redeco-idle-ja"],[3,"robotboss-redeco-red-last-hit-ja"]],"robotboss-yelloweco-ag":[[0,"robotboss-yelloweco-lod0-jg"],[1,"robotboss-yelloweco-lod0-mg"],[2,"robotboss-yelloweco-idle-ja"],[3,"robotboss-yelloweco-yellow-last-hit-ja"]],"rolling-start-ag":[[0,"rolling-start-whole-lod0-jg"],[1,"rolling-start-whole-lod0-mg"],[2,"rolling-start-broken-lod0-jg"],[3,"rolling-start-broken-lod0-mg"],[4,"rolling-start-idle-ja"],[5,"rolling-start-break-whole-ja"],[6,"rolling-start-break-broken-ja"],[7,"rolling-start-broken-ja"]],"rollingcam-ag":[[0,"rollingcam-lod0-jg"],[1,"rollingcam-lod0-mg"],[2,"rollingcam-anim-ja"]],"ropebridge-32-ag":[[0,"ropebridge-32-lod0-jg"],[1,"ropebridge-32-lod0-mg"],[2,"ropebridge-32-lod1-mg"],[3,"ropebridge-32-idle-ja"]],"ropebridge-36-ag":[[0,"ropebridge-36-lod0-jg"],[1,"ropebridge-36-lod0-mg"],[2,"ropebridge-36-lod1-mg"],[3,"ropebridge-36-idle-ja"]],"ropebridge-52-ag":[[0,"ropebridge-52-lod0-jg"],[1,"ropebridge-52-lod0-mg"],[2,"ropebridge-52-lod1-mg"],[3,"ropebridge-52-idle-ja"]],"ropebridge-70-ag":[[0,"ropebridge-70-lod0-jg"],[1,"ropebridge-70-lod0-mg"],[2,"ropebridge-70-lod1-mg"],[3,"ropebridge-70-idle-ja"]],"rounddoor-ag":[[0,"rounddoor-lod0-jg"],[1,"rounddoor-lod0-mg"],[2,"rounddoor-lod1-mg"],[3,"rounddoor-idle-ja"]],"sack-ag":[[0,"sack-lod0-jg"],[1,"sack-lod0-mg"],[2,"sack-idle-ja"],[3,"sack-hit-ja"],[4,"sack-fuse-ja"]],"sage-ag":[[0,"sage-lod0-jg"],[1,"sage-lod0-mg"],[2,"sage-shadow-mg"],[3,"sage-idle-cannon-ja"],[4,"sage-idle-ecorocks-breathe-ja"],[5,"sage-idle-ecorocks-peer-ja"],[6,"sage-idle-levitate-ja"],[7,"sage-idle-levitate-backward-ja"]],"sage-bluehut-ag":[[0,"sage-bluehut-lod0-jg"],[1,"sage-bluehut-lod0-mg"],[2,"sage-bluehut-shadow-mg"],[3,"sage-bluehut-idle-ja"],[4,"sage-bluehut-idle-stand-ja"],[5,"sage-bluehut-idle-prec-arm-ja"]],"sage-village3-ag":[[0,"sage-village3-lod0-jg"],[1,"sage-village3-lod0-mg"],[2,"sage-village3-shadow-mg"],[3,"sage-village3-idle-ja"]],"sagesail-ag":[[0,"sagesail-lod0-jg"],[1,"sagesail-lod0-mg"],[2,"sagesail-lod1-mg"],[3,"sagesail-lod2-mg"],[4,"sagesail-idle-ja"]],"scarecrow-a-ag":[[0,"scarecrow-a-lod0-jg"],[1,"scarecrow-a-lod0-mg"],[2,"scarecrow-a-lod1-mg"],[3,"scarecrow-a-lod2-mg"],[4,"scarecrow-a-break-lod0-mg"],[5,"scarecrow-a-idle-ja"],[6,"scarecrow-a-hit-left-ja"],[7,"scarecrow-a-hit-right-ja"],[8,"scarecrow-a-hit-front-ja"]],"scarecrow-b-ag":[[0,"scarecrow-b-lod0-jg"],[1,"scarecrow-b-lod0-mg"],[2,"scarecrow-b-lod1-mg"],[3,"scarecrow-b-lod2-mg"],[4,"scarecrow-b-break-lod0-mg"],[5,"scarecrow-b-idle-ja"],[6,"scarecrow-b-hit-left-ja"],[7,"scarecrow-b-hit-right-ja"],[8,"scarecrow-b-hit-front-ja"]],"sculptor-ag":[[0,"sculptor-lod0-jg"],[1,"sculptor-lod0-mg"],[2,"sculptor-shadow-mg"],[3,"sculptor-idle-ja"],[4,"sculptor-sigh-ja"],[5,"sculptor-strikestart-ja"],[6,"sculptor-strikemiddle-ja"],[7,"sculptor-strikeend-ja"],[8,"sculptor-to-small-ja"],[9,"sculptor-small-ja"],[10,"sculptor-small-to-looking-ja"],[11,"sculptor-looking-ja"],[12,"sculptor-from-looking-ja"],[13,"sculptor-to-huge-ja"],[14,"sculptor-huge-ja"],[15,"sculptor-huge-to-looking-ja"]],"sculptor-muse-ag":[[0,"sculptor-muse-lod0-jg"],[1,"sculptor-muse-lod0-mg"],[2,"sculptor-muse-idle-ja"]],"seagull-ag":[[0,"seagull-lod0-jg"],[1,"seagull-lod0-mg"],[2,"seagull-idle-ja"],[3,"seagull-peck-ja"],[4,"seagull-fly-ja"],[5,"seagull-slowfly-ja"],[6,"seagull-land-ja"],[7,"seagull-stop-ja"],[8,"seagull-walk-ja"],[9,"seagull-takeoff-ja"]],"seaweed-ag":[[0,"seaweed-lod0-jg"],[1,"seaweed-lod0-mg"],[2,"seaweed-idle-ja"]],"sharkey-ag":[[0,"sharkey-lod0-jg"],[1,"sharkey-lod0-mg"],[2,"sharkey-idle-ja"],[3,"sharkey-chomp-ja"]],"shortcut-boulder-ag":[[0,"shortcut-boulder-whole-lod0-jg"],[1,"shortcut-boulder-whole-lod0-mg"],[2,"shortcut-boulder-broken-lod0-jg"],[3,"shortcut-boulder-broken-lod0-mg"],[4,"shortcut-boulder-idle-ja"]],"shover-ag":[[0,"shover-lod0-jg"],[1,"shover-lod0-mg"],[2,"shover-idle-ja"]],"side-to-side-plat-ag":[[0,"side-to-side-plat-lod0-jg"],[1,"side-to-side-plat-lod0-mg"],[2,"side-to-side-plat-lod1-mg"],[3,"side-to-side-plat-idle-ja"]],"sidedoor-ag":[[0,"sidedoor-geo-jg"],[1,"sidedoor-geo-mg"],[2,"sidedoor-lod1-mg"],[3,"sidedoor-idle-ja"]],"sidekick-ag":[[0,"sidekick-lod0-jg"],[1,"sidekick-lod0-mg"],[2,"sidekick-shadow-mg"],[3,"sidekick-run-to-stance-ja"],[68,"sidekick-yellow-running-blast-ja"],[4,"sidekick-run-to-stance-loop-ja"],[5,"sidekick-stance-loop-ja"],[6,"sidekick-run-ja"],[7,"sidekick-run-up-ja"],[8,"sidekick-run-down-ja"],[9,"sidekick-walk-ja"],[10,"sidekick-walk-up-ja"],[11,"sidekick-walk-down-ja"],[12,"sidekick-run-squash-ja"],[13,"sidekick-run-squash-weak-ja"],[14,"sidekick-stance-to-duck-ja"],[15,"sidekick-duck-stance-ja"],[16,"sidekick-duck-walk-ja"],[17,"sidekick-turn-around-ja"],[18,"sidekick-jump-ja"],[19,"sidekick-jump-land-ja"],[20,"sidekick-painful-land-ja"],[21,"sidekick-painful-land-end-ja"],[22,"sidekick-jump-loop-ja"],[23,"sidekick-jump-short-land-ja"],[24,"sidekick-jump-forward-ja"],[25,"sidekick-duck-high-jump-ja"],[26,"sidekick-launch-jump-ja"],[27,"sidekick-launch-jump-loop-ja"],[28,"sidekick-edge-grab-stance0-ja"],[29,"sidekick-edge-grab-stance1-ja"],[30,"sidekick-edge-grab-stance1-alt-ja"],[31,"sidekick-falling-to-edge-grab-ja"],[32,"sidekick-edge-grab-swing-left-ja"],[33,"sidekick-edge-grab-swing-right-ja"],[34,"sidekick-edge-grab-to-jump-ja"],[35,"sidekick-edge-grab-off-ja"],[36,"sidekick-attack-from-stance-ja"],[37,"sidekick-attack-from-stance-end-ja"],[38,"sidekick-attack-from-stance-alt-end-ja"],[39,"sidekick-attack-from-stance-run-end-ja"],[40,"sidekick-attack-from-stance-run-alt-end-ja"],[41,"sidekick-attack-from-jump-ja"],[42,"sidekick-attack-from-jump-loop-ja"],[171,"sidekick-free-run-ja"],[43,"sidekick-attack-from-jump-end-ja"],[172,"sidekick-free-jog-ja"],[44,"sidekick-attack-punch-ja"],[173,"sidekick-free-walk-ja"],[45,"sidekick-attack-punch-end-ja"],[46,"sidekick-attack-punch-alt-end-ja"],[47,"sidekick-attack-uppercut-ja"],[48,"sidekick-flop-down-ja"],[49,"sidekick-flop-down-loop-ja"],[50,"sidekick-flop-down-land-ja"],[51,"sidekick-moving-flop-down-ja"],[52,"sidekick-moving-flop-down-loop-ja"],[53,"sidekick-moving-flop-down-land-ja"],[54,"sidekick-duck-roll-ja"],[55,"sidekick-duck-roll-end-ja"],[56,"sidekick-wheel-flip-ja"],[57,"sidekick-wheel-flip-land-ja"],[58,"sidekick-hit-from-front-ja"],[59,"sidekick-hit-from-back-ja"],[60,"sidekick-hit-up-ja"],[61,"sidekick-deatha-ja"],[62,"sidekick-death-painful-land-ja"],[69,"sidekick-yellow-running-blast-end-ja"],[70,"sidekick-yellow-jumping-blast-ja"],[71,"sidekick-powerup-ja"],[72,"sidekick-shocked-ja"],[73,"sidekick-wade-shallow-walk-ja"],[74,"sidekick-wade-deep-walk-ja"],[75,"sidekick-swim-stance-ja"],[76,"sidekick-swim-walk-ja"],[77,"sidekick-swim-walk-to-down-ja"],[78,"sidekick-swim-down-ja"],[79,"sidekick-swim-down-to-up-ja"],[80,"sidekick-swim-up-ja"],[81,"sidekick-swim-up-to-stance-ja"],[82,"sidekick-swim-jump-ja"],[95,"sidekick-trip-ja"],[122,"sidekick-fuel-cell-victory-9-ja"]],"sidekick-human-ag":[[0,"sidekick-human-lod0-jg"],[1,"sidekick-human-lod0-mg"],[2,"sidekick-human-shadow-mg"],[3,"sidekick-human-idle-ja"]],"silodoor-ag":[[0,"silodoor-lod0-jg"],[1,"silodoor-lod0-mg"],[2,"silodoor-idle-ja"]],"silostep-ag":[[0,"silostep-lod0-jg"],[1,"silostep-lod0-mg"],[2,"silostep-idle-ja"]],"snow-ball-ag":[[0,"snow-ball-lod0-jg"],[1,"snow-ball-lod0-mg"],[2,"snow-ball-idle-ja"],[3,"snow-ball-shadow-lod0-jg"],[4,"snow-ball-shadow-lod0-mg"],[5,"snow-ball-shadow-shadow-mg"],[6,"snow-ball-shadow-idle-ja"]],"snow-bridge-36-ag":[[0,"snow-bridge-36-lod0-jg"],[1,"snow-bridge-36-lod0-mg"],[2,"snow-bridge-36-lod1-mg"],[3,"snow-bridge-36-idle-ja"]],"snow-bumper-ag":[[0,"snow-bumper-lod0-jg"],[1,"snow-bumper-lod0-mg"],[2,"snow-bumper-lod1-mg"],[3,"snow-bumper-idle-ja"],[4,"snow-bumper-button-ja"],[5,"snow-bumper-collapse-ja"]],"snow-bunny-ag":[[0,"snow-bunny-lod0-jg"],[1,"snow-bunny-lod0-mg"],[2,"snow-bunny-lod1-mg"],[3,"snow-bunny-lod2-mg"],[4,"snow-bunny-shadow-mg"],[5,"snow-bunny-idle-ja"],[6,"snow-bunny-attack-ja"],[7,"snow-bunny-big-hop-ja"],[8,"snow-bunny-small-hop-ja"],[9,"snow-bunny-sees-player-ja"],[10,"snow-bunny-sees-player-land-ja"],[11,"snow-bunny-die-ja"]],"snow-button-ag":[[0,"snow-button-lod0-jg"],[1,"snow-button-lod0-mg"],[2,"snow-button-going-down-ja"],[3,"snow-button-going-up-ja"]],"snow-eggtop-ag":[[0,"snow-eggtop-lod0-jg"],[1,"snow-eggtop-lod0-mg"],[2,"snow-eggtop-idle-ja"]],"snow-fort-gate-ag":[[0,"snow-fort-gate-lod0-jg"],[1,"snow-fort-gate-lod0-mg"],[2,"snow-fort-gate-idle-ja"]],"snow-gears-ag":[[0,"snow-gears-lod0-jg"],[1,"snow-gears-lod0-mg"],[2,"snow-gears-idle-ja"],[3,"snow-gears-start-ja"],[4,"snow-gears-loop-ja"],[5,"snow-gears-stop-ja"]],"snow-log-ag":[[0,"snow-log-lod0-jg"],[1,"snow-log-lod0-mg"],[2,"snow-log-activate-ja"],[3,"snow-log-active-loop-ja"]],"snow-spatula-ag":[[0,"snow-spatula-lod0-jg"],[1,"snow-spatula-lod0-mg"],[2,"snow-spatula-idle-ja"]],"snow-switch-ag":[[0,"snow-switch-lod0-jg"],[1,"snow-switch-lod0-mg"],[2,"snow-switch-idle-ja"]],"snowcam-ag":[[0,"snowcam-lod0-jg"],[1,"snowcam-lod0-mg"],[2,"snowcam-gearstart-ja"],[3,"snowcam-gate-ja"],[4,"snowcam-gearend-ja"],[5,"snowcam-eggtop-activating-ja"],[6,"snowcam-ecovent-activating-ja"]],"snowpusher-ag":[[0,"snowpusher-lod0-jg"],[1,"snowpusher-lod0-mg"],[2,"snowpusher-idle-ja"]],"speaker-ag":[[0,"speaker-lod0-jg"],[1,"speaker-lod0-mg"],[2,"speaker-idle-ja"]],"spider-egg-ag":[[0,"spider-egg-unbroken-lod0-jg"],[1,"spider-egg-unbroken-lod0-mg"],[2,"spider-egg-unbroken-lod1-mg"],[3,"spider-egg-unbroken-lod2-mg"],[4,"spider-egg-unbroken-shadow-mg"],[5,"spider-egg-broken-lod0-jg"],[6,"spider-egg-broken-lod0-mg"],[7,"spider-egg-broken-lod1-mg"],[8,"spider-egg-broken-lod2-mg"],[9,"spider-egg-idle-ja"],[10,"spider-egg-crack-ja"],[11,"spider-egg-bounce-ja"],[12,"spider-egg-die-ja"],[13,"spider-egg-twitch-ja"]],"spiderwebs-ag":[[0,"spiderwebs-good-lod0-jg"],[1,"spiderwebs-good-lod0-mg"],[2,"spiderwebs-bounce-ja"]],"spike-ag":[[0,"spike-lod0-jg"],[1,"spike-lod0-mg"],[2,"spike-lod1-mg"],[3,"spike-idle-ja"]],"square-platform-ag":[[0,"square-platform-lod0-jg"],[1,"square-platform-lod0-mg"],[2,"square-platform-lod1-mg"],[3,"square-platform-idle-ja"]],"steam-cap-ag":[[0,"steam-cap-lod0-jg"],[1,"steam-cap-lod0-mg"],[2,"steam-cap-idle-ja"]],"sun-iris-door-ag":[[0,"sun-iris-door-lod0-jg"],[1,"sun-iris-door-lod0-mg"],[2,"sun-iris-door-lod1-mg"],[3,"sun-iris-door-idle-ja"]],"sunken-elevator-ag":[[0,"sunken-elevator-lod0-jg"],[1,"sunken-elevator-lod0-mg"],[2,"sunken-elevator-pressed-ja"]],"sunkencam-ag":[[0,"sunkencam-lod0-jg"],[1,"sunkencam-lod0-mg"],[2,"sunkencam-qbert-show-door-open-ja"],[3,"sunkencam-qbert-show-door-close-ja"],[4,"sunkencam-exit-chamber-door-open-ja"],[5,"sunkencam-start-door-shut-ja"],[6,"sunkencam-start-in-room-ja"],[7,"sunkencam-middle-in-water-ja"],[8,"sunkencam-end-out-of-water-ja"],[9,"sunkencam-dive-start-ja"],[10,"sunkencam-dive-middle-ja"],[11,"sunkencam-dive-end-ja"],[12,"sunkencam-square-platform-setup1-rise1-ja"],[13,"sunkencam-square-platform-setup1-rise2-ja"],[14,"sunkencam-square-platform-setup2-rise1-ja"],[15,"sunkencam-square-platform-setup2-rise2-ja"],[16,"sunkencam-helix-hit-switch-ja"],[17,"sunkencam-helix-door-shuts-ja"],[18,"sunkencam-helix-show-rising-water-ja"],[19,"sunkencam-pipegame-left-ja"],[20,"sunkencam-pipegame-middle-ja"],[21,"sunkencam-pipegame-right-ja"]],"sunkenfisha-ag":[[0,"sunkenfisha-red-yellow-lod0-jg"],[1,"sunkenfisha-red-yellow-lod0-mg"],[2,"sunkenfisha-yellow-blue-lod0-jg"],[3,"sunkenfisha-yellow-blue-lod0-mg"],[4,"sunkenfisha-yellow-eye-lod0-jg"],[5,"sunkenfisha-yellow-eye-lod0-mg"],[6,"sunkenfisha-idle-ja"]],"swamp-bat-ag":[[0,"swamp-bat-lod0-jg"],[1,"swamp-bat-lod0-mg"],[2,"swamp-bat-lod1-mg"],[3,"swamp-bat-lod2-mg"],[4,"swamp-bat-idle-ja"],[5,"swamp-bat-notice-ja"],[6,"swamp-bat-swoop-ja"],[7,"swamp-bat-strafe-ja"],[8,"swamp-bat-die-ja"],[9,"swamp-bat-strafe-to-idle-ja"]],"swamp-blimp-ag":[[0,"swamp-blimp-lod0-jg"],[1,"swamp-blimp-lod0-mg"],[2,"swamp-blimp-lod1-mg"],[3,"swamp-blimp-idle-ja"]],"swamp-rat-ag":[[0,"swamp-rat-lod0-jg"],[1,"swamp-rat-lod0-mg"],[2,"swamp-rat-lod1-mg"],[3,"swamp-rat-lod2-mg"],[4,"swamp-rat-idle-ja"],[5,"swamp-rat-fall-ja"],[6,"swamp-rat-bounce-ja"],[7,"swamp-rat-walk-ja"],[8,"swamp-rat-notice-ja"],[9,"swamp-rat-run-ja"],[10,"swamp-rat-celebrate-ja"],[11,"swamp-rat-die-ja"],[12,"swamp-rat-eat-ja"]],"swamp-rat-nest-ag":[[0,"swamp-rat-nest-a-lod0-jg"],[1,"swamp-rat-nest-a-lod0-mg"],[2,"swamp-rat-nest-a-lod1-mg"],[3,"swamp-rat-nest-a-idle-ja"],[4,"swamp-rat-nest-b-lod0-jg"],[5,"swamp-rat-nest-b-lod0-mg"],[6,"swamp-rat-nest-b-lod1-mg"],[7,"swamp-rat-nest-b-idle-ja"],[8,"swamp-rat-nest-c-lod0-jg"],[9,"swamp-rat-nest-c-lod0-mg"],[10,"swamp-rat-nest-c-lod1-mg"],[11,"swamp-rat-nest-c-idle-ja"]],"swamp-rock-ag":[[0,"swamp-rock-lod0-jg"],[1,"swamp-rock-lod0-mg"],[2,"swamp-rock-idle-ja"]],"swamp-rope-ag":[[0,"swamp-rope-lod0-jg"],[1,"swamp-rope-lod0-mg"],[2,"swamp-rope-idle-ja"],[3,"swamp-rope-slack-ja"],[4,"swamp-rope-swing-ja"]],"swamp-spike-ag":[[0,"swamp-spike-lod0-jg"],[1,"swamp-spike-lod0-mg"],[2,"swamp-spike-lod1-mg"],[3,"swamp-spike-up-ja"],[4,"swamp-spike-down-ja"],[5,"swamp-spike-shake-ja"]],"swamp-tetherrock-ag":[[0,"swamp-tetherrock-lod0-jg"],[1,"swamp-tetherrock-lod0-mg"],[2,"swamp-tetherrock-idle-ja"]],"swamp-tetherrock-explode-ag":[[0,"swamp-tetherrock-explode-lod0-jg"],[1,"swamp-tetherrock-explode-lod0-mg"],[2,"swamp-tetherrock-explode-idle-ja"],[3,"swamp-tetherrock-explode-explode-ja"]],"swampcam-ag":[[0,"swampcam-lod0-jg"],[1,"swampcam-lod0-mg"],[2,"swampcam-anim-ja"],[3,"swampcam-swamp-ambush-ja"]],"tar-plat-ag":[[0,"tar-plat-lod0-jg"],[1,"tar-plat-lod0-mg"],[2,"tar-plat-lod1-mg"],[3,"tar-plat-idle-ja"]],"teetertotter-ag":[[0,"teetertotter-lod0-jg"],[1,"teetertotter-lod0-mg"],[2,"teetertotter-lod1-mg"],[3,"teetertotter-lod2-mg"],[4,"teetertotter-idle-ja"],[5,"teetertotter-landing-ja"]],"tntbarrel-ag":[[0,"tntbarrel-lod0-jg"],[1,"tntbarrel-lod0-mg"],[2,"tntbarrel-idle-ja"]],"towertop-ag":[[0,"towertop-lod0-jg"],[1,"towertop-lod0-mg"],[2,"towertop-lod1-mg"],[3,"towertop-lod2-mg"],[4,"towertop-idle-ja"]],"trainingcam-ag":[[0,"trainingcam-lod0-jg"],[1,"trainingcam-lod0-mg"],[2,"trainingcam-orbcam-ja"],[3,"trainingcam-fuelcellcam-ja"],[4,"trainingcam-ecocam-ja"],[5,"trainingcam-greenecocam-ja"],[6,"trainingcam-precursordoorcam-ja"],[7,"trainingcam-ecoventcam-ja"]],"vil3-bridge-36-ag":[[0,"vil3-bridge-36-lod0-jg"],[1,"vil3-bridge-36-lod0-mg"],[2,"vil3-bridge-36-idle-ja"]],"villa-starfish-ag":[[0,"villa-starfish-lod0-jg"],[1,"villa-starfish-lod0-mg"],[2,"villa-starfish-idle-ja"]],"village-cam-ag":[[0,"village-cam-lod0-jg"],[1,"village-cam-lod0-mg"],[2,"village-cam-firecanyon-cam-ja"],[3,"village-cam-firecanyon-alt-cam-ja"],[4,"village-cam-vi2-button-cam-ja"],[5,"village-cam-vi3-button-cam-ja"]],"village1cam-ag":[[0,"village1cam-lod0-jg"],[1,"village1cam-lod0-mg"],[2,"village1cam-anim-ja"]],"village2cam-ag":[[0,"village2cam-lod0-jg"],[1,"village2cam-lod0-mg"],[2,"village2cam-elevator-at-top-going-down-ja"],[3,"village2cam-elevator-at-bottom-going-up-ja"],[4,"village2cam-elevator-at-top-going-up-ja"]],"wall-plat-ag":[[0,"wall-plat-lod0-jg"],[1,"wall-plat-lod0-mg"],[2,"wall-plat-idle-ja"]],"warp-gate-switch-ag":[[0,"warp-gate-switch-lod0-jg"],[1,"warp-gate-switch-lod0-mg"],[2,"warp-gate-switch-down-ja"]],"warpgate-ag":[[0,"warpgate-lod0-jg"],[1,"warpgate-lod0-mg"]],"warrior-ag":[[0,"warrior-lod0-jg"],[1,"warrior-lod0-mg"],[2,"warrior-lod1-mg"],[3,"warrior-lod2-mg"],[4,"warrior-shadow-mg"],[5,"warrior-idle-ja"]],"water-anim-darkcave-ag":[[0,"water-anim-darkcave-water-with-crystal-lod0-jg"],[1,"water-anim-darkcave-water-with-crystal-lod0-mg"],[2,"water-anim-darkcave-idle-ja"]],"water-anim-finalboss-ag":[[0,"water-anim-finalboss-dark-eco-pool-lod0-jg"],[1,"water-anim-finalboss-dark-eco-pool-lod0-mg"],[2,"water-anim-finalboss-idle-ja"]],"water-anim-jungle-ag":[[0,"water-anim-jungle-river-lod0-jg"],[1,"water-anim-jungle-river-lod0-mg"],[2,"water-anim-jungle-river-lod1-mg"],[3,"water-anim-jungle-idle-ja"]],"water-anim-lavatube-ag":[[0,"water-anim-lavatube-energy-lava-lod0-jg"],[1,"water-anim-lavatube-energy-lava-lod0-mg"],[2,"water-anim-lavatube-idle-ja"]],"water-anim-maincave-ag":[[0,"water-anim-maincave-center-pool-lod0-jg"],[1,"water-anim-maincave-center-pool-lod0-mg"],[2,"water-anim-maincave-lower-right-pool-lod0-jg"],[3,"water-anim-maincave-lower-right-pool-lod0-mg"],[4,"water-anim-maincave-mid-right-pool-lod0-jg"],[5,"water-anim-maincave-mid-right-pool-lod0-mg"],[6,"water-anim-maincave-lower-left-pool-lod0-jg"],[7,"water-anim-maincave-lower-left-pool-lod0-mg"],[8,"water-anim-maincave-mid-left-pool-lod0-jg"],[9,"water-anim-maincave-mid-left-pool-lod0-mg"],[10,"water-anim-maincave-idle-ja"]],"water-anim-maincave-water-ag":[[0,"water-anim-maincave-water-with-crystal-lod0-jg"],[1,"water-anim-maincave-water-with-crystal-lod0-mg"],[2,"water-anim-maincave-water-idle-ja"]],"water-anim-misty-ag":[[0,"water-anim-misty-mud-by-arena-lod0-jg"],[1,"water-anim-misty-mud-by-arena-lod0-mg"],[2,"water-anim-misty-mud-above-skeleton-lod0-jg"],[3,"water-anim-misty-mud-above-skeleton-lod0-mg"],[4,"water-anim-misty-mud-behind-skeleton-lod0-jg"],[5,"water-anim-misty-mud-behind-skeleton-lod0-mg"],[6,"water-anim-misty-mud-above-skull-back-lod0-jg"],[7,"water-anim-misty-mud-above-skull-back-lod0-mg"],[8,"water-anim-misty-mud-above-skull-front-lod0-jg"],[9,"water-anim-misty-mud-above-skull-front-lod0-mg"],[10,"water-anim-misty-mud-other-near-skull-lod0-jg"],[11,"water-anim-misty-mud-other-near-skull-lod0-mg"],[12,"water-anim-misty-mud-near-skull-lod0-jg"],[13,"water-anim-misty-mud-near-skull-lod0-mg"],[14,"water-anim-misty-mud-under-spine-lod0-jg"],[15,"water-anim-misty-mud-under-spine-lod0-mg"],[16,"water-anim-misty-mud-by-dock-lod0-jg"],[17,"water-anim-misty-mud-by-dock-lod0-mg"],[18,"water-anim-misty-mud-island-near-dock-lod0-jg"],[19,"water-anim-misty-mud-island-near-dock-lod0-mg"],[20,"water-anim-misty-mud-lonely-island-lod0-jg"],[21,"water-anim-misty-mud-lonely-island-lod0-mg"],[22,"water-anim-misty-dark-eco-pool-lod0-jg"],[23,"water-anim-misty-dark-eco-pool-lod0-mg"],[24,"water-anim-misty-idle-ja"]],"water-anim-ogre-ag":[[0,"water-anim-ogre-lava-lod0-jg"],[1,"water-anim-ogre-lava-lod0-mg"],[2,"water-anim-ogre-idle-ja"],[3,"water-anim-ogre-submerge1-ja"],[4,"water-anim-ogre-emerge1-ja"],[5,"water-anim-ogre-submerge2-ja"],[6,"water-anim-ogre-emerge2-ja"],[7,"water-anim-ogre-boulder-ja"]],"water-anim-robocave-ag":[[0,"water-anim-robocave-main-pool-lod0-jg"],[1,"water-anim-robocave-main-pool-lod0-mg"],[2,"water-anim-robocave-main-pool-lod1-mg"],[3,"water-anim-robocave-idle-ja"]],"water-anim-rolling-ag":[[0,"water-anim-rolling-water-back-lod0-jg"],[1,"water-anim-rolling-water-back-lod0-mg"],[2,"water-anim-rolling-water-front-lod0-jg"],[3,"water-anim-rolling-water-front-lod0-mg"],[4,"water-anim-rolling-idle-ja"]],"water-anim-sunken-ag":[[0,"water-anim-sunken-big-room-lod0-jg"],[1,"water-anim-sunken-big-room-lod0-mg"],[2,"water-anim-sunken-first-room-from-entrance-lod0-jg"],[3,"water-anim-sunken-first-room-from-entrance-lod0-mg"],[4,"water-anim-sunken-qbert-room-lod0-jg"],[5,"water-anim-sunken-qbert-room-lod0-mg"],[6,"water-anim-sunken-first-right-branch-lod0-jg"],[7,"water-anim-sunken-first-right-branch-lod0-mg"],[8,"water-anim-sunken-circular-with-bullys-lod0-jg"],[9,"water-anim-sunken-circular-with-bullys-lod0-mg"],[10,"water-anim-sunken-hall-with-one-whirlpool-lod0-jg"],[11,"water-anim-sunken-hall-with-one-whirlpool-lod0-mg"],[12,"water-anim-sunken-hall-with-three-whirlpools-lod0-jg"],[13,"water-anim-sunken-hall-with-three-whirlpools-lod0-mg"],[14,"water-anim-sunken-start-of-helix-slide-lod0-jg"],[15,"water-anim-sunken-start-of-helix-slide-lod0-mg"],[16,"water-anim-sunken-room-above-exit-chamber-lod0-jg"],[17,"water-anim-sunken-room-above-exit-chamber-lod0-mg"],[18,"water-anim-sunken-hall-before-big-room-lod0-jg"],[19,"water-anim-sunken-hall-before-big-room-lod0-mg"],[20,"water-anim-sunken-short-piece-lod0-jg"],[21,"water-anim-sunken-short-piece-lod0-mg"],[22,"water-anim-sunken-big-room-upper-water-lod0-jg"],[23,"water-anim-sunken-big-room-upper-water-lod0-mg"],[24,"water-anim-sunken-idle-ja"]],"water-anim-sunken-dark-eco-ag":[[0,"water-anim-sunken-dark-eco-qbert-lod0-jg"],[1,"water-anim-sunken-dark-eco-qbert-lod0-mg"],[2,"water-anim-sunken-dark-eco-platform-room-lod0-jg"],[3,"water-anim-sunken-dark-eco-platform-room-lod0-mg"],[4,"water-anim-sunken-dark-eco-helix-room-lod0-jg"],[5,"water-anim-sunken-dark-eco-helix-room-lod0-mg"],[6,"water-anim-sunken-dark-eco-idle-ja"]],"water-anim-training-ag":[[0,"water-anim-training-lake-lod0-jg"],[1,"water-anim-training-lake-lod0-mg"],[2,"water-anim-training-idle-ja"]],"water-anim-village1-ag":[[0,"water-anim-village1-rice-paddy-lod0-jg"],[1,"water-anim-village1-rice-paddy-lod0-mg"],[2,"water-anim-village1-rice-paddy-mid-lod0-jg"],[3,"water-anim-village1-rice-paddy-mid-lod0-mg"],[4,"water-anim-village1-rice-paddy-top-lod0-jg"],[5,"water-anim-village1-rice-paddy-top-lod0-mg"],[6,"water-anim-village1-fountain-lod0-jg"],[7,"water-anim-village1-fountain-lod0-mg"],[8,"water-anim-village1-idle-ja"]],"water-anim-village2-ag":[[0,"water-anim-village2-bucket-lod0-jg"],[1,"water-anim-village2-bucket-lod0-mg"],[2,"water-anim-village2-idle-ja"]],"water-anim-village3-ag":[[0,"water-anim-village3-lava-lod0-jg"],[1,"water-anim-village3-lava-lod0-mg"],[2,"water-anim-village3-lava-lod1-mg"],[3,"water-anim-village3-idle-ja"]],"wedge-plat-ag":[[0,"wedge-plat-lod0-jg"],[1,"wedge-plat-lod0-mg"],[2,"wedge-plat-idle-ja"],[3,"wedge-plat-tip-ja"]],"wedge-plat-outer-ag":[[0,"wedge-plat-outer-lod0-jg"],[1,"wedge-plat-outer-lod0-mg"],[2,"wedge-plat-outer-idle-ja"],[3,"wedge-plat-outer-tip-ja"]],"wheel-ag":[[0,"wheel-geo-jg"],[1,"wheel-geo-mg"],[2,"wheel-idle-ja"]],"whirlpool-ag":[[0,"whirlpool-lod0-jg"],[1,"whirlpool-lod0-mg"],[2,"whirlpool-idle-ja"]],"windmill-one-ag":[[0,"windmill-one-lod0-jg"],[1,"windmill-one-lod0-mg"],[2,"windmill-one-lod1-mg"],[3,"windmill-one-lod2-mg"],[4,"windmill-one-idle-ja"]],"windmill-sail-ag":[[0,"windmill-sail-lod0-jg"],[1,"windmill-sail-lod0-mg"],[2,"windmill-sail-lod1-mg"],[3,"windmill-sail-lod2-mg"],[4,"windmill-sail-idle-ja"]],"windspinner-ag":[[0,"windspinner-lod0-jg"],[1,"windspinner-lod0-mg"],[2,"windspinner-lod1-mg"],[3,"windspinner-idle-ja"]],"windturbine-ag":[[0,"windturbine-lod0-jg"],[1,"windturbine-lod0-mg"],[2,"windturbine-lod1-mg"],[3,"windturbine-lod2-mg"],[4,"windturbine-idle-ja"]],"yakow-ag":[[0,"yakow-lod0-jg"],[1,"yakow-lod0-mg"],[2,"yakow-lod1-mg"],[3,"yakow-shadow-mg"],[4,"yakow-idle-ja"],[5,"yakow-graze-ja"],[6,"yakow-walk-ja"],[7,"yakow-run-ja"],[8,"yakow-kicked-ja"],[9,"yakow-walk-right-ja"],[10,"yakow-walk-left-ja"],[11,"yakow-kicked-in-place-ja"]],"yellowsage-ag":[[0,"yellowsage-lod0-jg"],[1,"yellowsage-lod0-mg"],[2,"yellowsage-lod1-mg"],[3,"yellowsage-shadow-mg"],[4,"yellowsage-yellowsage-idle-ja"],[5,"yellowsage-yellowsage-attack-start-ja"],[6,"yellowsage-yellowsage-attack-loop-ja"]],"yeti-ag":[[0,"yeti-lod0-jg"],[1,"yeti-lod0-mg"],[2,"yeti-idle-ja"],[3,"yeti-walk-ja"],[4,"yeti-spot-ja"],[5,"yeti-charge-ja"],[6,"yeti-give-up-ja"],[7,"yeti-give-up-hop-ja"],[8,"yeti-win-ja"],[9,"yeti-death-ja"],[10,"yeti-jump-ja"],[11,"yeti-jump-land-ja"],[12,"yeti-turn-ja"]]} +{"accordian-ag":[[0,"accordian-lod0-jg"],[1,"accordian-lod0-mg"],[2,"accordian-lod1-mg"],[3,"accordian-idle-ja"]],"allpontoons-ag":[[0,"allpontoons-lod0-jg"],[1,"allpontoons-lod0-mg"],[2,"allpontoons-idle-ja"]],"aphid-lurker-ag":[[0,"aphid-lurker-lod0-jg"],[1,"aphid-lurker-lod0-mg"],[2,"aphid-lurker-shadow-mg"],[3,"aphid-lurker-idle-ja"],[4,"aphid-lurker-walk-ja"],[5,"aphid-lurker-walk-deadly-ja"],[6,"aphid-lurker-spike-out-ja"],[7,"aphid-lurker-give-up-ja"],[8,"aphid-lurker-give-up-hop-ja"],[9,"aphid-lurker-turn-ja"],[10,"aphid-lurker-win-ja"],[11,"aphid-lurker-die-ja"]],"assistant-ag":[[0,"assistant-lod0-jg"],[1,"assistant-lod0-mg"],[2,"assistant-shadow-mg"],[3,"assistant-idle-leaning-right-ja"],[4,"assistant-idle-transition-right-to-left-ja"],[5,"assistant-idle-leaning-left-ja"],[6,"assistant-idle-transition-left-to-right-ja"],[7,"assistant-idle-wiping-brow-ja"],[8,"assistant-idle-transition-to-welding-ja"],[9,"assistant-idle-welding-ja"]],"assistant-firecanyon-ag":[[0,"assistant-firecanyon-lod0-jg"],[1,"assistant-firecanyon-lod0-mg"],[2,"assistant-firecanyon-shadow-mg"],[3,"assistant-firecanyon-idle-twist-ja"],[4,"assistant-firecanyon-idle-down-ja"],[5,"assistant-firecanyon-idle-examine-ja"],[6,"assistant-firecanyon-idle-up-ja"],[7,"assistant-firecanyon-idle-fiddle-ja"],[8,"assistant-firecanyon-idle-a-ja"],[9,"assistant-firecanyon-idle-to-b-ja"],[10,"assistant-firecanyon-idle-b-ja"],[11,"assistant-firecanyon-idle-to-a-ja"],[12,"assistant-firecanyon-idle-wipe-brow-ja"]],"assistant-lavatube-end-ag":[[0,"assistant-lavatube-end-lod0-jg"],[1,"assistant-lavatube-end-lod0-mg"],[2,"assistant-lavatube-end-shadow-mg"],[3,"assistant-lavatube-end-idle-ja"]],"assistant-lavatube-start-ag":[[0,"assistant-lavatube-start-lod0-jg"],[1,"assistant-lavatube-start-lod0-mg"],[2,"assistant-lavatube-start-shadow-mg"],[3,"assistant-lavatube-start-idle-ja"],[4,"assistant-lavatube-start-idle-b-ja"]],"assistant-village2-ag":[[0,"assistant-village2-lod0-jg"],[1,"assistant-village2-lod0-mg"],[2,"assistant-village2-lod1-mg"],[3,"assistant-village2-lod2-mg"],[4,"assistant-village2-shadow-mg"],[5,"assistant-village2-idle-a-ja"],[6,"assistant-village2-idle-to-b-ja"],[7,"assistant-village2-idle-b-ja"],[8,"assistant-village2-idle-to-a-ja"],[9,"assistant-village2-idle-after-ja"],[10,"assistant-village2-idle-hut-breath-ja"],[11,"assistant-village2-idle-hut-look-right-ja"],[12,"assistant-village2-idle-hut-start-welding-ja"],[13,"assistant-village2-idle-hut-welding-ja"],[14,"assistant-village2-idle-hut-stop-welding-ja"]],"assistant-village3-ag":[[0,"assistant-village3-lod0-jg"],[1,"assistant-village3-lod0-mg"],[2,"assistant-village3-shadow-mg"],[3,"assistant-village3-idle-ja"]],"babak-ag":[[0,"babak-lod0-jg"],[1,"babak-lod0-mg"],[2,"babak-lod1-mg"],[3,"babak-lod2-mg"],[4,"babak-shadow-mg"],[5,"babak-idle-ja"],[6,"babak-walk-ja"],[7,"babak-spot-ja"],[8,"babak-charge-ja"],[9,"babak-give-up-ja"],[10,"babak-give-up-hop-ja"],[11,"babak-win-ja"],[12,"babak-death-ja"],[13,"babak-jump-ja"],[14,"babak-jump-land-ja"],[15,"babak-taunt-ja"],[16,"babak-turn-ja"],[17,"babak-look-ja"],[18,"babak-stop-look-ja"]],"baby-spider-ag":[[0,"baby-spider-lod0-jg"],[1,"baby-spider-lod0-mg"],[2,"baby-spider-lod1-mg"],[3,"baby-spider-lod2-mg"],[4,"baby-spider-shadow-mg"],[5,"baby-spider-birth-ja"],[6,"baby-spider-idle-ja"],[7,"baby-spider-run-ja"],[8,"baby-spider-walk-ja"],[9,"baby-spider-jump-up-ja"],[10,"baby-spider-jump-land-ja"],[11,"baby-spider-notice-ja"],[12,"baby-spider-celebrate-ja"],[13,"baby-spider-die-ja"]],"balance-plat-ag":[[0,"balance-plat-lod0-jg"],[1,"balance-plat-lod0-mg"],[2,"balance-plat-lod1-mg"],[3,"balance-plat-lod2-mg"],[4,"balance-plat-idle-ja"]],"balloon-ag":[[0,"balloon-lod0-jg"],[1,"balloon-lod0-mg"],[2,"balloon-lod1-mg"],[3,"balloon-idle-ja"]],"balloonlurker-ag":[[0,"balloonlurker-lod0-jg"],[1,"balloonlurker-lod0-mg"],[2,"balloonlurker-lod1-mg"],[3,"balloonlurker-lod2-mg"],[4,"balloonlurker-idle-ja"],[5,"balloonlurker-death-ja"],[6,"balloonlurker-pilot-lod0-jg"],[7,"balloonlurker-pilot-lod0-mg"],[8,"balloonlurker-pilot-lod1-mg"],[9,"balloonlurker-pilot-lod2-mg"],[10,"balloonlurker-pilot-idle-ja"],[11,"balloonlurker-pilot-death-ja"]],"barrel-ag":[[0,"barrel-lod0-jg"],[1,"barrel-lod0-mg"],[2,"barrel-idle-ja"]],"beachcam-ag":[[8,"beachcam-ecoventrock-7-ja"],[0,"beachcam-lod0-jg"],[1,"beachcam-lod0-mg"],[2,"beachcam-anim-ja"],[4,"beachcam-ecoventrock-4-ja"],[5,"beachcam-ecoventrock-5-ja"],[6,"beachcam-ecoventrock-6-ja"],[7,"beachcam-ecoventrock-3-ja"]],"billy-ag":[[0,"billy-lod0-jg"],[1,"billy-lod0-mg"],[10,"billy-billy-after-ja"],[2,"billy-shadow-mg"],[3,"billy-idle-breath-ja"],[4,"billy-idle-shoo-ja"]],"billy-sidekick-ag":[[0,"billy-sidekick-lod0-jg"],[1,"billy-sidekick-lod0-mg"],[2,"billy-sidekick-idle-ja"],[3,"billy-sidekick-billy-after-ja"]],"bird-lady-ag":[[0,"bird-lady-lod0-jg"],[1,"bird-lady-lod0-mg"],[2,"bird-lady-shadow-mg"],[3,"bird-lady-idle-ja"]],"bird-lady-beach-ag":[[0,"bird-lady-beach-lod0-jg"],[1,"bird-lady-beach-lod0-mg"],[2,"bird-lady-beach-shadow-mg"],[3,"bird-lady-beach-idle-ja"]],"bladeassm-ag":[[0,"bladeassm-lod0-jg"],[1,"bladeassm-lod0-mg"],[2,"bladeassm-lod1-mg"],[3,"bladeassm-lod2-mg"],[4,"bladeassm-idle-ja"]],"blue-eco-charger-ag":[[0,"blue-eco-charger-lod0-jg"],[1,"blue-eco-charger-lod0-mg"],[2,"blue-eco-charger-open-ja"]],"blue-eco-charger-orb-ag":[[0,"blue-eco-charger-orb-lod0-jg"],[1,"blue-eco-charger-orb-lod0-mg"],[2,"blue-eco-charger-orb-idle-ja"]],"bluesage-ag":[[0,"bluesage-lod0-jg"],[1,"bluesage-lod0-mg"],[2,"bluesage-lod1-mg"],[3,"bluesage-shadow-mg"],[4,"bluesage-bluesage-idle-ja"],[5,"bluesage-bluesage-attack-start-ja"],[6,"bluesage-bluesage-attack-loop-ja"]],"boatpaddle-ag":[[0,"boatpaddle-lod0-jg"],[1,"boatpaddle-lod0-mg"],[2,"boatpaddle-lod1-mg"],[3,"boatpaddle-idle-ja"]],"bonelurker-ag":[[0,"bonelurker-lod0-jg"],[1,"bonelurker-lod0-mg"],[2,"bonelurker-lod1-mg"],[3,"bonelurker-lod2-mg"],[4,"bonelurker-shadow-mg"],[5,"bonelurker-idle-ja"],[6,"bonelurker-walk-ja"],[7,"bonelurker-spot-ja"],[8,"bonelurker-charge-ja"],[9,"bonelurker-charge-left-ja"],[10,"bonelurker-charge-right-ja"],[11,"bonelurker-give-up-ja"],[12,"bonelurker-give-up-hop-ja"],[13,"bonelurker-win-ja"],[14,"bonelurker-death-ja"],[15,"bonelurker-stun-ja"],[16,"bonelurker-turn-ja"],[17,"bonelurker-jump-ja"],[18,"bonelurker-jump-land-ja"]],"bounceytarp-ag":[[0,"bounceytarp-lod0-jg"],[1,"bounceytarp-lod0-mg"],[2,"bounceytarp-idle-ja"]],"breakaway-left-ag":[[0,"breakaway-left-lod0-jg"],[1,"breakaway-left-lod0-mg"],[2,"breakaway-left-idle-ja"]],"breakaway-mid-ag":[[0,"breakaway-mid-lod0-jg"],[1,"breakaway-mid-lod0-mg"],[2,"breakaway-mid-idle-ja"]],"breakaway-right-ag":[[0,"breakaway-right-lod0-jg"],[1,"breakaway-right-lod0-mg"],[2,"breakaway-right-idle-ja"]],"bully-ag":[[0,"bully-lod0-jg"],[1,"bully-lod0-mg"],[2,"bully-lod1-mg"],[3,"bully-lod2-mg"],[4,"bully-shadow-mg"],[5,"bully-idle-ja"],[6,"bully-notice-jump-up-ja"],[7,"bully-notice-land-ja"],[8,"bully-start-spin-ja"],[9,"bully-spin-ja"],[10,"bully-die-ja"],[11,"bully-idle-bounced-ja"],[12,"bully-spin-bounced-ja"],[13,"bully-dizzy-ja"],[14,"bully-broken-cage-lod0-jg"],[15,"bully-broken-cage-lod0-mg"],[16,"bully-broken-cage-explode-ja"]],"buzzer-ag":[[0,"buzzer-lod0-jg"],[1,"buzzer-lod0-mg"],[2,"buzzer-idle-ja"]],"catch-fisha-ag":[[0,"catch-fisha-lod0-jg"],[1,"catch-fisha-lod0-mg"],[2,"catch-fisha-idle-ja"]],"catch-fishb-ag":[[0,"catch-fishb-lod0-jg"],[1,"catch-fishb-lod0-mg"],[2,"catch-fishb-idle-ja"]],"catch-fishc-ag":[[0,"catch-fishc-lod0-jg"],[1,"catch-fishc-lod0-mg"],[2,"catch-fishc-idle-ja"]],"cavecrusher-ag":[[0,"cavecrusher-lod0-jg"],[1,"cavecrusher-lod0-mg"],[2,"cavecrusher-lod1-mg"],[3,"cavecrusher-lod2-mg"],[4,"cavecrusher-idle-ja"]],"cavecrystal-ag":[[0,"cavecrystal-lod0-jg"],[1,"cavecrystal-lod0-mg"],[2,"cavecrystal-lod1-mg"],[3,"cavecrystal-idle-ja"]],"caveelevator-ag":[[0,"caveelevator-lod0-jg"],[1,"caveelevator-lod0-mg"],[2,"caveelevator-cycle-12m-ja"],[3,"caveelevator-one-way-58m-ja"],[4,"caveelevator-one-way-58m-reverse-ja"],[5,"caveelevator-cycle-3-floors-36m-ja"]],"cavegem-ag":[[0,"cavegem-lod0-jg"],[1,"cavegem-lod0-mg"],[2,"cavegem-idle-ja"]],"cavespatula-darkcave-ag":[[0,"cavespatula-darkcave-lod0-jg"],[1,"cavespatula-darkcave-lod0-mg"],[2,"cavespatula-darkcave-lod1-mg"],[3,"cavespatula-darkcave-idle-ja"]],"cavespatulatwo-ag":[[0,"cavespatulatwo-lod0-jg"],[1,"cavespatulatwo-lod0-mg"],[2,"cavespatulatwo-lod1-mg"],[3,"cavespatulatwo-idle-ja"]],"cavetrapdoor-ag":[[0,"cavetrapdoor-lod0-jg"],[1,"cavetrapdoor-lod0-mg"],[2,"cavetrapdoor-lod1-mg"],[3,"cavetrapdoor-lod2-mg"],[4,"cavetrapdoor-idle-ja"],[5,"cavetrapdoor-bob-ja"],[6,"cavetrapdoor-swing-ja"],[7,"cavetrapdoor-idle-down-ja"],[8,"cavetrapdoor-reset-ja"]],"ceilingflag-ag":[[0,"ceilingflag-geo-jg"],[1,"ceilingflag-geo-mg"],[2,"ceilingflag-idle-ja"]],"chainmine-ag":[[0,"chainmine-lod0-jg"],[1,"chainmine-lod0-mg"],[2,"chainmine-idle-ja"]],"citadelcam-ag":[[0,"citadelcam-lod0-jg"],[1,"citadelcam-lod0-mg"],[2,"citadelcam-idle-ja"],[3,"citadelcam-stair-plats-ja"],[4,"citadelcam-citadel-bunnies-ja"]],"citb-arm-ag":[[0,"citb-arm-a-lod0-jg"],[1,"citb-arm-a-lod0-mg"],[2,"citb-arm-a-lod1-mg"],[3,"citb-arm-a-idle-ja"],[4,"citb-arm-b-lod0-jg"],[5,"citb-arm-b-lod0-mg"],[6,"citb-arm-b-lod1-mg"],[7,"citb-arm-b-idle-ja"],[8,"citb-arm-c-lod0-jg"],[9,"citb-arm-c-lod0-mg"],[10,"citb-arm-c-lod1-mg"],[11,"citb-arm-c-idle-ja"],[12,"citb-arm-d-lod0-jg"],[13,"citb-arm-d-lod0-mg"],[14,"citb-arm-d-lod1-mg"],[15,"citb-arm-d-idle-ja"]],"citb-arm-shoulder-ag":[[0,"citb-arm-shoulder-a-lod0-jg"],[1,"citb-arm-shoulder-a-lod0-mg"],[2,"citb-arm-shoulder-a-idle-ja"],[3,"citb-arm-shoulder-b-lod0-jg"],[4,"citb-arm-shoulder-b-lod0-mg"],[5,"citb-arm-shoulder-b-idle-ja"]],"citb-bunny-ag":[[0,"citb-bunny-lod0-jg"],[1,"citb-bunny-lod0-mg"],[2,"citb-bunny-shadow-mg"],[3,"citb-bunny-idle-ja"],[4,"citb-bunny-attack-ja"],[5,"citb-bunny-big-hop-ja"],[6,"citb-bunny-small-hop-ja"],[7,"citb-bunny-sees-player-ja"],[8,"citb-bunny-sees-player-land-ja"],[9,"citb-bunny-die-ja"]],"citb-button-ag":[[0,"citb-button-lod0-jg"],[1,"citb-button-lod0-mg"],[2,"citb-button-idle-ja"]],"citb-chain-plat-ag":[[0,"citb-chain-plat-lod0-jg"],[1,"citb-chain-plat-lod0-mg"],[2,"citb-chain-plat-lod1-mg"],[3,"citb-chain-plat-idle-ja"]],"citb-chains-ag":[[0,"citb-chains-lod0-jg"],[1,"citb-chains-lod0-mg"],[2,"citb-chains-lod1-mg"],[3,"citb-chains-lod2-mg"],[4,"citb-chains-idle-ja"]],"citb-coil-ag":[[0,"citb-coil-lod0-jg"],[1,"citb-coil-lod0-mg"],[2,"citb-coil-lod1-mg"],[3,"citb-coil-idle-ja"],[4,"citb-coil-die-ja"],[5,"citb-coil-dead-ja"]],"citb-disc-ag":[[0,"citb-disc-a-lod0-jg"],[1,"citb-disc-a-lod0-mg"],[2,"citb-disc-a-lod1-mg"],[3,"citb-disc-a-lod2-mg"],[4,"citb-disc-a-idle-ja"],[5,"citb-disc-b-lod0-jg"],[6,"citb-disc-b-lod0-mg"],[7,"citb-disc-b-lod1-mg"],[8,"citb-disc-b-lod2-mg"],[9,"citb-disc-b-idle-ja"],[10,"citb-disc-c-lod0-jg"],[11,"citb-disc-c-lod0-mg"],[12,"citb-disc-c-lod1-mg"],[13,"citb-disc-c-lod2-mg"],[14,"citb-disc-c-idle-ja"],[15,"citb-disc-d-lod0-jg"],[16,"citb-disc-d-lod0-mg"],[17,"citb-disc-d-lod1-mg"],[18,"citb-disc-d-lod2-mg"],[19,"citb-disc-d-idle-ja"]],"citb-donut-ag":[[0,"citb-donut-lod0-jg"],[1,"citb-donut-lod0-mg"],[2,"citb-donut-lod1-mg"],[3,"citb-donut-idle-ja"]],"citb-drop-plat-ag":[[0,"citb-drop-plat-lod0-jg"],[1,"citb-drop-plat-lod0-mg"],[2,"citb-drop-plat-lod1-mg"],[3,"citb-drop-plat-idle-ja"],[4,"citb-drop-plat-red-lod0-jg"],[5,"citb-drop-plat-red-lod0-mg"],[6,"citb-drop-plat-red-lod1-mg"],[7,"citb-drop-plat-red-idle-ja"],[8,"citb-drop-plat-green-lod0-jg"],[9,"citb-drop-plat-green-lod0-mg"],[10,"citb-drop-plat-green-lod1-mg"],[11,"citb-drop-plat-green-idle-ja"],[12,"citb-drop-plat-blue-lod0-jg"],[13,"citb-drop-plat-blue-lod0-mg"],[14,"citb-drop-plat-blue-lod1-mg"],[15,"citb-drop-plat-blue-idle-ja"],[16,"citb-drop-plat-yellow-lod0-jg"],[17,"citb-drop-plat-yellow-lod0-mg"],[18,"citb-drop-plat-yellow-lod1-mg"],[19,"citb-drop-plat-yellow-idle-ja"]],"citb-exit-plat-ag":[[0,"citb-exit-plat-lod0-jg"],[1,"citb-exit-plat-lod0-mg"],[2,"citb-exit-plat-idle-ja"]],"citb-firehose-ag":[[0,"citb-firehose-lod0-jg"],[1,"citb-firehose-lod0-mg"],[2,"citb-firehose-idle-ja"],[3,"citb-firehose-start-ja"],[4,"citb-firehose-loopflame-ja"],[5,"citb-firehose-end-ja"]],"citb-generator-ag":[[0,"citb-generator-lod0-jg"],[1,"citb-generator-lod0-mg"],[2,"citb-generator-broken-lod0-jg"],[3,"citb-generator-broken-lod0-mg"],[4,"citb-generator-idle-ja"]],"citb-hose-ag":[[0,"citb-hose-lod0-jg"],[1,"citb-hose-lod0-mg"],[2,"citb-hose-lod1-mg"],[3,"citb-hose-idle-ja"],[4,"citb-hose-spit-ja"],[5,"citb-hose-die-ja"]],"citb-iris-door-ag":[[0,"citb-iris-door-lod0-jg"],[1,"citb-iris-door-lod0-mg"],[2,"citb-iris-door-lod1-mg"],[3,"citb-iris-door-idle-ja"]],"citb-launcher-ag":[[0,"citb-launcher-lod0-jg"],[1,"citb-launcher-lod0-mg"],[2,"citb-launcher-idle-ja"]],"citb-robotboss-ag":[[0,"citb-robotboss-lod0-jg"],[1,"citb-robotboss-lod0-mg"],[2,"citb-robotboss-idle-ja"],[3,"citb-robotboss-nose-lod0-jg"],[4,"citb-robotboss-nose-lod0-mg"],[5,"citb-robotboss-nose-idle-ja"],[6,"citb-robotboss-head-lod0-jg"],[7,"citb-robotboss-head-lod0-mg"],[8,"citb-robotboss-head-idle-ja"],[9,"citb-robotboss-gun-lod0-jg"],[10,"citb-robotboss-gun-lod0-mg"],[11,"citb-robotboss-gun-idle-ja"],[12,"citb-robotboss-leftshoulder-lod0-jg"],[13,"citb-robotboss-leftshoulder-lod0-mg"],[14,"citb-robotboss-leftshoulder-idle-ja"],[15,"citb-robotboss-rightshoulder-lod0-jg"],[16,"citb-robotboss-rightshoulder-lod0-mg"],[17,"citb-robotboss-rightshoulder-idle-ja"],[18,"citb-robotboss-leftarm-lod0-jg"],[19,"citb-robotboss-leftarm-lod0-mg"],[20,"citb-robotboss-leftarm-idle-ja"],[21,"citb-robotboss-rightarm-lod0-jg"],[22,"citb-robotboss-rightarm-lod0-mg"],[23,"citb-robotboss-rightarm-idle-ja"],[24,"citb-robotboss-belly-lod0-jg"],[25,"citb-robotboss-belly-lod0-mg"],[26,"citb-robotboss-belly-idle-ja"]],"citb-rotatebox-ag":[[0,"citb-rotatebox-lod0-jg"],[1,"citb-rotatebox-lod0-mg"],[2,"citb-rotatebox-idle-ja"]],"citb-sagecage-ag":[[8,"citb-sagecage-bluesage-idle-ja"],[0,"citb-sagecage-lod0-jg"],[1,"citb-sagecage-lod0-mg"],[2,"citb-sagecage-lod1-mg"],[3,"citb-sagecage-idle-ja"],[4,"citb-sagecage-redsage-idle-ja"],[5,"citb-sagecage-redsage-attack-start-ja"],[6,"citb-sagecage-redsage-attack-loop-ja"],[9,"citb-sagecage-bluesage-attack-start-ja"],[10,"citb-sagecage-bluesage-attack-loop-ja"],[12,"citb-sagecage-yellowsage-idle-ja"],[13,"citb-sagecage-yellowsage-attack-start-ja"],[14,"citb-sagecage-yellowsage-attack-loop-ja"],[16,"citb-sagecage-green-sagecage-idle-ja"]],"citb-stopbox-ag":[[0,"citb-stopbox-lod0-jg"],[1,"citb-stopbox-lod0-mg"],[2,"citb-stopbox-lod1-mg"],[3,"citb-stopbox-idle-ja"]],"crate-ag":[[0,"crate-wood-lod0-jg"],[1,"crate-wood-lod0-mg"],[2,"crate-wood-lod1-mg"],[3,"crate-wood-lod2-mg"],[4,"crate-iron-lod0-jg"],[5,"crate-iron-lod0-mg"],[6,"crate-iron-lod1-mg"],[7,"crate-iron-lod2-mg"],[8,"crate-steel-lod0-jg"],[9,"crate-steel-lod0-mg"],[10,"crate-steel-lod1-mg"],[11,"crate-steel-lod2-mg"],[12,"crate-darkeco-lod0-jg"],[13,"crate-darkeco-lod0-mg"],[14,"crate-darkeco-lod1-mg"],[15,"crate-darkeco-lod2-mg"],[16,"crate-idle-ja"],[17,"crate-barrel-lod0-jg"],[18,"crate-barrel-lod0-mg"],[19,"crate-barrel-lod1-mg"],[20,"crate-barrel-lod2-mg"],[21,"crate-barrel-idle-ja"],[22,"crate-bucket-lod0-jg"],[23,"crate-bucket-lod0-mg"],[24,"crate-bucket-idle-ja"]],"crate-darkeco-cluster-ag":[[0,"crate-darkeco-cluster-lod0-jg"],[1,"crate-darkeco-cluster-lod0-mg"],[2,"crate-darkeco-cluster-lod1-mg"],[3,"crate-darkeco-cluster-idle-ja"]],"dark-crystal-ag":[[0,"dark-crystal-lod0-jg"],[1,"dark-crystal-lod0-mg"],[2,"dark-crystal-idle-ja"],[3,"dark-crystal-explode-lod0-jg"],[4,"dark-crystal-explode-lod0-mg"],[5,"dark-crystal-explode-idle-ja"]],"dark-plant-ag":[[0,"dark-plant-lod0-jg"],[1,"dark-plant-lod0-mg"],[2,"dark-plant-idle-ja"],[3,"dark-plant-death-ja"],[4,"dark-plant-sprout-ja"]],"darkecobarrel-ag":[[0,"darkecobarrel-lod0-jg"],[1,"darkecobarrel-lod0-mg"],[2,"darkecobarrel-idle-ja"]],"darkecobomb-ag":[[0,"darkecobomb-lod0-jg"],[1,"darkecobomb-lod0-mg"],[2,"darkecobomb-idle-ja"],[3,"darkecobomb-blast-ja"],[4,"darkecobomb-open-ja"],[5,"darkecobomb-spin-cycle-ja"]],"darkecocan-ag":[[0,"darkecocan-lod0-jg"],[1,"darkecocan-lod0-mg"],[2,"darkecocan-glow-lod0-jg"],[3,"darkecocan-glow-lod0-mg"],[4,"darkecocan-idle-ja"]],"darkvine-ag":[[0,"darkvine-lod0-jg"],[1,"darkvine-lod0-mg"],[2,"darkvine-lod1-mg"],[3,"darkvine-idle-ja"],[4,"darkvine-retreat-ja"],[5,"darkvine-pushup-ja"],[6,"darkvine-dead-ja"]],"deathcam-ag":[[0,"deathcam-lod0-jg"],[1,"deathcam-lod0-mg"],[2,"deathcam-idle-ja"]],"double-lurker-ag":[[0,"double-lurker-lod0-jg"],[1,"double-lurker-lod0-mg"],[2,"double-lurker-lod1-mg"],[3,"double-lurker-lod2-mg"],[4,"double-lurker-shadow-mg"],[5,"double-lurker-both-idle-ja"],[6,"double-lurker-both-patrol-ja"],[7,"double-lurker-both-spot-ja"],[8,"double-lurker-both-charge-ja"],[9,"double-lurker-both-celebrate-ja"],[10,"double-lurker-both-break-apart-ja"],[11,"double-lurker-both-take-hit-ja"],[12,"double-lurker-idle-ja"],[13,"double-lurker-patrol-ja"],[14,"double-lurker-spot-ja"],[15,"double-lurker-charge-ja"],[16,"double-lurker-celebrate-ja"],[17,"double-lurker-die-ja"],[18,"double-lurker-bottom-take-hit-ja"]],"double-lurker-top-ag":[[0,"double-lurker-top-lod0-jg"],[1,"double-lurker-top-lod0-mg"],[2,"double-lurker-top-lod1-mg"],[3,"double-lurker-top-lod2-mg"],[4,"double-lurker-top-shadow-mg"],[5,"double-lurker-top-both-idle-ja"],[6,"double-lurker-top-both-patrol-ja"],[7,"double-lurker-top-both-spot-ja"],[8,"double-lurker-top-both-charge-ja"],[9,"double-lurker-top-both-celebrate-ja"],[10,"double-lurker-top-both-break-apart-ja"],[11,"double-lurker-top-both-take-hit-ja"],[12,"double-lurker-top-idle-ja"],[13,"double-lurker-top-patrol-ja"],[14,"double-lurker-top-spot-ja"],[15,"double-lurker-top-charge-ja"],[16,"double-lurker-top-celebrate-ja"],[17,"double-lurker-top-die-ja"],[18,"double-lurker-top-on-shoulders-die-ja"]],"driller-lurker-ag":[[0,"driller-lurker-lod0-jg"],[1,"driller-lurker-lod0-mg"],[2,"driller-lurker-lod1-mg"],[3,"driller-lurker-lod2-mg"],[4,"driller-lurker-shadow-mg"],[5,"driller-lurker-idle-ja"],[6,"driller-lurker-idle-look-left-ja"],[7,"driller-lurker-idle-look-right-ja"],[8,"driller-lurker-walk-ja"],[9,"driller-lurker-walk-up-ja"],[10,"driller-lurker-drill-jams-ja"],[11,"driller-lurker-run-ja"],[12,"driller-lurker-run-up-ja"],[13,"driller-lurker-attack-ja"],[14,"driller-lurker-attack-up-ja"],[15,"driller-lurker-idle-drilling-ja"],[16,"driller-lurker-die-ja"]],"ecoclaw-ag":[[0,"ecoclaw-lod0-jg"],[1,"ecoclaw-lod0-mg"],[2,"ecoclaw-idle-ja"]],"ecovalve-ag":[[0,"ecovalve-geo-jg"],[1,"ecovalve-geo-mg"],[2,"ecovalve-idle-ja"]],"ecoventrock-ag":[[0,"ecoventrock-lod0-jg"],[1,"ecoventrock-lod0-mg"],[2,"ecoventrock-lod1-mg"],[3,"ecoventrock-idle-ja"]],"ef-plane-ag":[[0,"ef-plane-lod0-jg"],[1,"ef-plane-lod0-mg"],[2,"ef-plane-idle-ja"]],"eggtop-ag":[[0,"eggtop-lod0-jg"],[1,"eggtop-lod0-mg"],[2,"eggtop-idle-ja"]],"eichar-ag":[[0,"eichar-lod0-jg"],[1,"eichar-lod0-mg"],[2,"eichar-shadow-mg"],[3,"eichar-run-to-stance-ja"],[4,"eichar-run-to-stance-loop-ja"],[5,"eichar-stance-loop-ja"],[6,"eichar-run-to-stance-left-ja"],[7,"eichar-run-to-stance-loop-left-ja"],[8,"eichar-stance-loop-left-ja"],[9,"eichar-run-to-stance-right-ja"],[10,"eichar-run-to-stance-loop-right-ja"],[11,"eichar-stance-loop-right-ja"],[12,"eichar-run-to-stance-up-ja"],[13,"eichar-run-to-stance-loop-up-ja"],[14,"eichar-stance-loop-up-ja"],[15,"eichar-run-to-stance-down-ja"],[16,"eichar-run-to-stance-loop-down-ja"],[17,"eichar-stance-loop-down-ja"],[18,"eichar-run-ja"],[19,"eichar-run-up-ja"],[20,"eichar-run-down-ja"],[21,"eichar-run-right-ja"],[22,"eichar-run-left-ja"],[23,"eichar-walk-ja"],[24,"eichar-walk-up-ja"],[25,"eichar-walk-down-ja"],[26,"eichar-walk-right-ja"],[27,"eichar-walk-left-ja"],[28,"eichar-run-squash-ja"],[29,"eichar-run-squash-weak-ja"],[30,"eichar-stance-to-duck-ja"],[31,"eichar-duck-stance-ja"],[32,"eichar-duck-walk-ja"],[33,"eichar-turn-around-ja"],[34,"eichar-jump-ja"],[35,"eichar-jump-land-ja"],[36,"eichar-painful-land-ja"],[37,"eichar-painful-land-end-ja"],[38,"eichar-jump-loop-ja"],[39,"eichar-jump-short-land-ja"],[40,"eichar-jump-forward-ja"],[41,"eichar-duck-high-jump-ja"],[42,"eichar-launch-jump-ja"],[43,"eichar-launch-jump-loop-ja"],[44,"eichar-edge-grab-stance0-ja"],[45,"eichar-edge-grab-stance1-ja"],[46,"eichar-falling-to-edge-grab-ja"],[47,"eichar-edge-grab-swing-left-ja"],[48,"eichar-edge-grab-swing-right-ja"],[49,"eichar-edge-grab-to-jump-ja"],[50,"eichar-edge-grab-off-ja"],[51,"eichar-attack-from-stance-ja"],[52,"eichar-attack-from-stance-end-ja"],[53,"eichar-attack-from-stance-alt-end-ja"],[54,"eichar-attack-from-stance-run-end-ja"],[55,"eichar-attack-from-stance-run-alt-end-ja"],[56,"eichar-attack-from-jump-ja"],[57,"eichar-attack-from-jump-loop-ja"],[58,"eichar-attack-from-jump-end-ja"],[59,"eichar-attack-punch-ja"],[60,"eichar-attack-punch-end-ja"],[61,"eichar-attack-punch-alt-end-ja"],[62,"eichar-attack-uppercut-ja"],[63,"eichar-flop-down-ja"],[64,"eichar-flop-down-loop-ja"],[65,"eichar-flop-down-land-ja"],[66,"eichar-moving-flop-down-ja"],[67,"eichar-moving-flop-down-loop-ja"],[68,"eichar-moving-flop-down-land-ja"],[69,"eichar-duck-roll-ja"],[70,"eichar-duck-roll-end-ja"],[71,"eichar-wheel-flip-ja"],[72,"eichar-wheel-flip-land-ja"],[73,"eichar-hit-from-front-ja"],[74,"eichar-hit-from-back-ja"],[75,"eichar-hit-up-ja"],[76,"eichar-deatha-ja"],[77,"eichar-death-painful-land-ja"],[78,"eichar-smack-surface-ja"],[79,"eichar-smack-surface-end-ja"],[84,"eichar-yellow-running-blast-ja"],[85,"eichar-yellow-running-blast-end-ja"],[86,"eichar-yellow-jumping-blast-ja"],[87,"eichar-powerup-ja"],[88,"eichar-shocked-ja"],[89,"eichar-wade-shallow-walk-ja"],[90,"eichar-wade-deep-walk-ja"],[91,"eichar-swim-stance-ja"],[92,"eichar-swim-walk-ja"],[93,"eichar-swim-walk-to-down-ja"],[94,"eichar-swim-down-ja"],[95,"eichar-swim-down-to-up-ja"],[96,"eichar-swim-up-ja"],[97,"eichar-swim-up-to-stance-ja"],[98,"eichar-swim-jump-ja"],[101,"eichar-periscope-grab-ja"],[112,"eichar-trip-ja"],[121,"eichar-fuel-cell-victory-9-ja"],[210,"eichar-main-plant-boss-kill-ja"],[211,"eichar-main-plant-boss-kill-close-ja"],[99,"eichar-fishing-ja"],[100,"eichar-fishing-lose-ja"],[122,"eichar-racer-idle-ja"],[123,"eichar-racer-turn-ja"],[124,"eichar-racer-turn2-ja"],[125,"eichar-racer-dig-ja"],[126,"eichar-racer-dig2-ja"],[127,"eichar-racer-jump-ja"],[128,"eichar-racer-jump-loop-ja"],[129,"eichar-racer-jump-land-ja"],[130,"eichar-racer-jump-small-ja"],[131,"eichar-racer-jump-small-loop-ja"],[132,"eichar-racer-jump-small-land-ja"],[133,"eichar-racer-stance-ja"],[134,"eichar-racer-jump-high-loop-ja"],[135,"eichar-racer-jump-high-land-ja"],[136,"eichar-racer-smack-ja"],[137,"eichar-racer-get-off-ja"],[138,"eichar-racer-get-on-ja"],[139,"eichar-racer-death-explode-ja"],[140,"eichar-flut-idle-ja"],[141,"eichar-flut-walk-ja"],[142,"eichar-flut-run-ja"],[143,"eichar-flut-jump-ja"],[144,"eichar-flut-jump-loop-ja"],[145,"eichar-flut-jump-land-ja"],[146,"eichar-flut-jump-forward-ja"],[147,"eichar-flut-jump-forward-loop-ja"],[148,"eichar-flut-jump-forward-land-ja"],[149,"eichar-flut-double-jump-ja"],[150,"eichar-flut-running-attack-ja"],[151,"eichar-flut-running-attack-end-ja"],[152,"eichar-flut-air-attack-ja"],[153,"eichar-flut-air-attack-loop-ja"],[154,"eichar-flut-air-attack-land-ja"],[155,"eichar-flut-get-on-ja"],[156,"eichar-flut-get-off-ja"],[157,"eichar-flut-hit-back-ja"],[158,"eichar-flut-smack-surface-ja"],[159,"eichar-flut-smack-surface-end-ja"],[160,"eichar-flut-deatha-ja"],[161,"eichar-flut-squash-run-ja"],[105,"eichar-tube-turn-ja"],[106,"eichar-tube-jump-land-ja"],[107,"eichar-tube-dummy2-ja"],[108,"eichar-tube-dummy3-ja"],[109,"eichar-tube-dummy4-ja"],[110,"eichar-tube-dummy5-ja"],[111,"eichar-tube-dummy6-ja"],[80,"eichar-pole-cycle-ja"],[81,"eichar-pole-flip-up-ja"],[82,"eichar-pole-flip-forward-ja"],[83,"eichar-pole-jump-loop-ja"],[102,"eichar-ice-skate-ja"],[103,"eichar-ice-slide-ja"],[104,"eichar-ice-stance-ja"]],"energyarm-ag":[[0,"energyarm-lod0-jg"],[1,"energyarm-lod0-mg"],[2,"energyarm-lod1-mg"],[3,"energyarm-idle-ja"]],"energyball-ag":[[0,"energyball-lod0-jg"],[1,"energyball-lod0-mg"],[2,"energyball-idle-ja"]],"energybase-ag":[[0,"energybase-lod0-jg"],[1,"energybase-lod0-mg"],[2,"energybase-idle-ja"]],"energydoor-ag":[[0,"energydoor-lod0-jg"],[1,"energydoor-lod0-mg"],[2,"energydoor-idle-ja"]],"energyhub-ag":[[0,"energyhub-lod0-jg"],[1,"energyhub-lod0-mg"],[2,"energyhub-idle-ja"]],"evilbro-ag":[[0,"evilbro-lod0-jg"],[1,"evilbro-lod0-mg"],[2,"evilbro-shadow-mg"],[3,"evilbro-idle-ja"]],"evilbro-citadel-ag":[[0,"evilbro-citadel-lod0-jg"],[1,"evilbro-citadel-lod0-mg"],[2,"evilbro-citadel-shadow-mg"],[3,"evilbro-citadel-idle-ja"]],"evilbro-village3-ag":[[0,"evilbro-village3-lod0-jg"],[1,"evilbro-village3-lod0-mg"],[2,"evilbro-village3-shadow-mg"],[3,"evilbro-village3-idle-ja"]],"evilplant-ag":[[0,"evilplant-lod0-jg"],[1,"evilplant-lod0-mg"],[2,"evilplant-idle-ja"]],"evilsis-ag":[[0,"evilsis-lod0-jg"],[1,"evilsis-lod0-mg"],[2,"evilsis-shadow-mg"],[3,"evilsis-idle-ja"]],"evilsis-citadel-ag":[[0,"evilsis-citadel-lod0-jg"],[1,"evilsis-citadel-lod0-mg"],[2,"evilsis-citadel-shadow-mg"],[3,"evilsis-citadel-idle-ja"]],"evilsis-village3-ag":[[0,"evilsis-village3-lod0-jg"],[1,"evilsis-village3-lod0-mg"],[2,"evilsis-village3-shadow-mg"],[3,"evilsis-village3-idle-ja"]],"exit-chamber-ag":[[0,"exit-chamber-lod0-jg"],[1,"exit-chamber-lod0-mg"],[2,"exit-chamber-idle-ja"],[3,"exit-chamber-start-door-shut-ja"],[4,"exit-chamber-start-in-room-ja"],[5,"exit-chamber-middle-in-water-ja"],[6,"exit-chamber-end-out-of-water-ja"],[7,"exit-chamber-dive-start-ja"],[8,"exit-chamber-dive-middle-ja"],[9,"exit-chamber-dive-end-ja"]],"exit-chamber-dummy-ag":[[0,"exit-chamber-dummy-lod0-jg"],[1,"exit-chamber-dummy-lod0-mg"],[2,"exit-chamber-dummy-idle-ja"]],"explorer-ag":[[0,"explorer-lod0-jg"],[1,"explorer-lod0-mg"],[2,"explorer-shadow-mg"],[3,"explorer-idle-ja"],[4,"explorer-idle2-look-at-map-ja"],[5,"explorer-idle2-look-right-map-ja"],[6,"explorer-idle3-step-right-ja"],[7,"explorer-idle3-looking-ja"],[8,"explorer-idle3-step-left-ja"]],"farmer-ag":[[0,"farmer-lod0-jg"],[1,"farmer-lod0-mg"],[2,"farmer-lod1-mg"],[3,"farmer-shadow-mg"],[4,"farmer-sitting-cycle-ja"],[5,"farmer-standing-cycle-ja"]],"farthy-snack-ag":[[0,"farthy-snack-lod0-jg"],[1,"farthy-snack-lod0-mg"],[2,"farthy-snack-idle-ja"],[3,"farthy-snack-eat-ja"]],"finalbosscam-ag":[[0,"finalbosscam-lod0-jg"],[1,"finalbosscam-lod0-mg"],[2,"finalbosscam-idle-ja"]],"fireboulder-ag":[[0,"fireboulder-lod0-jg"],[1,"fireboulder-lod0-mg"],[2,"fireboulder-idle-ja"],[3,"fireboulder-hover-ja"],[4,"fireboulder-boulder1-ja"],[5,"fireboulder-boulder2-ja"],[6,"fireboulder-boulder3-ja"],[7,"fireboulder-boulder3b-ja"],[8,"fireboulder-boulder4-ja"],[10,"fireboulder-pre-throw-ja"]],"fish-net-ag":[[0,"fish-net-lod0-jg"],[1,"fish-net-lod0-mg"],[2,"fish-net-fishing-ja"]],"fisher-ag":[[0,"fisher-lod0-jg"],[1,"fisher-lod0-mg"],[2,"fisher-lod1-mg"],[3,"fisher-lod2-mg"],[4,"fisher-shadow-mg"],[5,"fisher-idle-less-often-ja"],[6,"fisher-idle-more-often-ja"],[7,"fisher-idle-win-ja"]],"fishermans-boat-ag":[[0,"fishermans-boat-lod0-jg"],[1,"fishermans-boat-lod0-mg"],[2,"fishermans-boat-lod1-mg"],[3,"fishermans-boat-idle-ja"]],"floating-launcher-ag":[[0,"floating-launcher-lod0-jg"],[1,"floating-launcher-lod0-mg"],[2,"floating-launcher-idle-ja"]],"flut-saddle-ag":[[3,"flut-saddle-flut-idle-ja"],[4,"flut-saddle-flut-walk-ja"],[5,"flut-saddle-flut-run-ja"],[6,"flut-saddle-flut-jump-ja"],[7,"flut-saddle-flut-jump-loop-ja"],[8,"flut-saddle-flut-jump-land-ja"],[9,"flut-saddle-flut-jump-forward-ja"],[10,"flut-saddle-flut-jump-forward-loop-ja"],[11,"flut-saddle-flut-jump-forward-land-ja"],[12,"flut-saddle-flut-double-jump-ja"],[13,"flut-saddle-flut-running-attack-ja"],[14,"flut-saddle-flut-running-attack-end-ja"],[15,"flut-saddle-flut-air-attack-ja"],[16,"flut-saddle-flut-air-attack-loop-ja"],[17,"flut-saddle-flut-air-attack-land-ja"],[18,"flut-saddle-flut-get-on-ja"],[19,"flut-saddle-flut-get-off-ja"],[20,"flut-saddle-flut-hit-back-ja"],[21,"flut-saddle-flut-smack-surface-ja"],[22,"flut-saddle-flut-smack-surface-end-ja"],[23,"flut-saddle-flut-deatha-ja"],[24,"flut-saddle-flut-squash-run-ja"],[0,"flut-saddle-lod0-jg"],[1,"flut-saddle-lod0-mg"],[2,"flut-saddle-shadow-mg"]],"flutflut-ag":[[0,"flutflut-lod0-jg"],[1,"flutflut-lod0-mg"],[2,"flutflut-flutflut-idle-ja"]],"flutflut-bluehut-ag":[[0,"flutflut-bluehut-lod0-jg"],[1,"flutflut-bluehut-lod0-mg"],[2,"flutflut-bluehut-idle-breathe-ja"],[3,"flutflut-bluehut-idle-start-scratch-ja"],[4,"flutflut-bluehut-idle-scratch-ja"]],"flutflut-plat-large-ag":[[0,"flutflut-plat-large-lod0-jg"],[1,"flutflut-plat-large-lod0-mg"],[2,"flutflut-plat-large-idle-ja"]],"flutflut-plat-med-ag":[[0,"flutflut-plat-med-lod0-jg"],[1,"flutflut-plat-med-lod0-mg"],[2,"flutflut-plat-med-idle-ja"]],"flutflut-plat-small-ag":[[0,"flutflut-plat-small-lod0-jg"],[1,"flutflut-plat-small-lod0-mg"],[2,"flutflut-plat-small-idle-ja"]],"flutflutegg-ag":[[0,"flutflutegg-lod0-jg"],[1,"flutflutegg-lod0-mg"],[2,"flutflutegg-lod1-mg"],[3,"flutflutegg-lod2-mg"],[4,"flutflutegg-idle-ja"],[5,"flutflutegg-crack-ja"],[6,"flutflutegg-broke-ja"]],"flying-lurker-ag":[[0,"flying-lurker-lod0-jg"],[1,"flying-lurker-lod0-mg"],[2,"flying-lurker-lod1-mg"],[3,"flying-lurker-lod2-mg"],[4,"flying-lurker-shadow-mg"],[5,"flying-lurker-fly-ja"],[6,"flying-lurker-look-ja"]],"fuel-cell-ag":[[0,"fuel-cell-lod0-jg"],[1,"fuel-cell-lod0-mg"],[2,"fuel-cell-idle-ja"],[11,"fuel-cell-fuel-cell-victory-9-ja"]],"fuelcell-naked-ag":[[0,"fuelcell-naked-lod0-jg"],[1,"fuelcell-naked-lod0-mg"],[2,"fuelcell-naked-idle-ja"]],"gambler-ag":[[0,"gambler-lod0-jg"],[1,"gambler-lod0-mg"],[2,"gambler-lod1-mg"],[3,"gambler-lod2-mg"],[4,"gambler-shadow-mg"],[5,"gambler-idle-tiptoe-ja"],[6,"gambler-idle-look-1-ja"],[7,"gambler-idle-fidget-ja"],[8,"gambler-idle-scratch-1-ja"],[9,"gambler-idle-look-2-ja"],[10,"gambler-idle-scratch-2-ja"]],"generic-button-ag":[[0,"generic-button-lod0-jg"],[1,"generic-button-lod0-mg"],[2,"generic-button-idle-ja"]],"geologist-ag":[[0,"geologist-lod0-jg"],[1,"geologist-lod0-mg"],[2,"geologist-lod1-mg"],[3,"geologist-lod2-mg"],[4,"geologist-shadow-mg"],[5,"geologist-idle-ja"]],"gnawer-ag":[[0,"gnawer-lod0-jg"],[1,"gnawer-lod0-mg"],[2,"gnawer-lod1-mg"],[3,"gnawer-lod2-mg"],[4,"gnawer-idle-ja"],[5,"gnawer-run-ja"],[6,"gnawer-takes-hit-ja"],[7,"gnawer-die-ja"],[8,"gnawer-tear-side-to-side-ja"],[9,"gnawer-tug-ja"],[10,"gnawer-up-to-chew-ja"],[11,"gnawer-chew-ja"],[12,"gnawer-notice-ja"],[13,"gnawer-down-from-chew-ja"],[14,"gnawer-segment-lod0-jg"],[15,"gnawer-segment-lod0-mg"],[16,"gnawer-segment-idle-ja"],[17,"gnawer-segment-die-ja"]],"gondola-ag":[[0,"gondola-lod0-jg"],[1,"gondola-lod0-mg"],[2,"gondola-shadow-mg"],[3,"gondola-idle-down-ja"],[4,"gondola-idle-up-ja"]],"gondolacables-ag":[[0,"gondolacables-lod0-jg"],[1,"gondolacables-lod0-mg"],[2,"gondolacables-idle-ja"]],"green-eco-lurker-ag":[[0,"green-eco-lurker-lod0-jg"],[1,"green-eco-lurker-lod0-mg"],[2,"green-eco-lurker-shadow-mg"],[3,"green-eco-lurker-idle-ja"],[4,"green-eco-lurker-charge-ja"],[5,"green-eco-lurker-win-ja"],[6,"green-eco-lurker-death-ja"],[7,"green-eco-lurker-jump-ja"],[8,"green-eco-lurker-jump-land-ja"],[9,"green-eco-lurker-spot-ja"],[10,"green-eco-lurker-turn-ja"],[11,"green-eco-lurker-jump-with-flip-ja"]],"green-sagecage-ag":[[0,"green-sagecage-lod0-jg"],[1,"green-sagecage-lod0-mg"],[2,"green-sagecage-lod1-mg"],[3,"green-sagecage-shadow-mg"],[4,"green-sagecage-green-sagecage-idle-ja"]],"greenshot-ag":[[0,"greenshot-lod0-jg"],[1,"greenshot-lod0-mg"],[2,"greenshot-idle-ja"]],"grottopole-ag":[[0,"grottopole-lod0-jg"],[1,"grottopole-lod0-mg"],[2,"grottopole-lod1-mg"],[3,"grottopole-idle-ja"]],"happy-plant-ag":[[0,"happy-plant-lod0-jg"],[1,"happy-plant-lod0-mg"],[2,"happy-plant-lod1-mg"],[3,"happy-plant-init-ja"],[4,"happy-plant-idle-ja"]],"harvester-ag":[[0,"harvester-lod0-jg"],[1,"harvester-lod0-mg"],[2,"harvester-lod1-mg"],[3,"harvester-lod2-mg"],[4,"harvester-idle-ja"],[5,"harvester-inflate-ja"]],"helix-button-ag":[[0,"helix-button-lod0-jg"],[1,"helix-button-lod0-mg"],[2,"helix-button-idle-ja"]],"helix-slide-door-ag":[[0,"helix-slide-door-lod0-jg"],[1,"helix-slide-door-lod0-mg"],[2,"helix-slide-door-idle-ja"]],"hopper-ag":[[0,"hopper-lod0-jg"],[1,"hopper-lod0-mg"],[2,"hopper-lod1-mg"],[3,"hopper-lod2-mg"],[4,"hopper-shadow-mg"],[5,"hopper-idle-ja"],[6,"hopper-burp-ja"],[7,"hopper-jump-long-ja"],[8,"hopper-jump-long-land-ja"],[9,"hopper-jump-short-ja"],[10,"hopper-jump-short-land-ja"],[11,"hopper-death-ja"]],"hutlamp-ag":[[0,"hutlamp-lod0-jg"],[1,"hutlamp-lod0-mg"],[2,"hutlamp-idle-ja"]],"ice-cube-ag":[[0,"ice-cube-lod0-jg"],[1,"ice-cube-lod0-mg"],[2,"ice-cube-lod1-mg"],[3,"ice-cube-lod2-mg"],[4,"ice-cube-shadow-mg"],[5,"ice-cube-vuln-idle-ja"],[6,"ice-cube-vuln-walk-ja"],[7,"ice-cube-appear-jump-up-ja"],[8,"ice-cube-appear-land-ja"],[9,"ice-cube-extend-spikes-ja"],[10,"ice-cube-turn-on-player-ja"],[11,"ice-cube-turn-on-player-land-ja"],[12,"ice-cube-invuln-run-ja"],[13,"ice-cube-invuln-stopping-ja"],[14,"ice-cube-retract-spikes-ja"],[15,"ice-cube-breathing-ja"],[16,"ice-cube-head-wipe-ja"],[17,"ice-cube-invuln-stopping-upright-ja"]],"ice-cube-break-ag":[[0,"ice-cube-break-lod0-jg"],[1,"ice-cube-break-lod0-mg"],[2,"ice-cube-break-idle-ja"]],"jak-white-ag":[[0,"jak-white-lod0-jg"],[1,"jak-white-lod0-mg"],[2,"jak-white-idle-ja"]],"jaws-ag":[[0,"jaws-lod0-jg"],[1,"jaws-lod0-mg"],[2,"jaws-idle-ja"]],"jng-iris-door-ag":[[0,"jng-iris-door-lod0-jg"],[1,"jng-iris-door-lod0-mg"],[2,"jng-iris-door-lod1-mg"],[3,"jng-iris-door-idle-ja"]],"junglecam-ag":[[0,"junglecam-lod0-jg"],[1,"junglecam-lod0-mg"],[2,"junglecam-beamcam-ja"],[3,"junglecam-tower1-ja"],[4,"junglecam-tower2-ja"],[5,"junglecam-tower3-ja"],[6,"junglecam-tower4-ja"],[7,"junglecam-tower5-ja"],[8,"junglecam-precurbridgecam-ja"]],"junglefish-ag":[[0,"junglefish-lod0-jg"],[1,"junglefish-lod0-mg"],[2,"junglefish-lod1-mg"],[3,"junglefish-lod2-mg"],[4,"junglefish-swim-ja"],[5,"junglefish-chomp-ja"],[6,"junglefish-death-ja"]],"junglesnake-ag":[[0,"junglesnake-lod0-jg"],[1,"junglesnake-lod0-mg"],[2,"junglesnake-idle-ja"],[3,"junglesnake-strike-close-ja"],[4,"junglesnake-strike-far-ja"],[5,"junglesnake-drop-down-ja"],[6,"junglesnake-death-ja"],[7,"junglesnake-give-up-ja"]],"keg-ag":[[0,"keg-lod0-jg"],[1,"keg-lod0-mg"],[2,"keg-lod1-mg"],[3,"keg-lod2-mg"],[4,"keg-shadow-mg"],[5,"keg-idle-ja"]],"keg-conveyor-ag":[[0,"keg-conveyor-lod0-jg"],[1,"keg-conveyor-lod0-mg"],[2,"keg-conveyor-idle-ja"]],"keg-conveyor-paddle-ag":[[0,"keg-conveyor-paddle-lod0-jg"],[1,"keg-conveyor-paddle-lod0-mg"],[2,"keg-conveyor-paddle-idle-ja"]],"kermit-ag":[[0,"kermit-lod0-jg"],[1,"kermit-lod0-mg"],[2,"kermit-lod1-mg"],[3,"kermit-lod2-mg"],[4,"kermit-idle-ja"],[5,"kermit-hop-ja"],[6,"kermit-longhop-ja"],[7,"kermit-lash-ja"],[8,"kermit-miss-ja"],[9,"kermit-pull-ja"],[10,"kermit-turn-ja"],[11,"kermit-die-ja"]],"kickrock-ag":[[0,"kickrock-lod0-jg"],[1,"kickrock-lod0-mg"],[2,"kickrock-idle-ja"]],"launcherdoor-ag":[[0,"launcherdoor-geo-jg"],[1,"launcherdoor-geo-mg"],[2,"launcherdoor-lod1-mg"],[3,"launcherdoor-idle-ja"]],"launcherdoor-maincave-ag":[[0,"launcherdoor-maincave-geo-jg"],[1,"launcherdoor-maincave-geo-mg"],[2,"launcherdoor-maincave-lod1-mg"],[3,"launcherdoor-maincave-idle-ja"]],"lavaballoon-ag":[[0,"lavaballoon-lod0-jg"],[1,"lavaballoon-lod0-mg"],[2,"lavaballoon-lod1-mg"],[3,"lavaballoon-idle-ja"]],"lavabase-ag":[[0,"lavabase-lod0-jg"],[1,"lavabase-lod0-mg"],[2,"lavabase-idle-ja"]],"lavafall-ag":[[0,"lavafall-lod0-jg"],[1,"lavafall-lod0-mg"],[2,"lavafall-idle-ja"]],"lavafallsewera-ag":[[0,"lavafallsewera-lod0-jg"],[1,"lavafallsewera-lod0-mg"],[2,"lavafallsewera-idle-ja"]],"lavafallsewerb-ag":[[0,"lavafallsewerb-lod0-jg"],[1,"lavafallsewerb-lod0-mg"],[2,"lavafallsewerb-idle-ja"]],"lavashortcut-ag":[[0,"lavashortcut-lod0-jg"],[1,"lavashortcut-lod0-mg"],[2,"lavashortcut-idle-ja"]],"lavaspoutdrip-ag":[[0,"lavaspoutdrip-lod0-jg"],[1,"lavaspoutdrip-lod0-mg"],[2,"lavaspoutdrip-idle-ja"]],"lavayellowtarp-ag":[[0,"lavayellowtarp-lod0-jg"],[1,"lavayellowtarp-lod0-mg"],[2,"lavayellowtarp-idle-ja"]],"light-eco-ag":[[0,"light-eco-big-lod0-jg"],[1,"light-eco-big-lod0-mg"],[2,"light-eco-big-idle-ja"],[3,"light-eco-small-lod0-jg"],[4,"light-eco-small-lod0-mg"],[5,"light-eco-small-idle-ja"]],"lightning-mole-ag":[[0,"lightning-mole-lod0-jg"],[1,"lightning-mole-lod0-mg"],[2,"lightning-mole-lod1-mg"],[3,"lightning-mole-lod2-mg"],[4,"lightning-mole-shadow-mg"],[5,"lightning-mole-idle-ja"],[6,"lightning-mole-spots-ja"],[7,"lightning-mole-run-ja"],[8,"lightning-mole-run-right-ja"],[9,"lightning-mole-run-left-ja"],[10,"lightning-mole-yelp-ja"],[11,"lightning-mole-run-to-idle-ja"],[12,"lightning-mole-dive-ja"],[13,"lightning-mole-peep-ja"]],"logo-ag":[[8,"logo-logo-loop-pre-ja"],[0,"logo-english-lod0-jg"],[1,"logo-english-lod0-mg"],[2,"logo-japan-lod0-jg"],[3,"logo-japan-lod0-mg"],[4,"logo-idle-ja"],[6,"logo-logo-intro-2-pre-ja"]],"logo-black-ag":[[0,"logo-black-lod0-jg"],[1,"logo-black-lod0-mg"],[2,"logo-black-idle-ja"]],"logo-cam-ag":[[0,"logo-cam-lod0-jg"],[1,"logo-cam-lod0-mg"],[2,"logo-cam-idle-ja"],[4,"logo-cam-logo-intro-2-pre-ja"],[6,"logo-cam-logo-loop-pre-ja"]],"logo-volumes-ag":[[0,"logo-volumes-english-lod0-jg"],[1,"logo-volumes-english-lod0-mg"],[2,"logo-volumes-japan-lod0-jg"],[3,"logo-volumes-japan-lod0-mg"],[4,"logo-volumes-idle-ja"]],"logtrap-ag":[[0,"logtrap-lod0-jg"],[1,"logtrap-lod0-mg"],[2,"logtrap-lod1-mg"],[3,"logtrap-shadow-mg"],[4,"logtrap-idle-ja"]],"lrocklrg-ag":[[0,"lrocklrg-lod0-jg"],[1,"lrocklrg-lod0-mg"],[2,"lrocklrg-idle-ja"],[3,"lrocklrg-fallen-ja"]],"lurkercrab-ag":[[0,"lurkercrab-lod0-jg"],[1,"lurkercrab-lod0-mg"],[2,"lurkercrab-lod1-mg"],[3,"lurkercrab-lod2-mg"],[4,"lurkercrab-idle-ja"],[5,"lurkercrab-idle-to-walk-ja"],[6,"lurkercrab-walk-ja"],[7,"lurkercrab-peek-ja"],[8,"lurkercrab-peek-to-walk-ja"],[9,"lurkercrab-snip-ja"],[10,"lurkercrab-kickback-ja"],[11,"lurkercrab-die-ja"]],"lurkerm-piston-ag":[[0,"lurkerm-piston-geo-jg"],[1,"lurkerm-piston-geo-mg"],[2,"lurkerm-piston-idle-ja"]],"lurkerm-tall-sail-ag":[[0,"lurkerm-tall-sail-lod0-jg"],[1,"lurkerm-tall-sail-lod0-mg"],[2,"lurkerm-tall-sail-lod1-mg"],[3,"lurkerm-tall-sail-lod2-mg"],[4,"lurkerm-tall-sail-idle-ja"]],"lurkerpuppy-ag":[[0,"lurkerpuppy-lod0-jg"],[1,"lurkerpuppy-lod0-mg"],[2,"lurkerpuppy-lod1-mg"],[3,"lurkerpuppy-lod2-mg"],[4,"lurkerpuppy-shadow-mg"],[5,"lurkerpuppy-idle-ja"],[6,"lurkerpuppy-walk-ja"],[7,"lurkerpuppy-run-ja"],[8,"lurkerpuppy-celebrate-ja"],[9,"lurkerpuppy-jump-ja"],[10,"lurkerpuppy-jump-land-ja"],[11,"lurkerpuppy-die-ja"]],"lurkerworm-ag":[[0,"lurkerworm-lod0-jg"],[1,"lurkerworm-lod0-mg"],[2,"lurkerworm-lod1-mg"],[3,"lurkerworm-idle-ja"],[4,"lurkerworm-rise-ja"],[5,"lurkerworm-sink-ja"],[6,"lurkerworm-chomp-ja"],[7,"lurkerworm-die-ja"]],"maincavecam-ag":[[0,"maincavecam-lod0-jg"],[1,"maincavecam-lod0-mg"],[2,"maincavecam-dummy-ja"]],"maindoor-ag":[[0,"maindoor-lod0-jg"],[1,"maindoor-lod0-mg"],[2,"maindoor-lod1-mg"],[3,"maindoor-idle-ja"]],"mayor-ag":[[0,"mayor-lod0-jg"],[1,"mayor-lod0-mg"],[2,"mayor-shadow-mg"],[3,"mayor-idle-ja"]],"mayorgears-ag":[[0,"mayorgears-geo-jg"],[1,"mayorgears-geo-mg"],[2,"mayorgears-idle-ja"]],"medres-beach-ag":[[0,"medres-beach-lod0-jg"],[1,"medres-beach-lod0-mg"],[2,"medres-beach-idle-ja"]],"medres-beach1-ag":[[0,"medres-beach1-lod0-jg"],[1,"medres-beach1-lod0-mg"],[2,"medres-beach1-idle-ja"]],"medres-beach2-ag":[[0,"medres-beach2-lod0-jg"],[1,"medres-beach2-lod0-mg"],[2,"medres-beach2-idle-ja"]],"medres-beach3-ag":[[0,"medres-beach3-lod0-jg"],[1,"medres-beach3-lod0-mg"],[2,"medres-beach3-idle-ja"]],"medres-finalboss-ag":[[0,"medres-finalboss-lod0-jg"],[1,"medres-finalboss-lod0-mg"],[2,"medres-finalboss-idle-ja"]],"medres-firecanyon-ag":[[0,"medres-firecanyon-lod0-jg"],[1,"medres-firecanyon-lod0-mg"],[2,"medres-firecanyon-idle-ja"]],"medres-jungle-ag":[[0,"medres-jungle-lod0-jg"],[1,"medres-jungle-lod0-mg"],[2,"medres-jungle-idle-ja"]],"medres-jungle1-ag":[[0,"medres-jungle1-lod0-jg"],[1,"medres-jungle1-lod0-mg"],[2,"medres-jungle1-idle-ja"]],"medres-jungle2-ag":[[0,"medres-jungle2-lod0-jg"],[1,"medres-jungle2-lod0-mg"],[2,"medres-jungle2-idle-ja"]],"medres-misty-ag":[[0,"medres-misty-lod0-jg"],[1,"medres-misty-lod0-mg"],[2,"medres-misty-idle-ja"]],"medres-ogre-ag":[[0,"medres-ogre-lod0-jg"],[1,"medres-ogre-lod0-mg"],[2,"medres-ogre-idle-ja"]],"medres-ogre2-ag":[[0,"medres-ogre2-lod0-jg"],[1,"medres-ogre2-lod0-mg"],[2,"medres-ogre2-idle-ja"]],"medres-ogre3-ag":[[0,"medres-ogre3-lod0-jg"],[1,"medres-ogre3-lod0-mg"],[2,"medres-ogre3-idle-ja"]],"medres-rolling-ag":[[0,"medres-rolling-lod0-jg"],[1,"medres-rolling-lod0-mg"],[2,"medres-rolling-idle-ja"]],"medres-rolling1-ag":[[0,"medres-rolling1-lod0-jg"],[1,"medres-rolling1-lod0-mg"],[2,"medres-rolling1-idle-ja"]],"medres-snow-ag":[[0,"medres-snow-lod0-jg"],[1,"medres-snow-lod0-mg"],[2,"medres-snow-idle-ja"]],"medres-training-ag":[[0,"medres-training-lod0-jg"],[1,"medres-training-lod0-mg"],[2,"medres-training-idle-ja"]],"medres-village11-ag":[[0,"medres-village11-lod0-jg"],[1,"medres-village11-lod0-mg"],[2,"medres-village11-idle-ja"]],"medres-village12-ag":[[0,"medres-village12-lod0-jg"],[1,"medres-village12-lod0-mg"],[2,"medres-village12-idle-ja"]],"medres-village13-ag":[[0,"medres-village13-lod0-jg"],[1,"medres-village13-lod0-mg"],[2,"medres-village13-idle-ja"]],"medres-village2-ag":[[0,"medres-village2-lod0-jg"],[1,"medres-village2-lod0-mg"],[2,"medres-village2-idle-ja"]],"minecartsteel-ag":[[0,"minecartsteel-lod0-jg"],[1,"minecartsteel-lod0-mg"],[2,"minecartsteel-lod1-mg"],[3,"minecartsteel-lod2-mg"],[4,"minecartsteel-idle-ja"],[5,"minecartsteel-rail0-ja"],[6,"minecartsteel-rail1-ja"],[7,"minecartsteel-rail2-ja"]],"minershort-ag":[[0,"minershort-lod0-jg"],[1,"minershort-lod0-mg"],[2,"minershort-shadow-mg"],[3,"minershort-idle-ja"]],"minertall-ag":[[0,"minertall-lod0-jg"],[1,"minertall-lod0-mg"],[2,"minertall-shadow-mg"],[3,"minertall-idle-ja"]],"mis-bone-bridge-ag":[[0,"mis-bone-bridge-lod0-jg"],[1,"mis-bone-bridge-lod0-mg"],[2,"mis-bone-bridge-idle-ja"],[3,"mis-bone-bridge-idle2-ja"],[4,"mis-bone-bridge-idle7-ja"],[5,"mis-bone-bridge-kicked-ja"],[6,"mis-bone-bridge-bumped-ja"]],"mis-bone-platform-ag":[[0,"mis-bone-platform-lod0-jg"],[1,"mis-bone-platform-lod0-mg"],[2,"mis-bone-platform-idle-ja"]],"mistycam-ag":[[0,"mistycam-lod0-jg"],[1,"mistycam-lod0-mg"],[2,"mistycam-anim-ja"],[3,"mistycam-lurkerattack-ja"],[4,"mistycam-balloon-fuel-cell-ja"],[6,"mistycam-cannon-fuel-cell-ja"]],"mistycannon-ag":[[0,"mistycannon-lod0-jg"],[1,"mistycannon-lod0-mg"],[2,"mistycannon-lod1-mg"],[3,"mistycannon-idle-ja"]],"money-ag":[[0,"money-lod0-jg"],[1,"money-lod0-mg"],[2,"money-lod1-mg"],[3,"money-lod2-mg"],[4,"money-idle-ja"]],"mother-spider-ag":[[0,"mother-spider-lod0-jg"],[1,"mother-spider-lod0-mg"],[2,"mother-spider-lod1-mg"],[3,"mother-spider-lod2-mg"],[4,"mother-spider-shadow-mg"],[5,"mother-spider-idle-ja"],[6,"mother-spider-birth-ja"],[7,"mother-spider-lowering-ja"],[8,"mother-spider-stopped-lowering-ja"],[9,"mother-spider-takes-hit-ja"],[10,"mother-spider-spit-ja"],[11,"mother-spider-die-ja"],[12,"mother-spider-die-from-uppercut-ja"],[13,"mother-spider-leg-lod0-jg"],[14,"mother-spider-leg-lod0-mg"],[15,"mother-spider-leg-twitching-ja"],[16,"mother-spider-leg-die-ja"]],"muse-ag":[[0,"muse-lod0-jg"],[1,"muse-lod0-mg"],[2,"muse-shadow-mg"],[3,"muse-idle-ja"],[4,"muse-run-ja"],[5,"muse-idle-to-run-ja"],[6,"muse-run-to-idle-ja"],[7,"muse-jump-ja"],[8,"muse-jump-land-ja"]],"ndi-ag":[[0,"ndi-lod0-jg"],[1,"ndi-lod0-mg"],[2,"ndi-idle-ja"]],"ndi-cam-ag":[[0,"ndi-cam-lod0-jg"],[1,"ndi-cam-lod0-mg"],[2,"ndi-cam-idle-ja"]],"ndi-volumes-ag":[[0,"ndi-volumes-lod0-jg"],[1,"ndi-volumes-lod0-mg"],[2,"ndi-volumes-idle-ja"]],"ogre-bridge-ag":[[0,"ogre-bridge-lod0-jg"],[1,"ogre-bridge-lod0-mg"],[2,"ogre-bridge-idle-ja"],[3,"ogre-bridge-assemble-ja"],[4,"ogre-bridge-break-ja"]],"ogre-bridgeend-ag":[[0,"ogre-bridgeend-lod0-jg"],[1,"ogre-bridgeend-lod0-mg"],[2,"ogre-bridgeend-idle-ja"]],"ogre-isle-ag":[[0,"ogre-isle-a-lod0-jg"],[1,"ogre-isle-a-lod0-mg"],[2,"ogre-isle-a-idle-ja"],[3,"ogre-isle-b-lod0-jg"],[4,"ogre-isle-b-lod0-mg"],[5,"ogre-isle-b-idle-ja"],[6,"ogre-isle-c-lod0-jg"],[7,"ogre-isle-c-lod0-mg"],[8,"ogre-isle-c-idle-ja"],[9,"ogre-isle-d-lod0-jg"],[10,"ogre-isle-d-lod0-mg"],[11,"ogre-isle-d-idle-ja"]],"ogre-step-ag":[[0,"ogre-step-a-lod0-jg"],[1,"ogre-step-a-lod0-mg"],[2,"ogre-step-a-idle-ja"],[3,"ogre-step-b-lod0-jg"],[4,"ogre-step-b-lod0-mg"],[5,"ogre-step-b-idle-ja"],[6,"ogre-step-c-lod0-jg"],[7,"ogre-step-c-lod0-mg"],[8,"ogre-step-c-idle-ja"],[9,"ogre-step-d-lod0-jg"],[10,"ogre-step-d-lod0-mg"],[11,"ogre-step-d-idle-ja"]],"ogreboss-ag":[[0,"ogreboss-lod0-jg"],[1,"ogreboss-lod0-mg"],[2,"ogreboss-idle-ja"],[3,"ogreboss-idle-bored-ja"],[4,"ogreboss-idle-alt-ja"],[5,"ogreboss-roar-ja"],[6,"ogreboss-attack2-start-ja"],[7,"ogreboss-attack2-loop-ja"],[8,"ogreboss-attack2-last-ja"],[9,"ogreboss-attack3-throw-ja"],[10,"ogreboss-hit-chest-ja"],[11,"ogreboss-hit-crotch-ja"],[12,"ogreboss-hit-ja"],[13,"ogreboss-dive-ja"],[14,"ogreboss-rise-ja"],[15,"ogreboss-recover-ja"],[16,"ogreboss-victory-ja"],[17,"ogreboss-shuffle-prepare-ja"],[18,"ogreboss-shuffle-right-start-ja"],[19,"ogreboss-shuffle-right-loop-ja"],[20,"ogreboss-shuffle-right-stop-ja"],[21,"ogreboss-shuffle-left-start-ja"],[22,"ogreboss-shuffle-left-loop-ja"],[23,"ogreboss-shuffle-left-stop-ja"],[24,"ogreboss-intro-ja"],[25,"ogreboss-cam-lod0-jg"],[26,"ogreboss-cam-lod0-mg"],[27,"ogreboss-cam-idle-ja"],[28,"ogreboss-cam-intro-ja"],[29,"ogreboss-shoot-boulder-lod0-jg"],[30,"ogreboss-shoot-boulder-lod0-mg"],[31,"ogreboss-shoot-boulder-shadow-mg"],[32,"ogreboss-shoot-boulder-idle-ja"],[33,"ogreboss-shoot-boulder-break-lod0-jg"],[34,"ogreboss-shoot-boulder-break-lod0-mg"],[35,"ogreboss-shoot-boulder-break-idle-ja"],[36,"ogreboss-bounce-boulder-lod0-jg"],[37,"ogreboss-bounce-boulder-lod0-mg"],[38,"ogreboss-bounce-boulder-idle-ja"],[39,"ogreboss-super-boulder-lod0-jg"],[40,"ogreboss-super-boulder-lod0-mg"],[41,"ogreboss-super-boulder-idle-ja"],[42,"ogreboss-super-boulder-throw-ja"],[43,"ogreboss-super-boulder-hit-ja"],[44,"ogreboss-super-boulder-roll-ja"],[45,"ogreboss-column-lod0-jg"],[46,"ogreboss-column-lod0-mg"],[47,"ogreboss-column-idle-ja"],[48,"ogreboss-column-intro-ja"]],"ogreboss-village2-ag":[[0,"ogreboss-village2-lod0-jg"],[1,"ogreboss-village2-lod0-mg"],[2,"ogreboss-village2-idle-ja"],[3,"ogreboss-village2-idle-bored-ja"],[4,"ogreboss-village2-idle-alt-ja"],[5,"ogreboss-village2-throw-ja"],[6,"ogreboss-village2-victory-ja"],[7,"ogreboss-village2-pre-throw-ja"]],"ogrecam-ag":[[0,"ogrecam-lod0-jg"],[1,"ogrecam-lod0-mg"]],"oracle-ag":[[0,"oracle-lod0-jg"],[1,"oracle-lod0-mg"],[2,"oracle-idle-ja"]],"orb-cache-top-ag":[[0,"orb-cache-top-lod0-jg"],[1,"orb-cache-top-lod0-mg"],[2,"orb-cache-top-lod1-mg"],[3,"orb-cache-top-idle-ja"]],"orbit-plat-ag":[[0,"orbit-plat-lod0-jg"],[1,"orbit-plat-lod0-mg"],[2,"orbit-plat-idle-ja"]],"orbit-plat-bottom-ag":[[0,"orbit-plat-bottom-lod0-jg"],[1,"orbit-plat-bottom-lod0-mg"],[2,"orbit-plat-bottom-idle-ja"]],"pelican-ag":[[0,"pelican-lod0-jg"],[1,"pelican-lod0-mg"],[2,"pelican-lod1-mg"],[3,"pelican-lod2-mg"],[4,"pelican-shadow-mg"],[5,"pelican-fly-ja"],[6,"pelican-glide-ja"],[7,"pelican-swoop-ja"],[8,"pelican-fly-down-ja"],[9,"pelican-land-ja"],[10,"pelican-sleep-ja"]],"periscope-ag":[[0,"periscope-base-lod0-jg"],[1,"periscope-base-lod0-mg"],[2,"periscope-base-lod1-mg"],[3,"periscope-base-idle-ja"],[4,"periscope-mirror-lod0-jg"],[5,"periscope-mirror-lod0-mg"],[6,"periscope-mirror-lod1-mg"],[7,"periscope-mirror-idle-ja"]],"pistons-ag":[[0,"pistons-lod0-jg"],[1,"pistons-lod0-mg"],[2,"pistons-idle-ja"]],"plant-boss-ag":[[2,"plant-boss-main-shadow-mg"],[18,"plant-boss-main-plant-boss-kill-ja"],[3,"plant-boss-main-idle-ja"],[19,"plant-boss-main-plant-boss-kill-close-ja"],[0,"plant-boss-main-lod0-jg"],[1,"plant-boss-main-lod0-mg"],[4,"plant-boss-main-idle-alt-ja"],[5,"plant-boss-main-attack-ja"],[6,"plant-boss-main-attack-close-ja"],[7,"plant-boss-main-reset-ja"],[8,"plant-boss-main-eat-ja"],[9,"plant-boss-main-initial-ja"],[10,"plant-boss-main-intro-ja"],[11,"plant-boss-main-idle2vulnerable-ja"],[12,"plant-boss-main-vulnerable-ja"],[13,"plant-boss-main-vulnerable2idle-ja"],[14,"plant-boss-main-hit-ja"],[15,"plant-boss-main-hit-kick-ja"],[16,"plant-boss-main-hit-jumpkick-ja"],[17,"plant-boss-main-die-ja"],[20,"plant-boss-main-swallow-ja"],[21,"plant-boss-main-bounce-ja"],[22,"plant-boss-arms-lod0-jg"],[23,"plant-boss-arms-lod0-mg"],[24,"plant-boss-arms-shadow-mg"],[25,"plant-boss-arms-idle-ja"],[26,"plant-boss-arms-still-ja"],[27,"plant-boss-arms-die-ja"],[28,"plant-boss-arms-die-right-ja"],[29,"plant-boss-arms-hit-ja"],[30,"plant-boss-back-arms-lod0-jg"],[31,"plant-boss-back-arms-lod0-mg"],[32,"plant-boss-back-arms-shadow-mg"],[33,"plant-boss-back-arms-idle-ja"],[34,"plant-boss-back-arms-die-ja"],[35,"plant-boss-back-arms-hit-ja"],[36,"plant-boss-back-arms-hit-kick-ja"],[37,"plant-boss-leaf-lod0-jg"],[38,"plant-boss-leaf-lod0-mg"],[39,"plant-boss-leaf-shadow-mg"],[40,"plant-boss-leaf-stubby-left-ja"],[41,"plant-boss-leaf-grow-left-ja"],[42,"plant-boss-leaf-idle-left-ja"],[43,"plant-boss-leaf-stubby-right-ja"],[44,"plant-boss-leaf-grow-right-ja"],[45,"plant-boss-leaf-idle-right-ja"],[46,"plant-boss-leaf-left-bounce-ja"],[47,"plant-boss-leaf-right-bounce-ja"],[48,"plant-boss-vine-lod0-jg"],[49,"plant-boss-vine-lod0-mg"],[50,"plant-boss-vine-idle-ja"],[51,"plant-boss-vine-die-ja"],[52,"plant-boss-vine-hit-ja"],[53,"plant-boss-root-lod0-jg"],[54,"plant-boss-root-lod0-mg"],[55,"plant-boss-root-idle-ja"]],"plat-ag":[[0,"plat-lod0-jg"],[1,"plat-lod0-mg"],[2,"plat-lod1-mg"],[3,"plat-lod2-mg"],[4,"plat-idle-ja"]],"plat-button-ag":[[0,"plat-button-geo-jg"],[1,"plat-button-geo-mg"],[2,"plat-button-pressed-ja"]],"plat-citb-ag":[[0,"plat-citb-lod0-jg"],[1,"plat-citb-lod0-mg"],[2,"plat-citb-lod1-mg"],[3,"plat-citb-idle-ja"]],"plat-eco-ag":[[0,"plat-eco-lod0-jg"],[1,"plat-eco-lod0-mg"],[2,"plat-eco-lod1-mg"],[3,"plat-eco-lod2-mg"],[4,"plat-eco-lit-lod0-jg"],[5,"plat-eco-lit-lod0-mg"],[6,"plat-eco-lit-lod1-mg"],[7,"plat-eco-lit-lod2-mg"],[8,"plat-eco-idle-ja"]],"plat-eco-citb-ag":[[0,"plat-eco-citb-lod0-jg"],[1,"plat-eco-citb-lod0-mg"],[2,"plat-eco-citb-lod1-mg"],[3,"plat-eco-citb-lod2-mg"],[4,"plat-eco-citb-lit-lod0-jg"],[5,"plat-eco-citb-lit-lod0-mg"],[6,"plat-eco-citb-lit-lod1-mg"],[7,"plat-eco-citb-lit-lod2-mg"],[8,"plat-eco-citb-idle-ja"]],"plat-eco-finalboss-ag":[[0,"plat-eco-finalboss-lod0-jg"],[1,"plat-eco-finalboss-lod0-mg"],[2,"plat-eco-finalboss-lod1-mg"],[3,"plat-eco-finalboss-lod2-mg"],[4,"plat-eco-finalboss-lit-lod0-jg"],[5,"plat-eco-finalboss-lit-lod0-mg"],[6,"plat-eco-finalboss-lit-lod1-mg"],[7,"plat-eco-finalboss-lit-lod2-mg"],[8,"plat-eco-finalboss-idle-ja"]],"plat-flip-ag":[[0,"plat-flip-geo-jg"],[1,"plat-flip-geo-mg"],[2,"plat-flip-turn-down-ja"],[3,"plat-flip-turn-up-ja"]],"plat-jungleb-ag":[[0,"plat-jungleb-lod0-jg"],[1,"plat-jungleb-lod0-mg"],[2,"plat-jungleb-lod1-mg"],[3,"plat-jungleb-lod2-mg"],[4,"plat-jungleb-idle-ja"]],"plat-sunken-ag":[[0,"plat-sunken-lod0-jg"],[1,"plat-sunken-lod0-mg"],[2,"plat-sunken-lod1-mg"],[3,"plat-sunken-lod2-mg"],[4,"plat-sunken-idle-ja"]],"plunger-lurker-ag":[[0,"plunger-lurker-lod0-jg"],[1,"plunger-lurker-lod0-mg"],[2,"plunger-lurker-lod1-mg"],[3,"plunger-lurker-lod2-mg"],[4,"plunger-lurker-idle-ja"],[5,"plunger-lurker-notice-ja"],[6,"plunger-lurker-death-ja"]],"pontoonfive-ag":[[0,"pontoonfive-lod0-jg"],[1,"pontoonfive-lod0-mg"],[2,"pontoonfive-lod1-mg"],[3,"pontoonfive-lod2-mg"],[4,"pontoonfive-idle-ja"]],"pontoonten-ag":[[0,"pontoonten-lod0-jg"],[1,"pontoonten-lod0-mg"],[2,"pontoonten-lod1-mg"],[3,"pontoonten-lod2-mg"],[4,"pontoonten-idle-ja"]],"power-left-ag":[[0,"power-left-lod0-jg"],[1,"power-left-lod0-mg"],[2,"power-left-idle-ja"]],"power-right-ag":[[0,"power-right-lod0-jg"],[1,"power-right-lod0-mg"],[2,"power-right-idle-ja"]],"powercellalt-ag":[[0,"powercellalt-lod0-jg"],[1,"powercellalt-lod0-mg"],[2,"powercellalt-idle-ja"]],"precurbridge-ag":[[0,"precurbridge-geo-jg"],[1,"precurbridge-geo-mg"],[2,"precurbridge-lod1-mg"],[3,"precurbridge-idle-ja"],[4,"precurbridge-float-ja"],[5,"precurbridge-static-ja"]],"precursor-arm-ag":[[0,"precursor-arm-lod0-jg"],[1,"precursor-arm-lod0-mg"],[2,"precursor-arm-idle-ja"]],"puffer-ag":[[0,"puffer-main-lod0-jg"],[1,"puffer-main-lod0-mg"],[2,"puffer-main-lod1-mg"],[3,"puffer-main-lod2-mg"],[4,"puffer-main-shadow-mg"],[5,"puffer-mean-lod0-jg"],[6,"puffer-mean-lod0-mg"],[7,"puffer-mean-lod1-mg"],[8,"puffer-mean-lod2-mg"],[9,"puffer-hover-unpuffed-ja"],[10,"puffer-hover-puffed-ja"],[11,"puffer-fly-unpuffed-ja"],[12,"puffer-fly-puffed-ja"],[13,"puffer-puff-up-ja"],[14,"puffer-puff-down-ja"],[15,"puffer-die-ja"]],"pusher-ag":[[0,"pusher-lod0-jg"],[1,"pusher-lod0-mg"],[2,"pusher-idle-ja"]],"qbert-plat-ag":[[0,"qbert-plat-lod0-jg"],[1,"qbert-plat-lod0-mg"],[2,"qbert-plat-idle-ja"]],"qbert-plat-on-ag":[[0,"qbert-plat-on-lod0-jg"],[1,"qbert-plat-on-lod0-mg"],[2,"qbert-plat-on-idle-ja"]],"quicksandlurker-ag":[[0,"quicksandlurker-lod0-jg"],[1,"quicksandlurker-lod0-mg"],[2,"quicksandlurker-idle-ja"],[3,"quicksandlurker-yawn-ja"],[4,"quicksandlurker-spit-ja"],[5,"quicksandlurker-hide-ja"],[6,"quicksandlurker-victory-ja"],[7,"quicksandlurker-victory2-ja"],[8,"quicksandlurker-popup-ja"],[9,"quicksandlurker-die-ja"]],"race-ring-ag":[[0,"race-ring-lod0-jg"],[1,"race-ring-lod0-mg"],[2,"race-ring-race-ring-idle-ja"]],"racer-ag":[[3,"racer-racer-idle-ja"],[4,"racer-racer-turn-ja"],[5,"racer-racer-turn2-ja"],[6,"racer-racer-dig-ja"],[7,"racer-racer-dig2-ja"],[8,"racer-racer-jump-ja"],[9,"racer-racer-jump-loop-ja"],[10,"racer-racer-jump-land-ja"],[11,"racer-racer-jump-small-ja"],[12,"racer-racer-jump-small-loop-ja"],[13,"racer-racer-jump-small-land-ja"],[14,"racer-racer-stance-ja"],[15,"racer-racer-jump-high-loop-ja"],[16,"racer-racer-jump-high-land-ja"],[17,"racer-racer-smack-ja"],[18,"racer-racer-get-off-ja"],[19,"racer-racer-get-on-ja"],[20,"racer-racer-death-explode-ja"],[0,"racer-geo-jg"],[1,"racer-geo-mg"],[2,"racer-shadow-mg"],[22,"racer-explode-lod0-jg"],[23,"racer-explode-lod0-mg"],[24,"racer-explode-idle-ja"]],"ram-ag":[[0,"ram-lod0-jg"],[1,"ram-lod0-mg"],[2,"ram-lod1-mg"],[3,"ram-lod2-mg"],[4,"ram-cock-ja"],[5,"ram-release-ja"],[6,"ram-idle-ja"]],"ram-boss-ag":[[0,"ram-boss-lod0-jg"],[1,"ram-boss-lod0-mg"],[2,"ram-boss-lod1-mg"],[3,"ram-boss-lod2-mg"],[4,"ram-boss-cock-ja"],[5,"ram-boss-release-ja"],[6,"ram-boss-forward-defend-ja"],[7,"ram-boss-forward-defend-tracking-ja"],[8,"ram-boss-forward-defend-block-ja"],[9,"ram-boss-up-defend-block-ja"],[10,"ram-boss-throw-ja"],[11,"ram-boss-run-ja"],[12,"ram-boss-run-no-shield-ja"],[13,"ram-boss-far-idle-ja"],[14,"ram-boss-celebrate-ja"],[15,"ram-boss-die-ja"],[16,"ram-boss-dismount-start-ja"],[17,"ram-boss-dismount-hit-ground-ja"],[18,"ram-boss-lose-shield-ja"],[19,"ram-boss-sees-player-ja"],[20,"ram-boss-forward-defend-tracking-no-shield-ja"],[21,"ram-boss-up-defend-ja"],[22,"ram-boss-up-defend-tracking-ja"],[23,"ram-boss-throw-no-shield-ja"],[24,"ram-boss-forward-defend-no-shield-ja"]],"redring-ag":[[0,"redring-lod0-jg"],[1,"redring-lod0-mg"],[2,"redring-idle-ja"]],"redsage-ag":[[0,"redsage-lod0-jg"],[1,"redsage-lod0-mg"],[2,"redsage-lod1-mg"],[3,"redsage-shadow-mg"],[4,"redsage-redsage-idle-ja"],[5,"redsage-redsage-attack-start-ja"],[6,"redsage-redsage-attack-loop-ja"]],"reflector-middle-ag":[[0,"reflector-middle-geo-jg"],[1,"reflector-middle-geo-mg"],[2,"reflector-middle-idle-ja"]],"reflector-mirror-ag":[[0,"reflector-mirror-lod0-jg"],[1,"reflector-mirror-lod0-mg"],[2,"reflector-mirror-lod1-mg"],[3,"reflector-mirror-idle-ja"],[4,"reflector-mirror-break-lod0-jg"],[5,"reflector-mirror-break-lod0-mg"],[6,"reflector-mirror-break-break-ja"]],"revcycle-ag":[[0,"revcycle-geo-jg"],[1,"revcycle-geo-mg"],[2,"revcycle-idle-ja"]],"revcycleprop-ag":[[0,"revcycleprop-lod0-jg"],[1,"revcycleprop-lod0-mg"],[2,"revcycleprop-idle-ja"]],"robber-ag":[[0,"robber-lod0-jg"],[1,"robber-lod0-mg"],[2,"robber-lod1-mg"],[3,"robber-lod2-mg"],[4,"robber-shadow-mg"],[5,"robber-idle-ja"],[6,"robber-spots-ja"],[7,"robber-fly-ja"],[8,"robber-death-ja"],[9,"robber-taunt-ja"],[10,"robber-idle-hover-ja"],[11,"robber-ambient-look-ja"]],"robotboss-ag":[[0,"robotboss-basic-lod0-jg"],[1,"robotboss-basic-lod0-mg"],[2,"robotboss-idle-ja"],[3,"robotboss-idle-blue-ja"],[4,"robotboss-blue-hit-ja"],[5,"robotboss-blue-roar-ja"],[6,"robotboss-idle-hover-no-blue-ja"],[7,"robotboss-idle-hover-lookup-no-blue-ja"],[8,"robotboss-dark-reveal-ja"],[9,"robotboss-dark-shoot-ja"],[10,"robotboss-dark-return-ja"],[11,"robotboss-green-spawn-ja"],[12,"robotboss-green-idle-ja"],[13,"robotboss-green-roar-ja"],[14,"robotboss-dark-reveal-green-ja"],[15,"robotboss-dark-return-after-green-ja"],[16,"robotboss-red-idle-ja"],[17,"robotboss-red-charge-ja"],[18,"robotboss-red-blast-ja"],[19,"robotboss-red-hit-ja"],[20,"robotboss-red-roar-ja"],[21,"robotboss-idle-hover-no-red-ja"],[22,"robotboss-dark-reveal-no-red-ja"],[23,"robotboss-idle-hover-lookup-no-red-ja"],[24,"robotboss-dark-shoot-no-red-ja"],[25,"robotboss-dark-return-after-red-ja"],[26,"robotboss-yellow-idle-ja"],[27,"robotboss-yellow-blast-ja"],[28,"robotboss-yellow-hit-ja"],[29,"robotboss-yellow-roar-ja"],[30,"robotboss-idle-hover-no-yellow-ja"],[31,"robotboss-dark-reveal-no-yellow-ja"],[32,"robotboss-dark-shoot-no-yellow-ja"],[33,"robotboss-blue-last-hit-ja"],[34,"robotboss-red-last-hit-ja"],[35,"robotboss-yellow-last-hit-ja"]],"robotboss-blueeco-ag":[[0,"robotboss-blueeco-lod0-jg"],[1,"robotboss-blueeco-lod0-mg"],[2,"robotboss-blueeco-idle-ja"],[3,"robotboss-blueeco-blue-last-hit-ja"]],"robotboss-cinematic-ag":[[0,"robotboss-cinematic-lod0-jg"],[1,"robotboss-cinematic-lod0-mg"],[2,"robotboss-cinematic-idle-ja"]],"robotboss-redeco-ag":[[0,"robotboss-redeco-lod0-jg"],[1,"robotboss-redeco-lod0-mg"],[2,"robotboss-redeco-idle-ja"],[3,"robotboss-redeco-red-last-hit-ja"]],"robotboss-yelloweco-ag":[[0,"robotboss-yelloweco-lod0-jg"],[1,"robotboss-yelloweco-lod0-mg"],[2,"robotboss-yelloweco-idle-ja"],[3,"robotboss-yelloweco-yellow-last-hit-ja"]],"rolling-start-ag":[[0,"rolling-start-whole-lod0-jg"],[1,"rolling-start-whole-lod0-mg"],[2,"rolling-start-broken-lod0-jg"],[3,"rolling-start-broken-lod0-mg"],[4,"rolling-start-idle-ja"],[5,"rolling-start-break-whole-ja"],[6,"rolling-start-break-broken-ja"],[7,"rolling-start-broken-ja"]],"rollingcam-ag":[[0,"rollingcam-lod0-jg"],[1,"rollingcam-lod0-mg"],[2,"rollingcam-anim-ja"]],"ropebridge-32-ag":[[0,"ropebridge-32-lod0-jg"],[1,"ropebridge-32-lod0-mg"],[2,"ropebridge-32-lod1-mg"],[3,"ropebridge-32-idle-ja"]],"ropebridge-36-ag":[[0,"ropebridge-36-lod0-jg"],[1,"ropebridge-36-lod0-mg"],[2,"ropebridge-36-lod1-mg"],[3,"ropebridge-36-idle-ja"]],"ropebridge-52-ag":[[0,"ropebridge-52-lod0-jg"],[1,"ropebridge-52-lod0-mg"],[2,"ropebridge-52-lod1-mg"],[3,"ropebridge-52-idle-ja"]],"ropebridge-70-ag":[[0,"ropebridge-70-lod0-jg"],[1,"ropebridge-70-lod0-mg"],[2,"ropebridge-70-lod1-mg"],[3,"ropebridge-70-idle-ja"]],"rounddoor-ag":[[0,"rounddoor-lod0-jg"],[1,"rounddoor-lod0-mg"],[2,"rounddoor-lod1-mg"],[3,"rounddoor-idle-ja"]],"sack-ag":[[0,"sack-lod0-jg"],[1,"sack-lod0-mg"],[2,"sack-idle-ja"],[3,"sack-hit-ja"],[4,"sack-fuse-ja"]],"sage-ag":[[0,"sage-lod0-jg"],[1,"sage-lod0-mg"],[2,"sage-shadow-mg"],[3,"sage-idle-cannon-ja"],[4,"sage-idle-ecorocks-breathe-ja"],[5,"sage-idle-ecorocks-peer-ja"],[6,"sage-idle-levitate-ja"],[7,"sage-idle-levitate-backward-ja"]],"sage-bluehut-ag":[[0,"sage-bluehut-lod0-jg"],[1,"sage-bluehut-lod0-mg"],[2,"sage-bluehut-shadow-mg"],[3,"sage-bluehut-idle-ja"],[4,"sage-bluehut-idle-stand-ja"],[5,"sage-bluehut-idle-prec-arm-ja"]],"sage-village3-ag":[[0,"sage-village3-lod0-jg"],[1,"sage-village3-lod0-mg"],[2,"sage-village3-shadow-mg"],[3,"sage-village3-idle-ja"]],"sagesail-ag":[[0,"sagesail-lod0-jg"],[1,"sagesail-lod0-mg"],[2,"sagesail-lod1-mg"],[3,"sagesail-lod2-mg"],[4,"sagesail-idle-ja"]],"scarecrow-a-ag":[[0,"scarecrow-a-lod0-jg"],[1,"scarecrow-a-lod0-mg"],[2,"scarecrow-a-lod1-mg"],[3,"scarecrow-a-lod2-mg"],[4,"scarecrow-a-break-lod0-mg"],[5,"scarecrow-a-idle-ja"],[6,"scarecrow-a-hit-left-ja"],[7,"scarecrow-a-hit-right-ja"],[8,"scarecrow-a-hit-front-ja"]],"scarecrow-b-ag":[[0,"scarecrow-b-lod0-jg"],[1,"scarecrow-b-lod0-mg"],[2,"scarecrow-b-lod1-mg"],[3,"scarecrow-b-lod2-mg"],[4,"scarecrow-b-break-lod0-mg"],[5,"scarecrow-b-idle-ja"],[6,"scarecrow-b-hit-left-ja"],[7,"scarecrow-b-hit-right-ja"],[8,"scarecrow-b-hit-front-ja"]],"sculptor-ag":[[0,"sculptor-lod0-jg"],[1,"sculptor-lod0-mg"],[2,"sculptor-shadow-mg"],[3,"sculptor-idle-ja"],[4,"sculptor-sigh-ja"],[5,"sculptor-strikestart-ja"],[6,"sculptor-strikemiddle-ja"],[7,"sculptor-strikeend-ja"],[8,"sculptor-to-small-ja"],[9,"sculptor-small-ja"],[10,"sculptor-small-to-looking-ja"],[11,"sculptor-looking-ja"],[12,"sculptor-from-looking-ja"],[13,"sculptor-to-huge-ja"],[14,"sculptor-huge-ja"],[15,"sculptor-huge-to-looking-ja"]],"sculptor-muse-ag":[[0,"sculptor-muse-lod0-jg"],[1,"sculptor-muse-lod0-mg"],[2,"sculptor-muse-idle-ja"]],"seagull-ag":[[0,"seagull-lod0-jg"],[1,"seagull-lod0-mg"],[2,"seagull-idle-ja"],[3,"seagull-peck-ja"],[4,"seagull-fly-ja"],[5,"seagull-slowfly-ja"],[6,"seagull-land-ja"],[7,"seagull-stop-ja"],[8,"seagull-walk-ja"],[9,"seagull-takeoff-ja"]],"seaweed-ag":[[0,"seaweed-lod0-jg"],[1,"seaweed-lod0-mg"],[2,"seaweed-idle-ja"]],"sharkey-ag":[[0,"sharkey-lod0-jg"],[1,"sharkey-lod0-mg"],[2,"sharkey-idle-ja"],[3,"sharkey-chomp-ja"]],"shortcut-boulder-ag":[[0,"shortcut-boulder-whole-lod0-jg"],[1,"shortcut-boulder-whole-lod0-mg"],[2,"shortcut-boulder-broken-lod0-jg"],[3,"shortcut-boulder-broken-lod0-mg"],[4,"shortcut-boulder-idle-ja"]],"shover-ag":[[0,"shover-lod0-jg"],[1,"shover-lod0-mg"],[2,"shover-idle-ja"]],"side-to-side-plat-ag":[[0,"side-to-side-plat-lod0-jg"],[1,"side-to-side-plat-lod0-mg"],[2,"side-to-side-plat-lod1-mg"],[3,"side-to-side-plat-idle-ja"]],"sidedoor-ag":[[0,"sidedoor-geo-jg"],[1,"sidedoor-geo-mg"],[2,"sidedoor-lod1-mg"],[3,"sidedoor-idle-ja"]],"sidekick-ag":[[0,"sidekick-lod0-jg"],[1,"sidekick-lod0-mg"],[2,"sidekick-shadow-mg"],[3,"sidekick-run-to-stance-ja"],[68,"sidekick-yellow-running-blast-ja"],[4,"sidekick-run-to-stance-loop-ja"],[5,"sidekick-stance-loop-ja"],[6,"sidekick-run-ja"],[7,"sidekick-run-up-ja"],[8,"sidekick-run-down-ja"],[9,"sidekick-walk-ja"],[10,"sidekick-walk-up-ja"],[11,"sidekick-walk-down-ja"],[12,"sidekick-run-squash-ja"],[13,"sidekick-run-squash-weak-ja"],[14,"sidekick-stance-to-duck-ja"],[15,"sidekick-duck-stance-ja"],[16,"sidekick-duck-walk-ja"],[17,"sidekick-turn-around-ja"],[18,"sidekick-jump-ja"],[19,"sidekick-jump-land-ja"],[20,"sidekick-painful-land-ja"],[21,"sidekick-painful-land-end-ja"],[22,"sidekick-jump-loop-ja"],[23,"sidekick-jump-short-land-ja"],[24,"sidekick-jump-forward-ja"],[25,"sidekick-duck-high-jump-ja"],[26,"sidekick-launch-jump-ja"],[27,"sidekick-launch-jump-loop-ja"],[28,"sidekick-edge-grab-stance0-ja"],[29,"sidekick-edge-grab-stance1-ja"],[30,"sidekick-edge-grab-stance1-alt-ja"],[31,"sidekick-falling-to-edge-grab-ja"],[32,"sidekick-edge-grab-swing-left-ja"],[33,"sidekick-edge-grab-swing-right-ja"],[34,"sidekick-edge-grab-to-jump-ja"],[35,"sidekick-edge-grab-off-ja"],[36,"sidekick-attack-from-stance-ja"],[37,"sidekick-attack-from-stance-end-ja"],[38,"sidekick-attack-from-stance-alt-end-ja"],[39,"sidekick-attack-from-stance-run-end-ja"],[40,"sidekick-attack-from-stance-run-alt-end-ja"],[41,"sidekick-attack-from-jump-ja"],[42,"sidekick-attack-from-jump-loop-ja"],[43,"sidekick-attack-from-jump-end-ja"],[44,"sidekick-attack-punch-ja"],[45,"sidekick-attack-punch-end-ja"],[46,"sidekick-attack-punch-alt-end-ja"],[47,"sidekick-attack-uppercut-ja"],[48,"sidekick-flop-down-ja"],[49,"sidekick-flop-down-loop-ja"],[50,"sidekick-flop-down-land-ja"],[51,"sidekick-moving-flop-down-ja"],[52,"sidekick-moving-flop-down-loop-ja"],[53,"sidekick-moving-flop-down-land-ja"],[54,"sidekick-duck-roll-ja"],[55,"sidekick-duck-roll-end-ja"],[56,"sidekick-wheel-flip-ja"],[57,"sidekick-wheel-flip-land-ja"],[58,"sidekick-hit-from-front-ja"],[59,"sidekick-hit-from-back-ja"],[60,"sidekick-hit-up-ja"],[61,"sidekick-deatha-ja"],[62,"sidekick-death-painful-land-ja"],[69,"sidekick-yellow-running-blast-end-ja"],[70,"sidekick-yellow-jumping-blast-ja"],[71,"sidekick-powerup-ja"],[72,"sidekick-shocked-ja"],[73,"sidekick-wade-shallow-walk-ja"],[74,"sidekick-wade-deep-walk-ja"],[75,"sidekick-swim-stance-ja"],[76,"sidekick-swim-walk-ja"],[77,"sidekick-swim-walk-to-down-ja"],[78,"sidekick-swim-down-ja"],[79,"sidekick-swim-down-to-up-ja"],[80,"sidekick-swim-up-ja"],[81,"sidekick-swim-up-to-stance-ja"],[82,"sidekick-swim-jump-ja"],[95,"sidekick-trip-ja"],[122,"sidekick-fuel-cell-victory-9-ja"],[171,"sidekick-free-run-ja"],[172,"sidekick-free-jog-ja"],[173,"sidekick-free-walk-ja"],[169,"sidekick-main-plant-boss-kill-ja"],[170,"sidekick-main-plant-boss-kill-close-ja"],[83,"sidekick-fishing-ja"],[84,"sidekick-fishing-lose-ja"],[96,"sidekick-racer-idle-ja"],[97,"sidekick-racer-turn-ja"],[98,"sidekick-racer-turn2-ja"],[99,"sidekick-racer-dig-ja"],[100,"sidekick-racer-dig2-ja"],[101,"sidekick-racer-jump-ja"],[102,"sidekick-racer-jump-loop-ja"],[103,"sidekick-racer-jump-land-ja"],[104,"sidekick-racer-jump-small-ja"],[105,"sidekick-racer-jump-small-loop-ja"],[106,"sidekick-racer-jump-small-land-ja"],[107,"sidekick-racer-stance-ja"],[108,"sidekick-racer-jump-high-loop-ja"],[109,"sidekick-racer-jump-high-land-ja"],[110,"sidekick-racer-smack-ja"],[111,"sidekick-racer-get-off-ja"],[112,"sidekick-racer-get-on-ja"],[113,"sidekick-racer-death-explode-ja"],[195,"sidekick-flut-idle-ja"],[196,"sidekick-flut-walk-ja"],[197,"sidekick-flut-run-ja"],[198,"sidekick-flut-jump-ja"],[199,"sidekick-flut-jump-loop-ja"],[200,"sidekick-flut-jump-land-ja"],[201,"sidekick-flut-jump-forward-ja"],[202,"sidekick-flut-jump-forward-loop-ja"],[203,"sidekick-flut-jump-forward-land-ja"],[204,"sidekick-flut-double-jump-ja"],[205,"sidekick-flut-running-attack-ja"],[206,"sidekick-flut-running-attack-end-ja"],[207,"sidekick-flut-air-attack-ja"],[208,"sidekick-flut-air-attack-loop-ja"],[209,"sidekick-flut-air-attack-land-ja"],[210,"sidekick-flut-get-on-ja"],[211,"sidekick-flut-get-off-ja"],[212,"sidekick-flut-hit-back-ja"],[213,"sidekick-flut-smack-surface-ja"],[214,"sidekick-flut-smack-surface-end-ja"],[215,"sidekick-flut-deatha-ja"],[216,"sidekick-flut-squash-run-ja"],[88,"sidekick-tube-turn-ja"],[89,"sidekick-tube-jump-land-ja"],[90,"sidekick-tube-dummy2-ja"],[91,"sidekick-tube-dummy3-ja"],[92,"sidekick-tube-dummy4-ja"],[93,"sidekick-tube-dummy5-ja"],[94,"sidekick-tube-dummy6-ja"],[63,"sidekick-pole-cycle-ja"],[64,"sidekick-pole-cycle2-ja"],[65,"sidekick-pole-flip-up-ja"],[66,"sidekick-pole-flip-forward-ja"],[67,"sidekick-pole-jump-loop-ja"],[85,"sidekick-ice-skate-ja"],[86,"sidekick-ice-slide-ja"],[87,"sidekick-ice-stance-ja"]],"sidekick-human-ag":[[0,"sidekick-human-lod0-jg"],[1,"sidekick-human-lod0-mg"],[2,"sidekick-human-shadow-mg"],[3,"sidekick-human-idle-ja"]],"silodoor-ag":[[0,"silodoor-lod0-jg"],[1,"silodoor-lod0-mg"],[2,"silodoor-idle-ja"]],"silostep-ag":[[0,"silostep-lod0-jg"],[1,"silostep-lod0-mg"],[2,"silostep-idle-ja"]],"snow-ball-ag":[[0,"snow-ball-lod0-jg"],[1,"snow-ball-lod0-mg"],[2,"snow-ball-idle-ja"],[3,"snow-ball-shadow-lod0-jg"],[4,"snow-ball-shadow-lod0-mg"],[5,"snow-ball-shadow-shadow-mg"],[6,"snow-ball-shadow-idle-ja"]],"snow-bridge-36-ag":[[0,"snow-bridge-36-lod0-jg"],[1,"snow-bridge-36-lod0-mg"],[2,"snow-bridge-36-lod1-mg"],[3,"snow-bridge-36-idle-ja"]],"snow-bumper-ag":[[0,"snow-bumper-lod0-jg"],[1,"snow-bumper-lod0-mg"],[2,"snow-bumper-lod1-mg"],[3,"snow-bumper-idle-ja"],[4,"snow-bumper-button-ja"],[5,"snow-bumper-collapse-ja"]],"snow-bunny-ag":[[0,"snow-bunny-lod0-jg"],[1,"snow-bunny-lod0-mg"],[2,"snow-bunny-lod1-mg"],[3,"snow-bunny-lod2-mg"],[4,"snow-bunny-shadow-mg"],[5,"snow-bunny-idle-ja"],[6,"snow-bunny-attack-ja"],[7,"snow-bunny-big-hop-ja"],[8,"snow-bunny-small-hop-ja"],[9,"snow-bunny-sees-player-ja"],[10,"snow-bunny-sees-player-land-ja"],[11,"snow-bunny-die-ja"]],"snow-button-ag":[[0,"snow-button-lod0-jg"],[1,"snow-button-lod0-mg"],[2,"snow-button-going-down-ja"],[3,"snow-button-going-up-ja"]],"snow-eggtop-ag":[[0,"snow-eggtop-lod0-jg"],[1,"snow-eggtop-lod0-mg"],[2,"snow-eggtop-idle-ja"]],"snow-fort-gate-ag":[[0,"snow-fort-gate-lod0-jg"],[1,"snow-fort-gate-lod0-mg"],[2,"snow-fort-gate-idle-ja"]],"snow-gears-ag":[[0,"snow-gears-lod0-jg"],[1,"snow-gears-lod0-mg"],[2,"snow-gears-idle-ja"],[3,"snow-gears-start-ja"],[4,"snow-gears-loop-ja"],[5,"snow-gears-stop-ja"]],"snow-log-ag":[[0,"snow-log-lod0-jg"],[1,"snow-log-lod0-mg"],[2,"snow-log-activate-ja"],[3,"snow-log-active-loop-ja"]],"snow-spatula-ag":[[0,"snow-spatula-lod0-jg"],[1,"snow-spatula-lod0-mg"],[2,"snow-spatula-idle-ja"]],"snow-switch-ag":[[0,"snow-switch-lod0-jg"],[1,"snow-switch-lod0-mg"],[2,"snow-switch-idle-ja"]],"snowcam-ag":[[0,"snowcam-lod0-jg"],[1,"snowcam-lod0-mg"],[2,"snowcam-gearstart-ja"],[3,"snowcam-gate-ja"],[4,"snowcam-gearend-ja"],[5,"snowcam-eggtop-activating-ja"],[6,"snowcam-ecovent-activating-ja"]],"snowpusher-ag":[[0,"snowpusher-lod0-jg"],[1,"snowpusher-lod0-mg"],[2,"snowpusher-idle-ja"]],"speaker-ag":[[0,"speaker-lod0-jg"],[1,"speaker-lod0-mg"],[2,"speaker-idle-ja"]],"spider-egg-ag":[[0,"spider-egg-unbroken-lod0-jg"],[1,"spider-egg-unbroken-lod0-mg"],[2,"spider-egg-unbroken-lod1-mg"],[3,"spider-egg-unbroken-lod2-mg"],[4,"spider-egg-unbroken-shadow-mg"],[5,"spider-egg-broken-lod0-jg"],[6,"spider-egg-broken-lod0-mg"],[7,"spider-egg-broken-lod1-mg"],[8,"spider-egg-broken-lod2-mg"],[9,"spider-egg-idle-ja"],[10,"spider-egg-crack-ja"],[11,"spider-egg-bounce-ja"],[12,"spider-egg-die-ja"],[13,"spider-egg-twitch-ja"]],"spiderwebs-ag":[[0,"spiderwebs-good-lod0-jg"],[1,"spiderwebs-good-lod0-mg"],[2,"spiderwebs-bounce-ja"]],"spike-ag":[[0,"spike-lod0-jg"],[1,"spike-lod0-mg"],[2,"spike-lod1-mg"],[3,"spike-idle-ja"]],"square-platform-ag":[[0,"square-platform-lod0-jg"],[1,"square-platform-lod0-mg"],[2,"square-platform-lod1-mg"],[3,"square-platform-idle-ja"]],"steam-cap-ag":[[0,"steam-cap-lod0-jg"],[1,"steam-cap-lod0-mg"],[2,"steam-cap-idle-ja"]],"sun-iris-door-ag":[[0,"sun-iris-door-lod0-jg"],[1,"sun-iris-door-lod0-mg"],[2,"sun-iris-door-lod1-mg"],[3,"sun-iris-door-idle-ja"]],"sunken-elevator-ag":[[0,"sunken-elevator-lod0-jg"],[1,"sunken-elevator-lod0-mg"],[2,"sunken-elevator-pressed-ja"]],"sunkencam-ag":[[0,"sunkencam-lod0-jg"],[1,"sunkencam-lod0-mg"],[2,"sunkencam-qbert-show-door-open-ja"],[3,"sunkencam-qbert-show-door-close-ja"],[4,"sunkencam-exit-chamber-door-open-ja"],[5,"sunkencam-start-door-shut-ja"],[6,"sunkencam-start-in-room-ja"],[7,"sunkencam-middle-in-water-ja"],[8,"sunkencam-end-out-of-water-ja"],[9,"sunkencam-dive-start-ja"],[10,"sunkencam-dive-middle-ja"],[11,"sunkencam-dive-end-ja"],[12,"sunkencam-square-platform-setup1-rise1-ja"],[13,"sunkencam-square-platform-setup1-rise2-ja"],[14,"sunkencam-square-platform-setup2-rise1-ja"],[15,"sunkencam-square-platform-setup2-rise2-ja"],[16,"sunkencam-helix-hit-switch-ja"],[17,"sunkencam-helix-door-shuts-ja"],[18,"sunkencam-helix-show-rising-water-ja"],[19,"sunkencam-pipegame-left-ja"],[20,"sunkencam-pipegame-middle-ja"],[21,"sunkencam-pipegame-right-ja"]],"sunkenfisha-ag":[[0,"sunkenfisha-red-yellow-lod0-jg"],[1,"sunkenfisha-red-yellow-lod0-mg"],[2,"sunkenfisha-yellow-blue-lod0-jg"],[3,"sunkenfisha-yellow-blue-lod0-mg"],[4,"sunkenfisha-yellow-eye-lod0-jg"],[5,"sunkenfisha-yellow-eye-lod0-mg"],[6,"sunkenfisha-idle-ja"]],"swamp-bat-ag":[[0,"swamp-bat-lod0-jg"],[1,"swamp-bat-lod0-mg"],[2,"swamp-bat-lod1-mg"],[3,"swamp-bat-lod2-mg"],[4,"swamp-bat-idle-ja"],[5,"swamp-bat-notice-ja"],[6,"swamp-bat-swoop-ja"],[7,"swamp-bat-strafe-ja"],[8,"swamp-bat-die-ja"],[9,"swamp-bat-strafe-to-idle-ja"]],"swamp-blimp-ag":[[0,"swamp-blimp-lod0-jg"],[1,"swamp-blimp-lod0-mg"],[2,"swamp-blimp-lod1-mg"],[3,"swamp-blimp-idle-ja"]],"swamp-rat-ag":[[0,"swamp-rat-lod0-jg"],[1,"swamp-rat-lod0-mg"],[2,"swamp-rat-lod1-mg"],[3,"swamp-rat-lod2-mg"],[4,"swamp-rat-idle-ja"],[5,"swamp-rat-fall-ja"],[6,"swamp-rat-bounce-ja"],[7,"swamp-rat-walk-ja"],[8,"swamp-rat-notice-ja"],[9,"swamp-rat-run-ja"],[10,"swamp-rat-celebrate-ja"],[11,"swamp-rat-die-ja"],[12,"swamp-rat-eat-ja"]],"swamp-rat-nest-ag":[[0,"swamp-rat-nest-a-lod0-jg"],[1,"swamp-rat-nest-a-lod0-mg"],[2,"swamp-rat-nest-a-lod1-mg"],[3,"swamp-rat-nest-a-idle-ja"],[4,"swamp-rat-nest-b-lod0-jg"],[5,"swamp-rat-nest-b-lod0-mg"],[6,"swamp-rat-nest-b-lod1-mg"],[7,"swamp-rat-nest-b-idle-ja"],[8,"swamp-rat-nest-c-lod0-jg"],[9,"swamp-rat-nest-c-lod0-mg"],[10,"swamp-rat-nest-c-lod1-mg"],[11,"swamp-rat-nest-c-idle-ja"]],"swamp-rock-ag":[[0,"swamp-rock-lod0-jg"],[1,"swamp-rock-lod0-mg"],[2,"swamp-rock-idle-ja"]],"swamp-rope-ag":[[0,"swamp-rope-lod0-jg"],[1,"swamp-rope-lod0-mg"],[2,"swamp-rope-idle-ja"],[3,"swamp-rope-slack-ja"],[4,"swamp-rope-swing-ja"]],"swamp-spike-ag":[[0,"swamp-spike-lod0-jg"],[1,"swamp-spike-lod0-mg"],[2,"swamp-spike-lod1-mg"],[3,"swamp-spike-up-ja"],[4,"swamp-spike-down-ja"],[5,"swamp-spike-shake-ja"]],"swamp-tetherrock-ag":[[0,"swamp-tetherrock-lod0-jg"],[1,"swamp-tetherrock-lod0-mg"],[2,"swamp-tetherrock-idle-ja"]],"swamp-tetherrock-explode-ag":[[0,"swamp-tetherrock-explode-lod0-jg"],[1,"swamp-tetherrock-explode-lod0-mg"],[2,"swamp-tetherrock-explode-idle-ja"],[3,"swamp-tetherrock-explode-explode-ja"]],"swampcam-ag":[[0,"swampcam-lod0-jg"],[1,"swampcam-lod0-mg"],[2,"swampcam-anim-ja"],[3,"swampcam-swamp-ambush-ja"]],"tar-plat-ag":[[0,"tar-plat-lod0-jg"],[1,"tar-plat-lod0-mg"],[2,"tar-plat-lod1-mg"],[3,"tar-plat-idle-ja"]],"teetertotter-ag":[[0,"teetertotter-lod0-jg"],[1,"teetertotter-lod0-mg"],[2,"teetertotter-lod1-mg"],[3,"teetertotter-lod2-mg"],[4,"teetertotter-idle-ja"],[5,"teetertotter-landing-ja"]],"tntbarrel-ag":[[0,"tntbarrel-lod0-jg"],[1,"tntbarrel-lod0-mg"],[2,"tntbarrel-idle-ja"]],"towertop-ag":[[0,"towertop-lod0-jg"],[1,"towertop-lod0-mg"],[2,"towertop-lod1-mg"],[3,"towertop-lod2-mg"],[4,"towertop-idle-ja"]],"trainingcam-ag":[[0,"trainingcam-lod0-jg"],[1,"trainingcam-lod0-mg"],[2,"trainingcam-orbcam-ja"],[3,"trainingcam-fuelcellcam-ja"],[4,"trainingcam-ecocam-ja"],[5,"trainingcam-greenecocam-ja"],[6,"trainingcam-precursordoorcam-ja"],[7,"trainingcam-ecoventcam-ja"]],"vil3-bridge-36-ag":[[0,"vil3-bridge-36-lod0-jg"],[1,"vil3-bridge-36-lod0-mg"],[2,"vil3-bridge-36-idle-ja"]],"villa-starfish-ag":[[0,"villa-starfish-lod0-jg"],[1,"villa-starfish-lod0-mg"],[2,"villa-starfish-idle-ja"]],"village-cam-ag":[[0,"village-cam-lod0-jg"],[1,"village-cam-lod0-mg"],[2,"village-cam-firecanyon-cam-ja"],[3,"village-cam-firecanyon-alt-cam-ja"],[4,"village-cam-vi2-button-cam-ja"],[5,"village-cam-vi3-button-cam-ja"]],"village1cam-ag":[[0,"village1cam-lod0-jg"],[1,"village1cam-lod0-mg"],[2,"village1cam-anim-ja"]],"village2cam-ag":[[0,"village2cam-lod0-jg"],[1,"village2cam-lod0-mg"],[2,"village2cam-elevator-at-top-going-down-ja"],[3,"village2cam-elevator-at-bottom-going-up-ja"],[4,"village2cam-elevator-at-top-going-up-ja"]],"wall-plat-ag":[[0,"wall-plat-lod0-jg"],[1,"wall-plat-lod0-mg"],[2,"wall-plat-idle-ja"]],"warp-gate-switch-ag":[[0,"warp-gate-switch-lod0-jg"],[1,"warp-gate-switch-lod0-mg"],[2,"warp-gate-switch-down-ja"]],"warpgate-ag":[[0,"warpgate-lod0-jg"],[1,"warpgate-lod0-mg"]],"warrior-ag":[[0,"warrior-lod0-jg"],[1,"warrior-lod0-mg"],[2,"warrior-lod1-mg"],[3,"warrior-lod2-mg"],[4,"warrior-shadow-mg"],[5,"warrior-idle-ja"]],"water-anim-darkcave-ag":[[0,"water-anim-darkcave-water-with-crystal-lod0-jg"],[1,"water-anim-darkcave-water-with-crystal-lod0-mg"],[2,"water-anim-darkcave-idle-ja"]],"water-anim-finalboss-ag":[[0,"water-anim-finalboss-dark-eco-pool-lod0-jg"],[1,"water-anim-finalboss-dark-eco-pool-lod0-mg"],[2,"water-anim-finalboss-idle-ja"]],"water-anim-jungle-ag":[[0,"water-anim-jungle-river-lod0-jg"],[1,"water-anim-jungle-river-lod0-mg"],[2,"water-anim-jungle-river-lod1-mg"],[3,"water-anim-jungle-idle-ja"]],"water-anim-lavatube-ag":[[0,"water-anim-lavatube-energy-lava-lod0-jg"],[1,"water-anim-lavatube-energy-lava-lod0-mg"],[2,"water-anim-lavatube-idle-ja"]],"water-anim-maincave-ag":[[0,"water-anim-maincave-center-pool-lod0-jg"],[1,"water-anim-maincave-center-pool-lod0-mg"],[2,"water-anim-maincave-lower-right-pool-lod0-jg"],[3,"water-anim-maincave-lower-right-pool-lod0-mg"],[4,"water-anim-maincave-mid-right-pool-lod0-jg"],[5,"water-anim-maincave-mid-right-pool-lod0-mg"],[6,"water-anim-maincave-lower-left-pool-lod0-jg"],[7,"water-anim-maincave-lower-left-pool-lod0-mg"],[8,"water-anim-maincave-mid-left-pool-lod0-jg"],[9,"water-anim-maincave-mid-left-pool-lod0-mg"],[10,"water-anim-maincave-idle-ja"]],"water-anim-maincave-water-ag":[[0,"water-anim-maincave-water-with-crystal-lod0-jg"],[1,"water-anim-maincave-water-with-crystal-lod0-mg"],[2,"water-anim-maincave-water-idle-ja"]],"water-anim-misty-ag":[[0,"water-anim-misty-mud-by-arena-lod0-jg"],[1,"water-anim-misty-mud-by-arena-lod0-mg"],[2,"water-anim-misty-mud-above-skeleton-lod0-jg"],[3,"water-anim-misty-mud-above-skeleton-lod0-mg"],[4,"water-anim-misty-mud-behind-skeleton-lod0-jg"],[5,"water-anim-misty-mud-behind-skeleton-lod0-mg"],[6,"water-anim-misty-mud-above-skull-back-lod0-jg"],[7,"water-anim-misty-mud-above-skull-back-lod0-mg"],[8,"water-anim-misty-mud-above-skull-front-lod0-jg"],[9,"water-anim-misty-mud-above-skull-front-lod0-mg"],[10,"water-anim-misty-mud-other-near-skull-lod0-jg"],[11,"water-anim-misty-mud-other-near-skull-lod0-mg"],[12,"water-anim-misty-mud-near-skull-lod0-jg"],[13,"water-anim-misty-mud-near-skull-lod0-mg"],[14,"water-anim-misty-mud-under-spine-lod0-jg"],[15,"water-anim-misty-mud-under-spine-lod0-mg"],[16,"water-anim-misty-mud-by-dock-lod0-jg"],[17,"water-anim-misty-mud-by-dock-lod0-mg"],[18,"water-anim-misty-mud-island-near-dock-lod0-jg"],[19,"water-anim-misty-mud-island-near-dock-lod0-mg"],[20,"water-anim-misty-mud-lonely-island-lod0-jg"],[21,"water-anim-misty-mud-lonely-island-lod0-mg"],[22,"water-anim-misty-dark-eco-pool-lod0-jg"],[23,"water-anim-misty-dark-eco-pool-lod0-mg"],[24,"water-anim-misty-idle-ja"]],"water-anim-ogre-ag":[[0,"water-anim-ogre-lava-lod0-jg"],[1,"water-anim-ogre-lava-lod0-mg"],[2,"water-anim-ogre-idle-ja"],[3,"water-anim-ogre-submerge1-ja"],[4,"water-anim-ogre-emerge1-ja"],[5,"water-anim-ogre-submerge2-ja"],[6,"water-anim-ogre-emerge2-ja"],[7,"water-anim-ogre-boulder-ja"]],"water-anim-robocave-ag":[[0,"water-anim-robocave-main-pool-lod0-jg"],[1,"water-anim-robocave-main-pool-lod0-mg"],[2,"water-anim-robocave-main-pool-lod1-mg"],[3,"water-anim-robocave-idle-ja"]],"water-anim-rolling-ag":[[0,"water-anim-rolling-water-back-lod0-jg"],[1,"water-anim-rolling-water-back-lod0-mg"],[2,"water-anim-rolling-water-front-lod0-jg"],[3,"water-anim-rolling-water-front-lod0-mg"],[4,"water-anim-rolling-idle-ja"]],"water-anim-sunken-ag":[[0,"water-anim-sunken-big-room-lod0-jg"],[1,"water-anim-sunken-big-room-lod0-mg"],[2,"water-anim-sunken-first-room-from-entrance-lod0-jg"],[3,"water-anim-sunken-first-room-from-entrance-lod0-mg"],[4,"water-anim-sunken-qbert-room-lod0-jg"],[5,"water-anim-sunken-qbert-room-lod0-mg"],[6,"water-anim-sunken-first-right-branch-lod0-jg"],[7,"water-anim-sunken-first-right-branch-lod0-mg"],[8,"water-anim-sunken-circular-with-bullys-lod0-jg"],[9,"water-anim-sunken-circular-with-bullys-lod0-mg"],[10,"water-anim-sunken-hall-with-one-whirlpool-lod0-jg"],[11,"water-anim-sunken-hall-with-one-whirlpool-lod0-mg"],[12,"water-anim-sunken-hall-with-three-whirlpools-lod0-jg"],[13,"water-anim-sunken-hall-with-three-whirlpools-lod0-mg"],[14,"water-anim-sunken-start-of-helix-slide-lod0-jg"],[15,"water-anim-sunken-start-of-helix-slide-lod0-mg"],[16,"water-anim-sunken-room-above-exit-chamber-lod0-jg"],[17,"water-anim-sunken-room-above-exit-chamber-lod0-mg"],[18,"water-anim-sunken-hall-before-big-room-lod0-jg"],[19,"water-anim-sunken-hall-before-big-room-lod0-mg"],[20,"water-anim-sunken-short-piece-lod0-jg"],[21,"water-anim-sunken-short-piece-lod0-mg"],[22,"water-anim-sunken-big-room-upper-water-lod0-jg"],[23,"water-anim-sunken-big-room-upper-water-lod0-mg"],[24,"water-anim-sunken-idle-ja"]],"water-anim-sunken-dark-eco-ag":[[0,"water-anim-sunken-dark-eco-qbert-lod0-jg"],[1,"water-anim-sunken-dark-eco-qbert-lod0-mg"],[2,"water-anim-sunken-dark-eco-platform-room-lod0-jg"],[3,"water-anim-sunken-dark-eco-platform-room-lod0-mg"],[4,"water-anim-sunken-dark-eco-helix-room-lod0-jg"],[5,"water-anim-sunken-dark-eco-helix-room-lod0-mg"],[6,"water-anim-sunken-dark-eco-idle-ja"]],"water-anim-training-ag":[[0,"water-anim-training-lake-lod0-jg"],[1,"water-anim-training-lake-lod0-mg"],[2,"water-anim-training-idle-ja"]],"water-anim-village1-ag":[[0,"water-anim-village1-rice-paddy-lod0-jg"],[1,"water-anim-village1-rice-paddy-lod0-mg"],[2,"water-anim-village1-rice-paddy-mid-lod0-jg"],[3,"water-anim-village1-rice-paddy-mid-lod0-mg"],[4,"water-anim-village1-rice-paddy-top-lod0-jg"],[5,"water-anim-village1-rice-paddy-top-lod0-mg"],[6,"water-anim-village1-fountain-lod0-jg"],[7,"water-anim-village1-fountain-lod0-mg"],[8,"water-anim-village1-idle-ja"]],"water-anim-village2-ag":[[0,"water-anim-village2-bucket-lod0-jg"],[1,"water-anim-village2-bucket-lod0-mg"],[2,"water-anim-village2-idle-ja"]],"water-anim-village3-ag":[[0,"water-anim-village3-lava-lod0-jg"],[1,"water-anim-village3-lava-lod0-mg"],[2,"water-anim-village3-lava-lod1-mg"],[3,"water-anim-village3-idle-ja"]],"wedge-plat-ag":[[0,"wedge-plat-lod0-jg"],[1,"wedge-plat-lod0-mg"],[2,"wedge-plat-idle-ja"],[3,"wedge-plat-tip-ja"]],"wedge-plat-outer-ag":[[0,"wedge-plat-outer-lod0-jg"],[1,"wedge-plat-outer-lod0-mg"],[2,"wedge-plat-outer-idle-ja"],[3,"wedge-plat-outer-tip-ja"]],"wheel-ag":[[0,"wheel-geo-jg"],[1,"wheel-geo-mg"],[2,"wheel-idle-ja"]],"whirlpool-ag":[[0,"whirlpool-lod0-jg"],[1,"whirlpool-lod0-mg"],[2,"whirlpool-idle-ja"]],"windmill-one-ag":[[0,"windmill-one-lod0-jg"],[1,"windmill-one-lod0-mg"],[2,"windmill-one-lod1-mg"],[3,"windmill-one-lod2-mg"],[4,"windmill-one-idle-ja"]],"windmill-sail-ag":[[0,"windmill-sail-lod0-jg"],[1,"windmill-sail-lod0-mg"],[2,"windmill-sail-lod1-mg"],[3,"windmill-sail-lod2-mg"],[4,"windmill-sail-idle-ja"]],"windspinner-ag":[[0,"windspinner-lod0-jg"],[1,"windspinner-lod0-mg"],[2,"windspinner-lod1-mg"],[3,"windspinner-idle-ja"]],"windturbine-ag":[[0,"windturbine-lod0-jg"],[1,"windturbine-lod0-mg"],[2,"windturbine-lod1-mg"],[3,"windturbine-lod2-mg"],[4,"windturbine-idle-ja"]],"yakow-ag":[[0,"yakow-lod0-jg"],[1,"yakow-lod0-mg"],[2,"yakow-lod1-mg"],[3,"yakow-shadow-mg"],[4,"yakow-idle-ja"],[5,"yakow-graze-ja"],[6,"yakow-walk-ja"],[7,"yakow-run-ja"],[8,"yakow-kicked-ja"],[9,"yakow-walk-right-ja"],[10,"yakow-walk-left-ja"],[11,"yakow-kicked-in-place-ja"]],"yellowsage-ag":[[0,"yellowsage-lod0-jg"],[1,"yellowsage-lod0-mg"],[2,"yellowsage-lod1-mg"],[3,"yellowsage-shadow-mg"],[4,"yellowsage-yellowsage-idle-ja"],[5,"yellowsage-yellowsage-attack-start-ja"],[6,"yellowsage-yellowsage-attack-loop-ja"]],"yeti-ag":[[0,"yeti-lod0-jg"],[1,"yeti-lod0-mg"],[2,"yeti-idle-ja"],[3,"yeti-walk-ja"],[4,"yeti-spot-ja"],[5,"yeti-charge-ja"],[6,"yeti-give-up-ja"],[7,"yeti-give-up-hop-ja"],[8,"yeti-win-ja"],[9,"yeti-death-ja"],[10,"yeti-jump-ja"],[11,"yeti-jump-land-ja"],[12,"yeti-turn-ja"]]} diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index a3835a714f7..fe7412339cc 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -28409,7 +28409,7 @@ (define-extern ja-eval (function int :behavior process-drawable)) (define-extern ja-blend-eval (function int :behavior process-drawable)) (define-extern ja-post (function none :behavior process-drawable)) -(define-extern sleep-code (function symbol :behavior process-drawable)) +(define-extern sleep-code (function symbol :behavior process)) (define-extern transform-and-sleep (function none :behavior process-drawable)) (define-extern transform-and-sleep-code (function none :behavior process-drawable)) (define-extern transform-post (function int :behavior process-drawable)) @@ -29572,7 +29572,7 @@ (define-extern projectile-update-velocity-space-wars (function projectile none)) (define-extern projectile-init-by-other (function projectile-init-by-other-params projectile :behavior projectile)) (define-extern projectile-bounce-update-velocity (function projectile-bounce none :behavior projectile)) -(define-extern projectile-bounce-falling-post (function projectile-bounce none :behavior projectile-bounce)) +(define-extern projectile-bounce-falling-post (function none :behavior projectile-bounce)) (define-extern projectile-bounce-move (function projectile-bounce none)) (define-extern projectile-bounce-reaction (function control-info collide-query vector vector collide-status)) diff --git a/decompiler/config/jak2/ntsc_v1/art-group-info.min.json b/decompiler/config/jak2/ntsc_v1/art-group-info.min.json index c4e74197639..44747ebbb33 100644 --- a/decompiler/config/jak2/ntsc_v1/art-group-info.min.json +++ b/decompiler/config/jak2/ntsc_v1/art-group-info.min.json @@ -1 +1 @@ -{"air-train-ag":[[0,"air-train-lod0-jg"],[1,"air-train-lod0-mg"],[2,"air-train-idle-ja"]],"amphibian-ag":[[0,"amphibian-lod0-jg"],[1,"amphibian-lod0-mg"],[2,"amphibian-lod1-mg"],[3,"amphibian-shadow-mg"],[4,"amphibian-idle-ja"],[5,"amphibian-tongue-attack-ja"],[6,"amphibian-knocked0-ja"],[7,"amphibian-knocked-land0-ja"],[8,"amphibian-knocked1-ja"],[9,"amphibian-knocked-land1-ja"],[10,"amphibian-knocked2-ja"],[11,"amphibian-knocked-land2-ja"],[12,"amphibian-die-ja"],[13,"amphibian-swim-ja"],[14,"amphibian-swim-fast-ja"],[15,"amphibian-swim-chomp-ja"],[16,"amphibian-walk-ja"],[17,"amphibian-attack-ja"],[18,"amphibian-attack-left-ja"],[19,"amphibian-attack-right-ja"],[20,"amphibian-attack-forward-ja"],[21,"amphibian-die-falling-ja"],[22,"amphibian-blue-hit0-ja"],[23,"amphibian-blue-hit1-ja"],[24,"amphibian-blue-hit2-ja"],[25,"amphibian-blue-land-ja"],[26,"amphibian-run0-ja"],[27,"amphibian-run1-ja"],[28,"amphibian-notice0-ja"],[29,"amphibian-notice1-ja"],[30,"amphibian-jump-wind-up0-ja"],[31,"amphibian-jump-in-air0-ja"],[32,"amphibian-jump-land0-ja"],[33,"amphibian-jump-wind-up1-ja"],[34,"amphibian-jump-in-air1-ja"],[35,"amphibian-jump-land1-ja"],[36,"amphibian-jump-in-air1-part2-ja"],[37,"amphibian-turn-right-ja"],[38,"amphibian-turn-left-ja"],[39,"amphibian-turn-right-fast-ja"],[40,"amphibian-turn-left-fast-ja"]],"ashelin-ag":[[0,"ashelin-lod0-jg"],[1,"ashelin-lod0-mg"],[2,"ashelin-shadow-mg"],[3,"ashelin-idle0-ja"],[4,"ashelin-walk0-ja"],[5,"ashelin-jog0-ja"],[6,"ashelin-run0-ja"],[7,"ashelin-knocked-back0-ja"],[8,"ashelin-knocked-back-land0-ja"],[9,"ashelin-knocked-back-die0-ja"],[10,"ashelin-knocked-right0-ja"],[11,"ashelin-knocked-right-land0-ja"],[12,"ashelin-knocked-right-die0-ja"],[13,"ashelin-blue-hit-front0-ja"],[14,"ashelin-blue-hit-front1-ja"],[15,"ashelin-blue-hit-front2-ja"],[16,"ashelin-blue-hit-front-land0-ja"],[17,"ashelin-blue-hit-front-land1-ja"],[18,"ashelin-blue-hit-front-land2-ja"],[19,"ashelin-blue-hit-back0-ja"],[20,"ashelin-blue-hit-back1-ja"],[21,"ashelin-blue-hit-back2-ja"],[22,"ashelin-blue-hit-back-land0-ja"],[23,"ashelin-blue-hit-back-land1-ja"],[24,"ashelin-blue-hit-back-land2-ja"],[25,"ashelin-blue-hit-recover-ja"],[26,"ashelin-die-in-place0-ja"],[27,"ashelin-waiting-to-standing-ja"],[28,"ashelin-standing-fire-ja"],[29,"ashelin-standing-idle-ja"],[30,"ashelin-standing-to-waiting-ja"],[31,"ashelin-standing-turn-left-ja"],[32,"ashelin-standing-turn-right-ja"],[33,"ashelin-back-spring-start-ja"],[34,"ashelin-back-spring-loop-ja"],[35,"ashelin-back-spring-land-ja"],[36,"ashelin-cartwheel-left-start-ja"],[37,"ashelin-cartwheel-left-loop-ja"],[38,"ashelin-cartwheel-left-land-ja"],[39,"ashelin-tumble-right-start-ja"],[40,"ashelin-tumble-right-loop-ja"],[41,"ashelin-tumble-right-land-ja"]],"ashelin-highres-ag":[[0,"ashelin-highres-lod0-jg"],[1,"ashelin-highres-lod0-mg"],[2,"ashelin-highres-shadow-mg"],[3,"ashelin-highres-idle-ja"]],"atoll-hatch-ag":[[0,"atoll-hatch-lod0-jg"],[1,"atoll-hatch-lod0-mg"],[2,"atoll-hatch-lod1-mg"],[3,"atoll-hatch-idle-ja"]],"atoll-hellcat-ag":[[0,"atoll-hellcat-lod0-jg"],[1,"atoll-hellcat-lod0-mg"],[2,"atoll-hellcat-lod1-mg"],[3,"atoll-hellcat-lod2-mg"],[4,"atoll-hellcat-idle-ja"]],"atoll-mar-symbol-ag":[[0,"atoll-mar-symbol-lod0-jg"],[1,"atoll-mar-symbol-lod0-mg"],[2,"atoll-mar-symbol-idle-ja"]],"atoll-tank-ag":[[8,"atoll-tank-c-lod0-jg"],[0,"atoll-tank-a-lod0-jg"],[9,"atoll-tank-c-lod0-mg"],[1,"atoll-tank-a-lod0-mg"],[2,"atoll-tank-a-debris-ja"],[4,"atoll-tank-b-lod0-jg"],[5,"atoll-tank-b-lod0-mg"],[6,"atoll-tank-b-debris-ja"],[10,"atoll-tank-c-debris-ja"]],"atoll-valve-ag":[[0,"atoll-valve-lod0-jg"],[1,"atoll-valve-lod0-mg"],[2,"atoll-valve-lod1-mg"],[3,"atoll-valve-idle-ja"]],"atoll-windmill-ag":[[0,"atoll-windmill-lod0-jg"],[1,"atoll-windmill-lod0-mg"],[2,"atoll-windmill-lod1-mg"],[3,"atoll-windmill-lod2-mg"],[4,"atoll-windmill-idle-ja"]],"atollrotpipe-ag":[[0,"atollrotpipe-lod0-jg"],[1,"atollrotpipe-lod0-mg"],[2,"atollrotpipe-idle-ja"]],"awning-ag":[[0,"awning-lod0-jg"],[1,"awning-lod0-mg"],[2,"awning-idle-ja"]],"babak-ag":[[0,"babak-lod0-jg"],[1,"babak-lod0-mg"],[2,"babak-shadow-mg"],[3,"babak-idle-ja"],[4,"babak-idle-cower-ja"],[5,"babak-run-ja"],[6,"babak-knocked-ja"],[7,"babak-knocked-land-ja"],[8,"babak-jump-in-car-ja"],[9,"babak-idle-car-back-sides-ja"],[10,"babak-idle-car-sides-ja"],[11,"babak-idle-car-forward-sides-ja"],[12,"babak-idle-bike-back-sides-ja"],[13,"babak-idle-bike-sides-ja"],[14,"babak-idle-bike-forward-sides-ja"],[15,"babak-idle-hair-ja"],[16,"babak-jump-on-bike-ja"],[17,"babak-fall-out-patty-wagon-ja"],[18,"babak-idle-patty-wagon-ja"],[19,"babak-swim-ja"],[20,"babak-swim-ilde-ja"],[21,"babak-jump-ja"]],"barge-ag":[[0,"barge-lod0-jg"],[1,"barge-lod0-mg"],[2,"barge-idle-ja"]],"baron-ag":[[0,"baron-lod0-jg"],[1,"baron-lod0-mg"],[2,"baron-idle-ja"]],"baron-consite+0-ag":[[0,"baron-highres-idle-dead-ja"]],"baron-highres-ag":[[0,"baron-highres-lod0-jg"],[1,"baron-highres-lod0-mg"],[2,"baron-highres-shadow-mg"],[3,"baron-highres-idle-ja"]],"baron-pod-ag":[[0,"baron-pod-lod0-jg"],[1,"baron-pod-lod0-mg"],[2,"baron-pod-shadow-mg"],[3,"baron-pod-idle-ja"]],"baron-squid+0-ag":[[0,"baron-squid-idle-ja"],[1,"baron-shields-up-ja"],[2,"baron-shields-idle-ja"],[3,"baron-shields-down-ja"],[4,"baron-pods-down-ja"],[5,"baron-hatch-fore-open-ja"],[6,"baron-hatch-fore-launch-ja"],[7,"baron-hatch-fore-close-ja"],[8,"baron-hatch-aft-open-ja"],[9,"baron-hatch-aft-launch-ja"],[10,"baron-hatch-aft-close-ja"],[11,"baron-breathe-between-grenades-ja"],[12,"baron-pods-up-ja"],[13,"baron-fire-guns-start-ja"],[14,"baron-fire-guns-loop-ja"],[15,"baron-fire-guns-end-ja"],[16,"baron-fire-guns-release-ja"],[17,"baron-fire-guns-breathe-ja"],[18,"baron-fly-left-start-ja"],[19,"baron-fly-left-idle-ja"],[20,"baron-fly-left-end-ja"],[21,"baron-fly-right-start-ja"],[22,"baron-fly-right-idle-ja"],[23,"baron-fly-right-end-ja"],[24,"baron-fly-foreward-start-ja"],[25,"baron-fly-foreward-idle-ja"],[26,"baron-fly-foreward-end-ja"],[27,"baron-fly-backward-start-ja"],[28,"baron-fly-backward-idle-ja"],[29,"baron-fly-backward-end-ja"],[30,"baron-recharge-landing-ja"],[31,"baron-recharge-liftoff-ja"],[32,"baron-recharge-ja"],[33,"baron-damaged-ja"],[34,"baron-dummy17-ja"],[35,"baron-dummy18-ja"],[36,"baron-dummy19-ja"],[37,"baron-dummy20-ja"],[38,"squid-squid-idle-ja"],[39,"squid-shields-up-ja"],[40,"squid-shields-idle-ja"],[41,"squid-shields-down-ja"],[42,"squid-pods-down-ja"],[43,"squid-hatch-fore-open-ja"],[44,"squid-hatch-fore-launch-ja"],[45,"squid-hatch-fore-close-ja"],[46,"squid-hatch-aft-open-ja"],[47,"squid-hatch-aft-launch-ja"],[48,"squid-hatch-aft-close-ja"],[49,"squid-breathe-between-grenades-ja"],[50,"squid-pods-up-ja"],[51,"squid-fire-guns-start-ja"],[52,"squid-fire-guns-loop-ja"],[53,"squid-fire-guns-end-ja"],[54,"squid-fire-guns-release-ja"],[55,"squid-fire-guns-breathe-ja"],[56,"squid-fly-left-start-ja"],[57,"squid-fly-left-idle-ja"],[58,"squid-fly-left-end-ja"],[59,"squid-fly-right-start-ja"],[60,"squid-fly-right-idle-ja"],[61,"squid-fly-right-end-ja"],[62,"squid-fly-foreward-start-ja"],[63,"squid-fly-foreward-idle-ja"],[64,"squid-fly-foreward-end-ja"],[65,"squid-fly-backward-start-ja"],[66,"squid-fly-backward-idle-ja"],[67,"squid-fly-backward-end-ja"],[68,"squid-recharge-landing-ja"],[69,"squid-recharge-liftoff-ja"],[70,"squid-recharge-ja"],[71,"squid-damaged-ja"],[72,"squid-dummy17-ja"],[73,"squid-dummy18-ja"],[74,"squid-dummy19-ja"],[75,"squid-dummy20-ja"],[76,"squid-driver-squid-idle-ja"]],"baron-statue-ag":[[0,"baron-statue-lod0-jg"],[1,"baron-statue-lod0-mg"],[2,"baron-statue-idle-ja"]],"baron-widow+0-ag":[[0,"baron-grab-success-ja"],[1,"baron-fly-ja"],[2,"baron-return-ja"],[3,"baron-landing-ja"],[4,"baron-drill-ja"],[5,"baron-drill-right-high-ja"],[6,"baron-drill-right-mid-ja"],[7,"baron-drill-right-low-ja"],[8,"baron-drill-left-high-ja"],[9,"baron-drill-left-mid-ja"],[10,"baron-drill-left-low-ja"],[11,"baron-fire-start-ja"],[12,"baron-fire-loop-ja"],[13,"baron-fire-end-ja"],[14,"baron-grab-stone-ja"],[15,"baron-launch-left-ja"],[16,"baron-grab-fail-ja"],[17,"baron-grab-punch-ja"],[18,"baron-launch-right-ja"],[19,"baron-hit-pod-left-ja"],[20,"baron-hit-pod-right-ja"],[21,"baron-hit-front-ja"],[22,"baron-hit-gun-left-ja"],[23,"baron-hit-gun-right-ja"],[24,"baron-grab-pull-loop-ja"],[25,"baron-grab-yank-loop-ja"],[26,"baron-grab-tug-loop-ja"],[27,"baron-grab-footing-loop-ja"],[28,"baron-grab-launch-left-ja"],[29,"baron-grab-launch-right-ja"],[30,"baron-flight-launch-left-ja"],[31,"baron-flight-launch-right-ja"],[32,"baron-flight-hit-right-ja"],[33,"baron-flight-hit-left-ja"],[34,"baron-flight-hit-final-ja"],[35,"baron-pod-grab-success-ja"],[36,"heart-mar-grab-success-ja"],[37,"widow-grab-success-ja"],[38,"widow-fly-ja"],[39,"widow-return-ja"],[40,"widow-landing-ja"],[41,"widow-drill-ja"],[42,"widow-drill-right-high-ja"],[43,"widow-drill-right-mid-ja"],[44,"widow-drill-right-low-ja"],[45,"widow-drill-left-high-ja"],[46,"widow-drill-left-mid-ja"],[47,"widow-drill-left-low-ja"],[48,"widow-fire-start-ja"],[49,"widow-fire-loop-ja"],[50,"widow-fire-end-ja"],[51,"widow-grab-stone-ja"],[52,"widow-launch-left-ja"],[53,"widow-grab-fail-ja"],[54,"widow-grab-punch-ja"],[55,"widow-launch-right-ja"],[56,"widow-hit-pod-left-ja"],[57,"widow-hit-pod-right-ja"],[58,"widow-hit-front-ja"],[59,"widow-hit-gun-left-ja"],[60,"widow-hit-gun-right-ja"],[61,"widow-grab-pull-loop-ja"],[62,"widow-grab-yank-loop-ja"],[63,"widow-grab-tug-loop-ja"],[64,"widow-grab-footing-loop-ja"],[65,"widow-grab-launch-left-ja"],[66,"widow-grab-launch-right-ja"],[67,"widow-flight-launch-left-ja"],[68,"widow-flight-launch-right-ja"],[69,"widow-flight-hit-right-ja"],[70,"widow-flight-hit-left-ja"],[71,"widow-flight-hit-final-ja"]],"barons-ship-lores-ag":[[0,"barons-ship-lores-lod0-jg"],[1,"barons-ship-lores-lod0-mg"],[2,"barons-ship-lores-idle-ja"]],"beam-ag":[[0,"beam-lod0-jg"],[1,"beam-lod0-mg"],[2,"beam-idle-ja"],[3,"beam-slide-center-ja"]],"big-bopper-ag":[[0,"big-bopper-lod0-jg"],[1,"big-bopper-lod0-mg"],[2,"big-bopper-idle-ja"]],"bikea-ag":[[0,"bikea-lod0-jg"],[1,"bikea-lod0-mg"],[2,"bikea-lod1-mg"],[3,"bikea-lod2-mg"],[4,"bikea-shadow-mg"],[5,"bikea-idle-ja"]],"bikeb-ag":[[0,"bikeb-lod0-jg"],[1,"bikeb-lod0-mg"],[2,"bikeb-lod1-mg"],[3,"bikeb-lod2-mg"],[4,"bikeb-shadow-mg"],[5,"bikeb-idle-ja"]],"bikec-ag":[[0,"bikec-lod0-jg"],[1,"bikec-lod0-mg"],[2,"bikec-lod1-mg"],[3,"bikec-lod2-mg"],[4,"bikec-shadow-mg"],[5,"bikec-idle-ja"]],"blocking-plane-ag":[[0,"blocking-plane-lod0-jg"],[1,"blocking-plane-lod0-mg"],[2,"blocking-plane-idle-ja"]],"board-ag":[[0,"board-lod0-jg"],[1,"board-lod0-mg"],[2,"board-shadow-mg"],[3,"board-open-ja"],[4,"board-close-ja"],[5,"board-board-idle-ja"]],"bomb-trigger-ag":[[0,"bomb-trigger-lod0-jg"],[1,"bomb-trigger-lod0-mg"],[2,"bomb-trigger-idle-ja"]],"bombbot-ag":[[0,"bombbot-lod0-jg"],[1,"bombbot-lod0-mg"],[2,"bombbot-shadow-mg"],[3,"bombbot-idle-ja"],[4,"bombbot-exploding-lod0-jg"],[5,"bombbot-exploding-lod0-mg"],[6,"bombbot-exploding-idle-ja"]],"brutter-balloon-ag":[[0,"brutter-balloon-lod0-jg"],[1,"brutter-balloon-lod0-mg"],[2,"brutter-balloon-idle-ja"]],"brutter-balloon-norift-ag":[[0,"brutter-balloon-norift-lod0-jg"],[1,"brutter-balloon-norift-lod0-mg"],[2,"brutter-balloon-norift-idle-ja"]],"brutter-highres-ag":[[0,"brutter-highres-lod0-jg"],[1,"brutter-highres-lod0-mg"],[2,"brutter-highres-shadow-mg"],[3,"brutter-highres-idle-ja"],[4,"brutter-highres-idle-kiosk-ja"]],"brutter-low-ag":[[0,"brutter-low-lod0-jg"],[1,"brutter-low-lod0-mg"],[2,"brutter-low-lod1-mg"],[3,"brutter-low-shadow-mg"],[4,"brutter-low-idle-ja"],[5,"brutter-low-stad-sit-ja"]],"burning-bush-ag":[[0,"burning-bush-lod0-jg"],[1,"burning-bush-lod0-mg"],[2,"burning-bush-idle-ja"]],"cable-ag":[[0,"cable-lod0-jg"],[1,"cable-lod0-mg"],[2,"cable-idle-ja"]],"cara-ag":[[0,"cara-lod0-jg"],[1,"cara-lod0-mg"],[2,"cara-lod1-mg"],[3,"cara-lod2-mg"],[4,"cara-shadow-mg"],[5,"cara-idle-ja"]],"carb-ag":[[0,"carb-lod0-jg"],[1,"carb-lod0-mg"],[2,"carb-lod1-mg"],[3,"carb-lod2-mg"],[4,"carb-shadow-mg"],[5,"carb-idle-ja"]],"carc-ag":[[0,"carc-lod0-jg"],[1,"carc-lod0-mg"],[2,"carc-lod1-mg"],[3,"carc-lod2-mg"],[4,"carc-shadow-mg"],[5,"carc-idle-ja"]],"cas-button-ag":[[0,"cas-button-lod0-jg"],[1,"cas-button-lod0-mg"],[2,"cas-button-idle-ja"]],"cas-chain-plat-ag":[[0,"cas-chain-plat-lod0-jg"],[1,"cas-chain-plat-lod0-mg"],[2,"cas-chain-plat-idle-ja"],[3,"cas-chain-plat-drop-ja"]],"cas-conveyor-switch-ag":[[0,"cas-conveyor-switch-lod0-jg"],[1,"cas-conveyor-switch-lod0-mg"],[2,"cas-conveyor-switch-idle-ja"]],"cas-electric-fence-ag":[[0,"cas-electric-fence-lod0-jg"],[1,"cas-electric-fence-lod0-mg"],[2,"cas-electric-fence-idle-ja"],[3,"cas-electric-fence-explode-lod0-jg"],[4,"cas-electric-fence-explode-lod0-mg"],[5,"cas-electric-fence-explode-idle-ja"]],"cas-elevator-ag":[[0,"cas-elevator-lod0-jg"],[1,"cas-elevator-lod0-mg"],[2,"cas-elevator-idle-ja"],[3,"cas-elevator-up-down-ja"]],"cas-flag-a-ag":[[0,"cas-flag-a-lod0-jg"],[1,"cas-flag-a-lod0-mg"],[2,"cas-flag-a-idle-ja"]],"cas-flag-b-ag":[[0,"cas-flag-b-lod0-jg"],[1,"cas-flag-b-lod0-mg"],[2,"cas-flag-b-idle-ja"]],"cas-robot-door-ag":[[0,"cas-robot-door-lod0-jg"],[1,"cas-robot-door-lod0-mg"],[2,"cas-robot-door-idle-ja"]],"cas-rot-blade-ag":[[0,"cas-rot-blade-lod0-jg"],[1,"cas-rot-blade-lod0-mg"],[2,"cas-rot-blade-shadow-mg"],[3,"cas-rot-blade-idle-ja"]],"cas-rot-bridge-ag":[[0,"cas-rot-bridge-lod0-jg"],[1,"cas-rot-bridge-lod0-mg"],[2,"cas-rot-bridge-idle-ja"],[3,"cas-rot-bridge-section-one-ja"],[4,"cas-rot-bridge-section-two-ja"],[5,"cas-rot-bridge-section-three-ja"],[6,"cas-rot-bridge-single-section-ja"],[7,"cas-rot-bridge-section-one-reverse-ja"],[8,"cas-rot-bridge-section-two-reverse-ja"],[9,"cas-rot-bridge-section-three-reverse-ja"],[10,"cas-rot-bridge-single-section-reverse-ja"]],"cas-trapdoor-ag":[[0,"cas-trapdoor-lod0-jg"],[1,"cas-trapdoor-lod0-mg"],[2,"cas-trapdoor-idle-ja"],[3,"cas-trapdoor-explode-lod0-jg"],[4,"cas-trapdoor-explode-lod0-mg"],[5,"cas-trapdoor-explode-idle-ja"]],"cboss-bomb-ag":[[0,"cboss-bomb-lod0-jg"],[1,"cboss-bomb-lod0-mg"],[2,"cboss-bomb-idle-ja"]],"cboss-elevator-ag":[[0,"cboss-elevator-lod0-jg"],[1,"cboss-elevator-lod0-mg"],[2,"cboss-elevator-idle-ja"]],"cboss-tractor-ag":[[0,"cboss-tractor-lod0-jg"],[1,"cboss-tractor-lod0-mg"],[2,"cboss-tractor-idle-ja"]],"centipede-ag":[[0,"centipede-lod0-jg"],[1,"centipede-lod0-mg"],[2,"centipede-shadow-mg"],[3,"centipede-idle-ja"],[4,"centipede-walk0-ja"],[5,"centipede-attack0-ja"],[6,"centipede-eat0-ja"],[7,"centipede-mand-idle0-ja"],[8,"centipede-mand-chomp1-ja"],[9,"centipede-mand-chomp2-ja"],[10,"centipede-mand-chomp3-ja"],[11,"centipede-mand-open-mouth-ja"],[12,"centipede-mand-open-mouth-jitter-ja"],[13,"centipede-mand-close-mouth-ja"],[14,"centipede-mand-close-mouth-jitter-ja"]],"centipede-fma-ag":[[0,"centipede-fma-lod0-jg"],[1,"centipede-fma-lod0-mg"],[2,"centipede-fma-idle-ja"]],"centurion-ag":[[0,"centurion-lod0-jg"],[1,"centurion-lod0-mg"],[2,"centurion-lod1-mg"],[3,"centurion-shadow-mg"],[4,"centurion-celebrate-ja"],[5,"centurion-die-ja"],[6,"centurion-idle-ja"],[7,"centurion-jump-ja"],[8,"centurion-notice-ja"],[9,"centurion-patrol-ja"],[10,"centurion-rotate-ja"],[11,"centurion-rotate-end-ja"],[12,"centurion-shieldup-ja"],[13,"centurion-shieldup-idle-ja"],[14,"centurion-shoot-ja"],[15,"centurion-take-big-hit-ja"],[16,"centurion-take-hit-ja"],[17,"centurion-unblock-ja"],[18,"centurion-blue-hit-front-ja"],[19,"centurion-blue-hit-right-ja"],[20,"centurion-blue-hit-left-ja"],[21,"centurion-knocked-ja"],[22,"centurion-knocked-land-ja"],[23,"centurion-falling-death-ja"],[24,"centurion-hit-away-ja"],[25,"centurion-side-stepR-ja"],[26,"centurion-side-stepDR-ja"],[27,"centurion-side-stepDL-ja"],[28,"centurion-walk-forward-ja"],[29,"centurion-shoot-start-ja"],[30,"centurion-shoot-loop-ja"],[31,"centurion-shoot-end-ja"],[32,"centurion-yellow-hit-ja"],[33,"centurion-die-land-ja"],[34,"centurion-death-in-place-ja"]],"citizen-chick-ag":[[0,"citizen-chick-lod0-jg"],[1,"citizen-chick-lod0-mg"],[2,"citizen-chick-lod2-mg"],[3,"citizen-chick-shadow-mg"],[4,"citizen-chick-walk-ja"],[5,"citizen-chick-walk2-ja"],[6,"citizen-chick-walk3-ja"],[7,"citizen-chick-run-ja"],[8,"citizen-chick-run2-ja"],[9,"citizen-chick-run3-ja"],[10,"citizen-chick-idle-ja"],[11,"citizen-chick-panic-run-ja"],[12,"citizen-chick-tread-water-ja"],[13,"citizen-chick-hit-the-deck-ja"],[14,"citizen-chick-cover-head-start-ja"],[15,"citizen-chick-cover-head-loop-ja"],[16,"citizen-chick-cover-head-end-ja"],[17,"citizen-chick-dive-forward-ja"],[18,"citizen-chick-blue-hit-front-ja"],[19,"citizen-chick-blue-hit-back-ja"],[20,"citizen-chick-knocked-front-ja"],[21,"citizen-chick-knocked-front-land-ja"],[22,"citizen-chick-knocked-back-ja"],[23,"citizen-chick-knocked-back-land-ja"],[24,"citizen-chick-get-up-from-front-ja"],[25,"citizen-chick-get-up-from-back-ja"],[26,"citizen-chick-shuffle-ja"],[27,"citizen-chick-riding-stance-ja"]],"citizen-fat-ag":[[0,"citizen-fat-lod0-jg"],[1,"citizen-fat-lod0-mg"],[2,"citizen-fat-lod2-mg"],[3,"citizen-fat-shadow-mg"],[4,"citizen-fat-idle-ja"],[5,"citizen-fat-idle-to-arms-hips-ja"],[6,"citizen-fat-arms-hips-ja"],[7,"citizen-fat-idle-to-arms-crossed-ja"],[8,"citizen-fat-arms-crossed-ja"],[9,"citizen-fat-idle-to-out-of-breath-ja"],[10,"citizen-fat-out-of-breath-ja"],[11,"citizen-fat-walk-ja"],[12,"citizen-fat-shuffle-ja"],[13,"citizen-fat-walk2-ja"],[14,"citizen-fat-walk3-ja"],[15,"citizen-fat-run-ja"],[16,"citizen-fat-run2-ja"],[17,"citizen-fat-panic-run-ja"],[18,"citizen-fat-dive-forward-ja"],[19,"citizen-fat-hit-the-deck-ja"],[20,"citizen-fat-knocked-front-ja"],[21,"citizen-fat-knocked-front-land-ja"],[22,"citizen-fat-knocked-back-ja"],[23,"citizen-fat-knocked-back-land-ja"],[24,"citizen-fat-get-up-from-front-ja"],[25,"citizen-fat-get-up-from-back-ja"],[26,"citizen-fat-blue-hit-front-ja"],[27,"citizen-fat-blue-hit-back-ja"],[28,"citizen-fat-cover-head-start-ja"],[29,"citizen-fat-cover-head-loop-ja"],[30,"citizen-fat-cover-head-end-ja"],[31,"citizen-fat-riding-stance-ja"],[32,"citizen-fat-tread-water-ja"]],"citizen-norm-ag":[[0,"citizen-norm-lod0-jg"],[1,"citizen-norm-lod0-mg"],[2,"citizen-norm-lod2-mg"],[3,"citizen-norm-shadow-mg"],[4,"citizen-norm-idle-ja"],[5,"citizen-norm-idle-to-arms-hips-ja"],[6,"citizen-norm-arms-hips-ja"],[7,"citizen-norm-idle-to-arms-crossed-ja"],[8,"citizen-norm-arms-crossed-ja"],[9,"citizen-norm-idle-to-out-of-breath-ja"],[10,"citizen-norm-out-of-breath-ja"],[11,"citizen-norm-shuffle-ja"],[12,"citizen-norm-walk-ja"],[13,"citizen-norm-walk2-ja"],[14,"citizen-norm-run-ja"],[15,"citizen-norm-panic-run-ja"],[16,"citizen-norm-dive-forward-ja"],[17,"citizen-norm-hit-the-deck-ja"],[18,"citizen-norm-knocked-front-ja"],[19,"citizen-norm-knocked-front-land-ja"],[20,"citizen-norm-knocked-back-ja"],[21,"citizen-norm-knocked-back-land-ja"],[22,"citizen-norm-get-up-from-front-ja"],[23,"citizen-norm-get-up-from-back-ja"],[24,"citizen-norm-blue-hit-ja"],[25,"citizen-norm-blue-hit-land-death-ja"],[26,"citizen-norm-cover-head-start-ja"],[27,"citizen-norm-cover-head-loop-ja"],[28,"citizen-norm-cover-head-end-ja"],[29,"citizen-norm-tread-water-ja"],[30,"citizen-norm-bike-stance-ja"],[31,"citizen-norm-car-stance-ja"],[32,"citizen-norm-get-in-car-ja"],[33,"citizen-norm-knocked-from-car-ja"],[34,"citizen-norm-knocked-from-bike-ja"]],"citizen-norm-rider-ag":[[0,"citizen-norm-rider-lod0-jg"],[1,"citizen-norm-rider-lod0-mg"],[2,"citizen-norm-rider-lod2-mg"],[3,"citizen-norm-rider-idle-ja"],[4,"citizen-norm-rider-bike-stance-ja"],[5,"citizen-norm-rider-car-stance-ja"]],"citizen-rebel-ag":[[0,"citizen-rebel-lod0-jg"],[1,"citizen-rebel-lod0-mg"],[2,"citizen-rebel-shadow-mg"],[3,"citizen-rebel-idle-ja"],[4,"citizen-rebel-idle-to-arms-hips-ja"],[5,"citizen-rebel-arms-hips-ja"],[6,"citizen-rebel-idle-to-arms-crossed-ja"],[7,"citizen-rebel-arms-crossed-ja"],[8,"citizen-rebel-idle-to-out-of-breath-ja"],[9,"citizen-rebel-out-of-breath-ja"],[10,"citizen-rebel-shuffle-ja"],[11,"citizen-rebel-walk-ja"],[12,"citizen-rebel-walk2-ja"],[13,"citizen-rebel-walk3-ja"],[14,"citizen-rebel-run-ja"],[15,"citizen-rebel-run2-ja"],[16,"citizen-rebel-run3-ja"],[17,"citizen-rebel-panic-run-ja"],[18,"citizen-rebel-panic-run2-ja"],[19,"citizen-rebel-dive-forward-ja"],[20,"citizen-rebel-hit-the-deck-ja"],[21,"citizen-rebel-knocked-front-ja"],[22,"citizen-rebel-knocked-front-land-ja"],[23,"citizen-rebel-knocked-back-ja"],[24,"citizen-rebel-knocked-back-land-ja"],[25,"citizen-rebel-get-up-from-front-ja"],[26,"citizen-rebel-get-up-from-back-ja"],[27,"citizen-rebel-blue-hit-ja"],[28,"citizen-rebel-blue-hit-land-death-ja"],[29,"citizen-rebel-cover-head-start-ja"],[30,"citizen-rebel-cover-head-loop-ja"],[31,"citizen-rebel-cover-head-end-ja"],[32,"citizen-rebel-tread-water-ja"],[33,"citizen-rebel-bike-stance-ja"],[34,"citizen-rebel-car-stance-ja"],[35,"citizen-rebel-get-in-car-ja"]],"cntrlrm-button-ag":[[0,"cntrlrm-button-lod0-jg"],[1,"cntrlrm-button-lod0-mg"],[2,"cntrlrm-button-idle-ja"]],"cntrlrm-door-ag":[[0,"cntrlrm-door-lod0-jg"],[1,"cntrlrm-door-lod0-mg"],[2,"cntrlrm-door-idle-ja"],[3,"cntrlrm-door-opened-ja"]],"collectables-ag":[[0,"collectables-bomb-blast-lod0-jg"],[1,"collectables-bomb-blast-lod0-mg"],[2,"collectables-bomb-blast-idle-ja"],[3,"collectables-health-lod0-jg"],[4,"collectables-health-lod0-mg"],[5,"collectables-health-idle-ja"],[6,"collectables-gem-lod0-jg"],[7,"collectables-gem-lod0-mg"],[8,"collectables-gem-lod1-mg"],[9,"collectables-gem-idle-ja"],[10,"collectables-generic-blast-lod0-jg"],[11,"collectables-generic-blast-lod0-mg"],[12,"collectables-generic-blast-idle-ja"],[13,"collectables-generic-ripples-lod0-jg"],[14,"collectables-generic-ripples-lod0-mg"],[15,"collectables-generic-ripples-idle-ja"],[16,"collectables-generic-ripples-cycle-ja"],[17,"collectables-skill-lod0-jg"],[18,"collectables-skill-lod0-mg"],[19,"collectables-skill-lod1-mg"],[20,"collectables-skill-lod2-mg"],[21,"collectables-skill-shadow-mg"],[22,"collectables-skill-idle-ja"]],"com-airlock-inner-ag":[[0,"com-airlock-inner-lod0-jg"],[1,"com-airlock-inner-lod0-mg"],[2,"com-airlock-inner-idle-ja"]],"com-airlock-outer-ag":[[0,"com-airlock-outer-lod0-jg"],[1,"com-airlock-outer-lod0-mg"],[2,"com-airlock-outer-idle-ja"]],"com-elevator-ag":[[0,"com-elevator-lod0-jg"],[1,"com-elevator-lod0-mg"],[2,"com-elevator-lod1-mg"],[3,"com-elevator-idle-ja"]],"computerpaper-ag":[[0,"computerpaper-lod0-jg"],[1,"computerpaper-lod0-mg"],[2,"computerpaper-idle-ja"]],"consite-bomb-elevator-ag":[[0,"consite-bomb-elevator-lod0-jg"],[1,"consite-bomb-elevator-lod0-mg"],[2,"consite-bomb-elevator-idle-ja"],[4,"consite-bomb-elevator-hinges-lod0-jg"],[5,"consite-bomb-elevator-hinges-lod0-mg"],[6,"consite-bomb-elevator-hinges-idle-ja"]],"consite-break-scaffold-a-ag":[[8,"consite-break-scaffold-a-break-b-lod0-jg"],[0,"consite-break-scaffold-a-break-lod0-jg"],[9,"consite-break-scaffold-a-break-b-lod0-mg"],[1,"consite-break-scaffold-a-break-lod0-mg"],[2,"consite-break-scaffold-a-break-idle-ja"],[4,"consite-break-scaffold-a-break-a-lod0-jg"],[5,"consite-break-scaffold-a-break-a-lod0-mg"],[6,"consite-break-scaffold-a-break-a-idle-ja"],[10,"consite-break-scaffold-a-break-b-idle-ja"],[12,"consite-break-scaffold-a-break-c-lod0-jg"],[13,"consite-break-scaffold-a-break-c-lod0-mg"],[14,"consite-break-scaffold-a-break-c-idle-ja"]],"consite-break-scaffold-ag":[[0,"consite-break-scaffold-break-d-lod0-jg"],[1,"consite-break-scaffold-break-d-lod0-mg"],[2,"consite-break-scaffold-break-d-idle-ja"]],"consite-silo-doors-ag":[[0,"consite-silo-doors-lod0-jg"],[1,"consite-silo-doors-lod0-mg"],[2,"consite-silo-doors-idle-ja"]],"cpad-elevator-ag":[[0,"cpad-elevator-lod0-jg"],[1,"cpad-elevator-lod0-mg"],[2,"cpad-elevator-idle-ja"]],"crane-ag":[[0,"crane-lod0-jg"],[1,"crane-lod0-mg"],[2,"crane-idle-ja"]],"cranecrate-ag":[[0,"cranecrate-lod0-jg"],[1,"cranecrate-lod0-mg"],[2,"cranecrate-lod1-mg"],[3,"cranecrate-idle-ja"]],"crate-ag":[[0,"crate-krimson-lod0-jg"],[1,"crate-krimson-lod0-mg"],[2,"crate-krimson-lod1-mg"],[3,"crate-idle-ja"]],"crimson-bike-ag":[[0,"crimson-bike-lod0-jg"],[1,"crimson-bike-lod0-mg"],[2,"crimson-bike-lod1-mg"],[3,"crimson-bike-lod2-mg"],[4,"crimson-bike-shadow-mg"],[5,"crimson-bike-idle-ja"]],"crimson-guard-ag":[[0,"crimson-guard-lod0-jg"],[1,"crimson-guard-lod0-mg"],[2,"crimson-guard-lod2-mg"],[3,"crimson-guard-shadow-mg"],[4,"crimson-guard-idle-ja"],[5,"crimson-guard-walk-ja"],[6,"crimson-guard-run-ja"],[7,"crimson-guard-notice-ja"],[8,"crimson-guard-knocked-ja"],[9,"crimson-guard-knocked-land-ja"],[10,"crimson-guard-blue-hit-ja"],[11,"crimson-guard-blue-hit-land-ja"],[12,"crimson-guard-blue-hit-land-death-ja"],[13,"crimson-guard-yellow-hit0-ja"],[14,"crimson-guard-yellow-hit0-land-ja"],[15,"crimson-guard-yellow-hit1-ja"],[16,"crimson-guard-yellow-hit1-land-ja"],[17,"crimson-guard-die-ja"],[18,"crimson-guard-rifle-butt-ja"],[19,"crimson-guard-idle-to-stab-idle-ja"],[20,"crimson-guard-stab-idle-loop-ja"],[21,"crimson-guard-stab-idle-to-attack-ja"],[22,"crimson-guard-stab-attack-ja"],[23,"crimson-guard-stab-attack-to-stab-idle-ja"],[24,"crimson-guard-stab-idle-to-idle-ja"],[25,"crimson-guard-stab-shuffle-ja"],[26,"crimson-guard-gun-attack-ja"],[27,"crimson-guard-attack-shoot-knee-start-ja"],[28,"crimson-guard-attack-shoot-knee-loop-ja"],[29,"crimson-guard-attack-shoot-knee-ja"],[30,"crimson-guard-attack-shoot-knee-end-ja"],[31,"crimson-guard-knocked-back-ja"],[32,"crimson-guard-knocked-back-land-ja"],[33,"crimson-guard-get-up-front-ja"],[34,"crimson-guard-get-up-back-ja"],[35,"crimson-guard-bike-stance-ja"],[36,"crimson-guard-car-stance-ja"],[37,"crimson-guard-grenade-attack-ja"],[38,"crimson-guard-jump-high-ja"],[39,"crimson-guard-die-falling-ja"],[40,"crimson-guard-jump-right-ja"],[41,"crimson-guard-jump-left-ja"],[42,"crimson-guard-knocked-from-car-ja"],[43,"crimson-guard-knocked-from-bike-ja"]],"crimson-guard-highres-ag":[[0,"crimson-guard-highres-lod0-jg"],[1,"crimson-guard-highres-lod0-mg"],[2,"crimson-guard-highres-shadow-mg"],[3,"crimson-guard-highres-idle-ja"]],"crimson-guard-hover-ag":[[0,"crimson-guard-hover-lod0-jg"],[1,"crimson-guard-hover-lod0-mg"],[2,"crimson-guard-hover-lod1-mg"],[3,"crimson-guard-hover-shadow-mg"],[4,"crimson-guard-hover-idle-ja"],[5,"crimson-guard-hover-fly-right-ja"],[6,"crimson-guard-hover-fly-left-ja"],[7,"crimson-guard-hover-fly-forward-ja"],[8,"crimson-guard-hover-fly-back-ja"],[9,"crimson-guard-hover-shoot0-ja"],[10,"crimson-guard-hover-knocked0-ja"],[11,"crimson-guard-hover-knocked0-recover-ja"],[12,"crimson-guard-hover-knocked1-ja"],[13,"crimson-guard-hover-knocked1-recover-ja"],[14,"crimson-guard-hover-death-right-ja"],[15,"crimson-guard-hover-death-left-ja"],[16,"crimson-guard-hover-death-left-fall-ja"],[17,"crimson-guard-hover-death-right-fall-ja"],[18,"crimson-guard-hover-death-instant-ja"],[19,"crimson-guard-hover-death-land-ja"],[23,"crimson-guard-hover-explode-lod0-jg"],[24,"crimson-guard-hover-explode-lod0-mg"],[25,"crimson-guard-hover-explode-idle-ja"]],"crimson-guard-lowres-ag":[[0,"crimson-guard-lowres-lod0-jg"],[1,"crimson-guard-lowres-lod0-mg"],[2,"crimson-guard-lowres-shadow-mg"]],"crocadog-escort-ag":[[0,"crocadog-escort-lod0-jg"],[1,"crocadog-escort-lod0-mg"],[2,"crocadog-escort-shadow-mg"],[3,"crocadog-escort-idle-pant-ja"],[4,"crocadog-escort-idle-wag-ja"],[5,"crocadog-escort-idle-scratch-ja"],[6,"crocadog-escort-idle-bark-ja"],[7,"crocadog-escort-walk0-ja"],[8,"crocadog-escort-run0-ja"],[9,"crocadog-escort-turn0-ja"],[10,"crocadog-escort-jump-in-vehicle-ja"],[11,"crocadog-escort-idle-car0-ja"],[12,"crocadog-escort-knocked0-ja"],[13,"crocadog-escort-knocked-land0-ja"],[14,"crocadog-escort-angry-bark-ja"]],"crocadog-highres-ag":[[0,"crocadog-highres-lod0-jg"],[1,"crocadog-highres-lod0-mg"],[2,"crocadog-highres-shadow-mg"],[3,"crocadog-highres-idle-ja"],[4,"crocadog-highres-idle-stand-ja"]],"cty-fruit-stand-ag":[[0,"cty-fruit-stand-lod0-jg"],[1,"cty-fruit-stand-lod0-mg"],[2,"cty-fruit-stand-idle-ja"]],"cty-guard-turret-ag":[[0,"cty-guard-turret-lod0-jg"],[1,"cty-guard-turret-lod0-mg"],[2,"cty-guard-turret-idle-ja"],[3,"cty-guard-turret-pop-up-down-ja"],[4,"cty-guard-turret-explode-lod0-jg"],[5,"cty-guard-turret-explode-lod0-mg"],[6,"cty-guard-turret-explode-idle-ja"]],"cty-guard-turret-button-ag":[[0,"cty-guard-turret-button-lod0-jg"],[1,"cty-guard-turret-button-lod0-mg"],[2,"cty-guard-turret-button-idle-ja"],[3,"cty-guard-turret-button-pop-up-ja"]],"ctyn-lamp-ag":[[0,"ctyn-lamp-lod0-jg"],[1,"ctyn-lamp-lod0-mg"],[2,"ctyn-lamp-idle-ja"],[3,"ctyn-lamp-explode-lod0-jg"],[4,"ctyn-lamp-explode-lod0-mg"],[5,"ctyn-lamp-explode-idle-ja"]],"ctypal-baron-statue-break-ag":[[8,"ctypal-baron-statue-break-b-lod0-jg"],[0,"ctypal-baron-statue-break-lod0-jg"],[9,"ctypal-baron-statue-break-b-lod0-mg"],[1,"ctypal-baron-statue-break-lod0-mg"],[2,"ctypal-baron-statue-break-idle-ja"],[4,"ctypal-baron-statue-break-a-lod0-jg"],[5,"ctypal-baron-statue-break-a-lod0-mg"],[6,"ctypal-baron-statue-break-a-idle-ja"],[10,"ctypal-baron-statue-break-b-idle-ja"],[12,"ctypal-baron-statue-break-c-lod0-jg"],[13,"ctypal-baron-statue-break-c-lod0-mg"],[14,"ctypal-baron-statue-break-c-idle-ja"]],"ctypal-baron-statue-broken-ag":[[0,"ctypal-baron-statue-broken-lod0-jg"],[1,"ctypal-baron-statue-broken-lod0-mg"],[2,"ctypal-baron-statue-broken-idle-ja"]],"ctypal-break-wall-ag":[[0,"ctypal-break-wall-lod0-jg"],[1,"ctypal-break-wall-lod0-mg"],[2,"ctypal-break-wall-idle-ja"]],"ctypal-broke-wall-ag":[[0,"ctypal-broke-wall-lod0-jg"],[1,"ctypal-broke-wall-lod0-mg"],[2,"ctypal-broke-wall-idle-ja"]],"ctyport-cargo-ag":[[0,"ctyport-cargo-lod0-jg"],[1,"ctyport-cargo-lod0-mg"],[2,"ctyport-cargo-lod1-mg"],[3,"ctyport-cargo-idle-ja"],[4,"ctyport-cargo-explode-lod0-jg"],[5,"ctyport-cargo-explode-lod0-mg"],[6,"ctyport-cargo-explode-idle-ja"]],"ctyport-mine-ag":[[0,"ctyport-mine-lod0-jg"],[1,"ctyport-mine-lod0-mg"],[2,"ctyport-mine-idle-ja"]],"ctyport-spy-ag":[[0,"ctyport-spy-lod0-jg"],[1,"ctyport-spy-lod0-mg"],[2,"ctyport-spy-lod1-mg"],[3,"ctyport-spy-idle-ja"]],"ctywide-arrow-ag":[[0,"ctywide-arrow-lod0-jg"],[1,"ctywide-arrow-lod0-mg"],[2,"ctywide-arrow-idle-ja"]],"curtainsaw-ag":[[0,"curtainsaw-lod0-jg"],[1,"curtainsaw-lod0-mg"],[2,"curtainsaw-lod1-mg"],[3,"curtainsaw-idle-ja"]],"dark-barrel-ag":[[0,"dark-barrel-lod0-jg"],[1,"dark-barrel-lod0-mg"],[2,"dark-barrel-idle-ja"]],"darkjak-highres-ag":[[0,"darkjak-highres-lod0-jg"],[1,"darkjak-highres-lod0-mg"],[2,"darkjak-highres-idle-ja"]],"daxter-ag":[[64,"daxter-hit-from-back-ja"],[0,"daxter-lod0-jg"],[65,"daxter-hit-up-ja"],[1,"daxter-lod0-mg"],[66,"daxter-deatha-ja"],[2,"daxter-lod1-mg"],[67,"daxter-death-painful-land-ja"],[3,"daxter-shadow-mg"],[68,"daxter-smack-surface-ja"],[4,"daxter-run-to-stance-ja"],[5,"daxter-run-to-stance-loop-ja"],[6,"daxter-stance-loop-ja"],[7,"daxter-run-to-stance-fast-ja"],[8,"daxter-run-ja"],[9,"daxter-run-up-ja"],[10,"daxter-run-down-ja"],[11,"daxter-walk-ja"],[12,"daxter-walk-up-ja"],[13,"daxter-walk-down-ja"],[14,"daxter-run-squash-ja"],[15,"daxter-run-squash-weak-ja"],[16,"daxter-stance-to-duck-ja"],[17,"daxter-duck-stance-ja"],[18,"daxter-duck-walk-ja"],[19,"daxter-turn-around-ja"],[20,"daxter-jump-ja"],[21,"daxter-jump-land-ja"],[22,"daxter-painful-land-ja"],[23,"daxter-painful-land-end-ja"],[24,"daxter-jump-loop-ja"],[25,"daxter-jump-short-land-ja"],[26,"daxter-jump-forward-ja"],[27,"daxter-duck-high-jump-ja"],[29,"daxter-launch-jump-loop-ja"],[30,"daxter-edge-grab-stance0-ja"],[31,"daxter-edge-grab-stance1-ja"],[33,"daxter-falling-to-edge-grab-ja"],[36,"daxter-edge-grab-to-jump-ja"],[37,"daxter-edge-grab-off-ja"],[38,"daxter-attack-from-stance-ja"],[39,"daxter-attack-from-stance-end-ja"],[40,"daxter-attack-from-stance-alt-end-ja"],[41,"daxter-attack-from-stance-run-end-ja"],[42,"daxter-attack-from-stance-run-alt-end-ja"],[43,"daxter-attack-from-jump-ja"],[44,"daxter-attack-from-jump-loop-ja"],[45,"daxter-attack-from-jump-end-ja"],[46,"daxter-attack-punch-ja"],[47,"daxter-attack-punch-end-ja"],[48,"daxter-attack-punch-alt-end-ja"],[49,"daxter-attack-uppercut-ja"],[50,"daxter-flop-down-ja"],[51,"daxter-flop-down-loop-ja"],[52,"daxter-flop-down-land-ja"],[53,"daxter-moving-flop-down-ja"],[54,"daxter-moving-flop-down-loop-ja"],[56,"daxter-flop-jump-ja"],[57,"daxter-duck-roll-ja"],[58,"daxter-duck-roll-end-ja"],[59,"daxter-roll-flip-ja"],[60,"daxter-roll-flip-land-ja"],[61,"daxter-trip-ja"],[62,"daxter-hit-elec-ja"],[63,"daxter-hit-from-front-ja"],[69,"daxter-smack-surface-end-ja"],[70,"daxter-shocked-ja"],[75,"daxter-slide-right-ja"],[76,"daxter-slide-left-ja"],[77,"daxter-wall-hide-ja"],[78,"daxter-wall-hide-scared-ja"],[79,"daxter-wall-hide-scared-loop-ja"],[80,"daxter-wall-hide-scared-return-ja"],[81,"daxter-wall-hide-head-ja"],[82,"daxter-wall-hide-head-left-ja"],[83,"daxter-wall-hide-head-right-ja"],[84,"daxter-wall-hide-body-ja"],[127,"daxter-fuel-cell-victory-9-ja"]],"daxter-highres-ag":[[0,"daxter-highres-lod0-jg"],[1,"daxter-highres-lod0-mg"],[2,"daxter-highres-shadow-mg"],[3,"daxter-highres-idle-ja"]],"daxter-mole+0-ag":[[0,"big-bopper-mole-idle-ja"],[1,"big-bopper-mole-whack0-ja"],[2,"big-bopper-mole-whack1-ja"],[3,"big-bopper-mole-whack2-ja"],[4,"big-bopper-mole-whack3-ja"],[5,"big-bopper-mole-whack4-ja"],[6,"big-bopper-mole-whack5-ja"],[7,"big-bopper-mole-whack6-ja"],[8,"big-bopper-mole-whack7-ja"],[9,"big-bopper-mole-idle-crazy-ja"],[10,"big-bopper-mole-idle-tired-ja"],[11,"big-bopper-mole-idle-angry-ja"],[12,"big-bopper-mole-shock-ja"],[13,"big-bopper-mole-idle-shock-ja"],[14,"big-bopper-mole-idle-shock-end-ja"],[15,"big-bopper-mole-dummy6-ja"],[16,"big-bopper-mole-dummy7-ja"],[17,"big-bopper-mole-dummy8-ja"],[18,"big-bopper-mole-dummy9-ja"],[19,"big-bopper-mole-dummy10-ja"],[20,"big-bopper-mole-dummy11-ja"],[21,"big-bopper-mole-dummy12-ja"],[22,"daxter-highres-mole-idle-ja"],[23,"daxter-highres-mole-whack0-ja"],[24,"daxter-highres-mole-whack1-ja"],[25,"daxter-highres-mole-whack2-ja"],[26,"daxter-highres-mole-whack3-ja"],[27,"daxter-highres-mole-whack4-ja"],[28,"daxter-highres-mole-whack5-ja"],[29,"daxter-highres-mole-whack6-ja"],[30,"daxter-highres-mole-whack7-ja"],[31,"daxter-highres-mole-idle-crazy-ja"],[32,"daxter-highres-mole-idle-tired-ja"],[33,"daxter-highres-mole-idle-angry-ja"],[34,"daxter-highres-mole-shock-ja"],[35,"daxter-highres-mole-idle-shock-ja"],[36,"daxter-highres-mole-idle-shock-end-ja"],[37,"daxter-highres-mole-dummy6-ja"],[38,"daxter-highres-mole-dummy7-ja"],[39,"daxter-highres-mole-dummy8-ja"],[40,"daxter-highres-mole-dummy9-ja"],[41,"daxter-highres-mole-dummy10-ja"],[42,"daxter-highres-mole-dummy11-ja"],[43,"daxter-highres-mole-dummy12-ja"]],"dig-balloon-lurker-ag":[[0,"dig-balloon-lurker-lod0-jg"],[1,"dig-balloon-lurker-lod0-mg"],[2,"dig-balloon-lurker-idle-ja"],[3,"dig-balloon-lurker-trapeze-lod0-jg"],[4,"dig-balloon-lurker-trapeze-lod0-mg"],[5,"dig-balloon-lurker-trapeze-shadow-mg"],[6,"dig-balloon-lurker-trapeze-jak-off-ja"],[7,"dig-balloon-lurker-trapeze-jak-on-ja"]],"dig-bomb-crate-ag":[[0,"dig-bomb-crate-lod0-jg"],[1,"dig-bomb-crate-lod0-mg"],[2,"dig-bomb-crate-lod1-mg"],[3,"dig-bomb-crate-idle-ja"],[4,"dig-bomb-crate-explode-lod0-jg"],[5,"dig-bomb-crate-explode-lod0-mg"],[6,"dig-bomb-crate-explode-idle-ja"]],"dig-bomb-crate-cylinder-ag":[[0,"dig-bomb-crate-cylinder-lod0-jg"],[1,"dig-bomb-crate-cylinder-lod0-mg"],[2,"dig-bomb-crate-cylinder-idle-ja"],[3,"dig-bomb-crate-cylinder-pulse-ja"]],"dig-breakable-door-ag":[[0,"dig-breakable-door-lod0-jg"],[1,"dig-breakable-door-lod0-mg"],[2,"dig-breakable-door-idle-ja"]],"dig-button-ag":[[0,"dig-button-lod0-jg"],[1,"dig-button-lod0-mg"],[2,"dig-button-idle-ja"]],"dig-clasp-ag":[[0,"dig-clasp-lod0-jg"],[1,"dig-clasp-lod0-mg"],[2,"dig-clasp-idle-ja"],[3,"dig-clasp-explode-lod0-jg"],[4,"dig-clasp-explode-lod0-mg"],[5,"dig-clasp-explode-idle-ja"]],"dig-clasp-b-ag":[[0,"dig-clasp-b-lod0-jg"],[1,"dig-clasp-b-lod0-mg"],[2,"dig-clasp-b-idle-ja"]],"dig-conveyor-ag":[[0,"dig-conveyor-lod0-jg"],[1,"dig-conveyor-lod0-mg"],[2,"dig-conveyor-idle-ja"]],"dig-digger-ag":[[8,"dig-digger-explode-a-lod0-mg"],[0,"dig-digger-lod0-jg"],[1,"dig-digger-lod0-mg"],[10,"dig-digger-explode-b-lod0-jg"],[2,"dig-digger-idle-ja"],[4,"dig-digger-explode-lod0-jg"],[5,"dig-digger-explode-lod0-mg"],[7,"dig-digger-explode-a-lod0-jg"],[11,"dig-digger-explode-b-lod0-mg"],[13,"dig-digger-explode-c-lod0-jg"],[14,"dig-digger-explode-c-lod0-mg"]],"dig-jump-pad-ag":[[0,"dig-jump-pad-lod0-jg"],[1,"dig-jump-pad-lod0-mg"],[2,"dig-jump-pad-idle-ja"]],"dig-log-ag":[[0,"dig-log-lod0-jg"],[1,"dig-log-lod0-mg"],[2,"dig-log-idle-ja"]],"dig-sinking-plat-ag":[[0,"dig-sinking-plat-lod0-jg"],[1,"dig-sinking-plat-lod0-mg"],[2,"dig-sinking-plat-idle-ja"],[3,"dig-sinking-plat-shake-ja"]],"dig-spikey-sphere-ag":[[0,"dig-spikey-sphere-lod0-jg"],[1,"dig-spikey-sphere-lod0-mg"],[2,"dig-spikey-sphere-shadow-mg"],[3,"dig-spikey-sphere-idle-ja"],[4,"dig-spikey-sphere-explode-lod0-jg"],[5,"dig-spikey-sphere-explode-lod0-mg"],[6,"dig-spikey-sphere-explode-idle-ja"]],"dig-spikey-sphere-door-ag":[[0,"dig-spikey-sphere-door-lod0-jg"],[1,"dig-spikey-sphere-door-lod0-mg"],[2,"dig-spikey-sphere-door-idle-ja"]],"dig-spikey-step-ag":[[0,"dig-spikey-step-lod0-jg"],[1,"dig-spikey-step-lod0-mg"],[2,"dig-spikey-step-idle-ja"]],"dig-stomp-block-ag":[[0,"dig-stomp-block-lod0-jg"],[1,"dig-stomp-block-lod0-mg"],[2,"dig-stomp-block-idle-ja"]],"dig-tether-ag":[[0,"dig-tether-snapped-lod0-jg"],[1,"dig-tether-snapped-lod0-mg"],[2,"dig-tether-unsnapped-lod0-jg"],[3,"dig-tether-unsnapped-lod0-mg"],[4,"dig-tether-idle-ja"]],"dig-tipping-rock-ag":[[0,"dig-tipping-rock-lod0-jg"],[1,"dig-tipping-rock-lod0-mg"],[2,"dig-tipping-rock-idle-ja"]],"dig-totem-ag":[[0,"dig-totem-lod0-jg"],[1,"dig-totem-lod0-mg"],[2,"dig-totem-idle-ja"]],"dig-totem-fish-ag":[[0,"dig-totem-fish-lod0-jg"],[1,"dig-totem-fish-lod0-mg"],[2,"dig-totem-fish-idle-ja"]],"dig-wheel-step-ag":[[0,"dig-wheel-step-lod0-jg"],[1,"dig-wheel-step-lod0-mg"],[2,"dig-wheel-step-idle-ja"]],"door-ag":[[0,"oracle-door-lod0-jg"],[1,"oracle-door-lod0-mg"],[2,"oracle-door-idle-ja"]],"door-ctyinda-ag":[[0,"vin-door-ctyinda-lod0-jg"],[1,"vin-door-ctyinda-lod0-mg"],[2,"vin-door-ctyinda-idle-ja"]],"drill-barons-ship-ag":[[0,"drill-barons-ship-lod0-jg"],[1,"drill-barons-ship-lod0-mg"],[2,"drill-barons-ship-idle-ja"],[3,"drill-barons-ship-explode-lod0-jg"],[4,"drill-barons-ship-explode-lod0-mg"],[5,"drill-barons-ship-explode-idle-ja"],[6,"drill-barons-ship-turret-lod0-jg"],[7,"drill-barons-ship-turret-lod0-mg"],[8,"drill-barons-ship-turret-idle-ja"],[9,"drill-barons-ship-turret-b-lod0-jg"],[10,"drill-barons-ship-turret-b-lod0-mg"],[11,"drill-barons-ship-turret-b-idle-ja"],[12,"drill-barons-ship-turret-c-lod0-jg"],[13,"drill-barons-ship-turret-c-lod0-mg"],[14,"drill-barons-ship-turret-c-idle-ja"]],"drill-bridge-shot-ag":[[0,"drill-bridge-shot-lod0-jg"],[1,"drill-bridge-shot-lod0-mg"],[2,"drill-bridge-shot-lod1-mg"],[3,"drill-bridge-shot-idle-ja"],[4,"drill-bridge-shot-break-ja"],[5,"drill-bridge-shot-end-ja"]],"drill-control-panel-ag":[[0,"drill-control-panel-lod0-jg"],[1,"drill-control-panel-lod0-mg"],[2,"drill-control-panel-lod1-mg"],[3,"drill-control-panel-idle-ja"],[4,"drill-control-panel-break-ja"],[5,"drill-control-panel-a-lod0-jg"],[6,"drill-control-panel-a-lod0-mg"],[7,"drill-control-panel-a-lod1-mg"],[8,"drill-control-panel-a-idle-ja"],[9,"drill-control-panel-a-break-ja"]],"drill-crane-ag":[[8,"drill-crane-a-idle-ja"],[0,"drill-crane-lod0-jg"],[1,"drill-crane-lod0-mg"],[2,"drill-crane-lod1-mg"],[3,"drill-crane-idle-ja"],[4,"drill-crane-end-ja"],[6,"drill-crane-a-lod0-jg"],[7,"drill-crane-a-lod0-mg"],[10,"drill-crane-a-end-ja"],[11,"drill-crane-b-lod0-jg"],[12,"drill-crane-b-lod0-mg"],[13,"drill-crane-b-idle-ja"],[15,"drill-crane-b-end-ja"],[16,"drill-crane-c-lod0-jg"],[17,"drill-crane-c-lod0-mg"],[18,"drill-crane-c-idle-ja"],[20,"drill-crane-c-end-ja"],[21,"drill-crane-d-lod0-jg"],[22,"drill-crane-d-lod0-mg"],[23,"drill-crane-d-idle-ja"],[25,"drill-crane-d-end-ja"]],"drill-drill-ag":[[0,"drill-drill-lod0-jg"],[1,"drill-drill-lod0-mg"],[2,"drill-drill-idle-ja"]],"drill-drop-plat-ag":[[0,"drill-drop-plat-lod0-jg"],[1,"drill-drop-plat-lod0-mg"],[2,"drill-drop-plat-swing-up-ja"],[3,"drill-drop-plat-swing-down-ja"]],"drill-elevator-ag":[[0,"drill-elevator-lod0-jg"],[1,"drill-elevator-lod0-mg"],[2,"drill-elevator-idle-ja"],[3,"drill-elevator-raise-rail-ja"],[4,"drill-elevator-drop-rail-ja"]],"drill-elevator-base-ag":[[0,"drill-elevator-base-lod0-jg"],[1,"drill-elevator-base-lod0-mg"],[2,"drill-elevator-base-idle-ja"]],"drill-elevator-doors-ag":[[0,"drill-elevator-doors-lod0-jg"],[1,"drill-elevator-doors-lod0-mg"],[2,"drill-elevator-doors-idle-ja"]],"drill-falling-door-ag":[[0,"drill-falling-door-lod0-jg"],[1,"drill-falling-door-lod0-mg"],[2,"drill-falling-door-idle-ja"],[3,"drill-falling-door-hit1-ja"],[4,"drill-falling-door-hit2-ja"],[5,"drill-falling-door-hit3-ja"],[6,"drill-falling-door-fall-ja"]],"drill-flip-step-ag":[[0,"drill-flip-step-lod0-jg"],[1,"drill-flip-step-lod0-mg"],[2,"drill-flip-step-swing-up-ja"],[3,"drill-flip-step-swing-down-ja"]],"drill-lift-ag":[[0,"drill-lift-lod0-jg"],[1,"drill-lift-lod0-mg"],[2,"drill-lift-lod1-mg"],[3,"drill-lift-idle-ja"]],"drill-metalhead-eggs-a-ag":[[0,"drill-metalhead-eggs-a-lod0-jg"],[1,"drill-metalhead-eggs-a-lod0-mg"],[2,"drill-metalhead-eggs-a-idle-ja"]],"drill-metalhead-eggs-b-ag":[[0,"drill-metalhead-eggs-b-lod0-jg"],[1,"drill-metalhead-eggs-b-lod0-mg"],[2,"drill-metalhead-eggs-b-idle-ja"]],"drill-metalhead-eggs-c-ag":[[0,"drill-metalhead-eggs-c-lod0-jg"],[1,"drill-metalhead-eggs-c-lod0-mg"],[2,"drill-metalhead-eggs-c-idle-ja"]],"drill-moving-staircase-ag":[[0,"drill-moving-staircase-lod0-jg"],[1,"drill-moving-staircase-lod0-mg"],[2,"drill-moving-staircase-idle-ja"]],"drill-plat-ag":[[0,"drill-plat-lod0-jg"],[1,"drill-plat-lod0-mg"],[2,"drill-plat-lod1-mg"],[3,"drill-plat-idle-ja"]],"drill-plat-falling-ag":[[0,"drill-plat-falling-lod0-jg"],[1,"drill-plat-falling-lod0-mg"],[2,"drill-plat-falling-idle-ja"]],"drill-switch-ag":[[0,"drill-switch-lod0-jg"],[1,"drill-switch-lod0-mg"],[2,"drill-switch-idle-ja"]],"drill-top-break-ag":[[8,"drill-top-break-explode-a-lod0-mg"],[0,"drill-top-break-lod0-jg"],[1,"drill-top-break-lod0-mg"],[10,"drill-top-break-explode-b-lod0-jg"],[2,"drill-top-break-idle-ja"],[4,"drill-top-break-explode-lod0-jg"],[5,"drill-top-break-explode-lod0-mg"],[7,"drill-top-break-explode-a-lod0-jg"],[11,"drill-top-break-explode-b-lod0-mg"]],"drill-turret-ext-ag":[[0,"drill-turret-ext-lod0-jg"],[1,"drill-turret-ext-lod0-mg"],[2,"drill-turret-ext-idle-ja"],[4,"drill-turret-ext-explode-lod0-jg"],[5,"drill-turret-ext-explode-lod0-mg"],[6,"drill-turret-ext-explode-idle-ja"]],"drill-turret-int-ag":[[0,"drill-turret-int-lod0-jg"],[1,"drill-turret-int-lod0-mg"],[2,"drill-turret-int-idle-ja"]],"drill-wall-ag":[[0,"drill-wall-lod0-jg"],[1,"drill-wall-lod0-mg"],[2,"drill-wall-1-idle-ja"],[3,"drill-wall-1-end-ja"]],"eco-canister-ag":[[0,"eco-canister-dark-lod0-jg"],[1,"eco-canister-dark-lod0-mg"],[2,"eco-canister-dark-idle-ja"]],"ecowell-a-ag":[[0,"ecowell-a-lod0-jg"],[1,"ecowell-a-lod0-mg"],[2,"ecowell-a-idle-ja"]],"ecowell-b-ag":[[0,"ecowell-b-lod0-jg"],[1,"ecowell-b-lod0-mg"],[2,"ecowell-b-idle-ja"]],"ecowell-c-ag":[[0,"ecowell-c-lod0-jg"],[1,"ecowell-c-lod0-mg"],[2,"ecowell-c-idle-ja"]],"ecowell-d-ag":[[0,"ecowell-d-lod0-jg"],[1,"ecowell-d-lod0-mg"],[2,"ecowell-d-idle-ja"]],"errol-highres-ag":[[0,"errol-highres-lod0-jg"],[1,"errol-highres-lod0-mg"],[2,"errol-highres-shadow-mg"],[3,"errol-highres-idle-ja"]],"errol-racer-ag":[[0,"errol-racer-lod0-jg"],[1,"errol-racer-lod0-mg"],[2,"errol-racer-lod1-mg"],[3,"errol-racer-idle-ja"],[4,"errol-racer-bike-stance-ja"],[5,"errol-racer-bike-taunt-left-ja"],[6,"errol-racer-bike-taunt-right-ja"]],"farm-beetree-ag":[[0,"farm-beetree-lod0-jg"],[1,"farm-beetree-lod0-mg"],[2,"farm-beetree-idle-ja"],[3,"farm-beetree-explode-lod0-jg"],[4,"farm-beetree-explode-lod0-mg"],[5,"farm-beetree-explode-idle-ja"]],"farm-cabbage-ag":[[0,"farm-cabbage-lod0-jg"],[1,"farm-cabbage-lod0-mg"],[2,"farm-cabbage-idle-ja"],[3,"farm-cabbage-explode-lod0-jg"],[4,"farm-cabbage-explode-lod0-mg"],[5,"farm-cabbage-explode-idle-ja"]],"farm-chilirots-ag":[[0,"farm-chilirots-lod0-jg"],[1,"farm-chilirots-lod0-mg"],[2,"farm-chilirots-idle-ja"],[3,"farm-chilirots-explode-lod0-jg"],[4,"farm-chilirots-explode-lod0-mg"],[5,"farm-chilirots-explode-idle-ja"]],"farm-marrow-ag":[[0,"farm-marrow-lod0-jg"],[1,"farm-marrow-lod0-mg"],[2,"farm-marrow-idle-ja"],[3,"farm-marrow-explode-lod0-jg"],[4,"farm-marrow-explode-lod0-mg"],[5,"farm-marrow-explode-idle-ja"]],"farm-small-cabbage-ag":[[0,"farm-small-cabbage-lod0-jg"],[1,"farm-small-cabbage-lod0-mg"],[2,"farm-small-cabbage-idle-ja"],[3,"farm-small-cabbage-explode-lod0-jg"],[4,"farm-small-cabbage-explode-lod0-mg"],[5,"farm-small-cabbage-explode-idle-ja"]],"farm-sprinkler-barrels-ag":[[0,"farm-sprinkler-barrels-lod0-jg"],[1,"farm-sprinkler-barrels-lod0-mg"],[2,"farm-sprinkler-barrels-idle-ja"]],"farthy-ag":[[0,"farthy-lod0-jg"],[1,"farthy-lod0-mg"],[2,"farthy-idle-ja"]],"fencespikes-ag":[[0,"fencespikes-lod0-jg"],[1,"fencespikes-lod0-mg"],[2,"fencespikes-lod1-mg"],[3,"fencespikes-idle-ja"]],"flag-ag":[[0,"flag-lod0-jg"],[1,"flag-lod0-mg"],[2,"flag-lod1-mg"],[3,"flag-idle-ja"]],"flamer-ag":[[0,"flamer-lod0-jg"],[1,"flamer-lod0-mg"],[2,"flamer-lod1-mg"],[3,"flamer-lod2-mg"],[4,"flamer-shadow-mg"],[5,"flamer-idle-ja"],[6,"flamer-fly-right-ja"],[7,"flamer-fly-left-ja"],[8,"flamer-fly-forward-ja"],[9,"flamer-fly-back-ja"],[10,"flamer-fly-straight-ja"],[11,"flamer-shoot-ja"],[12,"flamer-shoot1-ja"],[13,"flamer-knock-back-ja"],[14,"flamer-knock-back-fall-ja"],[15,"flamer-die-ja"],[16,"flamer-knock-back-land-ja"],[17,"flamer-die-in-place-ja"],[18,"flamer-blue-hit0-ja"],[19,"flamer-blue-hit1-ja"],[20,"flamer-blue-hit2-ja"],[21,"flamer-explode-lod0-jg"],[22,"flamer-explode-lod0-mg"],[23,"flamer-explode-idle-ja"]],"flitter-ag":[[0,"flitter-lod0-jg"],[1,"flitter-lod0-mg"],[2,"flitter-lod1-mg"],[3,"flitter-lod2-mg"],[4,"flitter-shadow-mg"],[5,"flitter-idle-ja"],[6,"flitter-idle-look-left-ja"],[7,"flitter-idle-look-left-hold-ja"],[8,"flitter-idle-look-right-ja"],[9,"flitter-idle-look-right-hold-ja"],[10,"flitter-ambush-jump-ja"],[11,"flitter-ambush-land-ja"],[12,"flitter-notice-ja"],[13,"flitter-walk-ja"],[14,"flitter-move-ja"],[15,"flitter-turn-ja"],[16,"flitter-attack-ja"],[17,"flitter-attack-high-ja"],[18,"flitter-die-falling-ja"],[19,"flitter-die-in-place-ja"],[20,"flitter-knocked0-ja"],[21,"flitter-knocked-land0-ja"],[22,"flitter-knocked-land-upright-ja"],[23,"flitter-blue-hit0-ja"]],"flying-spider-ag":[[0,"flying-spider-lod0-jg"],[1,"flying-spider-lod0-mg"],[2,"flying-spider-lod1-mg"],[3,"flying-spider-lod2-mg"],[4,"flying-spider-shadow-mg"],[5,"flying-spider-idle0-ja"],[6,"flying-spider-idle-flying-ja"],[7,"flying-spider-drop-down-ja"],[8,"flying-spider-drop-down-land-ja"],[9,"flying-spider-walk0-ja"],[10,"flying-spider-knocked-blue0-ja"],[11,"flying-spider-attack-close0-ja"],[12,"flying-spider-knocked-red0-ja"],[13,"flying-spider-knocked-red0-land-ja"],[14,"flying-spider-shoot-start-ja"],[15,"flying-spider-shoot-right-ja"],[16,"flying-spider-shoot-left-ja"],[17,"flying-spider-shoot-stop-ja"],[18,"flying-spider-death-standing-ja"],[19,"flying-spider-turn-left-180-ja"],[20,"flying-spider-turn-right-180-ja"]],"fodder-ag":[[0,"fodder-lod0-jg"],[1,"fodder-lod0-mg"],[2,"fodder-lod1-mg"],[3,"fodder-shadow-mg"],[4,"fodder-idle-ja"],[5,"fodder-up-ja"],[6,"fodder-chew-ja"],[7,"fodder-run-ja"],[8,"fodder-run-low-ja"],[9,"fodder-biting-run-ja"],[10,"fodder-jump-chomp-ja"],[11,"fodder-jump-kick-ja"],[12,"fodder-walk-ja"],[13,"fodder-look-around-ja"],[14,"fodder-die-ja"],[15,"fodder-snap-ja"],[16,"fodder-knocked0-ja"],[17,"fodder-knocked-land0-ja"],[18,"fodder-blue-hit0-ja"],[19,"fodder-blue-hit1-ja"],[20,"fodder-blue-hit2-ja"],[21,"fodder-die-falling-ja"]],"fort-conveyor-ag":[[0,"fort-conveyor-lod0-jg"],[1,"fort-conveyor-lod0-mg"],[2,"fort-conveyor-idle-ja"]],"fort-dump-bomb-a-ag":[[0,"fort-dump-bomb-a-lod0-jg"],[1,"fort-dump-bomb-a-lod0-mg"],[2,"fort-dump-bomb-a-lod1-mg"],[3,"fort-dump-bomb-a-idle-ja"]],"fort-elec-belt-ag":[[0,"fort-elec-belt-lod0-jg"],[1,"fort-elec-belt-lod0-mg"],[2,"fort-elec-belt-idle-ja"]],"fort-elec-switch-ag":[[0,"fort-elec-switch-lod0-jg"],[1,"fort-elec-switch-lod0-mg"],[2,"fort-elec-switch-idle-ja"]],"fort-entry-gate-ag":[[0,"fort-entry-gate-lod0-jg"],[1,"fort-entry-gate-lod0-mg"],[2,"fort-entry-gate-idle-ja"]],"fort-fence-ag":[[0,"fort-fence-a-lod0-jg"],[8,"fort-fence-b-end-ja"],[1,"fort-fence-a-lod0-mg"],[2,"fort-fence-a-idle-ja"],[3,"fort-fence-a-end-ja"],[5,"fort-fence-b-lod0-jg"],[6,"fort-fence-b-lod0-mg"],[7,"fort-fence-b-idle-ja"]],"fort-floor-spike-b-ag":[[0,"fort-floor-spike-b-lod0-jg"],[1,"fort-floor-spike-b-lod0-mg"],[2,"fort-floor-spike-b-lod1-mg"],[3,"fort-floor-spike-b-lod2-mg"],[4,"fort-floor-spike-b-idle-ja"]],"fort-floor-spike-c-ag":[[0,"fort-floor-spike-c-lod0-jg"],[1,"fort-floor-spike-c-lod0-mg"],[2,"fort-floor-spike-c-lod1-mg"],[3,"fort-floor-spike-c-lod2-mg"],[4,"fort-floor-spike-c-idle-ja"]],"fort-led-ag":[[0,"fort-led-lod0-jg"],[1,"fort-led-lod0-mg"],[2,"fort-led-idle-ja"]],"fort-lift-plat-ag":[[0,"fort-lift-plat-lod0-jg"],[1,"fort-lift-plat-lod0-mg"],[2,"fort-lift-plat-lod1-mg"],[3,"fort-lift-plat-idle-ja"],[4,"fort-lift-plat-scale-ja"]],"fort-missile-ag":[[0,"fort-missile-lod0-jg"],[1,"fort-missile-lod0-mg"],[2,"fort-missile-idle-ja"]],"fort-missile-target-ag":[[0,"fort-missile-target-lod0-jg"],[1,"fort-missile-target-lod0-mg"],[2,"fort-missile-target-idle-ja"],[3,"fort-missile-target-explode-lod0-jg"],[4,"fort-missile-target-explode-lod0-mg"],[5,"fort-missile-target-explode-idle-ja"]],"fort-plat-orbit-ag":[[0,"fort-plat-orbit-lod0-jg"],[1,"fort-plat-orbit-lod0-mg"],[2,"fort-plat-orbit-idle-ja"]],"fort-plat-shuttle-ag":[[0,"fort-plat-shuttle-lod0-jg"],[1,"fort-plat-shuttle-lod0-mg"],[2,"fort-plat-shuttle-lod1-mg"],[3,"fort-plat-shuttle-idle-ja"]],"fort-roboscreen-ag":[[0,"fort-roboscreen-lod0-jg"],[1,"fort-roboscreen-lod0-mg"],[2,"fort-roboscreen-idle-ja"],[3,"fort-roboscreen-end-ja"]],"fort-robotank-ag":[[0,"fort-robotank-lod0-jg"],[1,"fort-robotank-lod0-mg"],[2,"fort-robotank-lod1-mg"],[3,"fort-robotank-idle-ja"],[4,"fort-robotank-fire-start-ja"],[5,"fort-robotank-fire-end-ja"]],"fort-robotank-sight-ag":[[0,"fort-robotank-sight-lod0-jg"],[1,"fort-robotank-sight-lod0-mg"],[2,"fort-robotank-sight-shadow-mg"],[3,"fort-robotank-sight-idle-ja"],[4,"fort-robotank-sight-locked-ja"]],"fort-robotank-top-ag":[[0,"fort-robotank-top-lod0-jg"],[1,"fort-robotank-top-lod0-mg"],[2,"fort-robotank-top-lod1-mg"],[3,"fort-robotank-top-idle-ja"],[4,"fort-robotank-top-fire-start-ja"],[5,"fort-robotank-top-fire-end-ja"]],"fort-trap-door-ag":[[0,"fort-trap-door-lod0-jg"],[1,"fort-trap-door-lod0-mg"],[2,"fort-trap-door-idle-ja"],[3,"fort-trap-door-explode-lod0-jg"],[4,"fort-trap-door-explode-lod0-mg"],[5,"fort-trap-door-explode-idle-ja"]],"fort-turret-ag":[[0,"fort-turret-lod0-jg"],[1,"fort-turret-lod0-mg"],[2,"fort-turret-lod1-mg"],[3,"fort-turret-shadow-mg"],[4,"fort-turret-idle-ja"],[5,"fort-turret-shoot-ja"],[6,"fort-turret-rise-ja"],[7,"fort-turret-explode-lod0-jg"],[8,"fort-turret-explode-lod0-mg"],[9,"fort-turret-explode-idle-ja"]],"gar-curtain-ag":[[0,"gar-curtain-lod0-jg"],[1,"gar-curtain-lod0-mg"],[2,"gar-curtain-idle-ja"]],"gar-door-ag":[[0,"gar-door-lod0-jg"],[1,"gar-door-lod0-mg"],[2,"gar-door-idle-ja"]],"gar-trophy-ca-ag":[[0,"gar-trophy-ca-lod0-jg"],[1,"gar-trophy-ca-lod0-mg"],[2,"gar-trophy-ca-idle-ja"]],"gar-trophy-cb-ag":[[0,"gar-trophy-cb-lod0-jg"],[1,"gar-trophy-cb-lod0-mg"],[2,"gar-trophy-cb-idle-ja"]],"gar-trophy-cc-ag":[[0,"gar-trophy-cc-lod0-jg"],[1,"gar-trophy-cc-lod0-mg"],[2,"gar-trophy-cc-idle-ja"]],"gar-weld-project-ag":[[0,"gar-weld-project-lod0-jg"],[1,"gar-weld-project-lod0-mg"],[2,"gar-weld-project-shadow-mg"],[3,"gar-weld-project-idle-ja"]],"garage-bikeb-ag":[[0,"garage-bikeb-lod0-jg"],[1,"garage-bikeb-lod0-mg"],[2,"garage-bikeb-idle-ja"]],"garage-bikec-ag":[[0,"garage-bikec-lod0-jg"],[1,"garage-bikec-lod0-mg"],[2,"garage-bikec-idle-ja"]],"gear-device-gear-ag":[[0,"mtn-gear-device-gear-lod0-jg"],[1,"mtn-gear-device-gear-lod0-mg"],[2,"mtn-gear-device-gear-idle-ja"]],"ginsu-ag":[[0,"ginsu-lod0-jg"],[1,"ginsu-lod0-mg"],[2,"ginsu-lod1-mg"],[3,"ginsu-lod2-mg"],[4,"ginsu-shadow-mg"],[5,"ginsu-idle-ja"],[6,"ginsu-flap-ja"],[7,"ginsu-fly-forward-ja"],[8,"ginsu-fly-right-ja"],[9,"ginsu-fly-left-ja"],[10,"ginsu-notice-ja"],[11,"ginsu-die-ja"],[12,"ginsu-die-land-ja"],[13,"ginsu-blue-hit-air-ja"],[14,"ginsu-blue-hit-land-ja"],[15,"ginsu-attack-ja"]],"gold-key-ag":[[0,"sew-gold-key-lod0-jg"],[1,"sew-gold-key-lod0-mg"],[2,"sew-gold-key-idle-ja"]],"grenadier-ag":[[0,"grenadier-lod0-jg"],[1,"grenadier-lod0-mg"],[2,"grenadier-lod1-mg"],[3,"grenadier-lod2-mg"],[4,"grenadier-shadow-mg"],[5,"grenadier-idle-ja"],[6,"grenadier-idle2-ja"],[7,"grenadier-idle-look-left-ja"],[8,"grenadier-idle-look-right-ja"],[9,"grenadier-patrol-ja"],[10,"grenadier-patrol1-ja"],[11,"grenadier-notice-ja"],[12,"grenadier-notice1-ja"],[13,"grenadier-run-ja"],[14,"grenadier-run1-ja"],[15,"grenadier-run-to-throw-ja"],[16,"grenadier-throw-turn-in-place-ja"],[17,"grenadier-throw-stance-ja"],[18,"grenadier-throw-ja"],[19,"grenadier-throw1-ja"],[20,"grenadier-throw-quick-ja"],[21,"grenadier-spin-kick-ja"],[22,"grenadier-victory-ja"],[23,"grenadier-hit-ja"],[24,"grenadier-hit-right-ja"],[25,"grenadier-hit-left-ja"],[26,"grenadier-hit-back-ja"],[27,"grenadier-blue-hit0-ja"],[28,"grenadier-blue-hit1-ja"],[29,"grenadier-blue-hit2-ja"],[30,"grenadier-blue-land-ja"],[31,"grenadier-knocked-ja"],[32,"grenadier-knocked-land-ja"],[33,"grenadier-die-ja"],[34,"grenadier-die-falling-ja"]],"grill-ag":[[0,"sew-grill-lod0-jg"],[1,"sew-grill-lod0-mg"],[2,"sew-grill-lod1-mg"],[3,"sew-grill-idle-ja"],[5,"sew-grill-sew-scare-grunt-end-ja"]],"grunt-ag":[[0,"grunt-lod0-jg"],[1,"grunt-lod0-mg"],[2,"grunt-lod1-mg"],[3,"grunt-lod2-mg"],[4,"grunt-shadow-mg"],[5,"grunt-idle-ja"],[6,"grunt-idle1-look-right-ja"],[7,"grunt-idle1-look-right-hold-ja"],[8,"grunt-idle1-look-left-ja"],[9,"grunt-idle1-look-left-hold-ja"],[10,"grunt-idle1-left-to-idle-ja"],[11,"grunt-patrol0-ja"],[12,"grunt-patrol1-ja"],[13,"grunt-notice-ja"],[14,"grunt-charge0-ja"],[15,"grunt-charge1-ja"],[16,"grunt-charge2-ja"],[17,"grunt-attack0-ja"],[18,"grunt-attack1-ja"],[19,"grunt-death-in-place-ja"],[20,"grunt-taunt-ja"],[21,"grunt-turn-ja"],[22,"grunt-knocked0-ja"],[23,"grunt-knocked-land0-ja"],[24,"grunt-knocked1-ja"],[25,"grunt-knocked-land1-ja"],[26,"grunt-knocked2-ja"],[27,"grunt-knocked-land2-ja"],[28,"grunt-explode0-ja"],[29,"grunt-explode-land0-ja"],[30,"grunt-celebrate-start-ja"],[31,"grunt-celebrate-finish-ja"],[32,"grunt-die-falling-ja"],[33,"grunt-bite-ja"],[34,"grunt-yellow-hit0-ja"],[35,"grunt-yellow-hit1-ja"],[36,"grunt-yellow-hit2-ja"],[37,"grunt-yellow-hit3-ja"],[38,"grunt-blue-hit0-ja"],[39,"grunt-blue-hit1-ja"],[40,"grunt-blue-hit2-ja"],[41,"grunt-blue-hit3-ja"],[42,"grunt-blue-hit4-ja"],[43,"grunt-blue-hit5-ja"],[44,"grunt-blue-land-ja"],[45,"grunt-jump-wind-up-ja"],[46,"grunt-jump-in-air-ja"],[47,"grunt-jump-land-ja"],[57,"grunt-sew-scare-grunt-end-ja"]],"grunt-egg-a-ag":[[0,"grunt-egg-a-lod0-jg"],[1,"grunt-egg-a-lod0-mg"],[2,"grunt-egg-a-lod1-mg"],[3,"grunt-egg-a-idle-ja"],[4,"grunt-egg-a-idle2-ja"]],"grunt-egg-b-ag":[[0,"grunt-egg-b-lod0-jg"],[1,"grunt-egg-b-lod0-mg"],[2,"grunt-egg-b-lod1-mg"],[3,"grunt-egg-b-idle-ja"],[4,"grunt-egg-b-idle2-ja"]],"grunt-egg-c-ag":[[0,"grunt-egg-c-lod0-jg"],[1,"grunt-egg-c-lod0-mg"],[2,"grunt-egg-c-lod1-mg"],[3,"grunt-egg-c-idle-ja"],[4,"grunt-egg-c-idle2-ja"]],"grunt-egg-d-ag":[[0,"grunt-egg-d-lod0-jg"],[1,"grunt-egg-d-lod0-mg"],[2,"grunt-egg-d-lod1-mg"],[3,"grunt-egg-d-idle-ja"],[4,"grunt-egg-d-idle2-ja"]],"grunt-fma-ag":[[0,"grunt-fma-lod0-jg"],[1,"grunt-fma-lod0-mg"]],"grunt-mech-anims+0-ag":[[0,"grunt-mech-lunge-ja"],[1,"grunt-mech-grab-ja"],[2,"grunt-mech-idle0-ja"],[3,"grunt-mech-head-butt-ja"],[4,"grunt-mech-punch-left-ja"],[5,"grunt-mech-double-pound-ja"],[6,"grunt-mech-dismount-ja"],[7,"grunt-mech-dismount-land-ja"]],"gun-ag":[[0,"gun-ammo-yellow-lod0-jg"],[1,"gun-ammo-yellow-lod0-mg"],[2,"gun-ammo-red-lod0-jg"],[3,"gun-ammo-red-lod0-mg"],[4,"gun-ammo-blue-lod0-jg"],[5,"gun-ammo-blue-lod0-mg"],[6,"gun-ammo-dark-lod0-jg"],[7,"gun-ammo-dark-lod0-mg"],[8,"gun-ammo-idle-ja"],[9,"gun-lod0-jg"],[10,"gun-lod0-mg"],[11,"gun-shadow-mg"],[12,"gun-idle-ja"],[13,"gun-idle-red-ja"],[14,"gun-idle-dark-ja"],[15,"gun-idle-yellow-ja"],[16,"gun-idle-blue-ja"],[40,"gun-red-cone-lod0-jg"],[41,"gun-red-cone-lod0-mg"],[42,"gun-red-cone-idle-ja"]],"gun-barrel-ag":[[0,"gun-barrel-lod0-jg"],[1,"gun-barrel-lod0-mg"],[2,"gun-barrel-idle-ja"]],"gun-buoy-ag":[[0,"gun-buoy-lod0-jg"],[1,"gun-buoy-lod0-mg"],[2,"gun-buoy-idle-ja"],[3,"gun-buoy-open-ja"],[4,"gun-buoy-close-ja"]],"gun-cit-a-ag":[[0,"gun-cit-a-lod0-jg"],[1,"gun-cit-a-lod0-mg"],[2,"gun-cit-a-idle-ja"],[3,"gun-cit-a-explode-lod0-jg"],[4,"gun-cit-a-explode-lod0-mg"],[5,"gun-cit-a-explode-idle-ja"]],"gun-cit-b-ag":[[0,"gun-cit-b-lod0-jg"],[1,"gun-cit-b-lod0-mg"],[2,"gun-cit-b-idle-ja"],[3,"gun-cit-b-explode-lod0-jg"],[4,"gun-cit-b-explode-lod0-mg"],[5,"gun-cit-b-explode-idle-ja"]],"gun-cit-c-ag":[[0,"gun-cit-c-lod0-jg"],[1,"gun-cit-c-lod0-mg"],[2,"gun-cit-c-idle-ja"],[3,"gun-cit-c-explode-lod0-jg"],[4,"gun-cit-c-explode-lod0-mg"],[5,"gun-cit-c-explode-idle-ja"]],"gun-cit-d-ag":[[0,"gun-cit-d-lod0-jg"],[1,"gun-cit-d-lod0-mg"],[2,"gun-cit-d-idle-ja"],[3,"gun-cit-d-explode-lod0-jg"],[4,"gun-cit-d-explode-lod0-mg"],[5,"gun-cit-d-explode-idle-ja"]],"gun-dummy-a-ag":[[0,"gun-dummy-a-lod0-jg"],[1,"gun-dummy-a-lod0-mg"],[2,"gun-dummy-a-idle-ja"],[3,"gun-dummy-a-explode-lod0-jg"],[4,"gun-dummy-a-explode-lod0-mg"],[5,"gun-dummy-a-explode-idle-ja"]],"gun-dummy-b-ag":[[0,"gun-dummy-b-lod0-jg"],[1,"gun-dummy-b-lod0-mg"],[2,"gun-dummy-b-idle-ja"],[3,"gun-dummy-b-explode-lod0-jg"],[4,"gun-dummy-b-explode-lod0-mg"],[5,"gun-dummy-b-explode-idle-ja"]],"gun-dummy-big-ag":[[0,"gun-dummy-big-lod0-jg"],[1,"gun-dummy-big-lod0-mg"],[2,"gun-dummy-big-idle-ja"],[3,"gun-dummy-big-explode-lod0-jg"],[4,"gun-dummy-big-explode-lod0-mg"],[5,"gun-dummy-big-explode-idle-ja"]],"gun-dummy-c-ag":[[0,"gun-dummy-c-lod0-jg"],[1,"gun-dummy-c-lod0-mg"],[2,"gun-dummy-c-idle-ja"],[3,"gun-dummy-c-explode-lod0-jg"],[4,"gun-dummy-c-explode-lod0-mg"],[5,"gun-dummy-c-explode-idle-ja"]],"gun-dummy-gold-ag":[[0,"gun-dummy-gold-lod0-jg"],[1,"gun-dummy-gold-lod0-mg"],[2,"gun-dummy-gold-idle-ja"],[3,"gun-dummy-gold-explode-lod0-jg"],[4,"gun-dummy-gold-explode-lod0-mg"],[5,"gun-dummy-gold-explode-idle-ja"]],"gun-dummy-yellow-gun-ag":[[0,"gun-dummy-yellow-gun-lod0-jg"],[1,"gun-dummy-yellow-gun-lod0-mg"],[2,"gun-dummy-yellow-gun-idle-ja"],[3,"gun-dummy-yellow-gun-explode-lod0-jg"],[4,"gun-dummy-yellow-gun-explode-lod0-mg"],[5,"gun-dummy-yellow-gun-explode-idle-ja"]],"gun-upgrade-a-ag":[[0,"gun-upgrade-a-lod0-jg"],[1,"gun-upgrade-a-lod0-mg"],[2,"gun-upgrade-a-idle-ja"]],"heart-mar-ag":[[0,"heart-mar-lod0-jg"],[1,"heart-mar-lod0-mg"],[2,"heart-mar-idle-ja"]],"heart-of-mar-ag":[[0,"heart-of-mar-lod0-jg"],[1,"heart-of-mar-lod0-mg"],[2,"heart-of-mar-idle-ja"]],"hellcat-ag":[[0,"hellcat-lod0-jg"],[1,"hellcat-lod0-mg"],[2,"hellcat-lod1-mg"],[3,"hellcat-lod2-mg"],[4,"hellcat-shadow-mg"],[5,"hellcat-idle-ja"]],"helldog-ag":[[0,"helldog-lod0-jg"],[1,"helldog-lod0-mg"],[2,"helldog-lod1-mg"],[3,"helldog-lod2-mg"],[4,"helldog-shadow-mg"],[5,"helldog-idle-ja"]],"hide-bike-ag":[[0,"hide-bike-lod0-jg"],[1,"hide-bike-lod0-mg"],[2,"hide-bike-idle-ja"]],"hide-door-a-ag":[[0,"hide-door-a-lod0-jg"],[1,"hide-door-a-lod0-mg"],[2,"hide-door-a-idle-ja"]],"hide-door-b-ag":[[0,"hide-door-b-lod0-jg"],[1,"hide-door-b-lod0-mg"],[2,"hide-door-b-idle-ja"]],"hide-faucet-ag":[[0,"hide-faucet-lod0-jg"],[1,"hide-faucet-lod0-mg"],[2,"hide-faucet-idle-ja"]],"hide-light-ag":[[0,"hide-light-lod0-jg"],[1,"hide-light-lod0-mg"],[2,"hide-light-shadow-mg"],[3,"hide-light-idle-ja"],[5,"hide-light-fog-lod0-jg"],[6,"hide-light-fog-lod0-mg"],[7,"hide-light-fog-idle-ja"]],"hip-bottle-b-ag":[[0,"hip-bottle-b-lod0-jg"],[1,"hip-bottle-b-lod0-mg"],[2,"hip-bottle-b-idle-ja"]],"hip-bottle-c-ag":[[0,"hip-bottle-c-lod0-jg"],[1,"hip-bottle-c-lod0-mg"],[2,"hip-bottle-c-idle-ja"]],"hip-door-a-ag":[[0,"hip-door-a-lod0-jg"],[1,"hip-door-a-lod0-mg"],[2,"hip-door-a-idle-ja"]],"hip-mirror-ag":[[0,"hip-mirror-lod0-jg"],[1,"hip-mirror-lod0-mg"],[2,"hip-mirror-idle-ja"]],"hip-mole-ag":[[0,"hip-mole-lod0-jg"],[1,"hip-mole-lod0-mg"],[2,"hip-mole-idle-ja"],[3,"hip-mole-up-ja"],[4,"hip-mole-loop-ja"],[5,"hip-mole-down-ja"]],"hip-mug-ag":[[0,"hip-mug-lod0-jg"],[1,"hip-mug-lod0-mg"],[2,"hip-mug-idle-ja"]],"hip-trophy-a-ag":[[0,"hip-trophy-a-lod0-jg"],[1,"hip-trophy-a-lod0-mg"],[2,"hip-trophy-a-idle-ja"]],"hip-trophy-c-ag":[[0,"hip-trophy-c-lod0-jg"],[1,"hip-trophy-c-lod0-mg"],[2,"hip-trophy-c-idle-ja"]],"hip-trophy-d-ag":[[0,"hip-trophy-d-lod0-jg"],[1,"hip-trophy-d-lod0-mg"],[2,"hip-trophy-d-idle-ja"]],"hip-trophy-f-ag":[[0,"hip-trophy-f-lod0-jg"],[1,"hip-trophy-f-lod0-mg"],[2,"hip-trophy-f-idle-ja"]],"hip-trophy-g-ag":[[0,"hip-trophy-g-lod0-jg"],[1,"hip-trophy-g-lod0-mg"],[2,"hip-trophy-g-idle-ja"]],"hip-trophy-i-ag":[[0,"hip-trophy-i-lod0-jg"],[1,"hip-trophy-i-lod0-mg"],[2,"hip-trophy-i-idle-ja"]],"hip-trophy-j-ag":[[0,"hip-trophy-j-lod0-jg"],[1,"hip-trophy-j-lod0-mg"],[2,"hip-trophy-j-idle-ja"]],"hip-trophy-m-ag":[[0,"hip-trophy-m-lod0-jg"],[1,"hip-trophy-m-lod0-mg"],[2,"hip-trophy-m-idle-ja"]],"hip-trophy-n-ag":[[0,"hip-trophy-n-lod0-jg"],[1,"hip-trophy-n-lod0-mg"],[2,"hip-trophy-n-idle-ja"]],"hip-whack-a-metal-ag":[[0,"hip-whack-a-metal-lod0-jg"],[1,"hip-whack-a-metal-lod0-mg"],[2,"hip-whack-a-metal-idle-ja"]],"homing-beacon-ag":[[0,"homing-beacon-lod0-jg"],[1,"homing-beacon-lod0-mg"],[2,"homing-beacon-idle-ja"]],"hopper-ag":[[0,"hopper-lod0-jg"],[1,"hopper-lod0-mg"],[2,"hopper-lod1-mg"],[3,"hopper-shadow-mg"],[4,"hopper-idle-ja"],[5,"hopper-idle-look-left-ja"],[6,"hopper-idle-look-right-ja"],[7,"hopper-notice-ja"],[8,"hopper-notice-alt-ja"],[9,"hopper-turn-ja"],[10,"hopper-jump-start-ja"],[11,"hopper-jump-start-left-ja"],[12,"hopper-jump-start-right-ja"],[13,"hopper-jump-ja"],[14,"hopper-jump-land-ja"],[15,"hopper-jump-attack-ja"],[16,"hopper-jump-attack-land-ja"],[17,"hopper-jump-attack2-ja"],[18,"hopper-jump-attack2-land-ja"],[19,"hopper-die-ja"],[20,"hopper-die-falling-ja"],[21,"hopper-blue-hit0-ja"],[22,"hopper-blue-hit1-ja"],[23,"hopper-blue-hit2-ja"],[24,"hopper-blue-hit-land-ja"],[25,"hopper-knocked0-ja"],[26,"hopper-knocked0-land-ja"],[27,"hopper-knocked1-ja"],[28,"hopper-knocked1-land-ja"],[29,"hopper-knocked2-ja"],[30,"hopper-knocked2-land-ja"],[31,"hopper-hop-start-ja"],[32,"hopper-hop-air-ja"],[33,"hopper-hop-land-ja"],[34,"hopper-hop-attack-start-ja"],[35,"hopper-hop-attack-air-ja"],[36,"hopper-hop-attack-land-ja"]],"hosehead-ag":[[0,"hosehead-lod0-jg"],[1,"hosehead-lod0-mg"],[2,"hosehead-lod1-mg"],[3,"hosehead-lod2-mg"],[4,"hosehead-shadow-mg"],[5,"hosehead-walk-ja"],[6,"hosehead-walk-wall-ja"],[7,"hosehead-wall-jump-start-ja"],[8,"hosehead-wall-jump-air-ja"],[9,"hosehead-wall-jump-land-ja"],[10,"hosehead-shoot-start-ja"],[11,"hosehead-shoot-loop-ja"],[12,"hosehead-shoot-end-ja"],[13,"hosehead-attack0-ja"],[14,"hosehead-attack1-ja"],[15,"hosehead-idle0-ja"],[16,"hosehead-idle-wall0-ja"],[17,"hosehead-run-ja"],[18,"hosehead-knocked-ja"],[19,"hosehead-knocked-land-ja"],[20,"hosehead-notice-ja"],[21,"hosehead-attack-left-ja"],[22,"hosehead-attack-right-ja"],[23,"hosehead-die-standing-ja"],[24,"hosehead-yellow-hit0-ja"],[25,"hosehead-yellow-hit1-ja"],[26,"hosehead-blue-hit0-ja"],[27,"hosehead-blue-hit-land0-ja"],[28,"hosehead-blue-hit1-ja"],[29,"hosehead-blue-hit-land1-ja"],[30,"hosehead-blue-hit2-ja"],[31,"hosehead-blue-hit-land2-ja"],[32,"hosehead-knocked1-ja"],[33,"hosehead-knocked-land1-ja"],[34,"hosehead-knocked2-ja"],[35,"hosehead-knocked-land2-ja"],[36,"hosehead-run1-ja"],[37,"hosehead-idle1-ja"],[38,"hosehead-idle2-ja"],[39,"hosehead-jitter-ja"],[40,"hosehead-jump-down-ja"],[41,"hosehead-jump-down-land-ja"]],"hovering-mine-ag":[[0,"hovering-mine-lod0-jg"],[1,"hovering-mine-lod0-mg"],[2,"hovering-mine-shadow-mg"],[3,"hovering-mine-idle-ja"]],"hud-ring-ag":[[0,"hud-ring-lod0-jg"],[1,"hud-ring-lod0-mg"],[2,"hud-ring-idle-ja"],[3,"hud-ring-part-lod0-jg"],[4,"hud-ring-part-lod0-mg"],[5,"hud-ring-part-idle-ja"]],"intro-flamer-ag":[[0,"intro-flamer-lod0-jg"],[1,"intro-flamer-lod0-mg"],[2,"intro-flamer-lod1-mg"],[3,"intro-flamer-lod2-mg"],[4,"intro-flamer-shadow-mg"],[5,"intro-flamer-fly-straight-ja"]],"iris-door-ag":[[0,"mtn-iris-door-lod0-jg"],[1,"mtn-iris-door-lod0-mg"],[2,"mtn-iris-door-idle-ja"]],"jak-board+0-ag":[[0,"daxter-board-stance-ja"],[1,"daxter-board-duck-turn-ja"],[2,"daxter-board-turn-ja"],[3,"daxter-board-jump-kick-ja"],[4,"daxter-board-jump-ja"],[5,"daxter-board-jump-loop-ja"],[6,"daxter-board-hit-ja"],[7,"daxter-board-flip-forward-ja"],[8,"daxter-board-turn-left-ja"],[9,"daxter-board-turn-right-ja"],[10,"daxter-board-turn-up-ja"],[11,"daxter-board-turn-down-ja"],[12,"daxter-board-hit-forward-ja"],[13,"daxter-board-ride-turn-back-ja"],[14,"daxter-board-ride-turn-front-ja"],[15,"daxter-board-ride-turn-right-ja"],[16,"daxter-board-ride-turn-left-ja"],[17,"daxter-board-get-on-ja"],[18,"daxter-board-get-off-ja"],[19,"daxter-board-grenade-ja"],[20,"daxter-board-nosegrab-ja"],[21,"daxter-board-method-ja"],[22,"daxter-board-kickflip-a-ja"],[23,"daxter-board-spin-ja"],[24,"daxter-board-air-turn-ja"],[25,"daxter-board-flip-backward-ja"],[26,"daxter-board-flip-forward-loop-ja"],[27,"daxter-board-flip-backward-loop-ja"],[28,"daxter-board-method-loop-ja"],[29,"daxter-board-method-end-ja"],[30,"daxter-board-nosegrab-loop-ja"],[31,"daxter-board-nosegrab-end-ja"],[32,"daxter-board-noseflip-ja"],[33,"daxter-board-jump-kickoff-ja"],[34,"daxter-board-hit-elec-ja"],[35,"daxter-board-get-on-land-ja"],[36,"daxter-board-get-off-pre-ja"],[37,"daxter-board-kickflip-b-ja"],[38,"daxter-board-kickflip-c-ja"],[39,"daxter-board-hit-get-off-ja"],[40,"daxter-board-spin-cw-ja"],[41,"daxter-board-spin-ccw-ja"],[42,"jakb-board-stance-ja"],[43,"jakb-board-duck-turn-ja"],[44,"jakb-board-turn-ja"],[45,"jakb-board-jump-kick-ja"],[46,"jakb-board-jump-ja"],[47,"jakb-board-jump-loop-ja"],[48,"jakb-board-hit-ja"],[49,"jakb-board-flip-forward-ja"],[50,"jakb-board-turn-left-ja"],[51,"jakb-board-turn-right-ja"],[52,"jakb-board-turn-up-ja"],[53,"jakb-board-turn-down-ja"],[54,"jakb-board-hit-forward-ja"],[55,"jakb-board-ride-turn-back-ja"],[56,"jakb-board-ride-turn-front-ja"],[57,"jakb-board-ride-turn-right-ja"],[58,"jakb-board-ride-turn-left-ja"],[59,"jakb-board-get-on-ja"],[60,"jakb-board-get-off-ja"],[61,"jakb-board-grenade-ja"],[62,"jakb-board-nosegrab-ja"],[63,"jakb-board-method-ja"],[64,"jakb-board-kickflip-a-ja"],[65,"jakb-board-spin-ja"],[66,"jakb-board-air-turn-ja"],[67,"jakb-board-flip-backward-ja"],[68,"jakb-board-flip-forward-loop-ja"],[69,"jakb-board-flip-backward-loop-ja"],[70,"jakb-board-method-loop-ja"],[71,"jakb-board-method-end-ja"],[72,"jakb-board-nosegrab-loop-ja"],[73,"jakb-board-nosegrab-end-ja"],[74,"jakb-board-noseflip-ja"],[75,"jakb-board-jump-kickoff-ja"],[76,"jakb-board-hit-elec-ja"],[77,"jakb-board-get-on-land-ja"],[78,"jakb-board-get-off-pre-ja"],[79,"jakb-board-kickflip-b-ja"],[80,"jakb-board-kickflip-c-ja"],[81,"jakb-board-hit-get-off-ja"]],"jak-clothes-ag":[[0,"jak-clothes-lod0-jg"],[1,"jak-clothes-lod0-mg"],[2,"jak-clothes-idle-ja"]],"jak-dark+0-ag":[[0,"daxter-darkjak-attack-ice-ja"],[1,"daxter-darkjak-walk-ja"],[2,"daxter-darkjak-run-ja"],[3,"daxter-darkjak-jump-ja"],[4,"daxter-darkjak-jump-land-ja"],[5,"daxter-darkjak-stance-ja"],[6,"daxter-darkjak-attack-spin-ja"],[7,"daxter-darkjak-attack-spin-end-ja"],[8,"daxter-darkjak-bomb-pre-ja"],[9,"daxter-darkjak-attack-combo1-ja"],[10,"daxter-darkjak-attack-combo1-end-ja"],[11,"daxter-darkjak-attack-combo2-ja"],[12,"daxter-darkjak-attack-combo2-end-ja"],[13,"daxter-darkjak-attack-combo3-ja"],[14,"daxter-darkjak-attack-combo3-end-ja"],[15,"daxter-darkjak-get-off-ja"],[16,"daxter-darkjak-attack-combo1b-ja"],[17,"daxter-darkjak-attack-combo1b-end-ja"],[18,"daxter-darkjak-bomb-end-ja"],[19,"daxter-darkjak-get-on-fast-ja"],[20,"daxter-darkjak-attack-combo3c-ja"],[21,"daxter-darkjak-attack-combo3c-end-ja"],[22,"daxter-darkjak-get-off-end-ja"],[23,"daxter-darkjak-bomb-ja"],[24,"daxter-darkjak-bomb-loop-ja"],[25,"daxter-darkjak-bomb-land-ja"],[26,"daxter-darkjak-attack-ice-loop-ja"],[27,"daxter-darkjak-attack-ice-loop2-ja"],[28,"daxter-darkjak-attack-ice-end-ja"],[29,"jakb-darkjak-attack-ice-ja"],[30,"jakb-darkjak-walk-ja"],[31,"jakb-darkjak-run-ja"],[32,"jakb-darkjak-jump-ja"],[33,"jakb-darkjak-jump-land-ja"],[34,"jakb-darkjak-stance-ja"],[35,"jakb-darkjak-attack-spin-ja"],[36,"jakb-darkjak-attack-spin-end-ja"],[37,"jakb-darkjak-bomb-pre-ja"],[38,"jakb-darkjak-attack-combo1-ja"],[39,"jakb-darkjak-attack-combo1-end-ja"],[40,"jakb-darkjak-attack-combo2-ja"],[41,"jakb-darkjak-attack-combo2-end-ja"],[42,"jakb-darkjak-attack-combo3-ja"],[43,"jakb-darkjak-attack-combo3-end-ja"],[44,"jakb-darkjak-get-off-ja"],[45,"jakb-darkjak-attack-combo1b-ja"],[46,"jakb-darkjak-attack-combo1b-end-ja"],[47,"jakb-darkjak-bomb-end-ja"],[48,"jakb-darkjak-get-on-fast-ja"],[49,"jakb-darkjak-attack-combo3c-ja"],[50,"jakb-darkjak-attack-combo3c-end-ja"],[51,"jakb-darkjak-get-off-end-ja"],[52,"jakb-darkjak-bomb-ja"],[53,"jakb-darkjak-bomb-loop-ja"],[54,"jakb-darkjak-bomb-land-ja"],[55,"jakb-darkjak-attack-ice-loop-ja"],[56,"jakb-darkjak-attack-ice-loop2-ja"],[57,"jakb-darkjak-attack-ice-end-ja"]],"jak-dark-on+0-ag":[[0,"daxter-darkjak-get-on-ja"],[1,"jakb-darkjak-get-on-ja"]],"jak-gun+0-ag":[[0,"daxter-gun-stance-ja"],[1,"daxter-gun-stance-yellow-low-ja"],[2,"daxter-gun-yellow-fire-low-ja"],[3,"daxter-gun-yellow-highlow-ja"],[4,"daxter-gun-attack-from-stance-ja"],[5,"daxter-gun-attack-from-stance-end-ja"],[6,"daxter-gun-attack-from-stance-blue-ja"],[7,"daxter-gun-attack-from-stance-blue-end-ja"],[8,"daxter-gun-blue-to-yellow-ja"],[9,"daxter-gun-stance-dark-ja"],[10,"daxter-gun-stance-yellow-ja"],[11,"daxter-gun-stance-blue-ja"],[12,"daxter-gun-red-fire-ja"],[13,"daxter-gun-blue-fire-ja"],[14,"daxter-gun-blue-fire-single-ja"],[15,"daxter-gun-dark-fire-ja"],[16,"daxter-gun-yellow-fire-ja"],[17,"daxter-gun-walk-side-ja"],[18,"daxter-gun-run-blue-ja"],[19,"daxter-gun-red-takeout-ja"],[20,"daxter-gun-dark-takeout-ja"],[21,"daxter-gun-yellow-takeout-ja"],[22,"daxter-gun-blue-takeout-ja"],[23,"daxter-gun-attack-upperbutt-ja"],[24,"daxter-gun-side-to-front-hop-ja"],[25,"daxter-gun-transformation-twirl-ja"],[26,"daxter-gun-front-to-side-hop-ja"],[27,"daxter-gun-front-to-blue-hop-ja"],[28,"daxter-gun-blue-to-front-hop-ja"],[29,"daxter-gun-attack-butt-ja"],[30,"daxter-gun-attack-butt-end-ja"],[31,"daxter-gun-attack-butt-blue-ja"],[32,"daxter-gun-attack-butt-blue-end-ja"],[33,"daxter-gun-jump-land-ja"],[34,"daxter-gun-jump-land-side-ja"],[35,"daxter-gun-attack-upperbutt-blue-ja"],[36,"daxter-gun-edge-grab-off-ja"],[37,"daxter-gun-edge-grab-to-jump-ja"],[38,"daxter-gun-duck-roll-ja"],[39,"daxter-gun-duck-roll-end-ja"],[40,"daxter-gun-roll-flip-ja"],[41,"daxter-gun-roll-flip-land-ja"],[42,"daxter-gun-flop-down-ja"],[43,"daxter-gun-flop-down-loop-ja"],[44,"daxter-gun-flop-down-land-ja"],[45,"daxter-gun-hit-from-front-ja"],[46,"daxter-gun-hit-from-back-ja"],[47,"daxter-gun-red-fire-to-sideways-ja"],[48,"daxter-gun-red-fire-from-sideways-ja"],[49,"daxter-gun-dark-fire-twirl-ja"],[50,"daxter-gun-stance-red-sideways-ja"],[51,"daxter-gun-red-from-sideways-ja"],[52,"daxter-gun-yellow-fire-twirl-ja"],[53,"daxter-gun-hit-elec-ja"],[54,"daxter-gun-front-walk-ja"],[55,"daxter-gun-front-run-ja"],[56,"daxter-gun-front-jump-ja"],[57,"daxter-gun-front-jump-land-ja"],[58,"daxter-gun-duck-walk-ja"],[59,"daxter-gun-walk-blue-ja"],[60,"daxter-gun-side-jump-ja"],[61,"daxter-gun-side-jump-land-ja"],[62,"daxter-gun-red-fire-fast-ja"],[63,"daxter-gun-attack-from-stance-end-alt1-ja"],[64,"daxter-gun-attack-butt-end-alt1-ja"],[65,"gun-gun-yellow-fire-low-ja"],[66,"gun-gun-red-fire-ja"],[67,"gun-gun-blue-fire-ja"],[68,"gun-gun-blue-fire-single-ja"],[69,"gun-gun-dark-fire-ja"],[70,"gun-gun-yellow-fire-ja"],[71,"gun-gun-red-dark-ja"],[72,"gun-gun-red-yellow-ja"],[73,"gun-gun-red-blue-ja"],[74,"gun-gun-dark-yellow-ja"],[75,"gun-gun-yellow-blue-ja"],[76,"gun-gun-yellow-red-ja"],[77,"gun-gun-blue-dark-ja"],[78,"gun-gun-blue-red-ja"],[79,"jakb-gun-stance-ja"],[80,"jakb-gun-stance-yellow-low-ja"],[81,"jakb-gun-yellow-fire-low-ja"],[82,"jakb-gun-yellow-highlow-ja"],[83,"jakb-gun-attack-from-stance-ja"],[84,"jakb-gun-attack-from-stance-end-ja"],[85,"jakb-gun-attack-from-stance-blue-ja"],[86,"jakb-gun-attack-from-stance-blue-end-ja"],[87,"jakb-gun-blue-to-yellow-ja"],[88,"jakb-gun-stance-dark-ja"],[89,"jakb-gun-stance-yellow-ja"],[90,"jakb-gun-stance-blue-ja"],[91,"jakb-gun-red-fire-ja"],[92,"jakb-gun-blue-fire-ja"],[93,"jakb-gun-blue-fire-single-ja"],[94,"jakb-gun-dark-fire-ja"],[95,"jakb-gun-yellow-fire-ja"],[96,"jakb-gun-walk-side-ja"],[97,"jakb-gun-run-blue-ja"],[98,"jakb-gun-red-takeout-ja"],[99,"jakb-gun-dark-takeout-ja"],[100,"jakb-gun-yellow-takeout-ja"],[101,"jakb-gun-blue-takeout-ja"],[102,"jakb-gun-attack-upperbutt-ja"],[103,"jakb-gun-side-to-front-hop-ja"],[104,"jakb-gun-transformation-twirl-ja"],[105,"jakb-gun-front-to-side-hop-ja"],[106,"jakb-gun-front-to-blue-hop-ja"],[107,"jakb-gun-blue-to-front-hop-ja"],[108,"jakb-gun-attack-butt-ja"],[109,"jakb-gun-attack-butt-end-ja"],[110,"jakb-gun-attack-butt-blue-ja"],[111,"jakb-gun-attack-butt-blue-end-ja"],[112,"jakb-gun-jump-land-ja"],[113,"jakb-gun-jump-land-side-ja"],[114,"jakb-gun-attack-upperbutt-blue-ja"],[115,"jakb-gun-edge-grab-off-ja"],[116,"jakb-gun-edge-grab-to-jump-ja"],[117,"jakb-gun-duck-roll-ja"],[118,"jakb-gun-duck-roll-end-ja"],[119,"jakb-gun-roll-flip-ja"],[120,"jakb-gun-roll-flip-land-ja"],[121,"jakb-gun-flop-down-ja"],[122,"jakb-gun-flop-down-loop-ja"],[123,"jakb-gun-flop-down-land-ja"],[124,"jakb-gun-hit-from-front-ja"],[125,"jakb-gun-hit-from-back-ja"],[126,"jakb-gun-red-fire-to-sideways-ja"],[127,"jakb-gun-red-fire-from-sideways-ja"],[128,"jakb-gun-dark-fire-twirl-ja"],[129,"jakb-gun-stance-red-sideways-ja"],[130,"jakb-gun-red-from-sideways-ja"],[131,"jakb-gun-yellow-fire-twirl-ja"],[132,"jakb-gun-hit-elec-ja"],[133,"jakb-gun-front-walk-ja"],[134,"jakb-gun-front-run-ja"],[135,"jakb-gun-front-jump-ja"],[136,"jakb-gun-front-jump-land-ja"],[137,"jakb-gun-duck-walk-ja"],[138,"jakb-gun-walk-blue-ja"],[139,"jakb-gun-side-jump-ja"],[140,"jakb-gun-side-jump-land-ja"],[141,"jakb-gun-red-fire-fast-ja"]],"jak-highres-ag":[[0,"jak-highres-lod0-jg"],[1,"jak-highres-lod0-mg"],[2,"jak-highres-shadow-mg"],[3,"jak-highres-idle-ja"]],"jak-highres-prison-ag":[[0,"jak-highres-prison-lod0-jg"],[1,"jak-highres-prison-lod0-mg"],[2,"jak-highres-prison-shadow-mg"],[3,"jak-highres-prison-idle-ja"]],"jak-indax+0-ag":[[0,"daxter-indax-stance-ja"],[1,"daxter-indax-walk-ja"],[2,"daxter-indax-run-ja"],[3,"daxter-indax-jump-ja"],[4,"daxter-indax-jump-loop-ja"],[5,"daxter-indax-jump-land-ja"],[6,"daxter-indax-attack-spin-ja"],[7,"daxter-indax-attack-spin-end-ja"],[8,"daxter-indax-run-look-back-ja"],[9,"daxter-indax-jump-forward-ja"],[10,"daxter-indax-jump-forward-loop-ja"],[11,"daxter-indax-jump-forward-land-ja"],[12,"daxter-indax-run-squash-ja"],[13,"daxter-indax-attack-spin-air-ja"],[14,"daxter-indax-run-to-stance-ja"],[15,"daxter-indax-hit-front-ja"],[16,"daxter-indax-hit-back-ja"],[17,"daxter-indax-hit-roll-ja"],[18,"daxter-indax-death-squashed-ja"],[19,"daxter-indax-death-fall-ja"],[20,"daxter-indax-death-kill-ja"],[21,"daxter-indax-death-eaten-ja"],[22,"daxter-indax-running-attack-ja"],[23,"daxter-indax-jump-forward-hands-ja"],[24,"daxter-indax-jump-forward-hands-loop-ja"],[25,"daxter-indax-jump-forward-hands-land-ja"],[26,"daxter-indax-run-squash-hands-ja"],[27,"daxter-indax-running-attack-end-ja"],[28,"daxter-indax-trip-ja"],[29,"daxter-indax-trip-land-ja"],[30,"daxter-indax-dummy3-ja"],[31,"daxter-indax-dummy4-ja"],[32,"daxter-indax-dummy5-ja"],[33,"daxter-indax-dummy6-ja"],[34,"daxter-indax-dummy7-ja"],[35,"daxter-indax-dummy8-ja"],[36,"daxter-indax-dummy9-ja"]],"jak-logo-ag":[[0,"jak-logo-lod0-jg"],[1,"jak-logo-lod0-mg"],[2,"jak-logo-idle-ja"],[5,"jak-logo-end-ja"]],"jak-mech+0-ag":[[0,"daxter-mech-stance-ja"],[1,"daxter-mech-run-ja"],[2,"daxter-mech-walk-ja"],[3,"daxter-mech-turn90-ja"],[4,"daxter-mech-jump-ja"],[5,"daxter-mech-jump-thrust-ja"],[6,"daxter-mech-jump-loop-ja"],[7,"daxter-mech-jump-land-ja"],[8,"daxter-mech-turn20-ja"],[9,"daxter-mech-punch-l-ja"],[10,"daxter-mech-punch-r-ja"],[11,"daxter-mech-punch-b-ja"],[12,"daxter-mech-carry-pickup-low-ja"],[13,"daxter-mech-carry-pickup-high-ja"],[14,"daxter-mech-carry-stance-ja"],[15,"daxter-mech-carry-walk-ja"],[16,"daxter-mech-carry-jump-ja"],[17,"daxter-mech-carry-jump-loop-ja"],[18,"daxter-mech-carry-jump-land-ja"],[19,"daxter-mech-carry-throw-ja"],[20,"daxter-mech-carry-turn45-ja"],[21,"daxter-mech-push-ja"],[22,"daxter-mech-pull-ja"],[23,"daxter-mech-drag-pickup-ja"],[24,"daxter-mech-hit-front-ja"],[25,"daxter-mech-get-off-ja"],[26,"daxter-mech-get-on-ja"],[27,"daxter-mech-death-a-ja"],[28,"daxter-mech-death-b-ja"],[29,"daxter-mech-punch-u-ja"],[30,"jakb-mech-stance-ja"],[31,"jakb-mech-run-ja"],[32,"jakb-mech-walk-ja"],[33,"jakb-mech-turn90-ja"],[34,"jakb-mech-jump-ja"],[35,"jakb-mech-jump-thrust-ja"],[36,"jakb-mech-jump-loop-ja"],[37,"jakb-mech-jump-land-ja"],[38,"jakb-mech-turn20-ja"],[39,"jakb-mech-punch-l-ja"],[40,"jakb-mech-punch-r-ja"],[41,"jakb-mech-punch-b-ja"],[42,"jakb-mech-carry-pickup-low-ja"],[43,"jakb-mech-carry-pickup-high-ja"],[44,"jakb-mech-carry-stance-ja"],[45,"jakb-mech-carry-walk-ja"],[46,"jakb-mech-carry-jump-ja"],[47,"jakb-mech-carry-jump-loop-ja"],[48,"jakb-mech-carry-jump-land-ja"],[49,"jakb-mech-carry-throw-ja"],[50,"jakb-mech-carry-turn45-ja"],[51,"jakb-mech-push-ja"],[52,"jakb-mech-pull-ja"],[53,"jakb-mech-drag-pickup-ja"],[54,"jakb-mech-hit-front-ja"],[55,"jakb-mech-get-off-ja"],[56,"jakb-mech-get-on-ja"],[57,"jakb-mech-death-a-ja"],[58,"jakb-mech-death-b-ja"],[59,"jakb-mech-punch-u-ja"],[60,"mech-mech-stance-ja"],[61,"mech-mech-run-ja"],[62,"mech-mech-walk-ja"],[63,"mech-mech-turn90-ja"],[64,"mech-mech-jump-ja"],[65,"mech-mech-jump-thrust-ja"],[66,"mech-mech-jump-loop-ja"],[67,"mech-mech-jump-land-ja"],[68,"mech-mech-turn20-ja"],[69,"mech-mech-punch-l-ja"],[70,"mech-mech-punch-r-ja"],[71,"mech-mech-punch-b-ja"],[72,"mech-mech-carry-pickup-low-ja"],[73,"mech-mech-carry-pickup-high-ja"],[74,"mech-mech-carry-stance-ja"],[75,"mech-mech-carry-walk-ja"],[76,"mech-mech-carry-jump-ja"],[77,"mech-mech-carry-jump-loop-ja"],[78,"mech-mech-carry-jump-land-ja"],[79,"mech-mech-carry-throw-ja"],[80,"mech-mech-carry-turn45-ja"],[81,"mech-mech-push-ja"],[82,"mech-mech-pull-ja"],[83,"mech-mech-drag-pickup-ja"],[84,"mech-mech-hit-front-ja"],[85,"mech-mech-get-off-ja"],[86,"mech-mech-get-on-ja"],[87,"mech-mech-death-a-ja"],[88,"mech-mech-death-b-ja"],[89,"mech-mech-punch-u-ja"]],"jak-pegasus+0-ag":[[0,"daxter-board-attack-pegasus-ja"],[1,"jakb-board-attack-pegasus-ja"]],"jak-pidax+0-ag":[[0,"daxter-pidax-car-turn-front-ja"],[1,"daxter-pidax-car-turn-back-ja"],[2,"daxter-pidax-car-up-down-ja"],[3,"daxter-pidax-car-crash-front-ja"],[4,"daxter-pidax-car-crash-back-ja"],[5,"daxter-pidax-car-crash-left-ja"],[6,"daxter-pidax-car-crash-right-ja"]],"jak-pilot+0-ag":[[0,"daxter-pilot-gun-red-takeout-ja"],[1,"daxter-pilot-car-get-off-ja"],[2,"daxter-pilot-car-get-on-ja"],[3,"daxter-pilot-bike-get-on-ja"],[4,"daxter-pilot-car-turn-front-ja"],[5,"daxter-pilot-car-turn-back-ja"],[6,"daxter-pilot-car-smack-front-ja"],[7,"daxter-pilot-car-smack-back-ja"],[8,"daxter-pilot-gun-blue-fire-ja"],[9,"daxter-pilot-gun-blue-fire-single-ja"],[10,"daxter-pilot-car-smack-shock-ja"],[11,"daxter-pilot-bike-turn-front-ja"],[12,"daxter-pilot-bike-turn-back-ja"],[13,"daxter-pilot-bike-smack-front-ja"],[14,"daxter-pilot-bike-smack-back-ja"],[15,"daxter-pilot-car-up-down-ja"],[16,"daxter-pilot-bike-up-down-ja"],[17,"daxter-pilot-bike-smack-shock-ja"],[18,"daxter-pilot-bike-get-off-ja"],[19,"daxter-pilot-eject-loop-ja"],[20,"daxter-pilot-gun-red-idle-ja"],[21,"daxter-pilot-gun-dark-idle-ja"],[22,"daxter-pilot-gun-yellow-idle-ja"],[23,"daxter-pilot-gun-blue-idle-ja"],[24,"daxter-pilot-gun-red-fire-ja"],[25,"daxter-pilot-gun-yellow-fire-ja"],[26,"daxter-pilot-gun-dark-fire-ja"],[27,"daxter-pilot-gun-red-dark-ja"],[28,"daxter-pilot-gun-red-yellow-ja"],[29,"daxter-pilot-gun-red-blue-ja"],[30,"daxter-pilot-gun-yellow-blue-ja"],[31,"daxter-pilot-gun-yellow-takeout-ja"],[32,"daxter-pilot-gun-blue-takeout-ja"],[33,"daxter-pilot-gun-dark-takeout-ja"],[34,"daxter-pilot-bike-smack-left-ja"],[35,"daxter-pilot-bike-smack-right-ja"],[36,"daxter-pilot-car-smack-left-ja"],[37,"daxter-pilot-car-smack-right-ja"],[38,"jakb-pilot-gun-red-takeout-ja"],[39,"jakb-pilot-car-get-off-ja"],[40,"jakb-pilot-car-get-on-ja"],[41,"jakb-pilot-bike-get-on-ja"],[42,"jakb-pilot-car-turn-front-ja"],[43,"jakb-pilot-car-turn-back-ja"],[44,"jakb-pilot-car-smack-front-ja"],[45,"jakb-pilot-car-smack-back-ja"],[46,"jakb-pilot-gun-blue-fire-ja"],[47,"jakb-pilot-gun-blue-fire-single-ja"],[48,"jakb-pilot-car-smack-shock-ja"],[49,"jakb-pilot-bike-turn-front-ja"],[50,"jakb-pilot-bike-turn-back-ja"],[51,"jakb-pilot-bike-smack-front-ja"],[52,"jakb-pilot-bike-smack-back-ja"],[53,"jakb-pilot-car-up-down-ja"],[54,"jakb-pilot-bike-up-down-ja"],[55,"jakb-pilot-bike-smack-shock-ja"],[56,"jakb-pilot-bike-get-off-ja"],[57,"jakb-pilot-eject-loop-ja"],[58,"jakb-pilot-gun-red-idle-ja"],[59,"jakb-pilot-gun-dark-idle-ja"],[60,"jakb-pilot-gun-yellow-idle-ja"],[61,"jakb-pilot-gun-blue-idle-ja"],[62,"jakb-pilot-gun-red-fire-ja"],[63,"jakb-pilot-gun-yellow-fire-ja"],[64,"jakb-pilot-gun-dark-fire-ja"],[65,"jakb-pilot-gun-red-dark-ja"],[66,"jakb-pilot-gun-red-yellow-ja"],[67,"jakb-pilot-gun-red-blue-ja"],[68,"jakb-pilot-gun-yellow-blue-ja"],[69,"jakb-pilot-gun-yellow-takeout-ja"],[70,"jakb-pilot-gun-blue-takeout-ja"],[71,"jakb-pilot-gun-dark-takeout-ja"],[72,"jakb-pilot-bike-smack-left-ja"],[73,"jakb-pilot-bike-smack-right-ja"],[74,"jakb-pilot-car-smack-left-ja"],[75,"jakb-pilot-car-smack-right-ja"]],"jak-pole+0-ag":[[0,"daxter-pole-cycle-ja"],[1,"daxter-pole-cycle2-ja"],[2,"daxter-pole-flip-up-ja"],[3,"daxter-pole-flip-forward-ja"],[4,"daxter-pole-jump-loop-ja"],[5,"jakb-pole-cycle-ja"],[6,"jakb-pole-flip-up-ja"],[7,"jakb-pole-flip-forward-ja"],[8,"jakb-pole-jump-loop-ja"]],"jak-stand-ag":[[0,"jak-stand-lod0-jg"],[1,"jak-stand-lod0-mg"],[2,"jak-stand-idle-ja"],[5,"jak-stand-end-ja"]],"jak-swim+0-ag":[[0,"daxter-death-swim-ja"],[1,"daxter-death-swim-loop-ja"],[2,"daxter-death-swim-end-ja"],[3,"daxter-wade-shallow-walk-ja"],[4,"daxter-wade-deep-walk-ja"],[5,"daxter-swim-stance-ja"],[6,"daxter-swim-walk-ja"],[7,"daxter-swim-walk-to-down-ja"],[8,"daxter-swim-down-ja"],[9,"daxter-swim-down-to-up-ja"],[10,"daxter-swim-up-ja"],[11,"daxter-swim-up-to-stance-ja"],[12,"daxter-swim-jump-ja"],[13,"jakb-death-swim-ja"],[14,"jakb-death-swim-loop-ja"],[15,"jakb-death-swim-end-ja"],[16,"jakb-wade-shallow-walk-ja"],[17,"jakb-wade-deep-walk-ja"],[18,"jakb-swim-stance-ja"],[19,"jakb-swim-walk-ja"],[20,"jakb-swim-walk-to-down-ja"],[21,"jakb-swim-down-ja"],[22,"jakb-swim-down-to-up-ja"],[23,"jakb-swim-up-ja"],[24,"jakb-swim-up-to-stance-ja"],[25,"jakb-swim-jump-ja"]],"jak-tube+0-ag":[[0,"daxter-tube-turn-ja"],[1,"daxter-tube-jump-land-ja"],[2,"jakb-tube-turn-ja"],[3,"jakb-tube-jump-land-ja"]],"jak-turret+0-ag":[[0,"daxter-turret-stance-ja"],[1,"daxter-turret-get-off-ja"],[2,"daxter-turret-get-on-ja"],[3,"jakb-turret-stance-ja"],[4,"jakb-turret-get-off-ja"],[5,"jakb-turret-get-on-ja"]],"jakb-ag":[[64,"jakb-hit-elec-ja"],[0,"jakb-lod0-jg"],[65,"jakb-hit-from-front-alt1-ja"],[1,"jakb-lod0-mg"],[66,"jakb-hit-from-front-ja"],[130,"jakb-fuel-cell-victory-9-ja"],[2,"jakb-shadow-mg"],[67,"jakb-hit-from-back-ja"],[3,"jakb-run-to-stance-ja"],[4,"jakb-run-to-stance-loop-ja"],[5,"jakb-stance-loop-ja"],[6,"jakb-run-to-stance-fast-ja"],[7,"jakb-run-ja"],[8,"jakb-run-up-ja"],[9,"jakb-run-down-ja"],[10,"jakb-run-right-ja"],[11,"jakb-run-left-ja"],[12,"jakb-walk-ja"],[13,"jakb-walk-up-ja"],[14,"jakb-walk-down-ja"],[15,"jakb-walk-right-ja"],[16,"jakb-walk-left-ja"],[17,"jakb-run-squash-ja"],[18,"jakb-run-squash-weak-ja"],[19,"jakb-stance-to-duck-ja"],[20,"jakb-duck-stance-ja"],[21,"jakb-duck-walk-ja"],[22,"jakb-turn-around-ja"],[23,"jakb-jump-ja"],[24,"jakb-jump-land-ja"],[25,"jakb-painful-land-ja"],[26,"jakb-painful-land-end-ja"],[27,"jakb-jump-loop-ja"],[28,"jakb-jump-short-land-ja"],[29,"jakb-jump-forward-ja"],[30,"jakb-duck-high-jump-ja"],[32,"jakb-launch-jump-loop-ja"],[33,"jakb-edge-grab-stance0-ja"],[34,"jakb-edge-grab-stance1-ja"],[35,"jakb-falling-to-edge-grab-ja"],[38,"jakb-edge-grab-to-jump-ja"],[39,"jakb-edge-grab-off-ja"],[40,"jakb-attack-from-stance-ja"],[41,"jakb-attack-from-stance-end-ja"],[42,"jakb-attack-from-stance-alt-end-ja"],[43,"jakb-attack-from-stance-run-end-ja"],[44,"jakb-attack-from-stance-run-alt-end-ja"],[45,"jakb-attack-from-jump-ja"],[46,"jakb-attack-from-jump-loop-ja"],[47,"jakb-attack-from-jump-end-ja"],[48,"jakb-attack-punch-ja"],[49,"jakb-attack-punch-end-ja"],[50,"jakb-attack-punch-alt-end-ja"],[51,"jakb-attack-uppercut-ja"],[52,"jakb-flop-down-ja"],[53,"jakb-flop-down-loop-ja"],[54,"jakb-flop-down-land-ja"],[55,"jakb-moving-flop-down-ja"],[56,"jakb-moving-flop-down-loop-ja"],[58,"jakb-flop-jump-ja"],[59,"jakb-duck-roll-ja"],[60,"jakb-duck-roll-end-ja"],[61,"jakb-roll-flip-ja"],[62,"jakb-roll-flip-land-ja"],[63,"jakb-trip-ja"],[68,"jakb-hit-up-ja"],[69,"jakb-deatha-ja"],[70,"jakb-death-painful-land-ja"],[71,"jakb-smack-surface-ja"],[72,"jakb-smack-surface-end-ja"],[73,"jakb-shocked-ja"],[79,"jakb-slide-right-ja"],[80,"jakb-slide-left-ja"],[81,"jakb-wall-hide-ja"],[82,"jakb-wall-hide-scared-ja"],[83,"jakb-wall-hide-scared-loop-ja"],[84,"jakb-wall-hide-scared-return-ja"],[85,"jakb-wall-hide-head-ja"],[86,"jakb-wall-hide-head-left-ja"],[87,"jakb-wall-hide-head-right-ja"],[88,"jakb-wall-hide-body-ja"]],"jakone-highres-ag":[[0,"jakone-highres-lod0-jg"],[1,"jakone-highres-lod0-mg"],[2,"jakone-highres-idle-ja"]],"jellyfish-ag":[[0,"jellyfish-lod0-jg"],[1,"jellyfish-lod0-mg"],[2,"jellyfish-idle-ja"],[3,"jellyfish-die-ja"],[4,"jellyfish-notice-ja"],[5,"jellyfish-notice-loop-ja"],[6,"jellyfish-notice-charge-ja"],[7,"jellyfish-notice-charge-loop-ja"],[8,"jellyfish-grab-start-ja"],[9,"jellyfish-grab-attach-ja"],[10,"jellyfish-grab-attach-loop-ja"],[11,"jellyfish-grab-detach-ja"]],"jinx-ag":[[0,"jinx-lod0-jg"],[1,"jinx-lod0-mg"],[2,"jinx-shadow-mg"],[3,"jinx-idle0-ja"],[4,"jinx-idle1-ja"],[5,"jinx-scared0-ja"],[6,"jinx-scared1-ja"],[7,"jinx-scared2-ja"],[8,"jinx-scared3-ja"],[9,"jinx-scared4-ja"],[10,"jinx-blue-hit-front0-ja"],[11,"jinx-blue-hit-front1-ja"],[12,"jinx-blue-hit-front2-ja"],[13,"jinx-blue-hit-back0-ja"],[14,"jinx-blue-hit-back1-ja"],[15,"jinx-blue-hit-back2-ja"],[16,"jinx-blue-hit-land-ja"],[17,"jinx-yellow-hit-left0-ja"],[18,"jinx-yellow-hit-land-left0-ja"],[19,"jinx-yellow-hit-right0-ja"],[20,"jinx-yellow-hit-land-right0-ja"],[21,"jinx-knocked0-ja"],[22,"jinx-knocked-land0-ja"],[23,"jinx-hard-hit0-ja"],[24,"jinx-hard-hit-land-ja"],[25,"jinx-die-in-place0-ja"],[26,"jinx-jump-wind-up-ja"],[27,"jinx-jump-in-air-ja"],[28,"jinx-jump-land-ja"],[29,"jinx-jump-wind-up-mog-ja"],[30,"jinx-jump-in-air-mog-ja"],[31,"jinx-jump-land-mog-ja"],[32,"jinx-walk0-ja"],[33,"jinx-run0-ja"],[34,"jinx-walk-limp0-ja"],[35,"jinx-run-limp0-ja"],[36,"jinx-walk-mog0-ja"],[37,"jinx-run-mog0-ja"],[38,"jinx-turn-left-start0-ja"],[39,"jinx-turn-left50-end0-ja"],[40,"jinx-turn-left100-end0-ja"],[41,"jinx-turn-left150-end0-ja"],[42,"jinx-turn-right-start0-ja"],[43,"jinx-turn-right50-end0-ja"],[44,"jinx-turn-right100-end0-ja"],[45,"jinx-turn-right150-end0-ja"],[46,"jinx-scared-turn-left-start0-ja"],[47,"jinx-scared-turn-left50-end0-ja"],[48,"jinx-scared-turn-left100-end0-ja"],[49,"jinx-scared-turn-left150-end0-ja"],[50,"jinx-scared-turn-right-start0-ja"],[51,"jinx-scared-turn-right50-end0-ja"],[52,"jinx-scared-turn-right100-end0-ja"],[53,"jinx-scared-turn-right150-end0-ja"],[54,"jinx-blast-forward-ja"],[55,"jinx-blast-left-ja"],[56,"jinx-blast-right-ja"],[57,"jinx-kick0-ja"],[58,"jinx-kick1-ja"],[59,"jinx-blast-forward-alert-ja"],[60,"jinx-alert0-ja"],[61,"jinx-alert-to-idle0-ja"],[62,"jinx-plant-bomb-right-ja"],[63,"jinx-bomb-recoil0-ja"],[64,"jinx-bomb-recoil1-ja"]],"jinx-bomb-ag":[[0,"jinx-bomb-lod0-jg"],[1,"jinx-bomb-lod0-mg"],[2,"jinx-bomb-idle-ja"]],"juicer-ag":[[0,"juicer-lod0-jg"],[1,"juicer-lod0-mg"],[2,"juicer-lod1-mg"],[3,"juicer-lod2-mg"],[4,"juicer-shadow-mg"],[5,"juicer-idle-ja"],[6,"juicer-idle-left-ja"],[7,"juicer-idle-right-ja"],[8,"juicer-patrol0-ja"],[9,"juicer-charge0-ja"],[10,"juicer-turn-ja"],[11,"juicer-hit-in-place-ja"],[12,"juicer-attack-turn-ja"],[13,"juicer-attack0-start-ja"],[14,"juicer-attack0-ja"],[15,"juicer-attack-spin-ja"],[16,"juicer-knocked0-ja"],[17,"juicer-knocked-land0-ja"],[18,"juicer-knocked1-ja"],[19,"juicer-knocked-land1-ja"],[20,"juicer-charge1-ja"],[21,"juicer-notice0-ja"],[22,"juicer-notice1-ja"],[23,"juicer-patrol1-ja"],[24,"juicer-celebrate0-ja"],[25,"juicer-celebrate1-ja"],[26,"juicer-blue-hit0-ja"],[27,"juicer-blue-hit1-ja"],[28,"juicer-blue-hit2-ja"],[29,"juicer-blue-hit3-ja"],[30,"juicer-blue-hit4-ja"],[31,"juicer-blue-hit5-ja"],[32,"juicer-blue-land-ja"],[33,"juicer-yellow-hit0-ja"],[34,"juicer-yellow-hit1-ja"],[35,"juicer-yellow-hit2-ja"],[36,"juicer-yellow-hit3-ja"],[37,"juicer-jump-wind-up-ja"],[38,"juicer-jump-in-air-ja"],[39,"juicer-jump-land-ja"],[40,"juicer-death-ja"],[41,"juicer-die-falling-ja"]],"keira-ag":[[0,"keira-lod0-jg"],[1,"keira-lod0-mg"],[2,"keira-lod1-mg"],[3,"keira-lod2-mg"],[4,"keira-shadow-mg"],[5,"keira-idle-leaning-right-ja"],[6,"keira-idle-transition-right-to-left-ja"],[7,"keira-idle-leaning-left-ja"],[8,"keira-idle-transition-left-to-right-ja"],[9,"keira-idle-wiping-brow-ja"],[10,"keira-stad-sit-ja"]],"keira-anim+0-ag":[[0,"keira-highres-idle-anim-ja"]],"keira-garage+0-ag":[[0,"keira-highres-idle-garage-ja"]],"keira-highres-ag":[[0,"keira-highres-lod0-jg"],[1,"keira-highres-lod0-mg"],[2,"keira-highres-shadow-mg"],[3,"keira-highres-idle-ja"]],"kid-ag":[[0,"kid-lod0-jg"],[1,"kid-lod0-mg"],[2,"kid-shadow-mg"],[3,"kid-idle0-ja"],[4,"kid-scared0-ja"],[5,"kid-walk0-ja"],[6,"kid-run0-ja"],[7,"kid-turn-left-start0-ja"],[8,"kid-turn-left50-end0-ja"],[9,"kid-turn-left100-end0-ja"],[10,"kid-turn-left150-end0-ja"],[11,"kid-turn-right-start0-ja"],[12,"kid-turn-right50-end0-ja"],[13,"kid-turn-right100-end0-ja"],[14,"kid-turn-right150-end0-ja"],[15,"kid-arrest-start-ja"],[16,"kid-arrest-idle0-ja"],[17,"kid-knocked0-ja"],[18,"kid-knocked-land0-ja"]],"kid-escort-ag":[[0,"kid-escort-lod0-jg"],[1,"kid-escort-lod0-mg"],[2,"kid-escort-shadow-mg"],[3,"kid-escort-idle0-ja"],[4,"kid-escort-run0-ja"],[5,"kid-escort-turn0-ja"],[6,"kid-escort-knocked0-ja"],[7,"kid-escort-knocked-land0-ja"],[8,"kid-escort-arrest-start-ja"],[9,"kid-escort-arrest-idle0-ja"],[10,"kid-escort-jump-in-vehicle-ja"],[11,"kid-escort-vehicle-lean-x-ja"],[12,"kid-escort-vehicle-lean-z-ja"]],"kid-highres-ag":[[0,"kid-highres-lod0-jg"],[1,"kid-highres-lod0-mg"],[2,"kid-highres-shadow-mg"],[3,"kid-highres-idle-ja"]],"kid-ltrnkrkd+0-ag":[[0,"kid-highres-idle-shuttle-ugrnd-ja"],[1,"kor-highres-idle-shuttle-ugrnd-ja"]],"kid-lyskdcd+0-ag":[[0,"kid-highres-idle-alley-ja"]],"kid-medallion-ag":[[0,"kid-medallion-lod0-jg"],[1,"kid-medallion-lod0-mg"],[2,"kid-medallion-idle-ja"]],"kid-nestb+0-ag":[[0,"kid-idle-floating-ja"]],"kid-tombd+0-ag":[[0,"crocadog-highres-idle-vinroom-ja"],[1,"kid-highres-idle-tomb-ja"]],"kiosk-banner-ag":[[0,"kiosk-banner-lod0-jg"],[1,"kiosk-banner-lod0-mg"],[2,"kiosk-banner-idle-ja"]],"kiosk-fish-sign-ag":[[0,"kiosk-fish-sign-lod0-jg"],[1,"kiosk-fish-sign-lod0-mg"],[2,"kiosk-fish-sign-idle-ja"]],"kor-ag":[[0,"kor-lod0-jg"],[1,"kor-lod0-mg"],[2,"kor-shadow-mg"],[3,"kor-idle0-ja"],[4,"kor-scared0-ja"],[5,"kor-walk0-ja"],[6,"kor-run0-ja"],[7,"kor-turn-left-start0-ja"],[8,"kor-turn-left50-end0-ja"],[9,"kor-turn-left100-end0-ja"],[10,"kor-turn-left150-end0-ja"],[11,"kor-turn-right-start0-ja"],[12,"kor-turn-right50-end0-ja"],[13,"kor-turn-right100-end0-ja"],[14,"kor-turn-right150-end0-ja"],[15,"kor-knocked0-ja"],[16,"kor-knocked-land0-ja"],[17,"kor-arrest-start-ja"],[18,"kor-arrest-idle0-ja"]],"kor-break-ag":[[0,"kor-break-lod0-jg"],[1,"kor-break-lod0-mg"],[2,"kor-break-idle-ja"]],"kor-break-ray-ag":[[0,"kor-break-ray-lod0-jg"],[1,"kor-break-ray-lod0-mg"],[2,"kor-break-ray-idle-ja"]],"kor-highres-ag":[[0,"kor-highres-lod0-jg"],[1,"kor-highres-lod0-mg"],[2,"kor-highres-shadow-mg"],[3,"kor-highres-idle-ja"],[4,"kor-highres-idle-stand-ja"]],"kor-transform-ag":[[0,"kor-transform-lod0-jg"],[8,"kor-transform-monsterparts-idle-ja"],[1,"kor-transform-lod0-mg"],[2,"kor-transform-shadow-mg"],[3,"kor-transform-idle-ja"],[5,"kor-transform-monsterparts-lod0-jg"],[6,"kor-transform-monsterparts-lod0-mg"],[7,"kor-transform-monsterparts-shadow-mg"]],"krew-clone-ag":[[0,"krew-clone-lod0-jg"],[1,"krew-clone-lod0-mg"],[2,"krew-clone-shadow-mg"],[3,"krew-clone-idle-ja"],[4,"krew-clone-idle-left-ja"],[5,"krew-clone-idle-right-ja"],[6,"krew-clone-run-ja"],[7,"krew-clone-run-left-ja"],[8,"krew-clone-run-right-ja"],[9,"krew-clone-attack-ja"],[10,"krew-clone-knocked-ja"],[11,"krew-clone-knocked-land-ja"],[12,"krew-clone-birth-ja"]],"krew-highres-ag":[[0,"krew-highres-lod0-jg"],[1,"krew-highres-lod0-mg"],[2,"krew-highres-shadow-mg"],[3,"krew-highres-idle-ja"],[4,"krew-highres-idle-float-ja"]],"krew-lowres-ag":[[0,"krew-lowres-lod0-jg"],[1,"krew-lowres-lod0-mg"],[2,"krew-lowres-lod1-mg"],[3,"krew-lowres-shadow-mg"],[4,"krew-lowres-idle-ja"],[5,"krew-lowres-idle-left-ja"],[6,"krew-lowres-idle-right-ja"],[7,"krew-lowres-run-ja"],[8,"krew-lowres-run-left-ja"],[9,"krew-lowres-run-right-ja"],[10,"krew-lowres-attack-ja"],[11,"krew-lowres-knocked-ja"],[12,"krew-lowres-knocked-land-ja"],[13,"krew-lowres-death-knocked-ja"],[14,"krew-lowres-death-spin-ja"],[15,"krew-lowres-death-land-ja"],[16,"krew-lowres-activate-clone-ja"],[17,"krew-lowres-fire-straight-ja"],[18,"krew-lowres-fire-rise-ja"]],"krew-moneybag-ag":[[0,"krew-moneybag-lod0-jg"],[1,"krew-moneybag-lod0-mg"],[2,"krew-moneybag-shadow-mg"],[3,"krew-moneybag-idle-ja"]],"krew-package-ag":[[0,"krew-package-lod0-jg"],[1,"krew-package-lod0-mg"],[2,"krew-package-lod1-mg"],[3,"krew-package-lod2-mg"],[4,"krew-package-idle-ja"]],"lgconveyor-ag":[[0,"lgconveyor-lod0-jg"],[1,"lgconveyor-lod0-mg"],[2,"lgconveyor-lod1-mg"],[3,"lgconveyor-idle-ja"]],"life-seed-ag":[[0,"life-seed-lod0-jg"],[1,"life-seed-lod0-mg"],[2,"life-seed-idle-ja"]],"liftcat-ag":[[0,"liftcat-lod0-jg"],[1,"liftcat-lod0-mg"],[2,"liftcat-lod1-mg"],[3,"liftcat-idle-ja"]],"light-switch-ag":[[0,"sew-light-switch-lod0-jg"],[1,"sew-light-switch-lod0-mg"],[2,"sew-light-switch-idle-ja"]],"lurker-pipe-lid-ag":[[0,"lurker-pipe-lid-lod0-jg"],[1,"lurker-pipe-lid-lod0-mg"],[2,"lurker-pipe-lid-idle-ja"]],"mammoth-ag":[[0,"mammoth-lod0-jg"],[1,"mammoth-lod0-mg"],[2,"mammoth-lod1-mg"],[3,"mammoth-shadow-mg"],[4,"mammoth-idle0-ja"],[5,"mammoth-idle0-to-walk-ja"],[6,"mammoth-walk0-ja"],[7,"mammoth-walk1-ja"],[8,"mammoth-walk-fire0-ja"],[9,"mammoth-death-right-ja"],[10,"mammoth-death-right-fall-ja"],[11,"mammoth-death-right-fall-end-ja"],[12,"mammoth-turn-left-50-start-ja"],[13,"mammoth-turn-left-50-ja"],[14,"mammoth-turn-left-150-start-ja"],[15,"mammoth-turn-left-150-ja"],[16,"mammoth-turn-right-50-ja"],[17,"mammoth-turn-right-150-ja"],[18,"mammoth-turn-right-150-end-ja"]],"mantis-ag":[[0,"mantis-lod0-jg"],[1,"mantis-lod0-mg"],[2,"mantis-lod1-mg"],[3,"mantis-lod2-mg"],[4,"mantis-shadow-mg"],[5,"mantis-idle0-ja"],[6,"mantis-idle1-ja"],[7,"mantis-idle0-to-idle1-ja"],[8,"mantis-idle1-to-idle0-ja"],[9,"mantis-run0-ja"],[10,"mantis-knocked-red0-ja"],[11,"mantis-knocked-red-land0-ja"],[12,"mantis-hop-forward-wind-up-ja"],[13,"mantis-hop-forward-go-ja"],[14,"mantis-hop-backward-wind-up-ja"],[15,"mantis-hop-backward-go-ja"],[16,"mantis-hop-backward-land-ja"],[17,"mantis-flip-forward-wind-up-ja"],[18,"mantis-flip-forward-go-ja"],[19,"mantis-flip-forward-land-ja"],[20,"mantis-flip-backward-wind-up-ja"],[21,"mantis-flip-backward-go-ja"],[22,"mantis-flip-backward-land-ja"],[23,"mantis-ground-jump-out-ja"],[24,"mantis-ground-jump-out-land-ja"],[25,"mantis-ground-crawl-out-ja"],[26,"mantis-death0-ja"],[27,"mantis-knocked-blue0-ja"],[28,"mantis-knocked-blue-land0-ja"],[29,"mantis-attack0-ja"],[30,"mantis-attack0-land-ja"],[31,"mantis-attack1-wind-up-ja"],[32,"mantis-attack1-go-ja"],[33,"mantis-attack1-land-ja"],[34,"mantis-roll-right-ja"],[35,"mantis-roll-right-land-ja"],[36,"mantis-roll-left-ja"],[37,"mantis-hop-left-ja"],[38,"mantis-hop-left-land-ja"]],"mar-statue-ag":[[0,"sew-mar-statue-lod0-jg"],[1,"sew-mar-statue-lod0-mg"],[2,"sew-mar-statue-idle-ja"]],"market-basket-a-ag":[[0,"market-basket-a-lod0-jg"],[1,"market-basket-a-lod0-mg"],[2,"market-basket-a-idle-ja"]],"market-basket-b-ag":[[0,"market-basket-b-lod0-jg"],[1,"market-basket-b-lod0-mg"],[2,"market-basket-b-idle-ja"]],"market-crate-ag":[[0,"market-crate-lod0-jg"],[1,"market-crate-lod0-mg"],[2,"market-crate-idle-ja"]],"market-sack-a-ag":[[0,"market-sack-a-lod0-jg"],[1,"market-sack-a-lod0-mg"],[2,"market-sack-a-idle-ja"]],"market-sack-b-ag":[[0,"market-sack-b-lod0-jg"],[1,"market-sack-b-lod0-mg"],[2,"market-sack-b-idle-ja"]],"mech-ag":[[40,"mech-explode-lod0-mg"],[0,"mech-lod0-jg"],[41,"mech-explode-idle-ja"],[1,"mech-lod0-mg"],[42,"mech-target-lod0-jg"],[2,"mech-shadow-mg"],[3,"mech-mech-idle-ja"],[39,"mech-explode-lod0-jg"],[43,"mech-target-lod0-mg"],[44,"mech-target-idle-ja"]],"mecha-daxter-ag":[[0,"mecha-daxter-lod0-jg"],[1,"mecha-daxter-lod0-mg"],[2,"mecha-daxter-idle-ja"]],"metalkor-ag":[[0,"metalkor-lod0-jg"],[1,"metalkor-lod0-mg"],[2,"metalkor-shadow-mg"],[3,"metalkor-idle-ja"],[4,"metalkor-idle-alt-ja"],[5,"metalkor-walk-ja"],[6,"metalkor-run-ja"],[7,"metalkor-collapse-ja"],[8,"metalkor-collapse-breathe-ja"],[9,"metalkor-hang-ja"],[10,"metalkor-hang-turn-right-start-ja"],[11,"metalkor-hang-turn-right-ja"],[12,"metalkor-hang-turn-right-end-ja"],[13,"metalkor-hang-turn-left-start-ja"],[14,"metalkor-hang-turn-left-ja"],[15,"metalkor-hang-turn-left-end-ja"],[16,"metalkor-hang-turn-right-end-alt-ja"],[17,"metalkor-hang-turn-left-end-alt-ja"],[18,"metalkor-hang-hit-ja"],[19,"metalkor-hang-hit-left-ja"],[20,"metalkor-hang-hit-right-ja"],[21,"metalkor-hang-roar-ja"],[22,"metalkor-breathe-ja"],[23,"metalkor-hang-pre-shot-ja"],[24,"metalkor-hang-shot-ja"],[25,"metalkor-collapse-hit-ja"],[26,"metalkor-collapse-hit-left-ja"],[27,"metalkor-collapse-hit-right-ja"],[28,"metalkor-collapse-hit-top-ja"],[29,"metalkor-collapse-hit-back-ja"],[30,"metalkor-collapse-recover-ja"],[31,"metalkor-attack-tail-ja"],[32,"metalkor-pre-shot-ja"],[33,"metalkor-shot-ja"],[34,"metalkor-hit-ja"],[35,"metalkor-hit-left-ja"],[36,"metalkor-hit-right-ja"],[37,"metalkor-walk-left-ja"],[38,"metalkor-walk-right-ja"],[39,"metalkor-walk-back-ja"],[40,"metalkor-run-back-ja"],[41,"metalkor-walk-to-stance-ja"],[42,"metalkor-attack-sweep-left-ja"],[43,"metalkor-attack-sweep-right-ja"],[44,"metalkor-hang-hit-major-ja"],[45,"metalkor-wings-open-ja"],[46,"metalkor-fly-ja"],[47,"metalkor-impact-ja"],[48,"metalkor-spinner-lod0-jg"],[49,"metalkor-spinner-lod0-mg"],[50,"metalkor-spinner-idle-ja"],[51,"metalkor-spinner-fire-ja"],[52,"metalkor-spinner-short-ja"],[53,"metalkor-spinner-dissolve-ja"]],"metalkor-bomb-ag":[[0,"metalkor-bomb-lod0-jg"],[1,"metalkor-bomb-lod0-mg"],[2,"metalkor-bomb-idle-ja"]],"metalkor-chopped-ag":[[0,"metalkor-chopped-lod0-jg"],[1,"metalkor-chopped-lod0-mg"],[2,"metalkor-chopped-idle-ja"]],"metalkor-distort-ag":[[0,"metalkor-distort-lod0-jg"],[1,"metalkor-distort-lod0-mg"],[2,"metalkor-distort-idle-ja"]],"metalkor-egg-ag":[[0,"metalkor-egg-lod0-jg"],[1,"metalkor-egg-lod0-mg"],[2,"metalkor-egg-shadow-mg"],[3,"metalkor-egg-idle-ja"],[4,"metalkor-egg-land-ja"],[5,"metalkor-egg-hatch-ja"],[6,"metalkor-egg-tumble-ja"],[7,"metalkor-egg-hop-ja"]],"metalkor-explode-ag":[[0,"metalkor-explode-lod0-jg"],[1,"metalkor-explode-lod0-mg"],[2,"metalkor-explode-idle-ja"]],"metalkor-fma-spinner-ag":[[0,"metalkor-fma-spinner-lod0-jg"],[1,"metalkor-fma-spinner-lod0-mg"],[2,"metalkor-fma-spinner-idle-ja"]],"metalkor-head-ag":[[0,"metalkor-head-lod0-jg"],[1,"metalkor-head-lod0-mg"],[2,"metalkor-head-idle-ja"]],"metalkor-highres-ag":[[8,"metalkor-highres-lowtorso-lod0-mg"],[0,"metalkor-highres-lod0-jg"],[9,"metalkor-highres-lowtorso-shadow-mg"],[1,"metalkor-highres-lod0-mg"],[10,"metalkor-highres-lowtorso-idle-ja"],[2,"metalkor-highres-shadow-mg"],[3,"metalkor-highres-idle-ja"],[7,"metalkor-highres-lowtorso-lod0-jg"],[14,"metalkor-highres-legs-lod0-jg"],[15,"metalkor-highres-legs-lod0-mg"],[16,"metalkor-highres-legs-shadow-mg"],[17,"metalkor-highres-legs-idle-ja"],[21,"metalkor-highres-wings-lod0-jg"],[22,"metalkor-highres-wings-lod0-mg"],[23,"metalkor-highres-wings-shadow-mg"],[24,"metalkor-highres-wings-idle-ja"]],"metalkor-legs-ag":[[0,"metalkor-legs-lod0-jg"],[1,"metalkor-legs-lod0-mg"],[2,"metalkor-legs-shadow-mg"],[3,"metalkor-legs-idle-ja"],[4,"metalkor-legs-idle-alt-ja"],[5,"metalkor-legs-walk-ja"],[6,"metalkor-legs-run-ja"],[7,"metalkor-legs-collapse-ja"],[8,"metalkor-legs-collapse-breathe-ja"],[9,"metalkor-legs-collapse-hit-ja"],[10,"metalkor-legs-collapse-hit-left-ja"],[11,"metalkor-legs-collapse-hit-right-ja"],[12,"metalkor-legs-collapse-hit-top-ja"],[13,"metalkor-legs-collapse-hit-back-ja"],[14,"metalkor-legs-collapse-recover-ja"],[15,"metalkor-legs-attack-tail-ja"],[16,"metalkor-legs-pre-shot-ja"],[17,"metalkor-legs-shot-ja"],[18,"metalkor-legs-hit-ja"],[19,"metalkor-legs-hit-left-ja"],[20,"metalkor-legs-hit-right-ja"],[21,"metalkor-legs-walk-left-ja"],[22,"metalkor-legs-walk-right-ja"],[23,"metalkor-legs-walk-back-ja"],[24,"metalkor-legs-run-back-ja"],[25,"metalkor-legs-walk-to-stance-ja"],[26,"metalkor-legs-wings-open-ja"],[27,"metalkor-legs-fly-ja"],[28,"metalkor-legs-impact-ja"]],"metalkor-lowtorso-ag":[[0,"metalkor-lowtorso-lod0-jg"],[1,"metalkor-lowtorso-lod0-mg"],[2,"metalkor-lowtorso-shadow-mg"],[3,"metalkor-lowtorso-idle-ja"],[4,"metalkor-lowtorso-idle-alt-ja"],[5,"metalkor-lowtorso-walk-ja"],[6,"metalkor-lowtorso-run-ja"],[7,"metalkor-lowtorso-collapse-ja"],[8,"metalkor-lowtorso-collapse-breathe-ja"],[9,"metalkor-lowtorso-hang-ja"],[10,"metalkor-lowtorso-hang-turn-right-start-ja"],[11,"metalkor-lowtorso-hang-turn-right-ja"],[12,"metalkor-lowtorso-hang-turn-right-end-ja"],[13,"metalkor-lowtorso-hang-turn-left-start-ja"],[14,"metalkor-lowtorso-hang-turn-left-ja"],[15,"metalkor-lowtorso-hang-turn-left-end-ja"],[16,"metalkor-lowtorso-hang-turn-right-end-alt-ja"],[17,"metalkor-lowtorso-hang-turn-left-end-alt-ja"],[18,"metalkor-lowtorso-hang-hit-ja"],[19,"metalkor-lowtorso-hang-hit-left-ja"],[20,"metalkor-lowtorso-hang-hit-right-ja"],[21,"metalkor-lowtorso-hang-roar-ja"],[22,"metalkor-lowtorso-breathe-ja"],[23,"metalkor-lowtorso-hang-pre-shot-ja"],[24,"metalkor-lowtorso-hang-shot-ja"],[25,"metalkor-lowtorso-collapse-hit-ja"],[26,"metalkor-lowtorso-collapse-hit-left-ja"],[27,"metalkor-lowtorso-collapse-hit-right-ja"],[28,"metalkor-lowtorso-collapse-hit-top-ja"],[29,"metalkor-lowtorso-collapse-hit-back-ja"],[30,"metalkor-lowtorso-collapse-recover-ja"],[31,"metalkor-lowtorso-attack-tail-ja"],[32,"metalkor-lowtorso-pre-shot-ja"],[33,"metalkor-lowtorso-shot-ja"],[34,"metalkor-lowtorso-hit-ja"],[35,"metalkor-lowtorso-hit-left-ja"],[36,"metalkor-lowtorso-hit-right-ja"],[37,"metalkor-lowtorso-walk-left-ja"],[38,"metalkor-lowtorso-walk-right-ja"],[39,"metalkor-lowtorso-walk-back-ja"],[40,"metalkor-lowtorso-run-back-ja"],[41,"metalkor-lowtorso-walk-to-stance-ja"],[42,"metalkor-lowtorso-hang-hit-major-ja"],[43,"metalkor-lowtorso-wings-open-ja"],[44,"metalkor-lowtorso-fly-ja"],[45,"metalkor-lowtorso-impact-ja"]],"metalkor-rays-ag":[[0,"metalkor-rays-lod0-jg"],[1,"metalkor-rays-lod0-mg"],[2,"metalkor-rays-idle-ja"]],"metalkor-torso-ag":[[0,"metalkor-torso-lod0-jg"],[1,"metalkor-torso-lod0-mg"],[2,"metalkor-torso-idle-ja"]],"metalkor-wings-ag":[[0,"metalkor-wings-lod0-jg"],[1,"metalkor-wings-lod0-mg"],[2,"metalkor-wings-shadow-mg"],[3,"metalkor-wings-idle-ja"],[4,"metalkor-wings-wings-open-ja"],[5,"metalkor-wings-fly-ja"],[6,"metalkor-wings-impact-ja"]],"metalmonk-ag":[[0,"metalmonk-lod0-jg"],[1,"metalmonk-lod0-mg"],[2,"metalmonk-lod1-mg"],[3,"metalmonk-lod2-mg"],[4,"metalmonk-shadow-mg"],[5,"metalmonk-idle-ja"],[6,"metalmonk-idle-look-left-ja"],[7,"metalmonk-idle-look-right-ja"],[8,"metalmonk-patrol0-ja"],[9,"metalmonk-patrol1-ja"],[10,"metalmonk-notice-ja"],[11,"metalmonk-notice1-ja"],[12,"metalmonk-charge0-ja"],[13,"metalmonk-charge1-ja"],[14,"metalmonk-attack0-ja"],[15,"metalmonk-attack1-ja"],[16,"metalmonk-knocked0-ja"],[17,"metalmonk-knocked-land0-ja"],[18,"metalmonk-knocked1-ja"],[19,"metalmonk-knocked-land1-ja"],[20,"metalmonk-knocked-forward0-ja"],[21,"metalmonk-knocked-forward-land0-ja"],[22,"metalmonk-celebrate-ja"],[23,"metalmonk-celebrate1-ja"],[24,"metalmonk-blue-hit0-ja"],[25,"metalmonk-blue-hit1-ja"],[26,"metalmonk-blue-hit2-ja"],[27,"metalmonk-blue-land-ja"],[28,"metalmonk-yellow-hit0-ja"],[29,"metalmonk-yellow-hit1-ja"],[30,"metalmonk-yellow-hit2-ja"],[31,"metalmonk-yellow-hit3-ja"],[32,"metalmonk-death-ja"],[33,"metalmonk-die-falling-ja"]],"meteor-ag":[[0,"meteor-lod0-jg"],[1,"meteor-lod0-mg"],[2,"meteor-idle-ja"]],"mincan-cogs-ag":[[0,"mincan-cogs-lod0-jg"],[1,"mincan-cogs-lod0-mg"],[2,"mincan-cogs-idle-ja"]],"mincan-lens-ag":[[0,"mincan-lens-lod0-jg"],[1,"mincan-lens-lod0-mg"],[2,"mincan-lens-idle-ja"],[3,"mincan-lens-idle-closed-ja"]],"mincan-lighthouse-ag":[[0,"mincan-lighthouse-lod0-jg"],[8,"mincan-lighthouse-lens-idle-erect-ja"],[1,"mincan-lighthouse-lod0-mg"],[2,"mincan-lighthouse-idle-ja"],[3,"mincan-lighthouse-idle-erect-ja"],[5,"mincan-lighthouse-lens-lod0-jg"],[6,"mincan-lighthouse-lens-lod0-mg"],[7,"mincan-lighthouse-lens-idle-ja"]],"mine-a-ag":[[0,"sew-mine-a-lod0-jg"],[1,"sew-mine-a-lod0-mg"],[2,"sew-mine-a-idle-ja"]],"mine-b-ag":[[0,"sew-mine-b-lod0-jg"],[1,"sew-mine-b-lod0-mg"],[2,"sew-mine-b-idle-ja"]],"minnow-ag":[[0,"minnow-lod0-jg"],[1,"minnow-lod0-mg"],[2,"minnow-idle-ja"]],"monster-frog-ag":[[0,"monster-frog-lod0-jg"],[1,"monster-frog-lod0-mg"],[2,"monster-frog-lod1-mg"],[3,"monster-frog-shadow-mg"],[4,"monster-frog-idle0-ja"],[5,"monster-frog-idle1-ja"],[6,"monster-frog-popup0-ja"],[7,"monster-frog-submerge0-ja"],[8,"monster-frog-notice0-ja"],[9,"monster-frog-notice0-jump-ja"],[10,"monster-frog-notice0-land-ja"],[11,"monster-frog-rotate-left-start-ja"],[12,"monster-frog-rotate-right-start-ja"],[13,"monster-frog-rotate-left-end-ja"],[14,"monster-frog-hop-small-start-ja"],[15,"monster-frog-hop-small-end-ja"],[16,"monster-frog-hop-slow-start-ja"],[17,"monster-frog-hop-slow-end-ja"],[18,"monster-frog-hop-fast-start-ja"],[19,"monster-frog-hop-fast-end-ja"],[20,"monster-frog-attack0-start-ja"],[21,"monster-frog-attack0-end-ja"],[22,"monster-frog-blue-hit0-ja"],[23,"monster-frog-blue-hit0-land-ja"],[24,"monster-frog-blue-hit1-ja"],[25,"monster-frog-blue-hit1-land-ja"],[26,"monster-frog-knocked-yellow-left-ja"],[27,"monster-frog-knocked-yellow-left-land-ja"],[28,"monster-frog-knocked-yellow-right-ja"],[29,"monster-frog-knocked-yellow-right-land-ja"],[30,"monster-frog-knocked0-ja"],[31,"monster-frog-knocked0-land-ja"],[32,"monster-frog-knocked1-ja"],[33,"monster-frog-knocked1-land-ja"]],"mtn-aval-rocks-ag":[[0,"mtn-aval-rocks-1-lod0-jg"],[1,"mtn-aval-rocks-1-lod0-mg"],[2,"mtn-aval-rocks-1-idle-ja"],[4,"mtn-aval-rocks-shadow-lod0-jg"],[5,"mtn-aval-rocks-shadow-lod0-mg"],[6,"mtn-aval-rocks-shadow-shadow-mg"],[7,"mtn-aval-rocks-shadow-idle-ja"]],"mtn-button-ag":[[0,"mtn-button-lod0-jg"],[1,"mtn-button-lod0-mg"],[2,"mtn-button-open-ja"],[3,"mtn-button-press-ja"]],"mtn-dice-ag":[[0,"mtn-dice-lod0-jg"],[1,"mtn-dice-lod0-mg"],[2,"mtn-dice-idle-ja"]],"mtn-dice-button-ag":[[0,"mtn-dice-button-lod0-jg"],[1,"mtn-dice-button-lod0-mg"],[2,"mtn-dice-button-lod1-mg"],[3,"mtn-dice-button-idle-ja"]],"mtn-gate-ag":[[0,"mtn-gate-lod0-jg"],[1,"mtn-gate-lod0-mg"],[2,"mtn-gate-lod1-mg"],[3,"mtn-gate-idle-ja"]],"mtn-gear-device-ag":[[0,"mtn-gear-device-lod0-jg"],[1,"mtn-gear-device-lod0-mg"],[2,"mtn-gear-device-idle-ja"],[4,"mtn-gear-device-collapse-lod0-jg"],[5,"mtn-gear-device-collapse-lod0-mg"],[6,"mtn-gear-device-collapse-idle-ja"]],"mtn-lens-ag":[[0,"mtn-lens-lod0-jg"],[1,"mtn-lens-lod0-mg"],[2,"mtn-lens-idle-ja"]],"mtn-lens-base-ag":[[0,"mtn-lens-base-lod0-jg"],[1,"mtn-lens-base-lod0-mg"],[2,"mtn-lens-base-idle-ja"],[3,"mtn-lens-base-opened-ja"]],"mtn-lens-floor-ag":[[0,"mtn-lens-floor-lod0-jg"],[1,"mtn-lens-floor-lod0-mg"],[2,"mtn-lens-floor-idle-ja"]],"mtn-plat-buried-rocks-ag":[[0,"mtn-plat-buried-rocks-lod0-jg"],[1,"mtn-plat-buried-rocks-lod0-mg"],[2,"mtn-plat-buried-rocks-lod1-mg"],[3,"mtn-plat-buried-rocks-idle-ja"]],"mtn-plat-eject-ag":[[0,"mtn-plat-eject-lod0-jg"],[1,"mtn-plat-eject-lod0-mg"],[2,"mtn-plat-eject-lod1-mg"],[3,"mtn-plat-eject-idle-ja"]],"mtn-plat-elevator-ag":[[0,"mtn-plat-elevator-lod0-jg"],[1,"mtn-plat-elevator-lod0-mg"],[2,"mtn-plat-elevator-lod1-mg"],[3,"mtn-plat-elevator-idle-ja"]],"mtn-plat-long-ag":[[0,"mtn-plat-long-lod0-jg"],[1,"mtn-plat-long-lod0-mg"],[2,"mtn-plat-long-lod1-mg"],[3,"mtn-plat-long-idle-ja"]],"mtn-plat-shoot-ag":[[0,"mtn-plat-shoot-lod0-jg"],[1,"mtn-plat-shoot-lod0-mg"],[2,"mtn-plat-shoot-lod1-mg"],[3,"mtn-plat-shoot-idle-ja"]],"mtn-plat-updown-ag":[[0,"mtn-plat-updown-lod0-jg"],[1,"mtn-plat-updown-lod0-mg"],[2,"mtn-plat-updown-idle-ja"]],"mtn-step-plat-rocks-ag":[[8,"mtn-step-plat-rocks-b-lod1-mg"],[0,"mtn-step-plat-rocks-a-lod0-jg"],[1,"mtn-step-plat-rocks-a-lod0-mg"],[2,"mtn-step-plat-rocks-a-lod1-mg"],[3,"mtn-step-plat-rocks-a-idle-ja"],[4,"mtn-step-plat-rocks-a-end-ja"],[6,"mtn-step-plat-rocks-b-lod0-jg"],[7,"mtn-step-plat-rocks-b-lod0-mg"],[9,"mtn-step-plat-rocks-b-idle-ja"],[10,"mtn-step-plat-rocks-b-end-ja"],[12,"mtn-step-plat-rocks-c-lod0-jg"],[13,"mtn-step-plat-rocks-c-lod0-mg"],[14,"mtn-step-plat-rocks-c-lod1-mg"],[15,"mtn-step-plat-rocks-c-idle-ja"],[16,"mtn-step-plat-rocks-c-end-ja"]],"nest-break-precipice-ag":[[0,"nest-break-precipice-lod0-jg"],[1,"nest-break-precipice-lod0-mg"],[2,"nest-break-precipice-idle-ja"]],"nest-break-rocks-ag":[[8,"nest-break-rocks-break-b-lod0-jg"],[0,"nest-break-rocks-break-lod0-jg"],[9,"nest-break-rocks-break-b-lod0-mg"],[1,"nest-break-rocks-break-lod0-mg"],[2,"nest-break-rocks-break-idle-ja"],[4,"nest-break-rocks-break-a-lod0-jg"],[5,"nest-break-rocks-break-a-lod0-mg"],[6,"nest-break-rocks-break-a-idle-ja"],[10,"nest-break-rocks-break-b-idle-ja"]],"nest-gun-elevator-ag":[[0,"nest-gun-elevator-lod0-jg"],[1,"nest-gun-elevator-lod0-mg"],[2,"nest-gun-elevator-idle-ja"],[3,"nest-gun-elevator-raiserail-ja"]],"nest-gun-parts-ag":[[0,"nest-gun-parts-lod0-jg"],[1,"nest-gun-parts-lod0-mg"],[2,"nest-gun-parts-idle-ja"]],"nest-unbroken-rocks-ag":[[0,"nest-unbroken-rocks-lod0-jg"],[1,"nest-unbroken-rocks-lod0-mg"],[2,"nest-unbroken-rocks-idle-ja"]],"nestb-tail-bound-ag":[[0,"nestb-tail-bound-lod0-jg"],[1,"nestb-tail-bound-lod0-mg"],[2,"nestb-tail-bound-idle-ja"]],"onin-brain-ag":[[0,"onin-brain-lod0-jg"],[1,"onin-brain-lod0-mg"],[2,"onin-brain-idle-ja"]],"onin-game+0-ag":[[0,"onin-highres-idle-game-ja"],[1,"pecker-highres-idle-game-ja"]],"onin-highres-ag":[[0,"onin-highres-lod0-jg"],[1,"onin-highres-lod0-mg"],[2,"onin-highres-shadow-mg"],[3,"onin-highres-idle-ja"],[4,"onin-highres-idle-sleep-ja"],[5,"onin-highres-idle-wakeup-ja"]],"oracle-roof-banner-ag":[[0,"oracle-roof-banner-lod0-jg"],[1,"oracle-roof-banner-lod0-mg"],[2,"oracle-roof-banner-idle-ja"]],"oracle-roof-banner-b-ag":[[0,"oracle-roof-banner-b-lod0-jg"],[1,"oracle-roof-banner-b-lod0-mg"],[2,"oracle-roof-banner-b-idle-ja"]],"oracle-wall-banner-ag":[[0,"oracle-wall-banner-lod0-jg"],[1,"oracle-wall-banner-lod0-mg"],[2,"oracle-wall-banner-idle-ja"]],"paddy-wagon-ag":[[0,"paddy-wagon-lod0-jg"],[1,"paddy-wagon-lod0-mg"],[2,"paddy-wagon-shadow-mg"],[3,"paddy-wagon-idle-ja"]],"pal-breakable-window-ag":[[0,"pal-breakable-window-lod0-jg"],[1,"pal-breakable-window-lod0-mg"],[2,"pal-breakable-window-idle-ja"],[3,"pal-breakable-window-explode-lod0-jg"],[4,"pal-breakable-window-explode-lod0-mg"],[5,"pal-breakable-window-explode-idle-ja"]],"pal-cable-nut-ag":[[0,"pal-cable-nut-lod0-jg"],[1,"pal-cable-nut-lod0-mg"],[2,"pal-cable-nut-lod1-mg"],[3,"pal-cable-nut-idle-ja"]],"pal-electric-fan-ag":[[0,"pal-electric-fan-lod0-jg"],[1,"pal-electric-fan-lod0-mg"],[2,"pal-electric-fan-lod1-mg"],[3,"pal-electric-fan-idle-ja"]],"pal-ent-door-ag":[[0,"pal-ent-door-lod0-jg"],[1,"pal-ent-door-lod0-mg"],[2,"pal-ent-door-idle-ja"]],"pal-ent-glass-ag":[[0,"pal-ent-glass-lod0-jg"],[1,"pal-ent-glass-lod0-mg"],[2,"pal-ent-glass-idle-ja"],[3,"pal-ent-glass-explode-lod0-jg"],[4,"pal-ent-glass-explode-lod0-mg"],[5,"pal-ent-glass-explode-idle-ja"]],"pal-falling-plat-ag":[[0,"pal-falling-plat-lod0-jg"],[1,"pal-falling-plat-lod0-mg"],[2,"pal-falling-plat-idle-ja"],[3,"pal-falling-plat-shake-ja"]],"pal-flip-step-ag":[[0,"pal-flip-step-lod0-jg"],[1,"pal-flip-step-lod0-mg"],[2,"pal-flip-step-idle-ja"],[3,"pal-flip-step-fall-ja"]],"pal-grind-ring-ag":[[0,"pal-grind-ring-lod0-jg"],[1,"pal-grind-ring-lod0-mg"],[2,"pal-grind-ring-idle-ja"]],"pal-grind-ring-center-ag":[[0,"pal-grind-ring-center-lod0-jg"],[1,"pal-grind-ring-center-lod0-mg"],[2,"pal-grind-ring-center-idle-ja"],[3,"pal-grind-ring-center-explode-lod0-jg"],[4,"pal-grind-ring-center-explode-lod0-mg"],[5,"pal-grind-ring-center-explode-idle-ja"]],"pal-gun-turret-ag":[[0,"pal-gun-turret-lod0-jg"],[1,"pal-gun-turret-lod0-mg"],[2,"pal-gun-turret-idle-ja"],[3,"pal-gun-turret-shoot-ja"],[4,"pal-gun-turret-explode-lod0-jg"],[5,"pal-gun-turret-explode-lod0-mg"],[6,"pal-gun-turret-explode-idle-ja"]],"pal-lowrez-throne-ag":[[0,"pal-lowrez-throne-lod0-jg"],[1,"pal-lowrez-throne-lod0-mg"],[2,"pal-lowrez-throne-idle-ja"]],"pal-prong-ag":[[0,"pal-prong-lod0-jg"],[1,"pal-prong-lod0-mg"],[2,"pal-prong-idle-ja"],[3,"pal-prong-explode-lod0-jg"],[4,"pal-prong-explode-lod0-mg"],[5,"pal-prong-explode-idle-ja"]],"pal-rot-gun-ag":[[0,"pal-rot-gun-lod0-jg"],[1,"pal-rot-gun-lod0-mg"],[2,"pal-rot-gun-idle-ja"]],"pal-throne-door-ag":[[0,"pal-throne-door-lod0-jg"],[1,"pal-throne-door-lod0-mg"],[2,"pal-throne-door-idle-ja"]],"pal-windmill-ag":[[0,"pal-windmill-lod0-jg"],[1,"pal-windmill-lod0-mg"],[2,"pal-windmill-idle-ja"]],"palace-door-ag":[[0,"palace-door-lod0-jg"],[1,"palace-door-lod0-mg"],[2,"palace-door-idle-ja"]],"palent-turret-ag":[[0,"palent-turret-lod0-jg"],[1,"palent-turret-lod0-mg"],[2,"palent-turret-idle-ja"],[3,"palent-turret-shoot-ja"],[4,"palent-turret-explode-lod0-jg"],[5,"palent-turret-explode-lod0-mg"],[6,"palent-turret-explode-idle-ja"]],"palmpilot-ag":[[0,"palmpilot-lod0-jg"],[1,"palmpilot-lod0-mg"],[2,"palmpilot-idle-ja"]],"particleman-ag":[[0,"particleman-lod0-jg"],[1,"particleman-lod0-mg"],[2,"particleman-idle-ja"]],"pecker-highres-ag":[[0,"pecker-highres-lod0-jg"],[1,"pecker-highres-lod0-mg"],[2,"pecker-highres-shadow-mg"],[3,"pecker-highres-idle-ja"],[4,"pecker-highres-idle-sleep-ja"],[5,"pecker-highres-idle-wakeup-ja"]],"pegasus-ag":[[0,"pegasus-lod0-jg"],[1,"pegasus-lod0-mg"],[2,"pegasus-lod1-mg"],[3,"pegasus-lod2-mg"],[4,"pegasus-shadow-mg"],[5,"pegasus-idle-ja"],[6,"pegasus-idle-takeoff-on-ground-ja"],[7,"pegasus-idle-takeoff-in-air-ja"],[8,"pegasus-fly-ja"],[9,"pegasus-fly-doublespeed-ja"],[10,"pegasus-fly-glide-ja"],[11,"pegasus-fly-turn-left-ja"],[12,"pegasus-fly-turn-right-ja"],[13,"pegasus-flip-around-a-ja"],[14,"pegasus-flip-around-b-ja"],[15,"pegasus-die-flying-ja"],[16,"pegasus-fly-to-run-ja"],[17,"pegasus-run-ja"],[18,"pegasus-run-to-fly-ja"],[19,"pegasus-fly-to-idle-ja"],[20,"pegasus-board-attack-pegasus-ja"]],"piston-ag":[[0,"piston-lod0-jg"],[1,"piston-lod0-mg"],[2,"piston-lod1-mg"],[3,"piston-idle-ja"]],"pitspikes-ag":[[0,"pitspikes-lod0-jg"],[1,"pitspikes-lod0-mg"],[2,"pitspikes-lod1-mg"],[3,"pitspikes-idle-ja"]],"plasmitebomb-ag":[[0,"plasmitebomb-lod0-jg"],[1,"plasmitebomb-lod0-mg"],[2,"plasmitebomb-idle-ja"]],"plasmitebox-ag":[[0,"plasmitebox-lod0-jg"],[1,"plasmitebox-lod0-mg"],[2,"plasmitebox-idle-ja"]],"plat-buried-ag":[[0,"mtn-plat-buried-lod0-jg"],[1,"mtn-plat-buried-lod0-mg"],[2,"mtn-plat-buried-lod1-mg"],[3,"mtn-plat-buried-lod2-mg"],[4,"mtn-plat-buried-idle-ja"]],"plat-return-ag":[[0,"mtn-plat-return-lod0-jg"],[1,"mtn-plat-return-lod0-mg"],[2,"mtn-plat-return-lod1-mg"],[3,"mtn-plat-return-lod2-mg"],[4,"mtn-plat-return-idle-ja"]],"port-turret-ag":[[0,"port-turret-lod0-jg"],[1,"port-turret-lod0-mg"],[2,"port-turret-idle-ja"]],"pow-mov-plat-ag":[[0,"pow-mov-plat-lod0-jg"],[1,"pow-mov-plat-lod0-mg"],[2,"pow-mov-plat-idle-ja"]],"precipice-a-ag":[[0,"precipice-a-lod0-jg"],[1,"precipice-a-lod0-mg"],[2,"precipice-a-idle-ja"]],"precipice-b-ag":[[0,"precipice-b-lod0-jg"],[1,"precipice-b-lod0-mg"],[2,"precipice-b-idle-ja"]],"precursor-ag":[[0,"precursor-lod0-jg"],[1,"precursor-lod0-mg"],[2,"precursor-idle-ja"]],"precursor-stone-ag":[[0,"precursor-stone-lod0-jg"],[1,"precursor-stone-lod0-mg"],[2,"precursor-stone-idle-ja"]],"predator-ag":[[0,"predator-lod0-jg"],[1,"predator-lod0-mg"],[2,"predator-lod1-mg"],[3,"predator-lod2-mg"],[4,"predator-shadow-mg"],[5,"predator-idle-ja"],[6,"predator-walk0-ja"],[7,"predator-run0-ja"],[8,"predator-close-attack-ja"],[9,"predator-close-attack-recover-ja"],[10,"predator-shoot-guns0-ja"],[11,"predator-death-standing-ja"],[12,"predator-knocked-ja"],[13,"predator-knocked-land-ja"],[14,"predator-knocked-death-ja"],[15,"predator-knocked-death-land-ja"],[16,"predator-jump-attack-ja"],[17,"predator-jump-attack-land-ja"],[18,"predator-knocked-big-ja"],[19,"predator-knocked-big-land-ja"],[20,"predator-knocked-big-death-ja"],[21,"predator-blue-hit-front-ja"],[22,"predator-blue-hit-back-ja"],[23,"predator-blue-hit-land-ja"]],"propa-ag":[[0,"propa-lod0-jg"],[1,"propa-lod0-mg"],[2,"propa-idle-ja"]],"prsn-cell-door-ag":[[0,"prsn-cell-door-lod0-jg"],[1,"prsn-cell-door-lod0-mg"],[2,"prsn-cell-door-idle-ja"]],"prsn-chair-shackle-ag":[[0,"prsn-chair-shackle-lod0-jg"],[1,"prsn-chair-shackle-lod0-mg"],[2,"prsn-chair-shackle-idle-ja"]],"prsn-daxter-plat-ag":[[0,"prsn-daxter-plat-lod0-jg"],[1,"prsn-daxter-plat-lod0-mg"],[2,"prsn-daxter-plat-idle-ja"]],"prsn-hang-cell-ag":[[0,"prsn-hang-cell-lod0-jg"],[1,"prsn-hang-cell-lod0-mg"],[2,"prsn-hang-cell-idle-ja"]],"prsn-torture-ag":[[0,"prsn-torture-lod0-jg"],[1,"prsn-torture-lod0-mg"],[2,"prsn-torture-idle-ja"]],"prsn-vent-fan-ag":[[0,"prsn-vent-fan-lod0-jg"],[1,"prsn-vent-fan-lod0-mg"],[2,"prsn-vent-fan-lod1-mg"],[3,"prsn-vent-fan-idle-ja"]],"pushblock-ag":[[0,"pushblock-lod0-jg"],[1,"pushblock-lod0-mg"],[2,"pushblock-lod1-mg"],[3,"pushblock-idle-ja"]],"race-bike-a-ag":[[0,"race-bike-a-lod0-jg"],[1,"race-bike-a-lod0-mg"],[2,"race-bike-a-lod1-mg"],[3,"race-bike-a-lod2-mg"],[4,"race-bike-a-shadow-mg"],[5,"race-bike-a-idle-ja"]],"race-bike-b-ag":[[0,"race-bike-b-lod0-jg"],[1,"race-bike-b-lod0-mg"],[2,"race-bike-b-lod1-mg"],[3,"race-bike-b-shadow-mg"],[4,"race-bike-b-idle-ja"]],"race-bike-c-ag":[[0,"race-bike-c-lod0-jg"],[1,"race-bike-c-lod0-mg"],[2,"race-bike-c-lod1-mg"],[3,"race-bike-c-shadow-mg"],[4,"race-bike-c-idle-ja"]],"race-start-light-ag":[[0,"race-start-light-lod0-jg"],[1,"race-start-light-lod0-mg"],[2,"race-start-light-idle-ja"]],"race-start-light-banner-ag":[[0,"race-start-light-banner-lod0-jg"],[1,"race-start-light-banner-lod0-mg"],[2,"race-start-light-banner-idle-ja"]],"rapid-gunner-ag":[[0,"rapid-gunner-lod0-jg"],[1,"rapid-gunner-lod0-mg"],[2,"rapid-gunner-lod1-mg"],[3,"rapid-gunner-lod2-mg"],[4,"rapid-gunner-shadow-mg"],[5,"rapid-gunner-idle-ja"],[6,"rapid-gunner-notice-ja"],[7,"rapid-gunner-turn-ja"],[8,"rapid-gunner-hop-forward-ja"],[9,"rapid-gunner-hop-back-ja"],[10,"rapid-gunner-hop-left-ja"],[11,"rapid-gunner-hop-right-ja"],[12,"rapid-gunner-aim-ja"],[13,"rapid-gunner-shift-gun-ja"],[14,"rapid-gunner-shoot-ja"],[15,"rapid-gunner-shoot1-ja"],[16,"rapid-gunner-shoottoreload-ja"],[17,"rapid-gunner-shoot-track-ja"],[18,"rapid-gunner-spin-attack-ja"],[19,"rapid-gunner-reload-ja"],[20,"rapid-gunner-hit-ja"],[21,"rapid-gunner-hit-left-ja"],[22,"rapid-gunner-hit-right-ja"],[23,"rapid-gunner-knocked0-ja"],[24,"rapid-gunner-blue-hit0-ja"],[25,"rapid-gunner-blue-hit1-ja"],[26,"rapid-gunner-blue-hit2-ja"],[27,"rapid-gunner-land-ja"],[28,"rapid-gunner-die-in-place-ja"],[29,"rapid-gunner-die-falling-ja"],[30,"rapid-gunner-knocked-land0-ja"]],"rhino-ag":[[0,"rhino-lod0-jg"],[1,"rhino-lod0-mg"],[2,"rhino-shadow-mg"],[3,"rhino-idle-ja"],[4,"rhino-idleB-ja"],[5,"rhino-jump-ja"],[6,"rhino-patrol-ja"],[7,"rhino-notice-ja"],[8,"rhino-attack-ja"],[9,"rhino-attack-to-charge-ja"],[10,"rhino-charge-ja"],[11,"rhino-victory-begin-ja"],[12,"rhino-victory-loop-ja"],[13,"rhino-victory-end-ja"],[14,"rhino-die-ja"],[15,"rhino-death-ja"],[16,"rhino-knocked-soft-ja"],[17,"rhino-knocked-soft-left-ja"],[18,"rhino-knocked-soft-right-ja"],[19,"rhino-knocked-soft-behind-ja"],[20,"rhino-skid-ja"],[21,"rhino-skid-left-ja"],[22,"rhino-skid-right-ja"],[23,"rhino-victory-hit-ja"],[24,"rhino-victory-hit2-ja"]],"rhino-wall-ag":[[0,"rhino-wall-1-lod0-jg"],[1,"rhino-wall-1-lod0-mg"],[9,"rhino-wall-2-end-ja"],[2,"rhino-wall-1-idle-ja"],[4,"rhino-wall-1-end-ja"],[5,"rhino-wall-2-lod0-jg"],[6,"rhino-wall-2-lod0-mg"],[7,"rhino-wall-2-idle-ja"]],"rift-break-ring-ag":[[0,"rift-break-ring-lod0-jg"],[1,"rift-break-ring-lod0-mg"],[2,"rift-break-ring-idle-ja"]],"rift-occlude-ag":[[0,"rift-occlude-lod0-jg"],[1,"rift-occlude-lod0-mg"],[2,"rift-occlude-idle-ja"]],"rift-rider-ag":[[0,"rift-rider-lod0-jg"],[1,"rift-rider-lod0-mg"],[2,"rift-rider-shadow-mg"],[3,"rift-rider-shadow-no-lift-mg"],[4,"rift-rider-idle-ja"]],"rift-rider-bar-ag":[[0,"rift-rider-bar-lod0-jg"],[1,"rift-rider-bar-lod0-mg"],[2,"rift-rider-bar-idle-ja"]],"rift-rider-break-ag":[[0,"rift-rider-break-lod0-jg"],[8,"rift-rider-break-a-lod0-mg"],[1,"rift-rider-break-lod0-mg"],[9,"rift-rider-break-a-idle-ja"],[2,"rift-rider-break-idle-ja"],[4,"rift-rider-break-end-ja"],[7,"rift-rider-break-a-lod0-jg"],[11,"rift-rider-break-a-end-ja"]],"rift-rider-break-b-ag":[[0,"rift-rider-break-b-lod0-jg"],[1,"rift-rider-break-b-lod0-mg"],[2,"rift-rider-break-b-idle-ja"]],"rift-rider-break-c-ag":[[0,"rift-rider-break-c-lod0-jg"],[1,"rift-rider-break-c-lod0-mg"],[2,"rift-rider-break-c-idle-ja"]],"rift-rider-chunk-a-ag":[[0,"rift-rider-chunk-a-lod0-jg"],[1,"rift-rider-chunk-a-lod0-mg"],[2,"rift-rider-chunk-a-idle-ja"]],"rift-rider-dash-ag":[[0,"rift-rider-dash-lod0-jg"],[1,"rift-rider-dash-lod0-mg"],[2,"rift-rider-dash-idle-ja"]],"rift-rider-donut-ag":[[0,"rift-rider-donut-lod0-jg"],[1,"rift-rider-donut-lod0-mg"],[2,"rift-rider-donut-shadow-mg"],[3,"rift-rider-donut-idle-ja"]],"rift-rider-heart-of-mar-ag":[[0,"rift-rider-heart-of-mar-lod0-jg"],[1,"rift-rider-heart-of-mar-lod0-mg"],[2,"rift-rider-heart-of-mar-idle-ja"]],"rift-ring-ag":[[0,"rift-ring-lod0-jg"],[1,"rift-ring-lod0-mg"],[2,"rift-ring-idle-ja"]],"rift-ring-in-game-ag":[[0,"rift-ring-in-game-lod0-jg"],[1,"rift-ring-in-game-lod0-mg"],[2,"rift-ring-in-game-idle-ja"]],"roboguard-ag":[[0,"roboguard-lod0-jg"],[1,"roboguard-lod0-mg"],[2,"roboguard-lod2-mg"],[3,"roboguard-shadow-mg"],[4,"roboguard-idle0-ja"],[5,"roboguard-idle1-ja"],[6,"roboguard-notice-ja"],[7,"roboguard-walk-ja"],[8,"roboguard-run-ja"],[9,"roboguard-idle-to-ball-ja"],[10,"roboguard-ball-ja"],[11,"roboguard-ball-to-idle-ja"],[12,"roboguard-death-standing-ja"],[13,"roboguard-laser-ground-ja"],[14,"roboguard-punch-rotate-ja"],[15,"roboguard-punch-go-ja"],[16,"roboguard-punch-hold-ja"],[17,"roboguard-punch-end-ja"],[18,"roboguard-shoot-left-start-ja"],[19,"roboguard-shoot-left-ja"],[20,"roboguard-shoot-left-end-ja"],[21,"roboguard-knocked-small-ja"],[22,"roboguard-knocked-small-land-ja"],[23,"roboguard-knocked-big-ja"],[24,"roboguard-knocked-big-land-ja"],[25,"roboguard-fall-ja"],[26,"roboguard-shoot-right-ja"],[27,"roboguard-ball-to-dizzy-ja"],[28,"roboguard-dizzy-ja"],[29,"roboguard-explode-lod0-jg"],[30,"roboguard-explode-lod0-mg"],[31,"roboguard-explode-idle-ja"]],"ruins-breakable-wall-ag":[[0,"ruins-breakable-wall-1-lod0-jg"],[9,"ruins-breakable-wall-2-lod0-jg"],[1,"ruins-breakable-wall-1-lod0-mg"],[2,"ruins-breakable-wall-1-lod1-mg"],[3,"ruins-breakable-wall-1-lod2-mg"],[4,"ruins-breakable-wall-1-idle-ja"],[5,"ruins-breakable-wall-1-end-front-ja"],[7,"ruins-breakable-wall-1-end-rear-ja"],[10,"ruins-breakable-wall-2-lod0-mg"],[11,"ruins-breakable-wall-2-lod1-mg"],[12,"ruins-breakable-wall-2-lod2-mg"],[13,"ruins-breakable-wall-2-idle-ja"],[14,"ruins-breakable-wall-2-end-front-ja"],[16,"ruins-breakable-wall-2-end-rear-ja"],[18,"ruins-breakable-wall-3-lod0-jg"],[19,"ruins-breakable-wall-3-lod0-mg"],[20,"ruins-breakable-wall-3-lod1-mg"],[21,"ruins-breakable-wall-3-lod2-mg"],[22,"ruins-breakable-wall-3-idle-ja"],[23,"ruins-breakable-wall-3-end-front-ja"],[25,"ruins-breakable-wall-3-end-rear-ja"],[27,"ruins-breakable-wall-4-lod0-jg"],[28,"ruins-breakable-wall-4-lod0-mg"],[29,"ruins-breakable-wall-4-idle-ja"],[30,"ruins-breakable-wall-4-end-front-ja"],[32,"ruins-breakable-wall-5-lod0-jg"],[33,"ruins-breakable-wall-5-lod0-mg"],[34,"ruins-breakable-wall-5-idle-ja"],[35,"ruins-breakable-wall-5-end-front-ja"],[37,"ruins-breakable-wall-6-lod0-jg"],[38,"ruins-breakable-wall-6-lod0-mg"],[39,"ruins-breakable-wall-6-idle-ja"],[40,"ruins-breakable-wall-6-end-front-ja"]],"ruins-bridge-ag":[[0,"ruins-bridge-1-lod0-jg"],[1,"ruins-bridge-1-lod0-mg"],[2,"ruins-bridge-1-lod1-mg"],[3,"ruins-bridge-1-idle-ja"],[4,"ruins-bridge-1-end-ja"]],"ruins-drop-plat-ag":[[0,"ruins-drop-plat-a-lod0-jg"],[9,"ruins-drop-plat-a-3-idle-ja"],[1,"ruins-drop-plat-a-lod0-mg"],[2,"ruins-drop-plat-a-lod1-mg"],[3,"ruins-drop-plat-a-1-idle-ja"],[4,"ruins-drop-plat-a-1-end-ja"],[6,"ruins-drop-plat-a-2-idle-ja"],[7,"ruins-drop-plat-a-2-end-ja"],[10,"ruins-drop-plat-a-3-end-ja"],[12,"ruins-drop-plat-b-lod0-jg"],[13,"ruins-drop-plat-b-lod0-mg"],[14,"ruins-drop-plat-b-lod1-mg"],[15,"ruins-drop-plat-b-1-idle-ja"],[16,"ruins-drop-plat-b-1-end-ja"],[18,"ruins-drop-plat-b-2-idle-ja"],[19,"ruins-drop-plat-b-2-end-ja"],[21,"ruins-drop-plat-c-lod0-jg"],[22,"ruins-drop-plat-c-lod0-mg"],[23,"ruins-drop-plat-c-lod1-mg"],[24,"ruins-drop-plat-c-1-idle-ja"],[25,"ruins-drop-plat-c-1-end-ja"],[27,"ruins-drop-plat-c-2-idle-ja"],[28,"ruins-drop-plat-c-2-end-ja"],[30,"ruins-drop-plat-c-3-idle-ja"],[31,"ruins-drop-plat-c-3-end-ja"]],"ruins-pillar-collapse-ag":[[0,"ruins-pillar-collapse-lod0-jg"],[8,"ruins-pillar-collapse-3-idle-ja"],[1,"ruins-pillar-collapse-lod0-mg"],[9,"ruins-pillar-collapse-3-end-ja"],[2,"ruins-pillar-collapse-1-idle-ja"],[3,"ruins-pillar-collapse-1-end-ja"],[5,"ruins-pillar-collapse-2-idle-ja"],[6,"ruins-pillar-collapse-2-end-ja"]],"ruins-precipice-ag":[[0,"ruins-precipice-lod0-jg"],[1,"ruins-precipice-lod0-mg"],[2,"ruins-precipice-idle-ja"]],"ruins-tower-a-ag":[[0,"ruins-tower-a-lod0-jg"],[1,"ruins-tower-a-lod0-mg"],[2,"ruins-tower-a-idle-ja"]],"ruins-tower-b-ag":[[0,"ruins-tower-b-lod0-jg"],[1,"ruins-tower-b-lod0-mg"],[2,"ruins-tower-b-idle-ja"]],"ruins-tower-c-ag":[[0,"ruins-tower-c-lod0-jg"],[1,"ruins-tower-c-lod0-mg"],[2,"ruins-tower-c-idle-ja"]],"ruins-tower-d-ag":[[0,"ruins-tower-d-lod0-jg"],[1,"ruins-tower-d-lod0-mg"],[2,"ruins-tower-d-idle-ja"]],"ruins-tower-e-ag":[[0,"ruins-tower-e-lod0-jg"],[1,"ruins-tower-e-lod0-mg"],[2,"ruins-tower-e-idle-ja"]],"ruins-tower-f-ag":[[0,"ruins-tower-f-lod0-jg"],[1,"ruins-tower-f-lod0-mg"],[2,"ruins-tower-f-idle-ja"]],"ruins-tower-rp-ag":[[0,"ruins-tower-rp-lod0-jg"],[1,"ruins-tower-rp-lod0-mg"],[2,"ruins-tower-rp-idle-ja"]],"samos-ag":[[0,"samos-lod0-jg"],[1,"samos-lod0-mg"],[2,"samos-lod1-mg"],[3,"samos-shadow-mg"],[4,"samos-idle-ja"],[5,"samos-idle-bots-ja"],[6,"samos-stand0-ja"],[7,"samos-raise-ship-ja"],[8,"samos-walk0-ja"],[9,"samos-knocked-forward-ja"],[10,"samos-knocked-forward-land-ja"],[11,"samos-knocked-back-ja"],[12,"samos-knocked-back-land-ja"],[13,"samos-death0-ja"],[14,"samos-death0-end-ja"]],"samos-highres-ag":[[0,"samos-highres-lod0-jg"],[1,"samos-highres-lod0-mg"],[2,"samos-highres-shadow-mg"],[3,"samos-highres-idle-ja"]],"samos-lsamergd+0-ag":[[0,"samos-highres-idle-garage-ja"]],"scenecamera-ag":[[0,"scenecamera-lod0-jg"],[1,"scenecamera-lod0-mg"],[2,"scenecamera-idle-ja"]],"seal-of-mar-ag":[[0,"seal-of-mar-lod0-jg"],[1,"seal-of-mar-lod0-mg"],[2,"seal-of-mar-idle-ja"]],"seal-of-mar-base-ag":[[0,"seal-of-mar-base-lod0-jg"],[1,"seal-of-mar-base-lod0-mg"],[2,"seal-of-mar-base-idle-ja"]],"seal-of-mar-top-ag":[[0,"seal-of-mar-top-lod0-jg"],[1,"seal-of-mar-top-lod0-mg"],[2,"seal-of-mar-top-idle-ja"]],"searchlight-ag":[[0,"searchlight-lod0-jg"],[1,"searchlight-lod0-mg"],[2,"searchlight-idle-ja"]],"security-wall-ag":[[0,"security-wall-lod0-jg"],[1,"security-wall-lod0-mg"],[2,"security-wall-idle-ja"]],"sew-arm-blade-ag":[[0,"sew-arm-blade-lod0-jg"],[1,"sew-arm-blade-lod0-mg"],[2,"sew-arm-blade-lod1-mg"],[3,"sew-arm-blade-idle-ja"]],"sew-catwalk-ag":[[0,"sew-catwalk-1-lod0-jg"],[1,"sew-catwalk-1-lod0-mg"],[2,"sew-catwalk-1-lod1-mg"],[3,"sew-catwalk-1-idle-ja"],[4,"sew-catwalk-1-end-ja"]],"sew-elevator-ag":[[0,"sew-elevator-lod0-jg"],[1,"sew-elevator-lod0-mg"],[2,"sew-elevator-lod1-mg"],[3,"sew-elevator-idle-ja"]],"sew-gunturret-ag":[[0,"sew-gunturret-lod0-jg"],[1,"sew-gunturret-lod0-mg"],[2,"sew-gunturret-idle-ja"],[3,"sew-gunturret-shoot-ja"],[4,"sew-gunturret-explode-lod0-jg"],[5,"sew-gunturret-explode-lod0-mg"],[6,"sew-gunturret-explode-idle-ja"]],"sew-mar-statue-explode-ag":[[0,"sew-mar-statue-explode-a-lod0-jg"],[1,"sew-mar-statue-explode-a-lod0-mg"],[2,"sew-mar-statue-explode-a-idle-ja"],[4,"sew-mar-statue-explode-b-lod0-jg"],[5,"sew-mar-statue-explode-b-lod0-mg"],[6,"sew-mar-statue-explode-b-idle-ja"]],"sew-multi-blade-ag":[[0,"sew-multi-blade-lod0-jg"],[1,"sew-multi-blade-lod0-mg"],[2,"sew-multi-blade-lod1-mg"],[3,"sew-multi-blade-idle-ja"]],"sew-single-blade-ag":[[0,"sew-single-blade-lod0-jg"],[1,"sew-single-blade-lod0-mg"],[2,"sew-single-blade-idle-ja"]],"sew-tri-blade-ag":[[0,"sew-tri-blade-lod0-jg"],[1,"sew-tri-blade-lod0-mg"],[2,"sew-tri-blade-lod1-mg"],[3,"sew-tri-blade-idle-ja"]],"sew-twist-blade-ag":[[0,"sew-twist-blade-lod0-jg"],[1,"sew-twist-blade-lod0-mg"],[2,"sew-twist-blade-lod1-mg"],[3,"sew-twist-blade-idle-ja"]],"sew-valve-ag":[[0,"sew-valve-lod0-jg"],[1,"sew-valve-lod0-mg"],[2,"sew-valve-lod1-mg"],[3,"sew-valve-idle-ja"]],"sew-wall-ag":[[0,"sew-wall-lod0-jg"],[1,"sew-wall-lod0-mg"],[2,"sew-wall-lod1-mg"],[3,"sew-wall-1-idle-ja"],[4,"sew-wall-1-end-ja"],[6,"sew-wall-2-idle-ja"],[7,"sew-wall-2-end-ja"]],"shard-ag":[[0,"mtn-shard-lod0-jg"],[1,"mtn-shard-lod0-mg"],[2,"mtn-shard-idle-ja"]],"shield-gunner-ag":[[0,"shield-gunner-lod0-jg"],[1,"shield-gunner-lod0-mg"],[2,"shield-gunner-idle-ja"]],"sig-ag":[[0,"sig-lod0-jg"],[1,"sig-lod0-mg"],[2,"sig-shadow-mg"],[3,"sig-walk-ja"],[4,"sig-idle-right0-ja"],[5,"sig-idle-right0-to-ready0-ja"],[6,"sig-ready0-to-idle-right0-ja"],[7,"sig-ready0-ja"],[8,"sig-run-ja"],[9,"sig-whip-forward-ja"],[10,"sig-whip-left-ja"],[11,"sig-whip-right-ja"],[12,"sig-blast-forward-ja"],[13,"sig-blast-left-ja"],[14,"sig-blast-right-ja"],[15,"sig-yellow-hit-forward0-ja"],[16,"sig-yellow-hit-backward0-ja"],[17,"sig-yellow-hit-left0-ja"],[18,"sig-yellow-hit-right0-ja"],[19,"sig-blue-hit0-ja"],[20,"sig-blue-hit1-ja"],[21,"sig-blue-hit2-ja"],[22,"sig-blue-hit-land-ja"],[23,"sig-hard-hit0-ja"],[24,"sig-hard-hit-land-ja"],[25,"sig-die-in-place0-ja"],[26,"sig-gun-fix-start-ja"],[27,"sig-gun-fix-hit-ja"],[28,"sig-gun-fix-hit-to-look-a-ja"],[29,"sig-gun-fix-look-a-ja"],[30,"sig-gun-fix-look-b-ja"],[31,"sig-gun-fix-shake-look-ja"],[32,"sig-gun-fix-look-to-stomp-ja"],[33,"sig-gun-fix-stomp-ja"],[34,"sig-gun-fix-stomp-to-hit-ja"],[35,"sig-charge-to-crouch-ja"],[36,"sig-charge0-ja"],[37,"sig-charge-to-ready-ja"],[38,"sig-charge-ready-ja"],[39,"sig-standing-jump-wind-up-ja"],[40,"sig-standing-jump-in-air-ja"],[41,"sig-standing-jump-land-ja"],[42,"sig-upper-base-low-ja"],[43,"sig-upper-low-to-high-ja"],[44,"sig-upper-base-high-ja"],[45,"sig-upper-shoot-ja"],[46,"sig-upper-high-to-low-ja"],[47,"sig-idle-crouch-ja"],[48,"sig-turn-left-start0-ja"],[49,"sig-turn-left50-end0-ja"],[50,"sig-turn-left100-end0-ja"],[51,"sig-turn-left150-end0-ja"],[52,"sig-turn-right-start0-ja"],[53,"sig-turn-right50-end0-ja"],[54,"sig-turn-right100-end0-ja"],[55,"sig-turn-right150-end0-ja"],[56,"sig-chased-run0-ja"],[57,"sig-chased-run-jump0-ja"],[58,"sig-chased-run-jump-land0-ja"],[59,"sig-chased-shoot-jump0-ja"],[60,"sig-chased-shoot-jump-land0-ja"],[61,"sig-chased-idle-start-ja"],[62,"sig-chased-idle-loop-ja"]],"sig-highres-ag":[[0,"sig-highres-lod0-jg"],[1,"sig-highres-lod0-mg"],[2,"sig-highres-shadow-mg"],[3,"sig-highres-idle-ja"],[4,"sig-highres-idle-stand-ja"]],"sinking-plat-ag":[[0,"sinking-plat-lod0-jg"],[1,"sinking-plat-lod0-mg"],[2,"sinking-plat-lod1-mg"],[3,"sinking-plat-idle-ja"]],"skate-gate-ag":[[0,"skate-gate-lod0-jg"],[1,"skate-gate-lod0-mg"],[2,"skate-gate-idle-ja"]],"skate-training-ramp-ag":[[0,"skate-training-ramp-lod0-jg"],[1,"skate-training-ramp-lod0-mg"],[2,"skate-training-ramp-idle-ja"]],"skatea-floating-ring-ag":[[0,"skatea-floating-ring-lod0-jg"],[1,"skatea-floating-ring-lod0-mg"],[2,"skatea-floating-ring-idle-ja"]],"skatea-jump-pad-ag":[[0,"skatea-jump-pad-lod0-jg"],[1,"skatea-jump-pad-lod0-mg"],[2,"skatea-jump-pad-idle-ja"]],"slider-ag":[[0,"slider-lod0-jg"],[1,"slider-lod0-mg"],[2,"slider-lod1-mg"],[3,"slider-idle-ja"]],"son-of-particleman-ag":[[0,"son-of-particleman-lod0-jg"],[1,"son-of-particleman-lod0-mg"],[2,"son-of-particleman-idle-ja"]],"spider-eyes-ag":[[0,"spider-eyes-lod0-jg"],[1,"spider-eyes-lod0-mg"],[2,"spider-eyes-idle-ja"]],"spotlight-ag":[[0,"spotlight-lod0-jg"],[1,"spotlight-lod0-mg"],[2,"spotlight-idle-ja"]],"spyder-ag":[[0,"spyder-lod0-jg"],[1,"spyder-lod0-mg"],[2,"spyder-lod1-mg"],[3,"spyder-shadow-mg"],[4,"spyder-idle-ja"],[5,"spyder-patrol0-ja"],[6,"spyder-notice-ja"],[7,"spyder-victory-ja"],[8,"spyder-run0-ja"],[9,"spyder-shoot-low-ja"],[10,"spyder-shoot-high-ja"],[11,"spyder-falling-death-ja"],[12,"spyder-death-ja"],[13,"spyder-die-knocked-ja"],[14,"spyder-jump-ja"],[15,"spyder-hit-ja"],[16,"spyder-hit-hard-ja"],[17,"spyder-blue-hit0-ja"],[18,"spyder-blue-hit1-ja"],[19,"spyder-blue-hit2-ja"],[20,"spyder-hit-land-ja"],[21,"spyder-jump-wind-up-ja"],[22,"spyder-jump-in-air-ja"],[23,"spyder-jump-land-ja"]],"spydroid-ag":[[0,"spydroid-lod0-jg"],[1,"spydroid-lod0-mg"],[2,"spydroid-shadow-mg"],[3,"spydroid-idle-ja"],[4,"spydroid-walk-ja"],[5,"spydroid-run-ja"],[6,"spydroid-attack-jump-ja"],[7,"spydroid-attack-land-ja"],[8,"spydroid-jump-wind-up-ja"],[9,"spydroid-jump-ja"],[10,"spydroid-jump-land-ja"],[11,"spydroid-knocked0-ja"],[12,"spydroid-knocked0-land-ja"],[13,"spydroid-knocked1-ja"],[14,"spydroid-knocked1-land-ja"],[15,"spydroid-explode-ja"],[16,"spydroid-turn-right-ja"],[17,"spydroid-turn-left-ja"],[18,"spydroid-exploding-lod0-jg"],[19,"spydroid-exploding-lod0-mg"],[20,"spydroid-exploding-idle-ja"]],"squid-ag":[[0,"squid-lod0-jg"],[64,"squid-firepool-dissipate-ja"],[1,"squid-lod0-mg"],[65,"squid-tentacle-shield-lod0-jg"],[42,"squid-tentacle-lod0-jg"],[2,"squid-shadow-mg"],[66,"squid-tentacle-shield-lod0-mg"],[43,"squid-tentacle-lod0-mg"],[44,"squid-tentacle-shadow-mg"],[45,"squid-tentacle-idle-ja"],[46,"squid-tentacle-recharge-start-ja"],[47,"squid-tentacle-recharge-ja"],[48,"squid-tentacle-recharge-end-ja"],[49,"squid-lights-lod0-jg"],[50,"squid-lights-lod0-mg"],[51,"squid-lights-idle-ja"],[52,"squid-driver-lod0-jg"],[53,"squid-driver-lod0-mg"],[54,"squid-driver-test-ja"],[56,"squid-grenade-lod0-jg"],[57,"squid-grenade-lod0-mg"],[58,"squid-grenade-shadow-mg"],[59,"squid-grenade-idle-ja"],[60,"squid-firepool-lod0-jg"],[61,"squid-firepool-lod0-mg"],[62,"squid-firepool-idle-ja"],[63,"squid-firepool-form-ja"],[67,"squid-tentacle-shield-idle-ja"],[68,"squid-squid-shield-lod0-jg"],[69,"squid-squid-shield-lod0-mg"],[70,"squid-squid-shield-idle-ja"]],"squid-break-ag":[[8,"squid-break-b-lod0-jg"],[0,"squid-break-pod-lod0-jg"],[9,"squid-break-b-lod0-mg"],[1,"squid-break-pod-lod0-mg"],[2,"squid-break-pod-idle-ja"],[4,"squid-break-a-lod0-jg"],[5,"squid-break-a-lod0-mg"],[6,"squid-break-a-idle-ja"],[10,"squid-break-b-idle-ja"],[12,"squid-break-c-lod0-jg"],[13,"squid-break-c-lod0-mg"],[14,"squid-break-c-idle-ja"],[16,"squid-break-d-lod0-jg"],[17,"squid-break-d-lod0-mg"],[18,"squid-break-d-idle-ja"],[20,"squid-break-e-lod0-jg"],[21,"squid-break-e-lod0-mg"],[22,"squid-break-e-idle-ja"],[24,"squid-break-tentacle-lod0-jg"],[25,"squid-break-tentacle-lod0-mg"],[26,"squid-break-tentacle-idle-ja"]],"squid-collision-ag":[[0,"squid-collision-lod0-jg"],[1,"squid-collision-lod0-mg"],[2,"squid-collision-b-lod0-jg"],[3,"squid-collision-b-lod0-mg"],[4,"squid-collision-c-lod0-jg"],[5,"squid-collision-c-lod0-mg"],[6,"squid-collision-idle-ja"]],"stad-c-force-field-ag":[[0,"stad-c-force-field-lod0-jg"],[1,"stad-c-force-field-lod0-mg"],[2,"stad-c-force-field-idle-ja"]],"stad-d-force-field-ag":[[0,"stad-d-force-field-lod0-jg"],[1,"stad-d-force-field-lod0-mg"],[2,"stad-d-force-field-idle-ja"]],"stad-force-field-ag":[[0,"stad-force-field-lod0-jg"],[1,"stad-force-field-lod0-mg"],[2,"stad-force-field-idle-ja"]],"stadium-barrier-ag":[[0,"stadium-barrier-lod0-jg"],[1,"stadium-barrier-lod0-mg"],[2,"stadium-barrier-idle-ja"]],"stadium-racer-ag":[[0,"stadium-racer-lod0-jg"],[1,"stadium-racer-lod0-mg"],[2,"stadium-racer-lod1-mg"],[3,"stadium-racer-idle-ja"],[4,"stadium-racer-bike-stance-ja"],[5,"stadium-racer-car-stance-ja"],[6,"stadium-racer-car-taunt-left-ja"],[7,"stadium-racer-car-taunt-right-ja"],[8,"stadium-racer-car-taunt-ja"]],"stdm-baron-box-ag":[[0,"stdm-baron-box-lod0-jg"],[1,"stdm-baron-box-lod0-mg"],[2,"stdm-baron-box-idle-ja"]],"stdm-barrels-ag":[[0,"stdm-barrels-lod0-jg"],[1,"stdm-barrels-lod0-mg"],[2,"stdm-barrels-idle-ja"]],"stdmb-race-hatch-ag":[[0,"stdmb-race-hatch-lod0-jg"],[1,"stdmb-race-hatch-lod0-mg"],[2,"stdmb-race-hatch-lod1-mg"],[3,"stdmb-race-hatch-idle-ja"]],"strip-chain-crate-ag":[[0,"strip-chain-crate-lod0-jg"],[1,"strip-chain-crate-lod0-mg"],[2,"strip-chain-crate-idle-ja"]],"strip-conveyor-ag":[[0,"strip-conveyor-lod0-jg"],[1,"strip-conveyor-lod0-mg"],[2,"strip-conveyor-idle-ja"]],"strip-game-crate-ag":[[0,"strip-game-crate-lod0-jg"],[1,"strip-game-crate-lod0-mg"],[2,"strip-game-crate-idle-ja"],[3,"strip-game-crate-final-ja"]],"switch-ag":[[0,"cas-switch-lod0-jg"],[1,"cas-switch-lod0-mg"],[2,"cas-switch-idle-ja"]],"talk-box-ag":[[0,"talk-box-lod0-jg"],[1,"talk-box-lod0-mg"],[2,"talk-box-idle-ja"]],"tanker-ag":[[0,"tanker-lod0-jg"],[1,"tanker-lod0-mg"],[2,"tanker-idle-ja"]],"tanker-barrels-ag":[[0,"tanker-barrels-lod0-jg"],[1,"tanker-barrels-lod0-mg"],[2,"tanker-barrels-idle-ja"]],"tanker-container-ag":[[0,"tanker-container-lod0-jg"],[1,"tanker-container-lod0-mg"],[2,"tanker-container-idle-ja"]],"tanker-crash-ag":[[0,"tanker-crash-lod0-jg"],[1,"tanker-crash-lod0-mg"],[2,"tanker-crash-idle-ja"]],"tanker-one-barrel-ag":[[0,"tanker-one-barrel-lod0-jg"],[1,"tanker-one-barrel-lod0-mg"],[2,"tanker-one-barrel-idle-ja"]],"tanker-roof-break-ag":[[0,"tanker-roof-break-lod0-jg"],[1,"tanker-roof-break-lod0-mg"],[2,"tanker-roof-break-idle-ja"]],"tess-highres-ag":[[0,"tess-highres-lod0-jg"],[1,"tess-highres-lod0-mg"],[2,"tess-highres-shadow-mg"],[3,"tess-highres-idle-ja"]],"tess-lhiphog+0-ag":[[0,"tess-highres-idle-hiphog-ja"]],"tess-ltrntess+0-ag":[[0,"tess-highres-idle-alley-ja"]],"tess-lwhack+0-ag":[[0,"tess-highres-idle-whack-ja"]],"throne-throne-ag":[[0,"throne-throne-lod0-jg"],[1,"throne-throne-lod0-mg"],[2,"throne-throne-idle-ja"]],"throwblock-ag":[[0,"throwblock-lod0-jg"],[1,"throwblock-lod0-mg"],[2,"throwblock-idle-ja"]],"time-map-ag":[[0,"time-map-lod0-jg"],[1,"time-map-lod0-mg"],[2,"time-map-idle-ja"]],"tomb-baby-spider-ag":[[0,"tomb-baby-spider-lod0-jg"],[1,"tomb-baby-spider-lod0-mg"],[2,"tomb-baby-spider-lod1-mg"],[3,"tomb-baby-spider-shadow-mg"],[4,"tomb-baby-spider-idle-ja"],[5,"tomb-baby-spider-walk0-ja"],[6,"tomb-baby-spider-notice-spin-ja"],[7,"tomb-baby-spider-notice-land-ja"],[8,"tomb-baby-spider-run0-ja"],[9,"tomb-baby-spider-turn-right-ja"],[10,"tomb-baby-spider-turn-left-ja"],[11,"tomb-baby-spider-attack0-start-ja"],[12,"tomb-baby-spider-attack0-stop-ja"],[13,"tomb-baby-spider-die-ja"],[14,"tomb-baby-spider-knocked0-ja"],[15,"tomb-baby-spider-knocked0-land-ja"],[16,"tomb-baby-spider-knocked0-land-fadeout-ja"],[17,"tomb-baby-spider-knocked1-ja"],[18,"tomb-baby-spider-knocked1-land-ja"],[19,"tomb-baby-spider-knocked1-land-fadeout-ja"],[20,"tomb-baby-spider-hit-blue-front-ja"],[21,"tomb-baby-spider-hit-blue-back-ja"],[22,"tomb-baby-spider-hit-blue-land-ja"]],"tomb-beetle-ag":[[0,"tomb-beetle-lod0-jg"],[1,"tomb-beetle-lod0-mg"],[2,"tomb-beetle-shadow-mg"],[3,"tomb-beetle-falling-ja"],[4,"tomb-beetle-land-ja"],[5,"tomb-beetle-wiggle-ja"],[6,"tomb-beetle-flip-ja"],[7,"tomb-beetle-run0-ja"],[8,"tomb-beetle-run1-ja"],[9,"tomb-beetle-stand0-ja"],[10,"tomb-beetle-fly-takeoff-ja"],[11,"tomb-beetle-fly-ja"],[12,"tomb-beetle-fly-land-ja"],[13,"tomb-beetle-die-ja"]],"tomb-beetle-door-ag":[[0,"tomb-beetle-door-lod0-jg"],[1,"tomb-beetle-door-lod0-mg"],[2,"tomb-beetle-door-idle-ja"],[3,"tomb-beetle-door-open-ja"]],"tomb-boss-bridge-ag":[[8,"tomb-boss-bridge-b-idle-ja"],[0,"tomb-boss-bridge-a-lod0-jg"],[1,"tomb-boss-bridge-a-lod0-mg"],[2,"tomb-boss-bridge-a-idle-ja"],[3,"tomb-boss-bridge-a-break-ja"],[4,"tomb-boss-bridge-a-end-ja"],[6,"tomb-boss-bridge-b-lod0-jg"],[7,"tomb-boss-bridge-b-lod0-mg"],[9,"tomb-boss-bridge-b-break-ja"],[10,"tomb-boss-bridge-b-end-ja"]],"tomb-boss-catwalk-ag":[[0,"tomb-boss-catwalk-a-lod0-jg"],[1,"tomb-boss-catwalk-a-lod0-mg"],[2,"tomb-boss-catwalk-a-idle-ja"],[3,"tomb-boss-catwalk-a-break-ja"],[4,"tomb-boss-catwalk-a-end-ja"],[5,"tomb-boss-catwalk-b-lod0-jg"],[6,"tomb-boss-catwalk-b-lod0-mg"],[7,"tomb-boss-catwalk-b-idle-ja"],[8,"tomb-boss-catwalk-b-break-ja"],[9,"tomb-boss-catwalk-b-end-ja"],[10,"tomb-boss-catwalk-c-lod0-jg"],[11,"tomb-boss-catwalk-c-lod0-mg"],[12,"tomb-boss-catwalk-c-idle-ja"],[13,"tomb-boss-catwalk-c-break-ja"],[14,"tomb-boss-catwalk-c-end-ja"],[15,"tomb-boss-catwalk-d-lod0-jg"],[16,"tomb-boss-catwalk-d-lod0-mg"],[17,"tomb-boss-catwalk-d-idle-ja"],[18,"tomb-boss-catwalk-d-break-ja"],[19,"tomb-boss-catwalk-d-end-ja"],[20,"tomb-boss-catwalk-e-lod0-jg"],[21,"tomb-boss-catwalk-e-lod0-mg"],[22,"tomb-boss-catwalk-e-idle-ja"],[23,"tomb-boss-catwalk-e-break-ja"],[24,"tomb-boss-catwalk-e-end-ja"],[25,"tomb-boss-catwalk-f-lod0-jg"],[26,"tomb-boss-catwalk-f-lod0-mg"],[27,"tomb-boss-catwalk-f-idle-ja"],[28,"tomb-boss-catwalk-f-break-ja"],[29,"tomb-boss-catwalk-f-end-ja"],[30,"tomb-boss-catwalk-g-lod0-jg"],[31,"tomb-boss-catwalk-g-lod0-mg"],[32,"tomb-boss-catwalk-g-idle-ja"],[33,"tomb-boss-catwalk-g-break-ja"],[34,"tomb-boss-catwalk-g-end-ja"],[35,"tomb-boss-catwalk-main-lod0-jg"],[36,"tomb-boss-catwalk-main-lod0-mg"],[37,"tomb-boss-catwalk-main-idle-ja"]],"tomb-boss-debris-ag":[[0,"tomb-boss-debris-a-lod0-jg"],[1,"tomb-boss-debris-a-lod0-mg"],[2,"tomb-boss-debris-a-idle-ja"],[3,"tomb-boss-debris-b-lod0-jg"],[4,"tomb-boss-debris-b-lod0-mg"],[5,"tomb-boss-debris-b-idle-ja"],[6,"tomb-boss-debris-c-lod0-jg"],[7,"tomb-boss-debris-c-lod0-mg"],[8,"tomb-boss-debris-c-idle-ja"],[9,"tomb-boss-debris-d-lod0-jg"],[10,"tomb-boss-debris-d-lod0-mg"],[11,"tomb-boss-debris-d-idle-ja"],[12,"tomb-boss-debris-e-lod0-jg"],[13,"tomb-boss-debris-e-lod0-mg"],[14,"tomb-boss-debris-e-idle-ja"],[15,"tomb-boss-debris-f-lod0-jg"],[16,"tomb-boss-debris-f-lod0-mg"],[17,"tomb-boss-debris-f-idle-ja"],[18,"tomb-boss-debris-g-lod0-jg"],[19,"tomb-boss-debris-g-lod0-mg"],[20,"tomb-boss-debris-g-idle-ja"],[21,"tomb-boss-debris-h-lod0-jg"],[22,"tomb-boss-debris-h-lod0-mg"],[23,"tomb-boss-debris-h-idle-ja"],[24,"tomb-boss-debris-i-lod0-jg"],[25,"tomb-boss-debris-i-lod0-mg"],[26,"tomb-boss-debris-i-idle-ja"]],"tomb-boss-door-ag":[[0,"tomb-boss-door-lod0-jg"],[1,"tomb-boss-door-lod0-mg"],[2,"tomb-boss-door-idle-ja"]],"tomb-boss-explode-ag":[[0,"tomb-boss-explode-lod0-jg"],[1,"tomb-boss-explode-lod0-mg"],[3,"tomb-boss-explode-a-lod0-jg"],[4,"tomb-boss-explode-a-lod0-mg"]],"tomb-boss-firepot-ag":[[0,"tomb-boss-firepot-lod0-jg"],[1,"tomb-boss-firepot-lod0-mg"],[2,"tomb-boss-firepot-lod1-mg"],[3,"tomb-boss-firepot-idle-ja"],[4,"tomb-boss-firepot-break-ja"],[5,"tomb-boss-firepot-end-ja"]],"tomb-boss-pillar-ag":[[0,"tomb-boss-pillar-lod0-jg"],[1,"tomb-boss-pillar-lod0-mg"],[2,"tomb-boss-pillar-lod1-mg"],[3,"tomb-boss-pillar-idle-ja"],[4,"tomb-boss-pillar-break-ja"],[5,"tomb-boss-pillar-end-ja"]],"tomb-boulder-ag":[[0,"tomb-boulder-lod0-jg"],[9,"tomb-boulder-explode-lod0-jg"],[1,"tomb-boulder-lod0-mg"],[10,"tomb-boulder-explode-lod0-mg"],[2,"tomb-boulder-idle-ja"],[3,"tomb-boulder-mid-ja"],[12,"tomb-boulder-explode-a-mid-ja"],[4,"tomb-boulder-end-ja"],[15,"tomb-boulder-stop-lod0-jg"],[16,"tomb-boulder-stop-lod0-mg"],[18,"tomb-boulder-stop-a-mid-ja"],[24,"tomb-boulder-pillar-lod0-jg"],[25,"tomb-boulder-pillar-lod0-mg"],[38,"tomb-boulder-spider-lod0-jg"],[39,"tomb-boulder-spider-lod0-mg"],[40,"tomb-boulder-spider-shadow-mg"],[41,"tomb-boulder-spider-idle-ja"],[42,"tomb-boulder-spider-mid-ja"],[43,"tomb-boulder-spider-end-ja"],[48,"tomb-boulder-stick-lod0-jg"],[49,"tomb-boulder-stick-lod0-mg"],[50,"tomb-boulder-stick-idle-ja"],[52,"tomb-boulder-wing-door-lod0-jg"],[53,"tomb-boulder-wing-door-lod0-mg"],[54,"tomb-boulder-wing-door-idle-ja"],[55,"tomb-boulder-wing-door-mid-ja"],[56,"tomb-boulder-wing-door-end-ja"]],"tomb-boulder-door-ag":[[0,"tomb-boulder-door-lod0-jg"],[1,"tomb-boulder-door-lod0-mg"],[2,"tomb-boulder-door-idle-ja"]],"tomb-bounce-web-ag":[[0,"tomb-bounce-web-lod0-jg"],[1,"tomb-bounce-web-lod0-mg"],[2,"tomb-bounce-web-idle-ja"]],"tomb-button-ag":[[0,"tomb-button-lod0-jg"],[1,"tomb-button-lod0-mg"],[2,"tomb-button-idle-ja"]],"tomb-door-ag":[[0,"tomb-door-lod0-jg"],[1,"tomb-door-lod0-mg"],[2,"tomb-door-idle-ja"],[3,"tomb-door-open-ja"]],"tomb-elevator-ag":[[0,"tomb-elevator-lod0-jg"],[1,"tomb-elevator-lod0-mg"],[2,"tomb-elevator-lod1-mg"],[3,"tomb-elevator-idle-ja"],[4,"tomb-elevator-run-ja"]],"tomb-mar-door-ag":[[0,"tomb-mar-door-lod0-jg"],[1,"tomb-mar-door-lod0-mg"],[2,"tomb-mar-door-idle-ja"]],"tomb-move-swing-pole-ag":[[0,"tomb-move-swing-pole-lod0-jg"],[1,"tomb-move-swing-pole-lod0-mg"],[2,"tomb-move-swing-pole-idle-ja"]],"tomb-plat-pillar-ag":[[0,"tomb-plat-pillar-lod0-jg"],[1,"tomb-plat-pillar-lod0-mg"],[2,"tomb-plat-pillar-idle-ja"]],"tomb-plat-return-ag":[[0,"tomb-plat-return-lod0-jg"],[1,"tomb-plat-return-lod0-mg"],[2,"tomb-plat-return-idle-ja"]],"tomb-plat-simon-ag":[[0,"tomb-plat-simon-lod0-jg"],[1,"tomb-plat-simon-lod0-mg"],[2,"tomb-plat-simon-lod1-mg"],[3,"tomb-plat-simon-idle-ja"]],"tomb-plat-wall-ag":[[0,"tomb-plat-wall-lod0-jg"],[1,"tomb-plat-wall-lod0-mg"],[2,"tomb-plat-wall-lod1-mg"],[3,"tomb-plat-wall-idle-ja"]],"tomb-simon-button-ag":[[0,"tomb-simon-button-lod0-jg"],[1,"tomb-simon-button-lod0-mg"],[2,"tomb-simon-button-lod1-mg"],[3,"tomb-simon-button-open-ja"],[4,"tomb-simon-button-press-ja"],[5,"tomb-simon-button-unpress-ja"]],"tomb-stair-block-ag":[[0,"tomb-stair-block-lod0-jg"],[1,"tomb-stair-block-lod0-mg"],[2,"tomb-stair-block-idle-ja"],[3,"tomb-stair-block-straight-ja"],[4,"tomb-stair-block-sink-ja"]],"tomb-stair-block-spikes-ag":[[0,"tomb-stair-block-spikes-lod0-jg"],[1,"tomb-stair-block-spikes-lod0-mg"],[2,"tomb-stair-block-spikes-idle-ja"]],"tomb-vibe-ag":[[0,"tomb-vibe-lod0-jg"],[1,"tomb-vibe-lod0-mg"],[2,"tomb-vibe-lod1-mg"],[3,"tomb-vibe-idle-ja"],[4,"tomb-vibe-vibrate-ja"],[5,"tomb-vibe-fall-ja"]],"tomb-wing-door-ag":[[0,"tomb-wing-door-lod0-jg"],[1,"tomb-wing-door-lod0-mg"],[2,"tomb-wing-door-idle-ja"]],"torn-highres-ag":[[0,"torn-highres-lod0-jg"],[1,"torn-highres-lod0-mg"],[2,"torn-highres-shadow-mg"],[3,"torn-highres-idle-ja"],[4,"torn-highres-idle-table-ja"],[5,"torn-highres-idle-alley-ja"]],"transport-ag":[[0,"transport-lod0-jg"],[1,"transport-lod0-mg"],[2,"transport-lod1-mg"],[3,"transport-lod2-mg"],[4,"transport-idle-ja"],[5,"transport-hatch-open-ja"],[6,"transport-hatch-close-ja"]],"turbine-ag":[[0,"turbine-lod0-jg"],[1,"turbine-lod0-mg"],[2,"turbine-lod1-mg"],[3,"turbine-idle-ja"]],"under-break-bridge-ag":[[0,"under-break-bridge-lod0-jg"],[1,"under-break-bridge-lod0-mg"],[2,"under-break-bridge-idle-ja"],[3,"under-break-bridge-broken-sig-dead-ja"]],"under-break-bridge-b-ag":[[0,"under-break-bridge-b-lod0-jg"],[1,"under-break-bridge-b-lod0-mg"],[2,"under-break-bridge-b-idle-ja"],[3,"under-break-bridge-b-broken-sig-dead-ja"]],"under-break-ceiling-ag":[[0,"under-break-ceiling-lod0-jg"],[1,"under-break-ceiling-lod0-mg"],[2,"under-break-ceiling-idle-ja"]],"under-break-door-ag":[[8,"under-break-door-3-idle-ja"],[0,"under-break-door-lod0-jg"],[9,"under-break-door-3-end-ja"],[1,"under-break-door-lod0-mg"],[2,"under-break-door-1-idle-ja"],[3,"under-break-door-1-end-ja"],[5,"under-break-door-2-idle-ja"],[6,"under-break-door-2-end-ja"],[11,"under-break-door-4-idle-ja"],[12,"under-break-door-4-end-ja"]],"under-break-floor-ag":[[0,"under-break-floor-lod0-jg"],[1,"under-break-floor-lod0-mg"],[2,"under-break-floor-idle-ja"],[3,"under-break-floor-explode-lod0-jg"],[4,"under-break-floor-explode-lod0-mg"],[5,"under-break-floor-explode-idle-ja"]],"under-break-wall-ag":[[0,"under-break-wall-lod0-jg"],[1,"under-break-wall-lod0-mg"],[2,"under-break-wall-idle-ja"]],"under-break-wall-b-ag":[[0,"under-break-wall-b-lod0-jg"],[1,"under-break-wall-b-lod0-mg"],[2,"under-break-wall-b-idle-ja"]],"under-buoy-base-ag":[[0,"under-buoy-base-lod0-jg"],[1,"under-buoy-base-lod0-mg"],[2,"under-buoy-base-idle-ja"]],"under-buoy-chain-ag":[[0,"under-buoy-chain-lod0-jg"],[1,"under-buoy-chain-lod0-mg"],[2,"under-buoy-chain-idle-ja"]],"under-buoy-plat-ag":[[0,"under-buoy-plat-lod0-jg"],[1,"under-buoy-plat-lod0-mg"],[2,"under-buoy-plat-idle-ja"]],"under-int-door-ag":[[0,"under-int-door-lod0-jg"],[1,"under-int-door-lod0-mg"],[2,"under-int-door-open-ja"]],"under-laser-ag":[[0,"under-laser-lod0-jg"],[1,"under-laser-lod0-mg"],[2,"under-laser-idle-ja"]],"under-laser-shadow-ag":[[0,"under-laser-shadow-lod0-jg"],[1,"under-laser-shadow-lod0-mg"],[2,"under-laser-shadow-shadow-mg"],[3,"under-laser-shadow-idle-ja"]],"under-lift-ag":[[0,"under-lift-lod0-jg"],[1,"under-lift-lod0-mg"],[2,"under-lift-lod1-mg"],[3,"under-lift-idle-ja"]],"under-mine-ag":[[0,"under-mine-lod0-jg"],[1,"under-mine-lod0-mg"],[2,"under-mine-lod1-mg"],[3,"under-mine-shadow-mg"],[4,"under-mine-idle-ja"],[5,"under-mine-explode-lod0-jg"],[6,"under-mine-explode-lod0-mg"],[7,"under-mine-explode-idle-ja"]],"under-plat-long-ag":[[0,"under-plat-long-lod0-jg"],[1,"under-plat-long-lod0-mg"],[2,"under-plat-long-idle-ja"]],"under-plat-shoot-ag":[[0,"under-plat-shoot-lod0-jg"],[1,"under-plat-shoot-lod0-mg"],[2,"under-plat-shoot-lod1-mg"],[3,"under-plat-shoot-idle-ja"]],"under-plat-wall-ag":[[0,"under-plat-wall-lod0-jg"],[1,"under-plat-wall-lod0-mg"],[2,"under-plat-wall-idle-ja"]],"under-rise-plat-ag":[[0,"under-rise-plat-lod0-jg"],[1,"under-rise-plat-lod0-mg"],[2,"under-rise-plat-rise1-ja"],[3,"under-rise-plat-idle-ja"],[4,"under-rise-plat-rise2-ja"],[5,"under-rise-plat-idle2-ja"]],"under-seaweed-a-ag":[[0,"under-seaweed-a-lod0-jg"],[1,"under-seaweed-a-lod0-mg"],[2,"under-seaweed-a-idle-ja"]],"under-seaweed-b-ag":[[0,"under-seaweed-b-lod0-jg"],[1,"under-seaweed-b-lod0-mg"],[2,"under-seaweed-b-idle-ja"]],"under-seaweed-c-ag":[[0,"under-seaweed-c-lod0-jg"],[1,"under-seaweed-c-lod0-mg"],[2,"under-seaweed-c-idle-ja"]],"under-seaweed-d-ag":[[0,"under-seaweed-d-lod0-jg"],[1,"under-seaweed-d-lod0-mg"],[2,"under-seaweed-d-idle-ja"]],"under-shoot-block-ag":[[0,"under-shoot-block-lod0-jg"],[1,"under-shoot-block-lod0-mg"],[2,"under-shoot-block-idle-ja"],[3,"under-shoot-block-explode-lod0-jg"],[4,"under-shoot-block-explode-lod0-mg"],[5,"under-shoot-block-explode-idle-ja"]],"under-warp-ag":[[0,"under-warp-lod0-jg"],[1,"under-warp-lod0-mg"],[2,"under-warp-idle-ja"],[3,"under-warp-none-ja"]],"vehicle-explosion-ag":[[0,"vehicle-explosion-lod0-jg"],[1,"vehicle-explosion-lod0-mg"],[2,"vehicle-explosion-idle-ja"]],"vehicle-turret-ag":[[0,"vehicle-turret-lod0-jg"],[1,"vehicle-turret-lod0-mg"],[2,"vehicle-turret-lod1-mg"],[3,"vehicle-turret-lod2-mg"],[4,"vehicle-turret-idle-ja"]],"vil-break-support-ag":[[0,"vil-break-support-lod0-jg"],[1,"vil-break-support-lod0-mg"],[2,"vil-break-support-idle-ja"]],"vil-sagesail-ag":[[0,"vil-sagesail-lod0-jg"],[1,"vil-sagesail-lod0-mg"],[2,"vil-sagesail-lod1-mg"],[3,"vil-sagesail-lod2-mg"],[4,"vil-sagesail-idle-ja"]],"vil-windmill-sail-ag":[[0,"vil-windmill-sail-lod0-jg"],[1,"vil-windmill-sail-lod0-mg"],[2,"vil-windmill-sail-lod1-mg"],[3,"vil-windmill-sail-lod2-mg"],[4,"vil-windmill-sail-idle-ja"]],"vil-windspinner-ag":[[0,"vil-windspinner-lod0-jg"],[1,"vil-windspinner-lod0-mg"],[2,"vil-windspinner-lod1-mg"],[3,"vil-windspinner-lod2-mg"],[4,"vil-windspinner-idle-ja"]],"vin-ag":[[0,"vin-lod0-jg"],[1,"vin-lod0-mg"],[2,"vin-shadow-mg"],[3,"vin-idle-ja"]],"vin-door-ag":[[0,"vin-door-lod0-jg"],[1,"vin-door-lod0-mg"],[2,"vin-door-idle-ja"]],"vin-turbine-ag":[[0,"vin-turbine-lod0-jg"],[1,"vin-turbine-lod0-mg"],[2,"vin-turbine-idle-ja"]],"vortex-light-ag":[[0,"vortex-light-lod0-jg"],[1,"vortex-light-lod0-mg"],[2,"vortex-light-idle-ja"]],"warp-gate-ag":[[0,"warp-gate-lod0-jg"],[1,"warp-gate-lod0-mg"],[2,"warp-gate-idle-ja"]],"warp-gate-b-ag":[[0,"warp-gate-b-lod0-jg"],[1,"warp-gate-b-lod0-mg"],[2,"warp-gate-b-idle-ja"]],"wasp-ag":[[0,"wasp-lod0-jg"],[1,"wasp-lod0-mg"],[2,"wasp-lod1-mg"],[3,"wasp-shadow-mg"],[4,"wasp-idle-ja"],[5,"wasp-fly-right-ja"],[6,"wasp-fly-left-ja"],[7,"wasp-fly-forward-ja"],[8,"wasp-fly-back-ja"],[9,"wasp-shoot0-ja"],[10,"wasp-knocked0-ja"],[11,"wasp-knocked0-recover-ja"],[12,"wasp-knocked1-ja"],[13,"wasp-knocked1-recover-ja"],[14,"wasp-death-left-ja"],[15,"wasp-death-left-fall-ja"],[16,"wasp-death-right-ja"],[17,"wasp-death-right-fall-ja"],[18,"wasp-death-instant-ja"],[19,"wasp-death-land-ja"],[20,"wasp-explode-lod0-jg"],[21,"wasp-explode-lod0-mg"],[22,"wasp-explode-idle-ja"]],"water-anim-ctypal-ag":[[0,"water-anim-ctypal-lrgsqr-pool-lod0-jg"],[1,"water-anim-ctypal-lrgsqr-pool-lod0-mg"],[2,"water-anim-ctypal-smlsqr-pool-lod0-jg"],[3,"water-anim-ctypal-smlsqr-pool-lod0-mg"],[4,"water-anim-ctypal-lrgfloor-pool-lod0-jg"],[5,"water-anim-ctypal-lrgfloor-pool-lod0-mg"],[6,"water-anim-ctypal-smlground-pool-lod0-jg"],[7,"water-anim-ctypal-smlground-pool-lod0-mg"],[8,"water-anim-ctypal-middle-fountain-lod0-jg"],[9,"water-anim-ctypal-middle-fountain-lod0-mg"],[10,"water-anim-ctypal-long-grnd-pool-lod0-jg"],[11,"water-anim-ctypal-long-grnd-pool-lod0-mg"],[12,"water-anim-ctypal-idle-ja"]],"water-anim-fortress-ag":[[0,"water-anim-fortress-exitb-pool-lod0-jg"],[1,"water-anim-fortress-exitb-pool-lod0-mg"],[2,"water-anim-fortress-idle-ja"]],"water-anim-mincan-ag":[[0,"water-anim-mincan-exitb-pool-lod0-jg"],[1,"water-anim-mincan-exitb-pool-lod0-mg"],[2,"water-anim-mincan-idle-ja"]],"water-anim-mountain-ag":[[0,"water-anim-mountain-fall-hi-lod0-jg"],[1,"water-anim-mountain-fall-hi-lod0-mg"],[2,"water-anim-mountain-fall-med-lod0-jg"],[3,"water-anim-mountain-fall-med-lod0-mg"],[4,"water-anim-mountain-fall-low-lod0-jg"],[5,"water-anim-mountain-fall-low-lod0-mg"],[6,"water-anim-mountain-idle-ja"]],"water-anim-mountain-dark-eco-ag":[[0,"water-anim-mountain-dark-eco-dice-lod0-jg"],[1,"water-anim-mountain-dark-eco-dice-lod0-mg"],[2,"water-anim-mountain-dark-eco-idle-ja"]],"water-anim-nest-dark-eco-ag":[[0,"water-anim-nest-dark-eco-largepool-lod0-jg"],[1,"water-anim-nest-dark-eco-largepool-lod0-mg"],[2,"water-anim-nest-dark-eco-smlupperpool-lod0-jg"],[3,"water-anim-nest-dark-eco-smlupperpool-lod0-mg"],[4,"water-anim-nest-dark-eco-middlepool-lod0-jg"],[5,"water-anim-nest-dark-eco-middlepool-lod0-mg"],[6,"water-anim-nest-dark-eco-botpool-lod0-jg"],[7,"water-anim-nest-dark-eco-botpool-lod0-mg"],[8,"water-anim-nest-dark-eco-idle-ja"]],"water-anim-stadium-ag":[[0,"water-anim-stadium-middle-pool-lod0-jg"],[1,"water-anim-stadium-middle-pool-lod0-mg"],[2,"water-anim-stadium-top-fountain-lod0-jg"],[3,"water-anim-stadium-top-fountain-lod0-mg"],[4,"water-anim-stadium-floor-pool-lod0-jg"],[5,"water-anim-stadium-floor-pool-lod0-mg"],[6,"water-anim-stadium-idle-ja"]],"water-anim-strip-dark-eco-ag":[[0,"water-anim-strip-dark-eco-near-lift-lod0-jg"],[1,"water-anim-strip-dark-eco-near-lift-lod0-mg"],[2,"water-anim-strip-dark-eco-near-lift-lod1-mg"],[3,"water-anim-strip-dark-eco-near-crane-lod0-jg"],[4,"water-anim-strip-dark-eco-near-crane-lod0-mg"],[5,"water-anim-strip-dark-eco-near-crane-lod1-mg"],[6,"water-anim-strip-dark-eco-with-eggs-lod0-jg"],[7,"water-anim-strip-dark-eco-with-eggs-lod0-mg"],[8,"water-anim-strip-dark-eco-with-eggs-lod1-mg"],[9,"water-anim-strip-dark-eco-under-bridge-lod0-jg"],[10,"water-anim-strip-dark-eco-under-bridge-lod0-mg"],[11,"water-anim-strip-dark-eco-under-bridge-lod1-mg"],[12,"water-anim-strip-dark-eco-idle-ja"]],"water-anim-tomb-ag":[[0,"water-anim-tomb-main-hall-lod0-jg"],[1,"water-anim-tomb-main-hall-lod0-mg"],[2,"water-anim-tomb-tunnel-b-lod0-jg"],[3,"water-anim-tomb-tunnel-b-lod0-mg"],[4,"water-anim-tomb-tunnel-c-lod0-jg"],[5,"water-anim-tomb-tunnel-c-lod0-mg"],[6,"water-anim-tomb-tunnel-d-lod0-jg"],[7,"water-anim-tomb-tunnel-d-lod0-mg"],[8,"water-anim-tomb-tunnel-e-lod0-jg"],[9,"water-anim-tomb-tunnel-e-lod0-mg"],[10,"water-anim-tomb-tunnel-f-lod0-jg"],[11,"water-anim-tomb-tunnel-f-lod0-mg"],[12,"water-anim-tomb-idle-ja"]],"water-anim-tomb-dark-eco-ag":[[0,"water-anim-tomb-dark-eco-stair-block-lod0-jg"],[1,"water-anim-tomb-dark-eco-stair-block-lod0-mg"],[2,"water-anim-tomb-dark-eco-raised-block-lod0-jg"],[3,"water-anim-tomb-dark-eco-raised-block-lod0-mg"],[4,"water-anim-tomb-dark-eco-idle-ja"]],"water-anim-under-ag":[[0,"water-anim-under-pool-lod0-jg"],[1,"water-anim-under-pool-lod0-mg"],[2,"water-anim-under-drainout-lod0-jg"],[3,"water-anim-under-drainout-lod0-mg"],[4,"water-anim-under-fillup-lod0-jg"],[5,"water-anim-under-fillup-lod0-mg"],[6,"water-anim-under-idle-ja"]],"widow-ag":[[0,"widow-lod0-jg"],[1,"widow-lod0-mg"],[2,"widow-shadow-mg"],[3,"widow-idle-ja"]],"widow-bomb-ag":[[0,"widow-bomb-lod0-jg"],[1,"widow-bomb-lod0-mg"],[2,"widow-bomb-lod1-mg"],[3,"widow-bomb-lod2-mg"],[4,"widow-bomb-shadow-mg"],[5,"widow-bomb-idle-ja"]],"wren-ag":[[0,"wren-lod0-jg"],[1,"wren-lod0-mg"],[2,"wren-idle-ja"],[3,"wren-hop-ja"],[4,"wren-peck-ja"],[5,"wren-takeoff-ja"],[6,"wren-fly-ja"],[7,"wren-glide-ja"],[8,"wren-land-ja"]],"yakow-ag":[[0,"yakow-lod0-jg"],[1,"yakow-lod0-mg"],[2,"yakow-shadow-mg"],[3,"yakow-idle-ja"],[4,"yakow-graze-ja"],[5,"yakow-walk-ja"],[6,"yakow-run-ja"],[7,"yakow-kicked-ja"],[8,"yakow-walk-right-ja"],[9,"yakow-walk-left-ja"],[10,"yakow-kicked-in-place-ja"]],"yellow-barrel-ag":[[0,"yellow-barrel-lod0-jg"],[1,"yellow-barrel-lod0-mg"],[2,"yellow-barrel-idle-ja"]],"youngsamos-forestb+0-ag":[[0,"youngsamos-highres-idle-meditate-ja"]],"youngsamos-highres-ag":[[0,"youngsamos-highres-lod0-jg"],[1,"youngsamos-highres-lod0-mg"],[10,"youngsamos-highres-stand-to-meditate0-ja"],[2,"youngsamos-highres-shadow-mg"],[11,"youngsamos-highres-idle-deep-meditate0-ja"],[3,"youngsamos-highres-idle-ja"],[12,"youngsamos-highres-hit-back0-ja"],[13,"youngsamos-highres-hit-right0-ja"],[14,"youngsamos-highres-hit-left0-ja"],[15,"youngsamos-highres-death-fall-ja"],[16,"youngsamos-highres-death-land-ja"],[17,"youngsamos-highres-stand0-ja"],[18,"youngsamos-highres-raise-ship-ja"],[19,"youngsamos-highres-knocked-back-ja"],[20,"youngsamos-highres-knocked-back-land-ja"],[21,"youngsamos-highres-knocked-forward-ja"],[22,"youngsamos-highres-knocked-forward-land-ja"],[23,"youngsamos-highres-death0-ja"],[24,"youngsamos-highres-death0-end-ja"],[25,"youngsamos-highres-walk0-ja"],[26,"youngsamos-highres-walk1-ja"]],"youngsamos-ltrnysam+0-ag":[[0,"youngsamos-highres-idle-stand3-ja"]],"youngsamos-lysamsam+0-ag":[[0,"samos-highres-idle-bots-ja"],[1,"youngsamos-highres-idle-stand2-ja"]],"youngsamos-lyskdcd+0-ag":[[0,"youngsamos-highres-idle-alley-ja"]],"youngsamos-onintent+0-ag":[[0,"youngsamos-highres-idle-onintent-ja"]],"youngsamos-tombd+0-ag":[[0,"youngsamos-highres-idle-tomb-ja"]],"zipline-ag":[[0,"zipline-lod0-jg"],[1,"zipline-lod0-mg"],[2,"zipline-idle-ja"]]} +{"air-train-ag":[[0,"air-train-lod0-jg"],[1,"air-train-lod0-mg"],[2,"air-train-idle-ja"]],"amphibian-ag":[[0,"amphibian-lod0-jg"],[1,"amphibian-lod0-mg"],[2,"amphibian-lod1-mg"],[3,"amphibian-shadow-mg"],[4,"amphibian-idle-ja"],[5,"amphibian-tongue-attack-ja"],[6,"amphibian-knocked0-ja"],[7,"amphibian-knocked-land0-ja"],[8,"amphibian-knocked1-ja"],[9,"amphibian-knocked-land1-ja"],[10,"amphibian-knocked2-ja"],[11,"amphibian-knocked-land2-ja"],[12,"amphibian-die-ja"],[13,"amphibian-swim-ja"],[14,"amphibian-swim-fast-ja"],[15,"amphibian-swim-chomp-ja"],[16,"amphibian-walk-ja"],[17,"amphibian-attack-ja"],[18,"amphibian-attack-left-ja"],[19,"amphibian-attack-right-ja"],[20,"amphibian-attack-forward-ja"],[21,"amphibian-die-falling-ja"],[22,"amphibian-blue-hit0-ja"],[23,"amphibian-blue-hit1-ja"],[24,"amphibian-blue-hit2-ja"],[25,"amphibian-blue-land-ja"],[26,"amphibian-run0-ja"],[27,"amphibian-run1-ja"],[28,"amphibian-notice0-ja"],[29,"amphibian-notice1-ja"],[30,"amphibian-jump-wind-up0-ja"],[31,"amphibian-jump-in-air0-ja"],[32,"amphibian-jump-land0-ja"],[33,"amphibian-jump-wind-up1-ja"],[34,"amphibian-jump-in-air1-ja"],[35,"amphibian-jump-land1-ja"],[36,"amphibian-jump-in-air1-part2-ja"],[37,"amphibian-turn-right-ja"],[38,"amphibian-turn-left-ja"],[39,"amphibian-turn-right-fast-ja"],[40,"amphibian-turn-left-fast-ja"]],"ashelin-ag":[[0,"ashelin-lod0-jg"],[1,"ashelin-lod0-mg"],[2,"ashelin-shadow-mg"],[3,"ashelin-idle0-ja"],[4,"ashelin-walk0-ja"],[5,"ashelin-jog0-ja"],[6,"ashelin-run0-ja"],[7,"ashelin-knocked-back0-ja"],[8,"ashelin-knocked-back-land0-ja"],[9,"ashelin-knocked-back-die0-ja"],[10,"ashelin-knocked-right0-ja"],[11,"ashelin-knocked-right-land0-ja"],[12,"ashelin-knocked-right-die0-ja"],[13,"ashelin-blue-hit-front0-ja"],[14,"ashelin-blue-hit-front1-ja"],[15,"ashelin-blue-hit-front2-ja"],[16,"ashelin-blue-hit-front-land0-ja"],[17,"ashelin-blue-hit-front-land1-ja"],[18,"ashelin-blue-hit-front-land2-ja"],[19,"ashelin-blue-hit-back0-ja"],[20,"ashelin-blue-hit-back1-ja"],[21,"ashelin-blue-hit-back2-ja"],[22,"ashelin-blue-hit-back-land0-ja"],[23,"ashelin-blue-hit-back-land1-ja"],[24,"ashelin-blue-hit-back-land2-ja"],[25,"ashelin-blue-hit-recover-ja"],[26,"ashelin-die-in-place0-ja"],[27,"ashelin-waiting-to-standing-ja"],[28,"ashelin-standing-fire-ja"],[29,"ashelin-standing-idle-ja"],[30,"ashelin-standing-to-waiting-ja"],[31,"ashelin-standing-turn-left-ja"],[32,"ashelin-standing-turn-right-ja"],[33,"ashelin-back-spring-start-ja"],[34,"ashelin-back-spring-loop-ja"],[35,"ashelin-back-spring-land-ja"],[36,"ashelin-cartwheel-left-start-ja"],[37,"ashelin-cartwheel-left-loop-ja"],[38,"ashelin-cartwheel-left-land-ja"],[39,"ashelin-tumble-right-start-ja"],[40,"ashelin-tumble-right-loop-ja"],[41,"ashelin-tumble-right-land-ja"]],"ashelin-highres-ag":[[0,"ashelin-highres-lod0-jg"],[1,"ashelin-highres-lod0-mg"],[2,"ashelin-highres-shadow-mg"],[3,"ashelin-highres-idle-ja"]],"atoll-hatch-ag":[[0,"atoll-hatch-lod0-jg"],[1,"atoll-hatch-lod0-mg"],[2,"atoll-hatch-lod1-mg"],[3,"atoll-hatch-idle-ja"]],"atoll-hellcat-ag":[[0,"atoll-hellcat-lod0-jg"],[1,"atoll-hellcat-lod0-mg"],[2,"atoll-hellcat-lod1-mg"],[3,"atoll-hellcat-lod2-mg"],[4,"atoll-hellcat-idle-ja"]],"atoll-mar-symbol-ag":[[0,"atoll-mar-symbol-lod0-jg"],[1,"atoll-mar-symbol-lod0-mg"],[2,"atoll-mar-symbol-idle-ja"]],"atoll-tank-ag":[[8,"atoll-tank-c-lod0-jg"],[0,"atoll-tank-a-lod0-jg"],[9,"atoll-tank-c-lod0-mg"],[1,"atoll-tank-a-lod0-mg"],[2,"atoll-tank-a-debris-ja"],[4,"atoll-tank-b-lod0-jg"],[5,"atoll-tank-b-lod0-mg"],[6,"atoll-tank-b-debris-ja"],[10,"atoll-tank-c-debris-ja"]],"atoll-valve-ag":[[0,"atoll-valve-lod0-jg"],[1,"atoll-valve-lod0-mg"],[2,"atoll-valve-lod1-mg"],[3,"atoll-valve-idle-ja"]],"atoll-windmill-ag":[[0,"atoll-windmill-lod0-jg"],[1,"atoll-windmill-lod0-mg"],[2,"atoll-windmill-lod1-mg"],[3,"atoll-windmill-lod2-mg"],[4,"atoll-windmill-idle-ja"]],"atollrotpipe-ag":[[0,"atollrotpipe-lod0-jg"],[1,"atollrotpipe-lod0-mg"],[2,"atollrotpipe-idle-ja"]],"awning-ag":[[0,"awning-lod0-jg"],[1,"awning-lod0-mg"],[2,"awning-idle-ja"]],"babak-ag":[[0,"babak-lod0-jg"],[1,"babak-lod0-mg"],[2,"babak-shadow-mg"],[3,"babak-idle-ja"],[4,"babak-idle-cower-ja"],[5,"babak-run-ja"],[6,"babak-knocked-ja"],[7,"babak-knocked-land-ja"],[8,"babak-jump-in-car-ja"],[9,"babak-idle-car-back-sides-ja"],[10,"babak-idle-car-sides-ja"],[11,"babak-idle-car-forward-sides-ja"],[12,"babak-idle-bike-back-sides-ja"],[13,"babak-idle-bike-sides-ja"],[14,"babak-idle-bike-forward-sides-ja"],[15,"babak-idle-hair-ja"],[16,"babak-jump-on-bike-ja"],[17,"babak-fall-out-patty-wagon-ja"],[18,"babak-idle-patty-wagon-ja"],[19,"babak-swim-ja"],[20,"babak-swim-ilde-ja"],[21,"babak-jump-ja"]],"barge-ag":[[0,"barge-lod0-jg"],[1,"barge-lod0-mg"],[2,"barge-idle-ja"]],"baron-ag":[[3,"baron-grab-success-ja"],[4,"baron-fly-ja"],[5,"baron-return-ja"],[6,"baron-landing-ja"],[7,"baron-drill-ja"],[8,"baron-drill-right-high-ja"],[9,"baron-drill-right-mid-ja"],[10,"baron-drill-right-low-ja"],[11,"baron-drill-left-high-ja"],[12,"baron-drill-left-mid-ja"],[13,"baron-drill-left-low-ja"],[14,"baron-fire-start-ja"],[15,"baron-fire-loop-ja"],[16,"baron-fire-end-ja"],[17,"baron-grab-stone-ja"],[18,"baron-launch-left-ja"],[19,"baron-grab-fail-ja"],[20,"baron-grab-punch-ja"],[21,"baron-launch-right-ja"],[22,"baron-hit-pod-left-ja"],[23,"baron-hit-pod-right-ja"],[24,"baron-hit-front-ja"],[25,"baron-hit-gun-left-ja"],[26,"baron-hit-gun-right-ja"],[27,"baron-grab-pull-loop-ja"],[28,"baron-grab-yank-loop-ja"],[29,"baron-grab-tug-loop-ja"],[30,"baron-grab-footing-loop-ja"],[31,"baron-grab-launch-left-ja"],[32,"baron-grab-launch-right-ja"],[33,"baron-flight-launch-left-ja"],[34,"baron-flight-launch-right-ja"],[35,"baron-flight-hit-right-ja"],[36,"baron-flight-hit-left-ja"],[37,"baron-flight-hit-final-ja"],[0,"baron-lod0-jg"],[1,"baron-lod0-mg"],[2,"baron-idle-ja"],[38,"baron-squid-idle-ja"],[39,"baron-shields-up-ja"],[40,"baron-shields-idle-ja"],[41,"baron-shields-down-ja"],[42,"baron-pods-down-ja"],[43,"baron-hatch-fore-open-ja"],[44,"baron-hatch-fore-launch-ja"],[45,"baron-hatch-fore-close-ja"],[46,"baron-hatch-aft-open-ja"],[47,"baron-hatch-aft-launch-ja"],[48,"baron-hatch-aft-close-ja"],[49,"baron-breathe-between-grenades-ja"],[50,"baron-pods-up-ja"],[51,"baron-fire-guns-start-ja"],[52,"baron-fire-guns-loop-ja"],[53,"baron-fire-guns-end-ja"],[54,"baron-fire-guns-release-ja"],[55,"baron-fire-guns-breathe-ja"],[56,"baron-fly-left-start-ja"],[57,"baron-fly-left-idle-ja"],[58,"baron-fly-left-end-ja"],[59,"baron-fly-right-start-ja"],[60,"baron-fly-right-idle-ja"],[61,"baron-fly-right-end-ja"],[62,"baron-fly-foreward-start-ja"],[63,"baron-fly-foreward-idle-ja"],[64,"baron-fly-foreward-end-ja"],[65,"baron-fly-backward-start-ja"],[66,"baron-fly-backward-idle-ja"],[67,"baron-fly-backward-end-ja"],[68,"baron-recharge-landing-ja"],[69,"baron-recharge-liftoff-ja"],[70,"baron-recharge-ja"],[71,"baron-damaged-ja"],[72,"baron-dummy17-ja"],[73,"baron-dummy18-ja"],[74,"baron-dummy19-ja"],[75,"baron-dummy20-ja"]],"baron-highres-ag":[[0,"baron-highres-lod0-jg"],[1,"baron-highres-lod0-mg"],[2,"baron-highres-shadow-mg"],[3,"baron-highres-idle-ja"],[4,"baron-highres-idle-dead-ja"]],"baron-pod-ag":[[4,"baron-pod-grab-success-ja"],[0,"baron-pod-lod0-jg"],[1,"baron-pod-lod0-mg"],[2,"baron-pod-shadow-mg"],[3,"baron-pod-idle-ja"]],"baron-statue-ag":[[0,"baron-statue-lod0-jg"],[1,"baron-statue-lod0-mg"],[2,"baron-statue-idle-ja"]],"barons-ship-lores-ag":[[0,"barons-ship-lores-lod0-jg"],[1,"barons-ship-lores-lod0-mg"],[2,"barons-ship-lores-idle-ja"]],"beam-ag":[[0,"beam-lod0-jg"],[1,"beam-lod0-mg"],[2,"beam-idle-ja"],[3,"beam-slide-center-ja"]],"big-bopper-ag":[[3,"big-bopper-mole-idle-ja"],[4,"big-bopper-mole-whack0-ja"],[5,"big-bopper-mole-whack1-ja"],[6,"big-bopper-mole-whack2-ja"],[7,"big-bopper-mole-whack3-ja"],[8,"big-bopper-mole-whack4-ja"],[9,"big-bopper-mole-whack5-ja"],[10,"big-bopper-mole-whack6-ja"],[11,"big-bopper-mole-whack7-ja"],[12,"big-bopper-mole-idle-crazy-ja"],[13,"big-bopper-mole-idle-tired-ja"],[14,"big-bopper-mole-idle-angry-ja"],[15,"big-bopper-mole-shock-ja"],[16,"big-bopper-mole-idle-shock-ja"],[17,"big-bopper-mole-idle-shock-end-ja"],[18,"big-bopper-mole-dummy6-ja"],[19,"big-bopper-mole-dummy7-ja"],[20,"big-bopper-mole-dummy8-ja"],[21,"big-bopper-mole-dummy9-ja"],[22,"big-bopper-mole-dummy10-ja"],[23,"big-bopper-mole-dummy11-ja"],[24,"big-bopper-mole-dummy12-ja"],[0,"big-bopper-lod0-jg"],[1,"big-bopper-lod0-mg"],[2,"big-bopper-idle-ja"]],"bikea-ag":[[0,"bikea-lod0-jg"],[1,"bikea-lod0-mg"],[2,"bikea-lod1-mg"],[3,"bikea-lod2-mg"],[4,"bikea-shadow-mg"],[5,"bikea-idle-ja"]],"bikeb-ag":[[0,"bikeb-lod0-jg"],[1,"bikeb-lod0-mg"],[2,"bikeb-lod1-mg"],[3,"bikeb-lod2-mg"],[4,"bikeb-shadow-mg"],[5,"bikeb-idle-ja"]],"bikec-ag":[[0,"bikec-lod0-jg"],[1,"bikec-lod0-mg"],[2,"bikec-lod1-mg"],[3,"bikec-lod2-mg"],[4,"bikec-shadow-mg"],[5,"bikec-idle-ja"]],"blocking-plane-ag":[[0,"blocking-plane-lod0-jg"],[1,"blocking-plane-lod0-mg"],[2,"blocking-plane-idle-ja"]],"board-ag":[[0,"board-lod0-jg"],[1,"board-lod0-mg"],[2,"board-shadow-mg"],[3,"board-open-ja"],[4,"board-close-ja"],[5,"board-board-idle-ja"]],"bomb-trigger-ag":[[0,"bomb-trigger-lod0-jg"],[1,"bomb-trigger-lod0-mg"],[2,"bomb-trigger-idle-ja"]],"bombbot-ag":[[0,"bombbot-lod0-jg"],[1,"bombbot-lod0-mg"],[2,"bombbot-shadow-mg"],[3,"bombbot-idle-ja"],[4,"bombbot-exploding-lod0-jg"],[5,"bombbot-exploding-lod0-mg"],[6,"bombbot-exploding-idle-ja"]],"brutter-balloon-ag":[[0,"brutter-balloon-lod0-jg"],[1,"brutter-balloon-lod0-mg"],[2,"brutter-balloon-idle-ja"]],"brutter-balloon-norift-ag":[[0,"brutter-balloon-norift-lod0-jg"],[1,"brutter-balloon-norift-lod0-mg"],[2,"brutter-balloon-norift-idle-ja"]],"brutter-highres-ag":[[0,"brutter-highres-lod0-jg"],[1,"brutter-highres-lod0-mg"],[2,"brutter-highres-shadow-mg"],[3,"brutter-highres-idle-ja"],[4,"brutter-highres-idle-kiosk-ja"]],"brutter-low-ag":[[0,"brutter-low-lod0-jg"],[1,"brutter-low-lod0-mg"],[2,"brutter-low-lod1-mg"],[3,"brutter-low-shadow-mg"],[4,"brutter-low-idle-ja"],[5,"brutter-low-stad-sit-ja"]],"burning-bush-ag":[[0,"burning-bush-lod0-jg"],[1,"burning-bush-lod0-mg"],[2,"burning-bush-idle-ja"]],"cable-ag":[[0,"cable-lod0-jg"],[1,"cable-lod0-mg"],[2,"cable-idle-ja"]],"cara-ag":[[0,"cara-lod0-jg"],[1,"cara-lod0-mg"],[2,"cara-lod1-mg"],[3,"cara-lod2-mg"],[4,"cara-shadow-mg"],[5,"cara-idle-ja"]],"carb-ag":[[0,"carb-lod0-jg"],[1,"carb-lod0-mg"],[2,"carb-lod1-mg"],[3,"carb-lod2-mg"],[4,"carb-shadow-mg"],[5,"carb-idle-ja"]],"carc-ag":[[0,"carc-lod0-jg"],[1,"carc-lod0-mg"],[2,"carc-lod1-mg"],[3,"carc-lod2-mg"],[4,"carc-shadow-mg"],[5,"carc-idle-ja"]],"cas-button-ag":[[0,"cas-button-lod0-jg"],[1,"cas-button-lod0-mg"],[2,"cas-button-idle-ja"]],"cas-chain-plat-ag":[[0,"cas-chain-plat-lod0-jg"],[1,"cas-chain-plat-lod0-mg"],[2,"cas-chain-plat-idle-ja"],[3,"cas-chain-plat-drop-ja"]],"cas-conveyor-switch-ag":[[0,"cas-conveyor-switch-lod0-jg"],[1,"cas-conveyor-switch-lod0-mg"],[2,"cas-conveyor-switch-idle-ja"]],"cas-electric-fence-ag":[[0,"cas-electric-fence-lod0-jg"],[1,"cas-electric-fence-lod0-mg"],[2,"cas-electric-fence-idle-ja"],[3,"cas-electric-fence-explode-lod0-jg"],[4,"cas-electric-fence-explode-lod0-mg"],[5,"cas-electric-fence-explode-idle-ja"]],"cas-elevator-ag":[[0,"cas-elevator-lod0-jg"],[1,"cas-elevator-lod0-mg"],[2,"cas-elevator-idle-ja"],[3,"cas-elevator-up-down-ja"]],"cas-flag-a-ag":[[0,"cas-flag-a-lod0-jg"],[1,"cas-flag-a-lod0-mg"],[2,"cas-flag-a-idle-ja"]],"cas-flag-b-ag":[[0,"cas-flag-b-lod0-jg"],[1,"cas-flag-b-lod0-mg"],[2,"cas-flag-b-idle-ja"]],"cas-robot-door-ag":[[0,"cas-robot-door-lod0-jg"],[1,"cas-robot-door-lod0-mg"],[2,"cas-robot-door-idle-ja"]],"cas-rot-blade-ag":[[0,"cas-rot-blade-lod0-jg"],[1,"cas-rot-blade-lod0-mg"],[2,"cas-rot-blade-shadow-mg"],[3,"cas-rot-blade-idle-ja"]],"cas-rot-bridge-ag":[[0,"cas-rot-bridge-lod0-jg"],[1,"cas-rot-bridge-lod0-mg"],[2,"cas-rot-bridge-idle-ja"],[3,"cas-rot-bridge-section-one-ja"],[4,"cas-rot-bridge-section-two-ja"],[5,"cas-rot-bridge-section-three-ja"],[6,"cas-rot-bridge-single-section-ja"],[7,"cas-rot-bridge-section-one-reverse-ja"],[8,"cas-rot-bridge-section-two-reverse-ja"],[9,"cas-rot-bridge-section-three-reverse-ja"],[10,"cas-rot-bridge-single-section-reverse-ja"]],"cas-switch-ag":[[0,"cas-switch-lod0-jg"],[1,"cas-switch-lod0-mg"],[2,"cas-switch-idle-ja"]],"cas-trapdoor-ag":[[0,"cas-trapdoor-lod0-jg"],[1,"cas-trapdoor-lod0-mg"],[2,"cas-trapdoor-idle-ja"],[3,"cas-trapdoor-explode-lod0-jg"],[4,"cas-trapdoor-explode-lod0-mg"],[5,"cas-trapdoor-explode-idle-ja"]],"cboss-bomb-ag":[[0,"cboss-bomb-lod0-jg"],[1,"cboss-bomb-lod0-mg"],[2,"cboss-bomb-idle-ja"]],"cboss-elevator-ag":[[0,"cboss-elevator-lod0-jg"],[1,"cboss-elevator-lod0-mg"],[2,"cboss-elevator-idle-ja"]],"cboss-tractor-ag":[[0,"cboss-tractor-lod0-jg"],[1,"cboss-tractor-lod0-mg"],[2,"cboss-tractor-idle-ja"]],"centipede-ag":[[0,"centipede-lod0-jg"],[1,"centipede-lod0-mg"],[2,"centipede-shadow-mg"],[3,"centipede-idle-ja"],[4,"centipede-walk0-ja"],[5,"centipede-attack0-ja"],[6,"centipede-eat0-ja"],[7,"centipede-mand-idle0-ja"],[8,"centipede-mand-chomp1-ja"],[9,"centipede-mand-chomp2-ja"],[10,"centipede-mand-chomp3-ja"],[11,"centipede-mand-open-mouth-ja"],[12,"centipede-mand-open-mouth-jitter-ja"],[13,"centipede-mand-close-mouth-ja"],[14,"centipede-mand-close-mouth-jitter-ja"]],"centipede-fma-ag":[[0,"centipede-fma-lod0-jg"],[1,"centipede-fma-lod0-mg"],[2,"centipede-fma-idle-ja"]],"centurion-ag":[[0,"centurion-lod0-jg"],[1,"centurion-lod0-mg"],[2,"centurion-lod1-mg"],[3,"centurion-shadow-mg"],[4,"centurion-celebrate-ja"],[5,"centurion-die-ja"],[6,"centurion-idle-ja"],[7,"centurion-jump-ja"],[8,"centurion-notice-ja"],[9,"centurion-patrol-ja"],[10,"centurion-rotate-ja"],[11,"centurion-rotate-end-ja"],[12,"centurion-shieldup-ja"],[13,"centurion-shieldup-idle-ja"],[14,"centurion-shoot-ja"],[15,"centurion-take-big-hit-ja"],[16,"centurion-take-hit-ja"],[17,"centurion-unblock-ja"],[18,"centurion-blue-hit-front-ja"],[19,"centurion-blue-hit-right-ja"],[20,"centurion-blue-hit-left-ja"],[21,"centurion-knocked-ja"],[22,"centurion-knocked-land-ja"],[23,"centurion-falling-death-ja"],[24,"centurion-hit-away-ja"],[25,"centurion-side-stepR-ja"],[26,"centurion-side-stepDR-ja"],[27,"centurion-side-stepDL-ja"],[28,"centurion-walk-forward-ja"],[29,"centurion-shoot-start-ja"],[30,"centurion-shoot-loop-ja"],[31,"centurion-shoot-end-ja"],[32,"centurion-yellow-hit-ja"],[33,"centurion-die-land-ja"],[34,"centurion-death-in-place-ja"]],"citizen-chick-ag":[[0,"citizen-chick-lod0-jg"],[1,"citizen-chick-lod0-mg"],[2,"citizen-chick-lod2-mg"],[3,"citizen-chick-shadow-mg"],[4,"citizen-chick-walk-ja"],[5,"citizen-chick-walk2-ja"],[6,"citizen-chick-walk3-ja"],[7,"citizen-chick-run-ja"],[8,"citizen-chick-run2-ja"],[9,"citizen-chick-run3-ja"],[10,"citizen-chick-idle-ja"],[11,"citizen-chick-panic-run-ja"],[12,"citizen-chick-tread-water-ja"],[13,"citizen-chick-hit-the-deck-ja"],[14,"citizen-chick-cover-head-start-ja"],[15,"citizen-chick-cover-head-loop-ja"],[16,"citizen-chick-cover-head-end-ja"],[17,"citizen-chick-dive-forward-ja"],[18,"citizen-chick-blue-hit-front-ja"],[19,"citizen-chick-blue-hit-back-ja"],[20,"citizen-chick-knocked-front-ja"],[21,"citizen-chick-knocked-front-land-ja"],[22,"citizen-chick-knocked-back-ja"],[23,"citizen-chick-knocked-back-land-ja"],[24,"citizen-chick-get-up-from-front-ja"],[25,"citizen-chick-get-up-from-back-ja"],[26,"citizen-chick-shuffle-ja"],[27,"citizen-chick-riding-stance-ja"]],"citizen-fat-ag":[[0,"citizen-fat-lod0-jg"],[1,"citizen-fat-lod0-mg"],[2,"citizen-fat-lod2-mg"],[3,"citizen-fat-shadow-mg"],[4,"citizen-fat-idle-ja"],[5,"citizen-fat-idle-to-arms-hips-ja"],[6,"citizen-fat-arms-hips-ja"],[7,"citizen-fat-idle-to-arms-crossed-ja"],[8,"citizen-fat-arms-crossed-ja"],[9,"citizen-fat-idle-to-out-of-breath-ja"],[10,"citizen-fat-out-of-breath-ja"],[11,"citizen-fat-walk-ja"],[12,"citizen-fat-shuffle-ja"],[13,"citizen-fat-walk2-ja"],[14,"citizen-fat-walk3-ja"],[15,"citizen-fat-run-ja"],[16,"citizen-fat-run2-ja"],[17,"citizen-fat-panic-run-ja"],[18,"citizen-fat-dive-forward-ja"],[19,"citizen-fat-hit-the-deck-ja"],[20,"citizen-fat-knocked-front-ja"],[21,"citizen-fat-knocked-front-land-ja"],[22,"citizen-fat-knocked-back-ja"],[23,"citizen-fat-knocked-back-land-ja"],[24,"citizen-fat-get-up-from-front-ja"],[25,"citizen-fat-get-up-from-back-ja"],[26,"citizen-fat-blue-hit-front-ja"],[27,"citizen-fat-blue-hit-back-ja"],[28,"citizen-fat-cover-head-start-ja"],[29,"citizen-fat-cover-head-loop-ja"],[30,"citizen-fat-cover-head-end-ja"],[31,"citizen-fat-riding-stance-ja"],[32,"citizen-fat-tread-water-ja"]],"citizen-norm-ag":[[0,"citizen-norm-lod0-jg"],[1,"citizen-norm-lod0-mg"],[2,"citizen-norm-lod2-mg"],[3,"citizen-norm-shadow-mg"],[4,"citizen-norm-idle-ja"],[5,"citizen-norm-idle-to-arms-hips-ja"],[6,"citizen-norm-arms-hips-ja"],[7,"citizen-norm-idle-to-arms-crossed-ja"],[8,"citizen-norm-arms-crossed-ja"],[9,"citizen-norm-idle-to-out-of-breath-ja"],[10,"citizen-norm-out-of-breath-ja"],[11,"citizen-norm-shuffle-ja"],[12,"citizen-norm-walk-ja"],[13,"citizen-norm-walk2-ja"],[14,"citizen-norm-run-ja"],[15,"citizen-norm-panic-run-ja"],[16,"citizen-norm-dive-forward-ja"],[17,"citizen-norm-hit-the-deck-ja"],[18,"citizen-norm-knocked-front-ja"],[19,"citizen-norm-knocked-front-land-ja"],[20,"citizen-norm-knocked-back-ja"],[21,"citizen-norm-knocked-back-land-ja"],[22,"citizen-norm-get-up-from-front-ja"],[23,"citizen-norm-get-up-from-back-ja"],[24,"citizen-norm-blue-hit-ja"],[25,"citizen-norm-blue-hit-land-death-ja"],[26,"citizen-norm-cover-head-start-ja"],[27,"citizen-norm-cover-head-loop-ja"],[28,"citizen-norm-cover-head-end-ja"],[29,"citizen-norm-tread-water-ja"],[30,"citizen-norm-bike-stance-ja"],[31,"citizen-norm-car-stance-ja"],[32,"citizen-norm-get-in-car-ja"],[33,"citizen-norm-knocked-from-car-ja"],[34,"citizen-norm-knocked-from-bike-ja"]],"citizen-norm-rider-ag":[[0,"citizen-norm-rider-lod0-jg"],[1,"citizen-norm-rider-lod0-mg"],[2,"citizen-norm-rider-lod2-mg"],[3,"citizen-norm-rider-idle-ja"],[4,"citizen-norm-rider-bike-stance-ja"],[5,"citizen-norm-rider-car-stance-ja"]],"citizen-rebel-ag":[[0,"citizen-rebel-lod0-jg"],[1,"citizen-rebel-lod0-mg"],[2,"citizen-rebel-shadow-mg"],[3,"citizen-rebel-idle-ja"],[4,"citizen-rebel-idle-to-arms-hips-ja"],[5,"citizen-rebel-arms-hips-ja"],[6,"citizen-rebel-idle-to-arms-crossed-ja"],[7,"citizen-rebel-arms-crossed-ja"],[8,"citizen-rebel-idle-to-out-of-breath-ja"],[9,"citizen-rebel-out-of-breath-ja"],[10,"citizen-rebel-shuffle-ja"],[11,"citizen-rebel-walk-ja"],[12,"citizen-rebel-walk2-ja"],[13,"citizen-rebel-walk3-ja"],[14,"citizen-rebel-run-ja"],[15,"citizen-rebel-run2-ja"],[16,"citizen-rebel-run3-ja"],[17,"citizen-rebel-panic-run-ja"],[18,"citizen-rebel-panic-run2-ja"],[19,"citizen-rebel-dive-forward-ja"],[20,"citizen-rebel-hit-the-deck-ja"],[21,"citizen-rebel-knocked-front-ja"],[22,"citizen-rebel-knocked-front-land-ja"],[23,"citizen-rebel-knocked-back-ja"],[24,"citizen-rebel-knocked-back-land-ja"],[25,"citizen-rebel-get-up-from-front-ja"],[26,"citizen-rebel-get-up-from-back-ja"],[27,"citizen-rebel-blue-hit-ja"],[28,"citizen-rebel-blue-hit-land-death-ja"],[29,"citizen-rebel-cover-head-start-ja"],[30,"citizen-rebel-cover-head-loop-ja"],[31,"citizen-rebel-cover-head-end-ja"],[32,"citizen-rebel-tread-water-ja"],[33,"citizen-rebel-bike-stance-ja"],[34,"citizen-rebel-car-stance-ja"],[35,"citizen-rebel-get-in-car-ja"]],"cntrlrm-button-ag":[[0,"cntrlrm-button-lod0-jg"],[1,"cntrlrm-button-lod0-mg"],[2,"cntrlrm-button-idle-ja"]],"cntrlrm-door-ag":[[0,"cntrlrm-door-lod0-jg"],[1,"cntrlrm-door-lod0-mg"],[2,"cntrlrm-door-idle-ja"],[3,"cntrlrm-door-opened-ja"]],"collectables-ag":[[0,"collectables-bomb-blast-lod0-jg"],[1,"collectables-bomb-blast-lod0-mg"],[2,"collectables-bomb-blast-idle-ja"],[3,"collectables-health-lod0-jg"],[4,"collectables-health-lod0-mg"],[5,"collectables-health-idle-ja"],[6,"collectables-gem-lod0-jg"],[7,"collectables-gem-lod0-mg"],[8,"collectables-gem-lod1-mg"],[9,"collectables-gem-idle-ja"],[10,"collectables-generic-blast-lod0-jg"],[11,"collectables-generic-blast-lod0-mg"],[12,"collectables-generic-blast-idle-ja"],[13,"collectables-generic-ripples-lod0-jg"],[14,"collectables-generic-ripples-lod0-mg"],[15,"collectables-generic-ripples-idle-ja"],[16,"collectables-generic-ripples-cycle-ja"],[17,"collectables-skill-lod0-jg"],[18,"collectables-skill-lod0-mg"],[19,"collectables-skill-lod1-mg"],[20,"collectables-skill-lod2-mg"],[21,"collectables-skill-shadow-mg"],[22,"collectables-skill-idle-ja"]],"com-airlock-inner-ag":[[0,"com-airlock-inner-lod0-jg"],[1,"com-airlock-inner-lod0-mg"],[2,"com-airlock-inner-idle-ja"]],"com-airlock-outer-ag":[[0,"com-airlock-outer-lod0-jg"],[1,"com-airlock-outer-lod0-mg"],[2,"com-airlock-outer-idle-ja"]],"com-elevator-ag":[[0,"com-elevator-lod0-jg"],[1,"com-elevator-lod0-mg"],[2,"com-elevator-lod1-mg"],[3,"com-elevator-idle-ja"]],"computerpaper-ag":[[0,"computerpaper-lod0-jg"],[1,"computerpaper-lod0-mg"],[2,"computerpaper-idle-ja"]],"consite-bomb-elevator-ag":[[0,"consite-bomb-elevator-lod0-jg"],[1,"consite-bomb-elevator-lod0-mg"],[2,"consite-bomb-elevator-idle-ja"],[4,"consite-bomb-elevator-hinges-lod0-jg"],[5,"consite-bomb-elevator-hinges-lod0-mg"],[6,"consite-bomb-elevator-hinges-idle-ja"]],"consite-break-scaffold-a-ag":[[8,"consite-break-scaffold-a-break-b-lod0-jg"],[0,"consite-break-scaffold-a-break-lod0-jg"],[9,"consite-break-scaffold-a-break-b-lod0-mg"],[1,"consite-break-scaffold-a-break-lod0-mg"],[2,"consite-break-scaffold-a-break-idle-ja"],[4,"consite-break-scaffold-a-break-a-lod0-jg"],[5,"consite-break-scaffold-a-break-a-lod0-mg"],[6,"consite-break-scaffold-a-break-a-idle-ja"],[10,"consite-break-scaffold-a-break-b-idle-ja"],[12,"consite-break-scaffold-a-break-c-lod0-jg"],[13,"consite-break-scaffold-a-break-c-lod0-mg"],[14,"consite-break-scaffold-a-break-c-idle-ja"]],"consite-break-scaffold-ag":[[0,"consite-break-scaffold-break-d-lod0-jg"],[1,"consite-break-scaffold-break-d-lod0-mg"],[2,"consite-break-scaffold-break-d-idle-ja"]],"consite-silo-doors-ag":[[0,"consite-silo-doors-lod0-jg"],[1,"consite-silo-doors-lod0-mg"],[2,"consite-silo-doors-idle-ja"]],"cpad-elevator-ag":[[0,"cpad-elevator-lod0-jg"],[1,"cpad-elevator-lod0-mg"],[2,"cpad-elevator-idle-ja"]],"crane-ag":[[0,"crane-lod0-jg"],[1,"crane-lod0-mg"],[2,"crane-idle-ja"]],"cranecrate-ag":[[0,"cranecrate-lod0-jg"],[1,"cranecrate-lod0-mg"],[2,"cranecrate-lod1-mg"],[3,"cranecrate-idle-ja"]],"crate-ag":[[0,"crate-krimson-lod0-jg"],[1,"crate-krimson-lod0-mg"],[2,"crate-krimson-lod1-mg"],[3,"crate-idle-ja"]],"crimson-bike-ag":[[0,"crimson-bike-lod0-jg"],[1,"crimson-bike-lod0-mg"],[2,"crimson-bike-lod1-mg"],[3,"crimson-bike-lod2-mg"],[4,"crimson-bike-shadow-mg"],[5,"crimson-bike-idle-ja"]],"crimson-guard-ag":[[0,"crimson-guard-lod0-jg"],[1,"crimson-guard-lod0-mg"],[2,"crimson-guard-lod2-mg"],[3,"crimson-guard-shadow-mg"],[4,"crimson-guard-idle-ja"],[5,"crimson-guard-walk-ja"],[6,"crimson-guard-run-ja"],[7,"crimson-guard-notice-ja"],[8,"crimson-guard-knocked-ja"],[9,"crimson-guard-knocked-land-ja"],[10,"crimson-guard-blue-hit-ja"],[11,"crimson-guard-blue-hit-land-ja"],[12,"crimson-guard-blue-hit-land-death-ja"],[13,"crimson-guard-yellow-hit0-ja"],[14,"crimson-guard-yellow-hit0-land-ja"],[15,"crimson-guard-yellow-hit1-ja"],[16,"crimson-guard-yellow-hit1-land-ja"],[17,"crimson-guard-die-ja"],[18,"crimson-guard-rifle-butt-ja"],[19,"crimson-guard-idle-to-stab-idle-ja"],[20,"crimson-guard-stab-idle-loop-ja"],[21,"crimson-guard-stab-idle-to-attack-ja"],[22,"crimson-guard-stab-attack-ja"],[23,"crimson-guard-stab-attack-to-stab-idle-ja"],[24,"crimson-guard-stab-idle-to-idle-ja"],[25,"crimson-guard-stab-shuffle-ja"],[26,"crimson-guard-gun-attack-ja"],[27,"crimson-guard-attack-shoot-knee-start-ja"],[28,"crimson-guard-attack-shoot-knee-loop-ja"],[29,"crimson-guard-attack-shoot-knee-ja"],[30,"crimson-guard-attack-shoot-knee-end-ja"],[31,"crimson-guard-knocked-back-ja"],[32,"crimson-guard-knocked-back-land-ja"],[33,"crimson-guard-get-up-front-ja"],[34,"crimson-guard-get-up-back-ja"],[35,"crimson-guard-bike-stance-ja"],[36,"crimson-guard-car-stance-ja"],[37,"crimson-guard-grenade-attack-ja"],[38,"crimson-guard-jump-high-ja"],[39,"crimson-guard-die-falling-ja"],[40,"crimson-guard-jump-right-ja"],[41,"crimson-guard-jump-left-ja"],[42,"crimson-guard-knocked-from-car-ja"],[43,"crimson-guard-knocked-from-bike-ja"]],"crimson-guard-highres-ag":[[0,"crimson-guard-highres-lod0-jg"],[1,"crimson-guard-highres-lod0-mg"],[2,"crimson-guard-highres-shadow-mg"],[3,"crimson-guard-highres-idle-ja"]],"crimson-guard-hover-ag":[[0,"crimson-guard-hover-lod0-jg"],[1,"crimson-guard-hover-lod0-mg"],[2,"crimson-guard-hover-lod1-mg"],[3,"crimson-guard-hover-shadow-mg"],[4,"crimson-guard-hover-idle-ja"],[5,"crimson-guard-hover-fly-right-ja"],[6,"crimson-guard-hover-fly-left-ja"],[7,"crimson-guard-hover-fly-forward-ja"],[8,"crimson-guard-hover-fly-back-ja"],[9,"crimson-guard-hover-shoot0-ja"],[10,"crimson-guard-hover-knocked0-ja"],[11,"crimson-guard-hover-knocked0-recover-ja"],[12,"crimson-guard-hover-knocked1-ja"],[13,"crimson-guard-hover-knocked1-recover-ja"],[14,"crimson-guard-hover-death-right-ja"],[15,"crimson-guard-hover-death-left-ja"],[16,"crimson-guard-hover-death-left-fall-ja"],[17,"crimson-guard-hover-death-right-fall-ja"],[18,"crimson-guard-hover-death-instant-ja"],[19,"crimson-guard-hover-death-land-ja"],[23,"crimson-guard-hover-explode-lod0-jg"],[24,"crimson-guard-hover-explode-lod0-mg"],[25,"crimson-guard-hover-explode-idle-ja"]],"crimson-guard-lowres-ag":[[0,"crimson-guard-lowres-lod0-jg"],[1,"crimson-guard-lowres-lod0-mg"],[2,"crimson-guard-lowres-shadow-mg"]],"crocadog-escort-ag":[[0,"crocadog-escort-lod0-jg"],[1,"crocadog-escort-lod0-mg"],[2,"crocadog-escort-shadow-mg"],[3,"crocadog-escort-idle-pant-ja"],[4,"crocadog-escort-idle-wag-ja"],[5,"crocadog-escort-idle-scratch-ja"],[6,"crocadog-escort-idle-bark-ja"],[7,"crocadog-escort-walk0-ja"],[8,"crocadog-escort-run0-ja"],[9,"crocadog-escort-turn0-ja"],[10,"crocadog-escort-jump-in-vehicle-ja"],[11,"crocadog-escort-idle-car0-ja"],[12,"crocadog-escort-knocked0-ja"],[13,"crocadog-escort-knocked-land0-ja"],[14,"crocadog-escort-angry-bark-ja"]],"crocadog-highres-ag":[[0,"crocadog-highres-lod0-jg"],[1,"crocadog-highres-lod0-mg"],[2,"crocadog-highres-shadow-mg"],[3,"crocadog-highres-idle-ja"],[4,"crocadog-highres-idle-stand-ja"],[5,"crocadog-highres-idle-vinroom-ja"]],"cty-fruit-stand-ag":[[0,"cty-fruit-stand-lod0-jg"],[1,"cty-fruit-stand-lod0-mg"],[2,"cty-fruit-stand-idle-ja"]],"cty-guard-turret-ag":[[0,"cty-guard-turret-lod0-jg"],[1,"cty-guard-turret-lod0-mg"],[2,"cty-guard-turret-idle-ja"],[3,"cty-guard-turret-pop-up-down-ja"],[4,"cty-guard-turret-explode-lod0-jg"],[5,"cty-guard-turret-explode-lod0-mg"],[6,"cty-guard-turret-explode-idle-ja"]],"cty-guard-turret-button-ag":[[0,"cty-guard-turret-button-lod0-jg"],[1,"cty-guard-turret-button-lod0-mg"],[2,"cty-guard-turret-button-idle-ja"],[3,"cty-guard-turret-button-pop-up-ja"]],"ctyn-lamp-ag":[[0,"ctyn-lamp-lod0-jg"],[1,"ctyn-lamp-lod0-mg"],[2,"ctyn-lamp-idle-ja"],[3,"ctyn-lamp-explode-lod0-jg"],[4,"ctyn-lamp-explode-lod0-mg"],[5,"ctyn-lamp-explode-idle-ja"]],"ctypal-baron-statue-break-ag":[[8,"ctypal-baron-statue-break-b-lod0-jg"],[0,"ctypal-baron-statue-break-lod0-jg"],[9,"ctypal-baron-statue-break-b-lod0-mg"],[1,"ctypal-baron-statue-break-lod0-mg"],[2,"ctypal-baron-statue-break-idle-ja"],[4,"ctypal-baron-statue-break-a-lod0-jg"],[5,"ctypal-baron-statue-break-a-lod0-mg"],[6,"ctypal-baron-statue-break-a-idle-ja"],[10,"ctypal-baron-statue-break-b-idle-ja"],[12,"ctypal-baron-statue-break-c-lod0-jg"],[13,"ctypal-baron-statue-break-c-lod0-mg"],[14,"ctypal-baron-statue-break-c-idle-ja"]],"ctypal-baron-statue-broken-ag":[[0,"ctypal-baron-statue-broken-lod0-jg"],[1,"ctypal-baron-statue-broken-lod0-mg"],[2,"ctypal-baron-statue-broken-idle-ja"]],"ctypal-break-wall-ag":[[0,"ctypal-break-wall-lod0-jg"],[1,"ctypal-break-wall-lod0-mg"],[2,"ctypal-break-wall-idle-ja"]],"ctypal-broke-wall-ag":[[0,"ctypal-broke-wall-lod0-jg"],[1,"ctypal-broke-wall-lod0-mg"],[2,"ctypal-broke-wall-idle-ja"]],"ctyport-cargo-ag":[[0,"ctyport-cargo-lod0-jg"],[1,"ctyport-cargo-lod0-mg"],[2,"ctyport-cargo-lod1-mg"],[3,"ctyport-cargo-idle-ja"],[4,"ctyport-cargo-explode-lod0-jg"],[5,"ctyport-cargo-explode-lod0-mg"],[6,"ctyport-cargo-explode-idle-ja"]],"ctyport-mine-ag":[[0,"ctyport-mine-lod0-jg"],[1,"ctyport-mine-lod0-mg"],[2,"ctyport-mine-idle-ja"]],"ctyport-spy-ag":[[0,"ctyport-spy-lod0-jg"],[1,"ctyport-spy-lod0-mg"],[2,"ctyport-spy-lod1-mg"],[3,"ctyport-spy-idle-ja"]],"ctywide-arrow-ag":[[0,"ctywide-arrow-lod0-jg"],[1,"ctywide-arrow-lod0-mg"],[2,"ctywide-arrow-idle-ja"]],"curtainsaw-ag":[[0,"curtainsaw-lod0-jg"],[1,"curtainsaw-lod0-mg"],[2,"curtainsaw-lod1-mg"],[3,"curtainsaw-idle-ja"]],"dark-barrel-ag":[[0,"dark-barrel-lod0-jg"],[1,"dark-barrel-lod0-mg"],[2,"dark-barrel-idle-ja"]],"darkjak-highres-ag":[[0,"darkjak-highres-lod0-jg"],[1,"darkjak-highres-lod0-mg"],[2,"darkjak-highres-idle-ja"]],"daxter-ag":[[64,"daxter-hit-from-back-ja"],[399,"daxter-darkjak-attack-combo3-ja"],[0,"daxter-lod0-jg"],[65,"daxter-hit-up-ja"],[1,"daxter-lod0-mg"],[457,"daxter-pidax-car-crash-left-ja"],[66,"daxter-deatha-ja"],[393,"daxter-darkjak-attack-spin-end-ja"],[2,"daxter-lod1-mg"],[67,"daxter-death-painful-land-ja"],[3,"daxter-shadow-mg"],[451,"daxter-indax-dummy9-ja"],[68,"daxter-smack-surface-ja"],[387,"daxter-darkjak-jump-ja"],[4,"daxter-run-to-stance-ja"],[5,"daxter-run-to-stance-loop-ja"],[397,"daxter-darkjak-attack-combo2-ja"],[6,"daxter-stance-loop-ja"],[7,"daxter-run-to-stance-fast-ja"],[407,"daxter-darkjak-attack-combo3c-end-ja"],[8,"daxter-run-ja"],[9,"daxter-run-up-ja"],[401,"daxter-darkjak-get-off-ja"],[10,"daxter-run-down-ja"],[11,"daxter-walk-ja"],[395,"daxter-darkjak-attack-combo1-ja"],[12,"daxter-walk-up-ja"],[13,"daxter-walk-down-ja"],[405,"daxter-darkjak-get-on-fast-ja"],[14,"daxter-run-squash-ja"],[15,"daxter-run-squash-weak-ja"],[415,"daxter-indax-stance-ja"],[16,"daxter-stance-to-duck-ja"],[17,"daxter-duck-stance-ja"],[409,"daxter-darkjak-bomb-ja"],[18,"daxter-duck-walk-ja"],[19,"daxter-turn-around-ja"],[403,"daxter-darkjak-attack-combo1b-end-ja"],[20,"daxter-jump-ja"],[21,"daxter-jump-land-ja"],[413,"daxter-darkjak-attack-ice-loop2-ja"],[22,"daxter-painful-land-ja"],[23,"daxter-painful-land-end-ja"],[24,"daxter-jump-loop-ja"],[25,"daxter-jump-short-land-ja"],[26,"daxter-jump-forward-ja"],[27,"daxter-duck-high-jump-ja"],[29,"daxter-launch-jump-loop-ja"],[30,"daxter-edge-grab-stance0-ja"],[31,"daxter-edge-grab-stance1-ja"],[33,"daxter-falling-to-edge-grab-ja"],[419,"daxter-indax-jump-loop-ja"],[36,"daxter-edge-grab-to-jump-ja"],[37,"daxter-edge-grab-off-ja"],[429,"daxter-indax-run-to-stance-ja"],[38,"daxter-attack-from-stance-ja"],[39,"daxter-attack-from-stance-end-ja"],[439,"daxter-indax-jump-forward-hands-loop-ja"],[40,"daxter-attack-from-stance-alt-end-ja"],[41,"daxter-attack-from-stance-run-end-ja"],[433,"daxter-indax-death-squashed-ja"],[42,"daxter-attack-from-stance-run-alt-end-ja"],[43,"daxter-attack-from-jump-ja"],[427,"daxter-indax-run-squash-ja"],[44,"daxter-attack-from-jump-loop-ja"],[45,"daxter-attack-from-jump-end-ja"],[437,"daxter-indax-running-attack-ja"],[46,"daxter-attack-punch-ja"],[47,"daxter-attack-punch-end-ja"],[447,"daxter-indax-dummy5-ja"],[48,"daxter-attack-punch-alt-end-ja"],[49,"daxter-attack-uppercut-ja"],[441,"daxter-indax-run-squash-hands-ja"],[50,"daxter-flop-down-ja"],[51,"daxter-flop-down-loop-ja"],[435,"daxter-indax-death-kill-ja"],[52,"daxter-flop-down-land-ja"],[53,"daxter-moving-flop-down-ja"],[445,"daxter-indax-dummy3-ja"],[54,"daxter-moving-flop-down-loop-ja"],[56,"daxter-flop-jump-ja"],[57,"daxter-duck-roll-ja"],[385,"daxter-darkjak-walk-ja"],[58,"daxter-duck-roll-end-ja"],[59,"daxter-roll-flip-ja"],[443,"daxter-indax-trip-ja"],[60,"daxter-roll-flip-land-ja"],[61,"daxter-trip-ja"],[389,"daxter-darkjak-stance-ja"],[62,"daxter-hit-elec-ja"],[63,"daxter-hit-from-front-ja"],[69,"daxter-smack-surface-end-ja"],[70,"daxter-shocked-ja"],[75,"daxter-slide-right-ja"],[76,"daxter-slide-left-ja"],[77,"daxter-wall-hide-ja"],[78,"daxter-wall-hide-scared-ja"],[79,"daxter-wall-hide-scared-loop-ja"],[80,"daxter-wall-hide-scared-return-ja"],[81,"daxter-wall-hide-head-ja"],[82,"daxter-wall-hide-head-left-ja"],[83,"daxter-wall-hide-head-right-ja"],[84,"daxter-wall-hide-body-ja"],[127,"daxter-fuel-cell-victory-9-ja"],[197,"daxter-gun-stance-ja"],[198,"daxter-gun-stance-yellow-low-ja"],[199,"daxter-gun-yellow-fire-low-ja"],[200,"daxter-gun-yellow-highlow-ja"],[322,"daxter-mech-jump-thrust-ja"],[201,"daxter-gun-attack-from-stance-ja"],[202,"daxter-gun-attack-from-stance-end-ja"],[332,"daxter-mech-carry-walk-ja"],[203,"daxter-gun-attack-from-stance-blue-ja"],[204,"daxter-gun-attack-from-stance-blue-end-ja"],[326,"daxter-mech-punch-l-ja"],[205,"daxter-gun-blue-to-yellow-ja"],[206,"daxter-gun-stance-dark-ja"],[320,"daxter-mech-turn90-ja"],[207,"daxter-gun-stance-yellow-ja"],[208,"daxter-gun-stance-blue-ja"],[330,"daxter-mech-carry-pickup-high-ja"],[209,"daxter-gun-red-fire-ja"],[210,"daxter-gun-blue-fire-ja"],[340,"daxter-mech-drag-pickup-ja"],[211,"daxter-gun-blue-fire-single-ja"],[212,"daxter-gun-dark-fire-ja"],[334,"daxter-mech-carry-jump-loop-ja"],[213,"daxter-gun-yellow-fire-ja"],[214,"daxter-gun-walk-side-ja"],[328,"daxter-mech-punch-b-ja"],[215,"daxter-gun-run-blue-ja"],[216,"daxter-gun-red-takeout-ja"],[338,"daxter-mech-push-ja"],[217,"daxter-gun-dark-takeout-ja"],[218,"daxter-gun-yellow-takeout-ja"],[219,"daxter-gun-blue-takeout-ja"],[220,"daxter-gun-attack-upperbutt-ja"],[342,"daxter-mech-get-off-ja"],[221,"daxter-gun-side-to-front-hop-ja"],[222,"daxter-gun-transformation-twirl-ja"],[336,"daxter-mech-carry-throw-ja"],[223,"daxter-gun-front-to-side-hop-ja"],[224,"daxter-gun-front-to-blue-hop-ja"],[282,"daxter-pilot-bike-turn-front-ja"],[225,"daxter-gun-blue-to-front-hop-ja"],[226,"daxter-gun-attack-butt-ja"],[227,"daxter-gun-attack-butt-end-ja"],[228,"daxter-gun-attack-butt-blue-ja"],[286,"daxter-pilot-car-up-down-ja"],[229,"daxter-gun-attack-butt-blue-end-ja"],[230,"daxter-gun-jump-land-ja"],[280,"daxter-pilot-gun-blue-fire-single-ja"],[231,"daxter-gun-jump-land-side-ja"],[232,"daxter-gun-attack-upperbutt-blue-ja"],[354,"daxter-turret-get-on-ja"],[233,"daxter-gun-edge-grab-off-ja"],[234,"daxter-gun-edge-grab-to-jump-ja"],[235,"daxter-gun-duck-roll-ja"],[236,"daxter-gun-duck-roll-end-ja"],[237,"daxter-gun-roll-flip-ja"],[238,"daxter-gun-roll-flip-land-ja"],[352,"daxter-turret-stance-ja"],[239,"daxter-gun-flop-down-ja"],[240,"daxter-gun-flop-down-loop-ja"],[241,"daxter-gun-flop-down-land-ja"],[242,"daxter-gun-hit-from-front-ja"],[243,"daxter-gun-hit-from-back-ja"],[244,"daxter-gun-red-fire-to-sideways-ja"],[245,"daxter-gun-red-fire-from-sideways-ja"],[246,"daxter-gun-dark-fire-twirl-ja"],[247,"daxter-gun-stance-red-sideways-ja"],[248,"daxter-gun-red-from-sideways-ja"],[249,"daxter-gun-yellow-fire-twirl-ja"],[250,"daxter-gun-hit-elec-ja"],[251,"daxter-gun-front-walk-ja"],[252,"daxter-gun-front-run-ja"],[253,"daxter-gun-front-jump-ja"],[254,"daxter-gun-front-jump-land-ja"],[255,"daxter-gun-duck-walk-ja"],[256,"daxter-gun-walk-blue-ja"],[257,"daxter-gun-side-jump-ja"],[258,"daxter-gun-side-jump-land-ja"],[262,"daxter-gun-red-fire-fast-ja"],[269,"daxter-gun-attack-from-stance-end-alt1-ja"],[149,"daxter-board-duck-turn-ja"],[270,"daxter-gun-attack-butt-end-alt1-ja"],[148,"daxter-board-stance-ja"],[150,"daxter-board-turn-ja"],[151,"daxter-board-jump-kick-ja"],[152,"daxter-board-jump-ja"],[274,"daxter-pilot-bike-get-on-ja"],[153,"daxter-board-jump-loop-ja"],[284,"daxter-pilot-bike-smack-front-ja"],[155,"daxter-board-hit-ja"],[156,"daxter-board-flip-forward-ja"],[158,"daxter-board-turn-left-ja"],[272,"daxter-pilot-car-get-off-ja"],[159,"daxter-board-turn-right-ja"],[160,"daxter-board-turn-up-ja"],[161,"daxter-board-turn-down-ja"],[162,"daxter-board-hit-forward-ja"],[292,"daxter-pilot-gun-dark-idle-ja"],[163,"daxter-board-ride-turn-back-ja"],[164,"daxter-board-ride-turn-front-ja"],[165,"daxter-board-ride-turn-right-ja"],[166,"daxter-board-ride-turn-left-ja"],[167,"daxter-board-get-on-ja"],[168,"daxter-board-get-off-ja"],[290,"daxter-pilot-eject-loop-ja"],[169,"daxter-board-grenade-ja"],[170,"daxter-board-nosegrab-ja"],[300,"daxter-pilot-gun-red-blue-ja"],[171,"daxter-board-method-ja"],[172,"daxter-board-kickflip-a-ja"],[294,"daxter-pilot-gun-blue-idle-ja"],[173,"daxter-board-spin-ja"],[174,"daxter-board-air-turn-ja"],[288,"daxter-pilot-bike-smack-shock-ja"],[175,"daxter-board-flip-backward-ja"],[178,"daxter-board-flip-forward-loop-ja"],[308,"daxter-pilot-car-smack-right-ja"],[179,"daxter-board-flip-backward-loop-ja"],[180,"daxter-board-method-loop-ja"],[302,"daxter-pilot-gun-yellow-takeout-ja"],[181,"daxter-board-method-end-ja"],[182,"daxter-board-nosegrab-loop-ja"],[296,"daxter-pilot-gun-yellow-fire-ja"],[183,"daxter-board-nosegrab-end-ja"],[184,"daxter-board-noseflip-ja"],[306,"daxter-pilot-bike-smack-right-ja"],[185,"daxter-board-jump-kickoff-ja"],[186,"daxter-board-hit-elec-ja"],[187,"daxter-board-get-on-land-ja"],[188,"daxter-board-get-off-pre-ja"],[189,"daxter-board-kickflip-b-ja"],[190,"daxter-board-kickflip-c-ja"],[304,"daxter-pilot-gun-dark-takeout-ja"],[191,"daxter-board-hit-get-off-ja"],[324,"daxter-mech-jump-land-ja"],[195,"daxter-board-spin-cw-ja"],[196,"daxter-board-spin-ccw-ja"],[384,"daxter-darkjak-attack-ice-ja"],[386,"daxter-darkjak-run-ja"],[388,"daxter-darkjak-jump-land-ja"],[392,"daxter-darkjak-attack-spin-ja"],[394,"daxter-darkjak-bomb-pre-ja"],[396,"daxter-darkjak-attack-combo1-end-ja"],[398,"daxter-darkjak-attack-combo2-end-ja"],[400,"daxter-darkjak-attack-combo3-end-ja"],[402,"daxter-darkjak-attack-combo1b-ja"],[404,"daxter-darkjak-bomb-end-ja"],[406,"daxter-darkjak-attack-combo3c-ja"],[408,"daxter-darkjak-get-off-end-ja"],[410,"daxter-darkjak-bomb-loop-ja"],[411,"daxter-darkjak-bomb-land-ja"],[412,"daxter-darkjak-attack-ice-loop-ja"],[414,"daxter-darkjak-attack-ice-end-ja"],[85,"daxter-death-swim-ja"],[86,"daxter-death-swim-loop-ja"],[87,"daxter-death-swim-end-ja"],[90,"daxter-wade-shallow-walk-ja"],[91,"daxter-wade-deep-walk-ja"],[92,"daxter-swim-stance-ja"],[93,"daxter-swim-walk-ja"],[94,"daxter-swim-walk-to-down-ja"],[95,"daxter-swim-down-ja"],[96,"daxter-swim-down-to-up-ja"],[97,"daxter-swim-up-ja"],[98,"daxter-swim-up-to-stance-ja"],[99,"daxter-swim-jump-ja"],[452,"daxter-pidax-car-turn-front-ja"],[453,"daxter-pidax-car-turn-back-ja"],[454,"daxter-pidax-car-up-down-ja"],[455,"daxter-pidax-car-crash-front-ja"],[456,"daxter-pidax-car-crash-back-ja"],[458,"daxter-pidax-car-crash-right-ja"],[192,"daxter-board-attack-pegasus-ja"],[108,"daxter-tube-turn-ja"],[109,"daxter-tube-jump-land-ja"],[100,"daxter-pole-cycle-ja"],[101,"daxter-pole-cycle2-ja"],[102,"daxter-pole-flip-up-ja"],[103,"daxter-pole-flip-forward-ja"],[104,"daxter-pole-jump-loop-ja"],[353,"daxter-turret-get-off-ja"],[416,"daxter-indax-walk-ja"],[417,"daxter-indax-run-ja"],[418,"daxter-indax-jump-ja"],[420,"daxter-indax-jump-land-ja"],[421,"daxter-indax-attack-spin-ja"],[422,"daxter-indax-attack-spin-end-ja"],[423,"daxter-indax-run-look-back-ja"],[424,"daxter-indax-jump-forward-ja"],[425,"daxter-indax-jump-forward-loop-ja"],[426,"daxter-indax-jump-forward-land-ja"],[428,"daxter-indax-attack-spin-air-ja"],[430,"daxter-indax-hit-front-ja"],[431,"daxter-indax-hit-back-ja"],[432,"daxter-indax-hit-roll-ja"],[434,"daxter-indax-death-fall-ja"],[436,"daxter-indax-death-eaten-ja"],[438,"daxter-indax-jump-forward-hands-ja"],[440,"daxter-indax-jump-forward-hands-land-ja"],[442,"daxter-indax-running-attack-end-ja"],[444,"daxter-indax-trip-land-ja"],[446,"daxter-indax-dummy4-ja"],[448,"daxter-indax-dummy6-ja"],[449,"daxter-indax-dummy7-ja"],[450,"daxter-indax-dummy8-ja"],[317,"daxter-mech-stance-ja"],[318,"daxter-mech-run-ja"],[319,"daxter-mech-walk-ja"],[321,"daxter-mech-jump-ja"],[323,"daxter-mech-jump-loop-ja"],[325,"daxter-mech-turn20-ja"],[327,"daxter-mech-punch-r-ja"],[329,"daxter-mech-carry-pickup-low-ja"],[331,"daxter-mech-carry-stance-ja"],[333,"daxter-mech-carry-jump-ja"],[335,"daxter-mech-carry-jump-land-ja"],[337,"daxter-mech-carry-turn45-ja"],[339,"daxter-mech-pull-ja"],[341,"daxter-mech-hit-front-ja"],[343,"daxter-mech-get-on-ja"],[344,"daxter-mech-death-a-ja"],[345,"daxter-mech-death-b-ja"],[346,"daxter-mech-punch-u-ja"],[271,"daxter-pilot-gun-red-takeout-ja"],[273,"daxter-pilot-car-get-on-ja"],[275,"daxter-pilot-car-turn-front-ja"],[276,"daxter-pilot-car-turn-back-ja"],[277,"daxter-pilot-car-smack-front-ja"],[278,"daxter-pilot-car-smack-back-ja"],[279,"daxter-pilot-gun-blue-fire-ja"],[281,"daxter-pilot-car-smack-shock-ja"],[283,"daxter-pilot-bike-turn-back-ja"],[285,"daxter-pilot-bike-smack-back-ja"],[287,"daxter-pilot-bike-up-down-ja"],[289,"daxter-pilot-bike-get-off-ja"],[291,"daxter-pilot-gun-red-idle-ja"],[293,"daxter-pilot-gun-yellow-idle-ja"],[295,"daxter-pilot-gun-red-fire-ja"],[297,"daxter-pilot-gun-dark-fire-ja"],[298,"daxter-pilot-gun-red-dark-ja"],[299,"daxter-pilot-gun-red-yellow-ja"],[301,"daxter-pilot-gun-yellow-blue-ja"],[303,"daxter-pilot-gun-blue-takeout-ja"],[305,"daxter-pilot-bike-smack-left-ja"],[307,"daxter-pilot-car-smack-left-ja"],[383,"daxter-darkjak-get-on-ja"]],"daxter-highres-ag":[[0,"daxter-highres-lod0-jg"],[1,"daxter-highres-lod0-mg"],[2,"daxter-highres-shadow-mg"],[3,"daxter-highres-idle-ja"],[4,"daxter-highres-mole-idle-ja"],[5,"daxter-highres-mole-whack0-ja"],[6,"daxter-highres-mole-whack1-ja"],[7,"daxter-highres-mole-whack2-ja"],[8,"daxter-highres-mole-whack3-ja"],[9,"daxter-highres-mole-whack4-ja"],[10,"daxter-highres-mole-whack5-ja"],[11,"daxter-highres-mole-whack6-ja"],[12,"daxter-highres-mole-whack7-ja"],[13,"daxter-highres-mole-idle-crazy-ja"],[14,"daxter-highres-mole-idle-tired-ja"],[15,"daxter-highres-mole-idle-angry-ja"],[16,"daxter-highres-mole-shock-ja"],[17,"daxter-highres-mole-idle-shock-ja"],[18,"daxter-highres-mole-idle-shock-end-ja"],[19,"daxter-highres-mole-dummy6-ja"],[20,"daxter-highres-mole-dummy7-ja"],[21,"daxter-highres-mole-dummy8-ja"],[22,"daxter-highres-mole-dummy9-ja"],[23,"daxter-highres-mole-dummy10-ja"],[24,"daxter-highres-mole-dummy11-ja"],[25,"daxter-highres-mole-dummy12-ja"]],"dig-balloon-lurker-ag":[[0,"dig-balloon-lurker-lod0-jg"],[1,"dig-balloon-lurker-lod0-mg"],[2,"dig-balloon-lurker-idle-ja"],[3,"dig-balloon-lurker-trapeze-lod0-jg"],[4,"dig-balloon-lurker-trapeze-lod0-mg"],[5,"dig-balloon-lurker-trapeze-shadow-mg"],[6,"dig-balloon-lurker-trapeze-jak-off-ja"],[7,"dig-balloon-lurker-trapeze-jak-on-ja"]],"dig-bomb-crate-ag":[[0,"dig-bomb-crate-lod0-jg"],[1,"dig-bomb-crate-lod0-mg"],[2,"dig-bomb-crate-lod1-mg"],[3,"dig-bomb-crate-idle-ja"],[4,"dig-bomb-crate-explode-lod0-jg"],[5,"dig-bomb-crate-explode-lod0-mg"],[6,"dig-bomb-crate-explode-idle-ja"]],"dig-bomb-crate-cylinder-ag":[[0,"dig-bomb-crate-cylinder-lod0-jg"],[1,"dig-bomb-crate-cylinder-lod0-mg"],[2,"dig-bomb-crate-cylinder-idle-ja"],[3,"dig-bomb-crate-cylinder-pulse-ja"]],"dig-breakable-door-ag":[[0,"dig-breakable-door-lod0-jg"],[1,"dig-breakable-door-lod0-mg"],[2,"dig-breakable-door-idle-ja"]],"dig-button-ag":[[0,"dig-button-lod0-jg"],[1,"dig-button-lod0-mg"],[2,"dig-button-idle-ja"]],"dig-clasp-ag":[[0,"dig-clasp-lod0-jg"],[1,"dig-clasp-lod0-mg"],[2,"dig-clasp-idle-ja"],[3,"dig-clasp-explode-lod0-jg"],[4,"dig-clasp-explode-lod0-mg"],[5,"dig-clasp-explode-idle-ja"]],"dig-clasp-b-ag":[[0,"dig-clasp-b-lod0-jg"],[1,"dig-clasp-b-lod0-mg"],[2,"dig-clasp-b-idle-ja"]],"dig-conveyor-ag":[[0,"dig-conveyor-lod0-jg"],[1,"dig-conveyor-lod0-mg"],[2,"dig-conveyor-idle-ja"]],"dig-digger-ag":[[8,"dig-digger-explode-a-lod0-mg"],[0,"dig-digger-lod0-jg"],[1,"dig-digger-lod0-mg"],[10,"dig-digger-explode-b-lod0-jg"],[2,"dig-digger-idle-ja"],[4,"dig-digger-explode-lod0-jg"],[5,"dig-digger-explode-lod0-mg"],[7,"dig-digger-explode-a-lod0-jg"],[11,"dig-digger-explode-b-lod0-mg"],[13,"dig-digger-explode-c-lod0-jg"],[14,"dig-digger-explode-c-lod0-mg"]],"dig-jump-pad-ag":[[0,"dig-jump-pad-lod0-jg"],[1,"dig-jump-pad-lod0-mg"],[2,"dig-jump-pad-idle-ja"]],"dig-log-ag":[[0,"dig-log-lod0-jg"],[1,"dig-log-lod0-mg"],[2,"dig-log-idle-ja"]],"dig-sinking-plat-ag":[[0,"dig-sinking-plat-lod0-jg"],[1,"dig-sinking-plat-lod0-mg"],[2,"dig-sinking-plat-idle-ja"],[3,"dig-sinking-plat-shake-ja"]],"dig-spikey-sphere-ag":[[0,"dig-spikey-sphere-lod0-jg"],[1,"dig-spikey-sphere-lod0-mg"],[2,"dig-spikey-sphere-shadow-mg"],[3,"dig-spikey-sphere-idle-ja"],[4,"dig-spikey-sphere-explode-lod0-jg"],[5,"dig-spikey-sphere-explode-lod0-mg"],[6,"dig-spikey-sphere-explode-idle-ja"]],"dig-spikey-sphere-door-ag":[[0,"dig-spikey-sphere-door-lod0-jg"],[1,"dig-spikey-sphere-door-lod0-mg"],[2,"dig-spikey-sphere-door-idle-ja"]],"dig-spikey-step-ag":[[0,"dig-spikey-step-lod0-jg"],[1,"dig-spikey-step-lod0-mg"],[2,"dig-spikey-step-idle-ja"]],"dig-stomp-block-ag":[[0,"dig-stomp-block-lod0-jg"],[1,"dig-stomp-block-lod0-mg"],[2,"dig-stomp-block-idle-ja"]],"dig-tether-ag":[[0,"dig-tether-snapped-lod0-jg"],[1,"dig-tether-snapped-lod0-mg"],[2,"dig-tether-unsnapped-lod0-jg"],[3,"dig-tether-unsnapped-lod0-mg"],[4,"dig-tether-idle-ja"]],"dig-tipping-rock-ag":[[0,"dig-tipping-rock-lod0-jg"],[1,"dig-tipping-rock-lod0-mg"],[2,"dig-tipping-rock-idle-ja"]],"dig-totem-ag":[[0,"dig-totem-lod0-jg"],[1,"dig-totem-lod0-mg"],[2,"dig-totem-idle-ja"]],"dig-totem-fish-ag":[[0,"dig-totem-fish-lod0-jg"],[1,"dig-totem-fish-lod0-mg"],[2,"dig-totem-fish-idle-ja"]],"dig-wheel-step-ag":[[0,"dig-wheel-step-lod0-jg"],[1,"dig-wheel-step-lod0-mg"],[2,"dig-wheel-step-idle-ja"]],"drill-barons-ship-ag":[[0,"drill-barons-ship-lod0-jg"],[1,"drill-barons-ship-lod0-mg"],[2,"drill-barons-ship-idle-ja"],[3,"drill-barons-ship-explode-lod0-jg"],[4,"drill-barons-ship-explode-lod0-mg"],[5,"drill-barons-ship-explode-idle-ja"],[6,"drill-barons-ship-turret-lod0-jg"],[7,"drill-barons-ship-turret-lod0-mg"],[8,"drill-barons-ship-turret-idle-ja"],[9,"drill-barons-ship-turret-b-lod0-jg"],[10,"drill-barons-ship-turret-b-lod0-mg"],[11,"drill-barons-ship-turret-b-idle-ja"],[12,"drill-barons-ship-turret-c-lod0-jg"],[13,"drill-barons-ship-turret-c-lod0-mg"],[14,"drill-barons-ship-turret-c-idle-ja"]],"drill-bridge-shot-ag":[[0,"drill-bridge-shot-lod0-jg"],[1,"drill-bridge-shot-lod0-mg"],[2,"drill-bridge-shot-lod1-mg"],[3,"drill-bridge-shot-idle-ja"],[4,"drill-bridge-shot-break-ja"],[5,"drill-bridge-shot-end-ja"]],"drill-control-panel-ag":[[0,"drill-control-panel-lod0-jg"],[1,"drill-control-panel-lod0-mg"],[2,"drill-control-panel-lod1-mg"],[3,"drill-control-panel-idle-ja"],[4,"drill-control-panel-break-ja"],[5,"drill-control-panel-a-lod0-jg"],[6,"drill-control-panel-a-lod0-mg"],[7,"drill-control-panel-a-lod1-mg"],[8,"drill-control-panel-a-idle-ja"],[9,"drill-control-panel-a-break-ja"]],"drill-crane-ag":[[8,"drill-crane-a-idle-ja"],[0,"drill-crane-lod0-jg"],[1,"drill-crane-lod0-mg"],[2,"drill-crane-lod1-mg"],[3,"drill-crane-idle-ja"],[4,"drill-crane-end-ja"],[6,"drill-crane-a-lod0-jg"],[7,"drill-crane-a-lod0-mg"],[10,"drill-crane-a-end-ja"],[11,"drill-crane-b-lod0-jg"],[12,"drill-crane-b-lod0-mg"],[13,"drill-crane-b-idle-ja"],[15,"drill-crane-b-end-ja"],[16,"drill-crane-c-lod0-jg"],[17,"drill-crane-c-lod0-mg"],[18,"drill-crane-c-idle-ja"],[20,"drill-crane-c-end-ja"],[21,"drill-crane-d-lod0-jg"],[22,"drill-crane-d-lod0-mg"],[23,"drill-crane-d-idle-ja"],[25,"drill-crane-d-end-ja"]],"drill-drill-ag":[[0,"drill-drill-lod0-jg"],[1,"drill-drill-lod0-mg"],[2,"drill-drill-idle-ja"]],"drill-drop-plat-ag":[[0,"drill-drop-plat-lod0-jg"],[1,"drill-drop-plat-lod0-mg"],[2,"drill-drop-plat-swing-up-ja"],[3,"drill-drop-plat-swing-down-ja"]],"drill-elevator-ag":[[0,"drill-elevator-lod0-jg"],[1,"drill-elevator-lod0-mg"],[2,"drill-elevator-idle-ja"],[3,"drill-elevator-raise-rail-ja"],[4,"drill-elevator-drop-rail-ja"]],"drill-elevator-base-ag":[[0,"drill-elevator-base-lod0-jg"],[1,"drill-elevator-base-lod0-mg"],[2,"drill-elevator-base-idle-ja"]],"drill-elevator-doors-ag":[[0,"drill-elevator-doors-lod0-jg"],[1,"drill-elevator-doors-lod0-mg"],[2,"drill-elevator-doors-idle-ja"]],"drill-falling-door-ag":[[0,"drill-falling-door-lod0-jg"],[1,"drill-falling-door-lod0-mg"],[2,"drill-falling-door-idle-ja"],[3,"drill-falling-door-hit1-ja"],[4,"drill-falling-door-hit2-ja"],[5,"drill-falling-door-hit3-ja"],[6,"drill-falling-door-fall-ja"]],"drill-flip-step-ag":[[0,"drill-flip-step-lod0-jg"],[1,"drill-flip-step-lod0-mg"],[2,"drill-flip-step-swing-up-ja"],[3,"drill-flip-step-swing-down-ja"]],"drill-lift-ag":[[0,"drill-lift-lod0-jg"],[1,"drill-lift-lod0-mg"],[2,"drill-lift-lod1-mg"],[3,"drill-lift-idle-ja"]],"drill-metalhead-eggs-a-ag":[[0,"drill-metalhead-eggs-a-lod0-jg"],[1,"drill-metalhead-eggs-a-lod0-mg"],[2,"drill-metalhead-eggs-a-idle-ja"]],"drill-metalhead-eggs-b-ag":[[0,"drill-metalhead-eggs-b-lod0-jg"],[1,"drill-metalhead-eggs-b-lod0-mg"],[2,"drill-metalhead-eggs-b-idle-ja"]],"drill-metalhead-eggs-c-ag":[[0,"drill-metalhead-eggs-c-lod0-jg"],[1,"drill-metalhead-eggs-c-lod0-mg"],[2,"drill-metalhead-eggs-c-idle-ja"]],"drill-moving-staircase-ag":[[0,"drill-moving-staircase-lod0-jg"],[1,"drill-moving-staircase-lod0-mg"],[2,"drill-moving-staircase-idle-ja"]],"drill-plat-ag":[[0,"drill-plat-lod0-jg"],[1,"drill-plat-lod0-mg"],[2,"drill-plat-lod1-mg"],[3,"drill-plat-idle-ja"]],"drill-plat-falling-ag":[[0,"drill-plat-falling-lod0-jg"],[1,"drill-plat-falling-lod0-mg"],[2,"drill-plat-falling-idle-ja"]],"drill-switch-ag":[[0,"drill-switch-lod0-jg"],[1,"drill-switch-lod0-mg"],[2,"drill-switch-idle-ja"]],"drill-top-break-ag":[[8,"drill-top-break-explode-a-lod0-mg"],[0,"drill-top-break-lod0-jg"],[1,"drill-top-break-lod0-mg"],[10,"drill-top-break-explode-b-lod0-jg"],[2,"drill-top-break-idle-ja"],[4,"drill-top-break-explode-lod0-jg"],[5,"drill-top-break-explode-lod0-mg"],[7,"drill-top-break-explode-a-lod0-jg"],[11,"drill-top-break-explode-b-lod0-mg"]],"drill-turret-ext-ag":[[0,"drill-turret-ext-lod0-jg"],[1,"drill-turret-ext-lod0-mg"],[2,"drill-turret-ext-idle-ja"],[4,"drill-turret-ext-explode-lod0-jg"],[5,"drill-turret-ext-explode-lod0-mg"],[6,"drill-turret-ext-explode-idle-ja"]],"drill-turret-int-ag":[[0,"drill-turret-int-lod0-jg"],[1,"drill-turret-int-lod0-mg"],[2,"drill-turret-int-idle-ja"]],"drill-wall-ag":[[0,"drill-wall-lod0-jg"],[1,"drill-wall-lod0-mg"],[2,"drill-wall-1-idle-ja"],[3,"drill-wall-1-end-ja"]],"eco-canister-ag":[[0,"eco-canister-dark-lod0-jg"],[1,"eco-canister-dark-lod0-mg"],[2,"eco-canister-dark-idle-ja"]],"ecowell-a-ag":[[0,"ecowell-a-lod0-jg"],[1,"ecowell-a-lod0-mg"],[2,"ecowell-a-idle-ja"]],"ecowell-b-ag":[[0,"ecowell-b-lod0-jg"],[1,"ecowell-b-lod0-mg"],[2,"ecowell-b-idle-ja"]],"ecowell-c-ag":[[0,"ecowell-c-lod0-jg"],[1,"ecowell-c-lod0-mg"],[2,"ecowell-c-idle-ja"]],"ecowell-d-ag":[[0,"ecowell-d-lod0-jg"],[1,"ecowell-d-lod0-mg"],[2,"ecowell-d-idle-ja"]],"errol-highres-ag":[[0,"errol-highres-lod0-jg"],[1,"errol-highres-lod0-mg"],[2,"errol-highres-shadow-mg"],[3,"errol-highres-idle-ja"]],"errol-racer-ag":[[0,"errol-racer-lod0-jg"],[1,"errol-racer-lod0-mg"],[2,"errol-racer-lod1-mg"],[3,"errol-racer-idle-ja"],[4,"errol-racer-bike-stance-ja"],[5,"errol-racer-bike-taunt-left-ja"],[6,"errol-racer-bike-taunt-right-ja"]],"farm-beetree-ag":[[0,"farm-beetree-lod0-jg"],[1,"farm-beetree-lod0-mg"],[2,"farm-beetree-idle-ja"],[3,"farm-beetree-explode-lod0-jg"],[4,"farm-beetree-explode-lod0-mg"],[5,"farm-beetree-explode-idle-ja"]],"farm-cabbage-ag":[[0,"farm-cabbage-lod0-jg"],[1,"farm-cabbage-lod0-mg"],[2,"farm-cabbage-idle-ja"],[3,"farm-cabbage-explode-lod0-jg"],[4,"farm-cabbage-explode-lod0-mg"],[5,"farm-cabbage-explode-idle-ja"]],"farm-chilirots-ag":[[0,"farm-chilirots-lod0-jg"],[1,"farm-chilirots-lod0-mg"],[2,"farm-chilirots-idle-ja"],[3,"farm-chilirots-explode-lod0-jg"],[4,"farm-chilirots-explode-lod0-mg"],[5,"farm-chilirots-explode-idle-ja"]],"farm-marrow-ag":[[0,"farm-marrow-lod0-jg"],[1,"farm-marrow-lod0-mg"],[2,"farm-marrow-idle-ja"],[3,"farm-marrow-explode-lod0-jg"],[4,"farm-marrow-explode-lod0-mg"],[5,"farm-marrow-explode-idle-ja"]],"farm-small-cabbage-ag":[[0,"farm-small-cabbage-lod0-jg"],[1,"farm-small-cabbage-lod0-mg"],[2,"farm-small-cabbage-idle-ja"],[3,"farm-small-cabbage-explode-lod0-jg"],[4,"farm-small-cabbage-explode-lod0-mg"],[5,"farm-small-cabbage-explode-idle-ja"]],"farm-sprinkler-barrels-ag":[[0,"farm-sprinkler-barrels-lod0-jg"],[1,"farm-sprinkler-barrels-lod0-mg"],[2,"farm-sprinkler-barrels-idle-ja"]],"farthy-ag":[[0,"farthy-lod0-jg"],[1,"farthy-lod0-mg"],[2,"farthy-idle-ja"]],"fencespikes-ag":[[0,"fencespikes-lod0-jg"],[1,"fencespikes-lod0-mg"],[2,"fencespikes-lod1-mg"],[3,"fencespikes-idle-ja"]],"flag-ag":[[0,"flag-lod0-jg"],[1,"flag-lod0-mg"],[2,"flag-lod1-mg"],[3,"flag-idle-ja"]],"flamer-ag":[[0,"flamer-lod0-jg"],[1,"flamer-lod0-mg"],[2,"flamer-lod1-mg"],[3,"flamer-lod2-mg"],[4,"flamer-shadow-mg"],[5,"flamer-idle-ja"],[6,"flamer-fly-right-ja"],[7,"flamer-fly-left-ja"],[8,"flamer-fly-forward-ja"],[9,"flamer-fly-back-ja"],[10,"flamer-fly-straight-ja"],[11,"flamer-shoot-ja"],[12,"flamer-shoot1-ja"],[13,"flamer-knock-back-ja"],[14,"flamer-knock-back-fall-ja"],[15,"flamer-die-ja"],[16,"flamer-knock-back-land-ja"],[17,"flamer-die-in-place-ja"],[18,"flamer-blue-hit0-ja"],[19,"flamer-blue-hit1-ja"],[20,"flamer-blue-hit2-ja"],[21,"flamer-explode-lod0-jg"],[22,"flamer-explode-lod0-mg"],[23,"flamer-explode-idle-ja"]],"flitter-ag":[[0,"flitter-lod0-jg"],[1,"flitter-lod0-mg"],[2,"flitter-lod1-mg"],[3,"flitter-lod2-mg"],[4,"flitter-shadow-mg"],[5,"flitter-idle-ja"],[6,"flitter-idle-look-left-ja"],[7,"flitter-idle-look-left-hold-ja"],[8,"flitter-idle-look-right-ja"],[9,"flitter-idle-look-right-hold-ja"],[10,"flitter-ambush-jump-ja"],[11,"flitter-ambush-land-ja"],[12,"flitter-notice-ja"],[13,"flitter-walk-ja"],[14,"flitter-move-ja"],[15,"flitter-turn-ja"],[16,"flitter-attack-ja"],[17,"flitter-attack-high-ja"],[18,"flitter-die-falling-ja"],[19,"flitter-die-in-place-ja"],[20,"flitter-knocked0-ja"],[21,"flitter-knocked-land0-ja"],[22,"flitter-knocked-land-upright-ja"],[23,"flitter-blue-hit0-ja"]],"flying-spider-ag":[[0,"flying-spider-lod0-jg"],[1,"flying-spider-lod0-mg"],[2,"flying-spider-lod1-mg"],[3,"flying-spider-lod2-mg"],[4,"flying-spider-shadow-mg"],[5,"flying-spider-idle0-ja"],[6,"flying-spider-idle-flying-ja"],[7,"flying-spider-drop-down-ja"],[8,"flying-spider-drop-down-land-ja"],[9,"flying-spider-walk0-ja"],[10,"flying-spider-knocked-blue0-ja"],[11,"flying-spider-attack-close0-ja"],[12,"flying-spider-knocked-red0-ja"],[13,"flying-spider-knocked-red0-land-ja"],[14,"flying-spider-shoot-start-ja"],[15,"flying-spider-shoot-right-ja"],[16,"flying-spider-shoot-left-ja"],[17,"flying-spider-shoot-stop-ja"],[18,"flying-spider-death-standing-ja"],[19,"flying-spider-turn-left-180-ja"],[20,"flying-spider-turn-right-180-ja"]],"fodder-ag":[[0,"fodder-lod0-jg"],[1,"fodder-lod0-mg"],[2,"fodder-lod1-mg"],[3,"fodder-shadow-mg"],[4,"fodder-idle-ja"],[5,"fodder-up-ja"],[6,"fodder-chew-ja"],[7,"fodder-run-ja"],[8,"fodder-run-low-ja"],[9,"fodder-biting-run-ja"],[10,"fodder-jump-chomp-ja"],[11,"fodder-jump-kick-ja"],[12,"fodder-walk-ja"],[13,"fodder-look-around-ja"],[14,"fodder-die-ja"],[15,"fodder-snap-ja"],[16,"fodder-knocked0-ja"],[17,"fodder-knocked-land0-ja"],[18,"fodder-blue-hit0-ja"],[19,"fodder-blue-hit1-ja"],[20,"fodder-blue-hit2-ja"],[21,"fodder-die-falling-ja"]],"fort-conveyor-ag":[[0,"fort-conveyor-lod0-jg"],[1,"fort-conveyor-lod0-mg"],[2,"fort-conveyor-idle-ja"]],"fort-dump-bomb-a-ag":[[0,"fort-dump-bomb-a-lod0-jg"],[1,"fort-dump-bomb-a-lod0-mg"],[2,"fort-dump-bomb-a-lod1-mg"],[3,"fort-dump-bomb-a-idle-ja"]],"fort-elec-belt-ag":[[0,"fort-elec-belt-lod0-jg"],[1,"fort-elec-belt-lod0-mg"],[2,"fort-elec-belt-idle-ja"]],"fort-elec-switch-ag":[[0,"fort-elec-switch-lod0-jg"],[1,"fort-elec-switch-lod0-mg"],[2,"fort-elec-switch-idle-ja"]],"fort-entry-gate-ag":[[0,"fort-entry-gate-lod0-jg"],[1,"fort-entry-gate-lod0-mg"],[2,"fort-entry-gate-idle-ja"]],"fort-fence-ag":[[8,"fort-fence-b-end-ja"],[0,"fort-fence-a-lod0-jg"],[1,"fort-fence-a-lod0-mg"],[2,"fort-fence-a-idle-ja"],[3,"fort-fence-a-end-ja"],[5,"fort-fence-b-lod0-jg"],[6,"fort-fence-b-lod0-mg"],[7,"fort-fence-b-idle-ja"]],"fort-floor-spike-b-ag":[[0,"fort-floor-spike-b-lod0-jg"],[1,"fort-floor-spike-b-lod0-mg"],[2,"fort-floor-spike-b-lod1-mg"],[3,"fort-floor-spike-b-lod2-mg"],[4,"fort-floor-spike-b-idle-ja"]],"fort-floor-spike-c-ag":[[0,"fort-floor-spike-c-lod0-jg"],[1,"fort-floor-spike-c-lod0-mg"],[2,"fort-floor-spike-c-lod1-mg"],[3,"fort-floor-spike-c-lod2-mg"],[4,"fort-floor-spike-c-idle-ja"]],"fort-led-ag":[[0,"fort-led-lod0-jg"],[1,"fort-led-lod0-mg"],[2,"fort-led-idle-ja"]],"fort-lift-plat-ag":[[0,"fort-lift-plat-lod0-jg"],[1,"fort-lift-plat-lod0-mg"],[2,"fort-lift-plat-lod1-mg"],[3,"fort-lift-plat-idle-ja"],[4,"fort-lift-plat-scale-ja"]],"fort-missile-ag":[[0,"fort-missile-lod0-jg"],[1,"fort-missile-lod0-mg"],[2,"fort-missile-idle-ja"]],"fort-missile-target-ag":[[0,"fort-missile-target-lod0-jg"],[1,"fort-missile-target-lod0-mg"],[2,"fort-missile-target-idle-ja"],[3,"fort-missile-target-explode-lod0-jg"],[4,"fort-missile-target-explode-lod0-mg"],[5,"fort-missile-target-explode-idle-ja"]],"fort-plat-orbit-ag":[[0,"fort-plat-orbit-lod0-jg"],[1,"fort-plat-orbit-lod0-mg"],[2,"fort-plat-orbit-idle-ja"]],"fort-plat-shuttle-ag":[[0,"fort-plat-shuttle-lod0-jg"],[1,"fort-plat-shuttle-lod0-mg"],[2,"fort-plat-shuttle-lod1-mg"],[3,"fort-plat-shuttle-idle-ja"]],"fort-roboscreen-ag":[[0,"fort-roboscreen-lod0-jg"],[1,"fort-roboscreen-lod0-mg"],[2,"fort-roboscreen-idle-ja"],[3,"fort-roboscreen-end-ja"]],"fort-robotank-ag":[[0,"fort-robotank-lod0-jg"],[1,"fort-robotank-lod0-mg"],[2,"fort-robotank-lod1-mg"],[3,"fort-robotank-idle-ja"],[4,"fort-robotank-fire-start-ja"],[5,"fort-robotank-fire-end-ja"]],"fort-robotank-sight-ag":[[0,"fort-robotank-sight-lod0-jg"],[1,"fort-robotank-sight-lod0-mg"],[2,"fort-robotank-sight-shadow-mg"],[3,"fort-robotank-sight-idle-ja"],[4,"fort-robotank-sight-locked-ja"]],"fort-robotank-top-ag":[[0,"fort-robotank-top-lod0-jg"],[1,"fort-robotank-top-lod0-mg"],[2,"fort-robotank-top-lod1-mg"],[3,"fort-robotank-top-idle-ja"],[4,"fort-robotank-top-fire-start-ja"],[5,"fort-robotank-top-fire-end-ja"]],"fort-trap-door-ag":[[0,"fort-trap-door-lod0-jg"],[1,"fort-trap-door-lod0-mg"],[2,"fort-trap-door-idle-ja"],[3,"fort-trap-door-explode-lod0-jg"],[4,"fort-trap-door-explode-lod0-mg"],[5,"fort-trap-door-explode-idle-ja"]],"fort-turret-ag":[[0,"fort-turret-lod0-jg"],[1,"fort-turret-lod0-mg"],[2,"fort-turret-lod1-mg"],[3,"fort-turret-shadow-mg"],[4,"fort-turret-idle-ja"],[5,"fort-turret-shoot-ja"],[6,"fort-turret-rise-ja"],[7,"fort-turret-explode-lod0-jg"],[8,"fort-turret-explode-lod0-mg"],[9,"fort-turret-explode-idle-ja"]],"gar-curtain-ag":[[0,"gar-curtain-lod0-jg"],[1,"gar-curtain-lod0-mg"],[2,"gar-curtain-idle-ja"]],"gar-door-ag":[[0,"gar-door-lod0-jg"],[1,"gar-door-lod0-mg"],[2,"gar-door-idle-ja"]],"gar-trophy-ca-ag":[[0,"gar-trophy-ca-lod0-jg"],[1,"gar-trophy-ca-lod0-mg"],[2,"gar-trophy-ca-idle-ja"]],"gar-trophy-cb-ag":[[0,"gar-trophy-cb-lod0-jg"],[1,"gar-trophy-cb-lod0-mg"],[2,"gar-trophy-cb-idle-ja"]],"gar-trophy-cc-ag":[[0,"gar-trophy-cc-lod0-jg"],[1,"gar-trophy-cc-lod0-mg"],[2,"gar-trophy-cc-idle-ja"]],"gar-weld-project-ag":[[0,"gar-weld-project-lod0-jg"],[1,"gar-weld-project-lod0-mg"],[2,"gar-weld-project-shadow-mg"],[3,"gar-weld-project-idle-ja"]],"garage-bikeb-ag":[[0,"garage-bikeb-lod0-jg"],[1,"garage-bikeb-lod0-mg"],[2,"garage-bikeb-idle-ja"]],"garage-bikec-ag":[[0,"garage-bikec-lod0-jg"],[1,"garage-bikec-lod0-mg"],[2,"garage-bikec-idle-ja"]],"ginsu-ag":[[0,"ginsu-lod0-jg"],[1,"ginsu-lod0-mg"],[2,"ginsu-lod1-mg"],[3,"ginsu-lod2-mg"],[4,"ginsu-shadow-mg"],[5,"ginsu-idle-ja"],[6,"ginsu-flap-ja"],[7,"ginsu-fly-forward-ja"],[8,"ginsu-fly-right-ja"],[9,"ginsu-fly-left-ja"],[10,"ginsu-notice-ja"],[11,"ginsu-die-ja"],[12,"ginsu-die-land-ja"],[13,"ginsu-blue-hit-air-ja"],[14,"ginsu-blue-hit-land-ja"],[15,"ginsu-attack-ja"]],"grenadier-ag":[[0,"grenadier-lod0-jg"],[1,"grenadier-lod0-mg"],[2,"grenadier-lod1-mg"],[3,"grenadier-lod2-mg"],[4,"grenadier-shadow-mg"],[5,"grenadier-idle-ja"],[6,"grenadier-idle2-ja"],[7,"grenadier-idle-look-left-ja"],[8,"grenadier-idle-look-right-ja"],[9,"grenadier-patrol-ja"],[10,"grenadier-patrol1-ja"],[11,"grenadier-notice-ja"],[12,"grenadier-notice1-ja"],[13,"grenadier-run-ja"],[14,"grenadier-run1-ja"],[15,"grenadier-run-to-throw-ja"],[16,"grenadier-throw-turn-in-place-ja"],[17,"grenadier-throw-stance-ja"],[18,"grenadier-throw-ja"],[19,"grenadier-throw1-ja"],[20,"grenadier-throw-quick-ja"],[21,"grenadier-spin-kick-ja"],[22,"grenadier-victory-ja"],[23,"grenadier-hit-ja"],[24,"grenadier-hit-right-ja"],[25,"grenadier-hit-left-ja"],[26,"grenadier-hit-back-ja"],[27,"grenadier-blue-hit0-ja"],[28,"grenadier-blue-hit1-ja"],[29,"grenadier-blue-hit2-ja"],[30,"grenadier-blue-land-ja"],[31,"grenadier-knocked-ja"],[32,"grenadier-knocked-land-ja"],[33,"grenadier-die-ja"],[34,"grenadier-die-falling-ja"]],"grunt-ag":[[0,"grunt-lod0-jg"],[1,"grunt-lod0-mg"],[2,"grunt-lod1-mg"],[3,"grunt-lod2-mg"],[4,"grunt-shadow-mg"],[5,"grunt-idle-ja"],[6,"grunt-idle1-look-right-ja"],[7,"grunt-idle1-look-right-hold-ja"],[8,"grunt-idle1-look-left-ja"],[9,"grunt-idle1-look-left-hold-ja"],[10,"grunt-idle1-left-to-idle-ja"],[11,"grunt-patrol0-ja"],[12,"grunt-patrol1-ja"],[13,"grunt-notice-ja"],[14,"grunt-charge0-ja"],[15,"grunt-charge1-ja"],[16,"grunt-charge2-ja"],[17,"grunt-attack0-ja"],[18,"grunt-attack1-ja"],[19,"grunt-death-in-place-ja"],[20,"grunt-taunt-ja"],[21,"grunt-turn-ja"],[22,"grunt-knocked0-ja"],[23,"grunt-knocked-land0-ja"],[24,"grunt-knocked1-ja"],[25,"grunt-knocked-land1-ja"],[26,"grunt-knocked2-ja"],[27,"grunt-knocked-land2-ja"],[28,"grunt-explode0-ja"],[29,"grunt-explode-land0-ja"],[30,"grunt-celebrate-start-ja"],[31,"grunt-celebrate-finish-ja"],[32,"grunt-die-falling-ja"],[33,"grunt-bite-ja"],[34,"grunt-yellow-hit0-ja"],[35,"grunt-yellow-hit1-ja"],[36,"grunt-yellow-hit2-ja"],[37,"grunt-yellow-hit3-ja"],[38,"grunt-blue-hit0-ja"],[39,"grunt-blue-hit1-ja"],[40,"grunt-blue-hit2-ja"],[41,"grunt-blue-hit3-ja"],[42,"grunt-blue-hit4-ja"],[43,"grunt-blue-hit5-ja"],[44,"grunt-blue-land-ja"],[45,"grunt-jump-wind-up-ja"],[46,"grunt-jump-in-air-ja"],[47,"grunt-jump-land-ja"],[57,"grunt-sew-scare-grunt-end-ja"],[48,"grunt-mech-lunge-ja"],[49,"grunt-mech-grab-ja"],[50,"grunt-mech-idle0-ja"],[51,"grunt-mech-head-butt-ja"],[52,"grunt-mech-punch-left-ja"],[53,"grunt-mech-double-pound-ja"],[54,"grunt-mech-dismount-ja"],[55,"grunt-mech-dismount-land-ja"]],"grunt-egg-a-ag":[[0,"grunt-egg-a-lod0-jg"],[1,"grunt-egg-a-lod0-mg"],[2,"grunt-egg-a-lod1-mg"],[3,"grunt-egg-a-idle-ja"],[4,"grunt-egg-a-idle2-ja"]],"grunt-egg-b-ag":[[0,"grunt-egg-b-lod0-jg"],[1,"grunt-egg-b-lod0-mg"],[2,"grunt-egg-b-lod1-mg"],[3,"grunt-egg-b-idle-ja"],[4,"grunt-egg-b-idle2-ja"]],"grunt-egg-c-ag":[[0,"grunt-egg-c-lod0-jg"],[1,"grunt-egg-c-lod0-mg"],[2,"grunt-egg-c-lod1-mg"],[3,"grunt-egg-c-idle-ja"],[4,"grunt-egg-c-idle2-ja"]],"grunt-egg-d-ag":[[0,"grunt-egg-d-lod0-jg"],[1,"grunt-egg-d-lod0-mg"],[2,"grunt-egg-d-lod1-mg"],[3,"grunt-egg-d-idle-ja"],[4,"grunt-egg-d-idle2-ja"]],"grunt-fma-ag":[[0,"grunt-fma-lod0-jg"],[1,"grunt-fma-lod0-mg"]],"gun-ag":[[0,"gun-ammo-yellow-lod0-jg"],[1,"gun-ammo-yellow-lod0-mg"],[2,"gun-ammo-red-lod0-jg"],[3,"gun-ammo-red-lod0-mg"],[4,"gun-ammo-blue-lod0-jg"],[5,"gun-ammo-blue-lod0-mg"],[6,"gun-ammo-dark-lod0-jg"],[7,"gun-ammo-dark-lod0-mg"],[8,"gun-ammo-idle-ja"],[9,"gun-lod0-jg"],[10,"gun-lod0-mg"],[11,"gun-shadow-mg"],[12,"gun-idle-ja"],[13,"gun-idle-red-ja"],[14,"gun-idle-dark-ja"],[15,"gun-idle-yellow-ja"],[16,"gun-idle-blue-ja"],[40,"gun-red-cone-lod0-jg"],[41,"gun-red-cone-lod0-mg"],[42,"gun-red-cone-idle-ja"],[17,"gun-gun-yellow-fire-low-ja"],[18,"gun-gun-red-fire-ja"],[19,"gun-gun-blue-fire-ja"],[20,"gun-gun-blue-fire-single-ja"],[21,"gun-gun-dark-fire-ja"],[22,"gun-gun-yellow-fire-ja"],[23,"gun-gun-red-dark-ja"],[24,"gun-gun-red-yellow-ja"],[25,"gun-gun-red-blue-ja"],[26,"gun-gun-dark-yellow-ja"],[27,"gun-gun-yellow-blue-ja"],[28,"gun-gun-yellow-red-ja"],[29,"gun-gun-blue-dark-ja"],[30,"gun-gun-blue-red-ja"]],"gun-barrel-ag":[[0,"gun-barrel-lod0-jg"],[1,"gun-barrel-lod0-mg"],[2,"gun-barrel-idle-ja"]],"gun-buoy-ag":[[0,"gun-buoy-lod0-jg"],[1,"gun-buoy-lod0-mg"],[2,"gun-buoy-idle-ja"],[3,"gun-buoy-open-ja"],[4,"gun-buoy-close-ja"]],"gun-cit-a-ag":[[0,"gun-cit-a-lod0-jg"],[1,"gun-cit-a-lod0-mg"],[2,"gun-cit-a-idle-ja"],[3,"gun-cit-a-explode-lod0-jg"],[4,"gun-cit-a-explode-lod0-mg"],[5,"gun-cit-a-explode-idle-ja"]],"gun-cit-b-ag":[[0,"gun-cit-b-lod0-jg"],[1,"gun-cit-b-lod0-mg"],[2,"gun-cit-b-idle-ja"],[3,"gun-cit-b-explode-lod0-jg"],[4,"gun-cit-b-explode-lod0-mg"],[5,"gun-cit-b-explode-idle-ja"]],"gun-cit-c-ag":[[0,"gun-cit-c-lod0-jg"],[1,"gun-cit-c-lod0-mg"],[2,"gun-cit-c-idle-ja"],[3,"gun-cit-c-explode-lod0-jg"],[4,"gun-cit-c-explode-lod0-mg"],[5,"gun-cit-c-explode-idle-ja"]],"gun-cit-d-ag":[[0,"gun-cit-d-lod0-jg"],[1,"gun-cit-d-lod0-mg"],[2,"gun-cit-d-idle-ja"],[3,"gun-cit-d-explode-lod0-jg"],[4,"gun-cit-d-explode-lod0-mg"],[5,"gun-cit-d-explode-idle-ja"]],"gun-dummy-a-ag":[[0,"gun-dummy-a-lod0-jg"],[1,"gun-dummy-a-lod0-mg"],[2,"gun-dummy-a-idle-ja"],[3,"gun-dummy-a-explode-lod0-jg"],[4,"gun-dummy-a-explode-lod0-mg"],[5,"gun-dummy-a-explode-idle-ja"]],"gun-dummy-b-ag":[[0,"gun-dummy-b-lod0-jg"],[1,"gun-dummy-b-lod0-mg"],[2,"gun-dummy-b-idle-ja"],[3,"gun-dummy-b-explode-lod0-jg"],[4,"gun-dummy-b-explode-lod0-mg"],[5,"gun-dummy-b-explode-idle-ja"]],"gun-dummy-big-ag":[[0,"gun-dummy-big-lod0-jg"],[1,"gun-dummy-big-lod0-mg"],[2,"gun-dummy-big-idle-ja"],[3,"gun-dummy-big-explode-lod0-jg"],[4,"gun-dummy-big-explode-lod0-mg"],[5,"gun-dummy-big-explode-idle-ja"]],"gun-dummy-c-ag":[[0,"gun-dummy-c-lod0-jg"],[1,"gun-dummy-c-lod0-mg"],[2,"gun-dummy-c-idle-ja"],[3,"gun-dummy-c-explode-lod0-jg"],[4,"gun-dummy-c-explode-lod0-mg"],[5,"gun-dummy-c-explode-idle-ja"]],"gun-dummy-gold-ag":[[0,"gun-dummy-gold-lod0-jg"],[1,"gun-dummy-gold-lod0-mg"],[2,"gun-dummy-gold-idle-ja"],[3,"gun-dummy-gold-explode-lod0-jg"],[4,"gun-dummy-gold-explode-lod0-mg"],[5,"gun-dummy-gold-explode-idle-ja"]],"gun-dummy-yellow-gun-ag":[[0,"gun-dummy-yellow-gun-lod0-jg"],[1,"gun-dummy-yellow-gun-lod0-mg"],[2,"gun-dummy-yellow-gun-idle-ja"],[3,"gun-dummy-yellow-gun-explode-lod0-jg"],[4,"gun-dummy-yellow-gun-explode-lod0-mg"],[5,"gun-dummy-yellow-gun-explode-idle-ja"]],"gun-upgrade-a-ag":[[0,"gun-upgrade-a-lod0-jg"],[1,"gun-upgrade-a-lod0-mg"],[2,"gun-upgrade-a-idle-ja"]],"heart-mar-ag":[[3,"heart-mar-grab-success-ja"],[0,"heart-mar-lod0-jg"],[1,"heart-mar-lod0-mg"],[2,"heart-mar-idle-ja"]],"heart-of-mar-ag":[[0,"heart-of-mar-lod0-jg"],[1,"heart-of-mar-lod0-mg"],[2,"heart-of-mar-idle-ja"]],"hellcat-ag":[[0,"hellcat-lod0-jg"],[1,"hellcat-lod0-mg"],[2,"hellcat-lod1-mg"],[3,"hellcat-lod2-mg"],[4,"hellcat-shadow-mg"],[5,"hellcat-idle-ja"]],"helldog-ag":[[0,"helldog-lod0-jg"],[1,"helldog-lod0-mg"],[2,"helldog-lod1-mg"],[3,"helldog-lod2-mg"],[4,"helldog-shadow-mg"],[5,"helldog-idle-ja"]],"hide-bike-ag":[[0,"hide-bike-lod0-jg"],[1,"hide-bike-lod0-mg"],[2,"hide-bike-idle-ja"]],"hide-door-a-ag":[[0,"hide-door-a-lod0-jg"],[1,"hide-door-a-lod0-mg"],[2,"hide-door-a-idle-ja"]],"hide-door-b-ag":[[0,"hide-door-b-lod0-jg"],[1,"hide-door-b-lod0-mg"],[2,"hide-door-b-idle-ja"]],"hide-faucet-ag":[[0,"hide-faucet-lod0-jg"],[1,"hide-faucet-lod0-mg"],[2,"hide-faucet-idle-ja"]],"hide-light-ag":[[0,"hide-light-lod0-jg"],[1,"hide-light-lod0-mg"],[2,"hide-light-shadow-mg"],[3,"hide-light-idle-ja"],[5,"hide-light-fog-lod0-jg"],[6,"hide-light-fog-lod0-mg"],[7,"hide-light-fog-idle-ja"]],"hip-bottle-b-ag":[[0,"hip-bottle-b-lod0-jg"],[1,"hip-bottle-b-lod0-mg"],[2,"hip-bottle-b-idle-ja"]],"hip-bottle-c-ag":[[0,"hip-bottle-c-lod0-jg"],[1,"hip-bottle-c-lod0-mg"],[2,"hip-bottle-c-idle-ja"]],"hip-door-a-ag":[[0,"hip-door-a-lod0-jg"],[1,"hip-door-a-lod0-mg"],[2,"hip-door-a-idle-ja"]],"hip-mirror-ag":[[0,"hip-mirror-lod0-jg"],[1,"hip-mirror-lod0-mg"],[2,"hip-mirror-idle-ja"]],"hip-mole-ag":[[0,"hip-mole-lod0-jg"],[1,"hip-mole-lod0-mg"],[2,"hip-mole-idle-ja"],[3,"hip-mole-up-ja"],[4,"hip-mole-loop-ja"],[5,"hip-mole-down-ja"]],"hip-mug-ag":[[0,"hip-mug-lod0-jg"],[1,"hip-mug-lod0-mg"],[2,"hip-mug-idle-ja"]],"hip-trophy-a-ag":[[0,"hip-trophy-a-lod0-jg"],[1,"hip-trophy-a-lod0-mg"],[2,"hip-trophy-a-idle-ja"]],"hip-trophy-c-ag":[[0,"hip-trophy-c-lod0-jg"],[1,"hip-trophy-c-lod0-mg"],[2,"hip-trophy-c-idle-ja"]],"hip-trophy-d-ag":[[0,"hip-trophy-d-lod0-jg"],[1,"hip-trophy-d-lod0-mg"],[2,"hip-trophy-d-idle-ja"]],"hip-trophy-f-ag":[[0,"hip-trophy-f-lod0-jg"],[1,"hip-trophy-f-lod0-mg"],[2,"hip-trophy-f-idle-ja"]],"hip-trophy-g-ag":[[0,"hip-trophy-g-lod0-jg"],[1,"hip-trophy-g-lod0-mg"],[2,"hip-trophy-g-idle-ja"]],"hip-trophy-i-ag":[[0,"hip-trophy-i-lod0-jg"],[1,"hip-trophy-i-lod0-mg"],[2,"hip-trophy-i-idle-ja"]],"hip-trophy-j-ag":[[0,"hip-trophy-j-lod0-jg"],[1,"hip-trophy-j-lod0-mg"],[2,"hip-trophy-j-idle-ja"]],"hip-trophy-m-ag":[[0,"hip-trophy-m-lod0-jg"],[1,"hip-trophy-m-lod0-mg"],[2,"hip-trophy-m-idle-ja"]],"hip-trophy-n-ag":[[0,"hip-trophy-n-lod0-jg"],[1,"hip-trophy-n-lod0-mg"],[2,"hip-trophy-n-idle-ja"]],"hip-whack-a-metal-ag":[[0,"hip-whack-a-metal-lod0-jg"],[1,"hip-whack-a-metal-lod0-mg"],[2,"hip-whack-a-metal-idle-ja"]],"homing-beacon-ag":[[0,"homing-beacon-lod0-jg"],[1,"homing-beacon-lod0-mg"],[2,"homing-beacon-idle-ja"]],"hopper-ag":[[0,"hopper-lod0-jg"],[1,"hopper-lod0-mg"],[2,"hopper-lod1-mg"],[3,"hopper-shadow-mg"],[4,"hopper-idle-ja"],[5,"hopper-idle-look-left-ja"],[6,"hopper-idle-look-right-ja"],[7,"hopper-notice-ja"],[8,"hopper-notice-alt-ja"],[9,"hopper-turn-ja"],[10,"hopper-jump-start-ja"],[11,"hopper-jump-start-left-ja"],[12,"hopper-jump-start-right-ja"],[13,"hopper-jump-ja"],[14,"hopper-jump-land-ja"],[15,"hopper-jump-attack-ja"],[16,"hopper-jump-attack-land-ja"],[17,"hopper-jump-attack2-ja"],[18,"hopper-jump-attack2-land-ja"],[19,"hopper-die-ja"],[20,"hopper-die-falling-ja"],[21,"hopper-blue-hit0-ja"],[22,"hopper-blue-hit1-ja"],[23,"hopper-blue-hit2-ja"],[24,"hopper-blue-hit-land-ja"],[25,"hopper-knocked0-ja"],[26,"hopper-knocked0-land-ja"],[27,"hopper-knocked1-ja"],[28,"hopper-knocked1-land-ja"],[29,"hopper-knocked2-ja"],[30,"hopper-knocked2-land-ja"],[31,"hopper-hop-start-ja"],[32,"hopper-hop-air-ja"],[33,"hopper-hop-land-ja"],[34,"hopper-hop-attack-start-ja"],[35,"hopper-hop-attack-air-ja"],[36,"hopper-hop-attack-land-ja"]],"hosehead-ag":[[0,"hosehead-lod0-jg"],[1,"hosehead-lod0-mg"],[2,"hosehead-lod1-mg"],[3,"hosehead-lod2-mg"],[4,"hosehead-shadow-mg"],[5,"hosehead-walk-ja"],[6,"hosehead-walk-wall-ja"],[7,"hosehead-wall-jump-start-ja"],[8,"hosehead-wall-jump-air-ja"],[9,"hosehead-wall-jump-land-ja"],[10,"hosehead-shoot-start-ja"],[11,"hosehead-shoot-loop-ja"],[12,"hosehead-shoot-end-ja"],[13,"hosehead-attack0-ja"],[14,"hosehead-attack1-ja"],[15,"hosehead-idle0-ja"],[16,"hosehead-idle-wall0-ja"],[17,"hosehead-run-ja"],[18,"hosehead-knocked-ja"],[19,"hosehead-knocked-land-ja"],[20,"hosehead-notice-ja"],[21,"hosehead-attack-left-ja"],[22,"hosehead-attack-right-ja"],[23,"hosehead-die-standing-ja"],[24,"hosehead-yellow-hit0-ja"],[25,"hosehead-yellow-hit1-ja"],[26,"hosehead-blue-hit0-ja"],[27,"hosehead-blue-hit-land0-ja"],[28,"hosehead-blue-hit1-ja"],[29,"hosehead-blue-hit-land1-ja"],[30,"hosehead-blue-hit2-ja"],[31,"hosehead-blue-hit-land2-ja"],[32,"hosehead-knocked1-ja"],[33,"hosehead-knocked-land1-ja"],[34,"hosehead-knocked2-ja"],[35,"hosehead-knocked-land2-ja"],[36,"hosehead-run1-ja"],[37,"hosehead-idle1-ja"],[38,"hosehead-idle2-ja"],[39,"hosehead-jitter-ja"],[40,"hosehead-jump-down-ja"],[41,"hosehead-jump-down-land-ja"]],"hovering-mine-ag":[[0,"hovering-mine-lod0-jg"],[1,"hovering-mine-lod0-mg"],[2,"hovering-mine-shadow-mg"],[3,"hovering-mine-idle-ja"]],"hud-ring-ag":[[0,"hud-ring-lod0-jg"],[1,"hud-ring-lod0-mg"],[2,"hud-ring-idle-ja"],[3,"hud-ring-part-lod0-jg"],[4,"hud-ring-part-lod0-mg"],[5,"hud-ring-part-idle-ja"]],"intro-flamer-ag":[[0,"intro-flamer-lod0-jg"],[1,"intro-flamer-lod0-mg"],[2,"intro-flamer-lod1-mg"],[3,"intro-flamer-lod2-mg"],[4,"intro-flamer-shadow-mg"],[5,"intro-flamer-fly-straight-ja"]],"jak-clothes-ag":[[0,"jak-clothes-lod0-jg"],[1,"jak-clothes-lod0-mg"],[2,"jak-clothes-idle-ja"]],"jak-highres-ag":[[0,"jak-highres-lod0-jg"],[1,"jak-highres-lod0-mg"],[2,"jak-highres-shadow-mg"],[3,"jak-highres-idle-ja"]],"jak-highres-prison-ag":[[0,"jak-highres-prison-lod0-jg"],[1,"jak-highres-prison-lod0-mg"],[2,"jak-highres-prison-shadow-mg"],[3,"jak-highres-prison-idle-ja"]],"jak-logo-ag":[[0,"jak-logo-lod0-jg"],[1,"jak-logo-lod0-mg"],[2,"jak-logo-idle-ja"],[5,"jak-logo-end-ja"]],"jak-stand-ag":[[0,"jak-stand-lod0-jg"],[1,"jak-stand-lod0-mg"],[2,"jak-stand-idle-ja"],[5,"jak-stand-end-ja"]],"jakb-ag":[[64,"jakb-hit-elec-ja"],[399,"jakb-darkjak-attack-spin-ja"],[0,"jakb-lod0-jg"],[65,"jakb-hit-from-front-alt1-ja"],[1,"jakb-lod0-mg"],[66,"jakb-hit-from-front-ja"],[393,"jakb-darkjak-run-ja"],[2,"jakb-shadow-mg"],[67,"jakb-hit-from-back-ja"],[3,"jakb-run-to-stance-ja"],[4,"jakb-run-to-stance-loop-ja"],[5,"jakb-stance-loop-ja"],[6,"jakb-run-to-stance-fast-ja"],[7,"jakb-run-ja"],[407,"jakb-darkjak-attack-combo3-end-ja"],[8,"jakb-run-up-ja"],[9,"jakb-run-down-ja"],[401,"jakb-darkjak-bomb-pre-ja"],[10,"jakb-run-right-ja"],[11,"jakb-run-left-ja"],[395,"jakb-darkjak-jump-land-ja"],[12,"jakb-walk-ja"],[13,"jakb-walk-up-ja"],[405,"jakb-darkjak-attack-combo2-end-ja"],[14,"jakb-walk-down-ja"],[15,"jakb-walk-right-ja"],[415,"jakb-darkjak-get-off-end-ja"],[16,"jakb-walk-left-ja"],[17,"jakb-run-squash-ja"],[409,"jakb-darkjak-attack-combo1b-ja"],[18,"jakb-run-squash-weak-ja"],[19,"jakb-stance-to-duck-ja"],[403,"jakb-darkjak-attack-combo1-end-ja"],[20,"jakb-duck-stance-ja"],[21,"jakb-duck-walk-ja"],[413,"jakb-darkjak-attack-combo3c-ja"],[22,"jakb-turn-around-ja"],[23,"jakb-jump-ja"],[24,"jakb-jump-land-ja"],[25,"jakb-painful-land-ja"],[26,"jakb-painful-land-end-ja"],[27,"jakb-jump-loop-ja"],[411,"jakb-darkjak-bomb-end-ja"],[28,"jakb-jump-short-land-ja"],[29,"jakb-jump-forward-ja"],[30,"jakb-duck-high-jump-ja"],[32,"jakb-launch-jump-loop-ja"],[33,"jakb-edge-grab-stance0-ja"],[34,"jakb-edge-grab-stance1-ja"],[35,"jakb-falling-to-edge-grab-ja"],[38,"jakb-edge-grab-to-jump-ja"],[39,"jakb-edge-grab-off-ja"],[40,"jakb-attack-from-stance-ja"],[41,"jakb-attack-from-stance-end-ja"],[42,"jakb-attack-from-stance-alt-end-ja"],[43,"jakb-attack-from-stance-run-end-ja"],[44,"jakb-attack-from-stance-run-alt-end-ja"],[45,"jakb-attack-from-jump-ja"],[46,"jakb-attack-from-jump-loop-ja"],[47,"jakb-attack-from-jump-end-ja"],[48,"jakb-attack-punch-ja"],[49,"jakb-attack-punch-end-ja"],[50,"jakb-attack-punch-alt-end-ja"],[51,"jakb-attack-uppercut-ja"],[52,"jakb-flop-down-ja"],[53,"jakb-flop-down-loop-ja"],[54,"jakb-flop-down-land-ja"],[55,"jakb-moving-flop-down-ja"],[391,"jakb-darkjak-attack-ice-ja"],[56,"jakb-moving-flop-down-loop-ja"],[58,"jakb-flop-jump-ja"],[59,"jakb-duck-roll-ja"],[60,"jakb-duck-roll-end-ja"],[61,"jakb-roll-flip-ja"],[62,"jakb-roll-flip-land-ja"],[63,"jakb-trip-ja"],[68,"jakb-hit-up-ja"],[69,"jakb-deatha-ja"],[70,"jakb-death-painful-land-ja"],[71,"jakb-smack-surface-ja"],[72,"jakb-smack-surface-end-ja"],[73,"jakb-shocked-ja"],[79,"jakb-slide-right-ja"],[80,"jakb-slide-left-ja"],[81,"jakb-wall-hide-ja"],[82,"jakb-wall-hide-scared-ja"],[83,"jakb-wall-hide-scared-loop-ja"],[84,"jakb-wall-hide-scared-return-ja"],[85,"jakb-wall-hide-head-ja"],[86,"jakb-wall-hide-head-left-ja"],[87,"jakb-wall-hide-head-right-ja"],[88,"jakb-wall-hide-body-ja"],[130,"jakb-fuel-cell-victory-9-ja"],[244,"jakb-gun-stance-ja"],[245,"jakb-gun-stance-yellow-low-ja"],[246,"jakb-gun-yellow-fire-low-ja"],[360,"jakb-turret-get-off-ja"],[247,"jakb-gun-yellow-highlow-ja"],[248,"jakb-gun-attack-from-stance-ja"],[249,"jakb-gun-attack-from-stance-end-ja"],[250,"jakb-gun-attack-from-stance-blue-ja"],[251,"jakb-gun-attack-from-stance-blue-end-ja"],[252,"jakb-gun-blue-to-yellow-ja"],[253,"jakb-gun-stance-dark-ja"],[254,"jakb-gun-stance-yellow-ja"],[255,"jakb-gun-stance-blue-ja"],[256,"jakb-gun-red-fire-ja"],[257,"jakb-gun-blue-fire-ja"],[258,"jakb-gun-blue-fire-single-ja"],[259,"jakb-gun-dark-fire-ja"],[260,"jakb-gun-yellow-fire-ja"],[261,"jakb-gun-walk-side-ja"],[262,"jakb-gun-run-blue-ja"],[263,"jakb-gun-red-takeout-ja"],[151,"jakb-board-stance-ja"],[264,"jakb-gun-dark-takeout-ja"],[265,"jakb-gun-yellow-takeout-ja"],[266,"jakb-gun-blue-takeout-ja"],[267,"jakb-gun-attack-upperbutt-ja"],[268,"jakb-gun-side-to-front-hop-ja"],[269,"jakb-gun-transformation-twirl-ja"],[270,"jakb-gun-front-to-side-hop-ja"],[271,"jakb-gun-front-to-blue-hop-ja"],[159,"jakb-board-flip-forward-ja"],[272,"jakb-gun-blue-to-front-hop-ja"],[273,"jakb-gun-attack-butt-ja"],[153,"jakb-board-turn-ja"],[274,"jakb-gun-attack-butt-end-ja"],[275,"jakb-gun-attack-butt-blue-ja"],[276,"jakb-gun-attack-butt-blue-end-ja"],[277,"jakb-gun-jump-land-ja"],[278,"jakb-gun-jump-land-side-ja"],[279,"jakb-gun-attack-upperbutt-blue-ja"],[231,"jakb-pilot-gun-dark-takeout-ja"],[280,"jakb-gun-edge-grab-off-ja"],[281,"jakb-gun-edge-grab-to-jump-ja"],[225,"jakb-pilot-gun-red-dark-ja"],[282,"jakb-gun-duck-roll-ja"],[283,"jakb-gun-duck-roll-end-ja"],[155,"jakb-board-jump-ja"],[284,"jakb-gun-roll-flip-ja"],[285,"jakb-gun-roll-flip-land-ja"],[229,"jakb-pilot-gun-yellow-takeout-ja"],[286,"jakb-gun-flop-down-ja"],[287,"jakb-gun-flop-down-loop-ja"],[175,"jakb-board-kickflip-a-ja"],[288,"jakb-gun-flop-down-land-ja"],[289,"jakb-gun-hit-from-front-ja"],[169,"jakb-board-ride-turn-left-ja"],[290,"jakb-gun-hit-from-back-ja"],[291,"jakb-gun-red-fire-to-sideways-ja"],[163,"jakb-board-turn-up-ja"],[292,"jakb-gun-red-fire-from-sideways-ja"],[293,"jakb-gun-dark-fire-twirl-ja"],[173,"jakb-board-nosegrab-ja"],[294,"jakb-gun-stance-red-sideways-ja"],[295,"jakb-gun-red-from-sideways-ja"],[183,"jakb-board-method-loop-ja"],[296,"jakb-gun-yellow-fire-twirl-ja"],[297,"jakb-gun-hit-elec-ja"],[177,"jakb-board-air-turn-ja"],[298,"jakb-gun-front-walk-ja"],[299,"jakb-gun-front-run-ja"],[171,"jakb-board-get-off-ja"],[300,"jakb-gun-front-jump-ja"],[301,"jakb-gun-front-jump-land-ja"],[181,"jakb-board-flip-forward-loop-ja"],[302,"jakb-gun-duck-walk-ja"],[303,"jakb-gun-walk-blue-ja"],[191,"jakb-board-get-off-pre-ja"],[304,"jakb-gun-side-jump-ja"],[305,"jakb-gun-side-jump-land-ja"],[309,"jakb-gun-red-fire-fast-ja"],[152,"jakb-board-duck-turn-ja"],[154,"jakb-board-jump-kick-ja"],[156,"jakb-board-jump-loop-ja"],[158,"jakb-board-hit-ja"],[161,"jakb-board-turn-left-ja"],[162,"jakb-board-turn-right-ja"],[164,"jakb-board-turn-down-ja"],[165,"jakb-board-hit-forward-ja"],[166,"jakb-board-ride-turn-back-ja"],[167,"jakb-board-ride-turn-front-ja"],[168,"jakb-board-ride-turn-right-ja"],[170,"jakb-board-get-on-ja"],[172,"jakb-board-grenade-ja"],[174,"jakb-board-method-ja"],[176,"jakb-board-spin-ja"],[178,"jakb-board-flip-backward-ja"],[182,"jakb-board-flip-backward-loop-ja"],[184,"jakb-board-method-end-ja"],[185,"jakb-board-nosegrab-loop-ja"],[186,"jakb-board-nosegrab-end-ja"],[187,"jakb-board-noseflip-ja"],[188,"jakb-board-jump-kickoff-ja"],[189,"jakb-board-hit-elec-ja"],[190,"jakb-board-get-on-land-ja"],[192,"jakb-board-kickflip-b-ja"],[193,"jakb-board-kickflip-c-ja"],[194,"jakb-board-hit-get-off-ja"],[392,"jakb-darkjak-walk-ja"],[394,"jakb-darkjak-jump-ja"],[396,"jakb-darkjak-stance-ja"],[400,"jakb-darkjak-attack-spin-end-ja"],[402,"jakb-darkjak-attack-combo1-ja"],[404,"jakb-darkjak-attack-combo2-ja"],[406,"jakb-darkjak-attack-combo3-ja"],[408,"jakb-darkjak-get-off-ja"],[410,"jakb-darkjak-attack-combo1b-end-ja"],[412,"jakb-darkjak-get-on-fast-ja"],[414,"jakb-darkjak-attack-combo3c-end-ja"],[416,"jakb-darkjak-bomb-ja"],[417,"jakb-darkjak-bomb-loop-ja"],[418,"jakb-darkjak-bomb-land-ja"],[419,"jakb-darkjak-attack-ice-loop-ja"],[420,"jakb-darkjak-attack-ice-loop2-ja"],[421,"jakb-darkjak-attack-ice-end-ja"],[89,"jakb-death-swim-ja"],[90,"jakb-death-swim-loop-ja"],[91,"jakb-death-swim-end-ja"],[94,"jakb-wade-shallow-walk-ja"],[95,"jakb-wade-deep-walk-ja"],[96,"jakb-swim-stance-ja"],[97,"jakb-swim-walk-ja"],[98,"jakb-swim-walk-to-down-ja"],[99,"jakb-swim-down-ja"],[100,"jakb-swim-down-to-up-ja"],[101,"jakb-swim-up-ja"],[102,"jakb-swim-up-to-stance-ja"],[103,"jakb-swim-jump-ja"],[324,"jakb-mech-stance-ja"],[195,"jakb-board-attack-pegasus-ja"],[111,"jakb-tube-turn-ja"],[112,"jakb-tube-jump-land-ja"],[104,"jakb-pole-cycle-ja"],[105,"jakb-pole-flip-up-ja"],[106,"jakb-pole-flip-forward-ja"],[107,"jakb-pole-jump-loop-ja"],[359,"jakb-turret-stance-ja"],[361,"jakb-turret-get-on-ja"],[325,"jakb-mech-run-ja"],[205,"jakb-pilot-car-smack-back-ja"],[326,"jakb-mech-walk-ja"],[327,"jakb-mech-turn90-ja"],[215,"jakb-pilot-bike-smack-shock-ja"],[328,"jakb-mech-jump-ja"],[329,"jakb-mech-jump-thrust-ja"],[209,"jakb-pilot-bike-turn-front-ja"],[330,"jakb-mech-jump-loop-ja"],[331,"jakb-mech-jump-land-ja"],[203,"jakb-pilot-car-turn-back-ja"],[332,"jakb-mech-turn20-ja"],[333,"jakb-mech-punch-l-ja"],[213,"jakb-pilot-car-up-down-ja"],[334,"jakb-mech-punch-r-ja"],[335,"jakb-mech-punch-b-ja"],[223,"jakb-pilot-gun-yellow-fire-ja"],[336,"jakb-mech-carry-pickup-low-ja"],[337,"jakb-mech-carry-pickup-high-ja"],[217,"jakb-pilot-eject-loop-ja"],[338,"jakb-mech-carry-stance-ja"],[339,"jakb-mech-carry-walk-ja"],[211,"jakb-pilot-bike-smack-front-ja"],[340,"jakb-mech-carry-jump-ja"],[341,"jakb-mech-carry-jump-loop-ja"],[221,"jakb-pilot-gun-blue-idle-ja"],[342,"jakb-mech-carry-jump-land-ja"],[343,"jakb-mech-carry-throw-ja"],[344,"jakb-mech-carry-turn45-ja"],[345,"jakb-mech-push-ja"],[346,"jakb-mech-pull-ja"],[347,"jakb-mech-drag-pickup-ja"],[219,"jakb-pilot-gun-dark-idle-ja"],[348,"jakb-mech-hit-front-ja"],[349,"jakb-mech-get-off-ja"],[350,"jakb-mech-get-on-ja"],[351,"jakb-mech-death-a-ja"],[352,"jakb-mech-death-b-ja"],[353,"jakb-mech-punch-u-ja"],[198,"jakb-pilot-gun-red-takeout-ja"],[199,"jakb-pilot-car-get-off-ja"],[200,"jakb-pilot-car-get-on-ja"],[201,"jakb-pilot-bike-get-on-ja"],[202,"jakb-pilot-car-turn-front-ja"],[204,"jakb-pilot-car-smack-front-ja"],[206,"jakb-pilot-gun-blue-fire-ja"],[207,"jakb-pilot-gun-blue-fire-single-ja"],[208,"jakb-pilot-car-smack-shock-ja"],[210,"jakb-pilot-bike-turn-back-ja"],[212,"jakb-pilot-bike-smack-back-ja"],[214,"jakb-pilot-bike-up-down-ja"],[216,"jakb-pilot-bike-get-off-ja"],[218,"jakb-pilot-gun-red-idle-ja"],[220,"jakb-pilot-gun-yellow-idle-ja"],[222,"jakb-pilot-gun-red-fire-ja"],[224,"jakb-pilot-gun-dark-fire-ja"],[226,"jakb-pilot-gun-red-yellow-ja"],[227,"jakb-pilot-gun-red-blue-ja"],[228,"jakb-pilot-gun-yellow-blue-ja"],[230,"jakb-pilot-gun-blue-takeout-ja"],[232,"jakb-pilot-bike-smack-left-ja"],[233,"jakb-pilot-bike-smack-right-ja"],[234,"jakb-pilot-car-smack-left-ja"],[235,"jakb-pilot-car-smack-right-ja"],[390,"jakb-darkjak-get-on-ja"]],"jakone-highres-ag":[[0,"jakone-highres-lod0-jg"],[1,"jakone-highres-lod0-mg"],[2,"jakone-highres-idle-ja"]],"jellyfish-ag":[[0,"jellyfish-lod0-jg"],[1,"jellyfish-lod0-mg"],[2,"jellyfish-idle-ja"],[3,"jellyfish-die-ja"],[4,"jellyfish-notice-ja"],[5,"jellyfish-notice-loop-ja"],[6,"jellyfish-notice-charge-ja"],[7,"jellyfish-notice-charge-loop-ja"],[8,"jellyfish-grab-start-ja"],[9,"jellyfish-grab-attach-ja"],[10,"jellyfish-grab-attach-loop-ja"],[11,"jellyfish-grab-detach-ja"]],"jinx-ag":[[0,"jinx-lod0-jg"],[1,"jinx-lod0-mg"],[2,"jinx-shadow-mg"],[3,"jinx-idle0-ja"],[4,"jinx-idle1-ja"],[5,"jinx-scared0-ja"],[6,"jinx-scared1-ja"],[7,"jinx-scared2-ja"],[8,"jinx-scared3-ja"],[9,"jinx-scared4-ja"],[10,"jinx-blue-hit-front0-ja"],[11,"jinx-blue-hit-front1-ja"],[12,"jinx-blue-hit-front2-ja"],[13,"jinx-blue-hit-back0-ja"],[14,"jinx-blue-hit-back1-ja"],[15,"jinx-blue-hit-back2-ja"],[16,"jinx-blue-hit-land-ja"],[17,"jinx-yellow-hit-left0-ja"],[18,"jinx-yellow-hit-land-left0-ja"],[19,"jinx-yellow-hit-right0-ja"],[20,"jinx-yellow-hit-land-right0-ja"],[21,"jinx-knocked0-ja"],[22,"jinx-knocked-land0-ja"],[23,"jinx-hard-hit0-ja"],[24,"jinx-hard-hit-land-ja"],[25,"jinx-die-in-place0-ja"],[26,"jinx-jump-wind-up-ja"],[27,"jinx-jump-in-air-ja"],[28,"jinx-jump-land-ja"],[29,"jinx-jump-wind-up-mog-ja"],[30,"jinx-jump-in-air-mog-ja"],[31,"jinx-jump-land-mog-ja"],[32,"jinx-walk0-ja"],[33,"jinx-run0-ja"],[34,"jinx-walk-limp0-ja"],[35,"jinx-run-limp0-ja"],[36,"jinx-walk-mog0-ja"],[37,"jinx-run-mog0-ja"],[38,"jinx-turn-left-start0-ja"],[39,"jinx-turn-left50-end0-ja"],[40,"jinx-turn-left100-end0-ja"],[41,"jinx-turn-left150-end0-ja"],[42,"jinx-turn-right-start0-ja"],[43,"jinx-turn-right50-end0-ja"],[44,"jinx-turn-right100-end0-ja"],[45,"jinx-turn-right150-end0-ja"],[46,"jinx-scared-turn-left-start0-ja"],[47,"jinx-scared-turn-left50-end0-ja"],[48,"jinx-scared-turn-left100-end0-ja"],[49,"jinx-scared-turn-left150-end0-ja"],[50,"jinx-scared-turn-right-start0-ja"],[51,"jinx-scared-turn-right50-end0-ja"],[52,"jinx-scared-turn-right100-end0-ja"],[53,"jinx-scared-turn-right150-end0-ja"],[54,"jinx-blast-forward-ja"],[55,"jinx-blast-left-ja"],[56,"jinx-blast-right-ja"],[57,"jinx-kick0-ja"],[58,"jinx-kick1-ja"],[59,"jinx-blast-forward-alert-ja"],[60,"jinx-alert0-ja"],[61,"jinx-alert-to-idle0-ja"],[62,"jinx-plant-bomb-right-ja"],[63,"jinx-bomb-recoil0-ja"],[64,"jinx-bomb-recoil1-ja"]],"jinx-bomb-ag":[[0,"jinx-bomb-lod0-jg"],[1,"jinx-bomb-lod0-mg"],[2,"jinx-bomb-idle-ja"]],"juicer-ag":[[0,"juicer-lod0-jg"],[1,"juicer-lod0-mg"],[2,"juicer-lod1-mg"],[3,"juicer-lod2-mg"],[4,"juicer-shadow-mg"],[5,"juicer-idle-ja"],[6,"juicer-idle-left-ja"],[7,"juicer-idle-right-ja"],[8,"juicer-patrol0-ja"],[9,"juicer-charge0-ja"],[10,"juicer-turn-ja"],[11,"juicer-hit-in-place-ja"],[12,"juicer-attack-turn-ja"],[13,"juicer-attack0-start-ja"],[14,"juicer-attack0-ja"],[15,"juicer-attack-spin-ja"],[16,"juicer-knocked0-ja"],[17,"juicer-knocked-land0-ja"],[18,"juicer-knocked1-ja"],[19,"juicer-knocked-land1-ja"],[20,"juicer-charge1-ja"],[21,"juicer-notice0-ja"],[22,"juicer-notice1-ja"],[23,"juicer-patrol1-ja"],[24,"juicer-celebrate0-ja"],[25,"juicer-celebrate1-ja"],[26,"juicer-blue-hit0-ja"],[27,"juicer-blue-hit1-ja"],[28,"juicer-blue-hit2-ja"],[29,"juicer-blue-hit3-ja"],[30,"juicer-blue-hit4-ja"],[31,"juicer-blue-hit5-ja"],[32,"juicer-blue-land-ja"],[33,"juicer-yellow-hit0-ja"],[34,"juicer-yellow-hit1-ja"],[35,"juicer-yellow-hit2-ja"],[36,"juicer-yellow-hit3-ja"],[37,"juicer-jump-wind-up-ja"],[38,"juicer-jump-in-air-ja"],[39,"juicer-jump-land-ja"],[40,"juicer-death-ja"],[41,"juicer-die-falling-ja"]],"keira-ag":[[0,"keira-lod0-jg"],[1,"keira-lod0-mg"],[2,"keira-lod1-mg"],[3,"keira-lod2-mg"],[4,"keira-shadow-mg"],[5,"keira-idle-leaning-right-ja"],[6,"keira-idle-transition-right-to-left-ja"],[7,"keira-idle-leaning-left-ja"],[8,"keira-idle-transition-left-to-right-ja"],[9,"keira-idle-wiping-brow-ja"],[10,"keira-stad-sit-ja"]],"keira-highres-ag":[[0,"keira-highres-lod0-jg"],[1,"keira-highres-lod0-mg"],[2,"keira-highres-shadow-mg"],[3,"keira-highres-idle-ja"],[4,"keira-highres-idle-anim-ja"],[5,"keira-highres-idle-garage-ja"]],"kid-ag":[[3,"kid-idle0-ja"],[19,"kid-idle-floating-ja"],[0,"kid-lod0-jg"],[1,"kid-lod0-mg"],[2,"kid-shadow-mg"],[4,"kid-scared0-ja"],[5,"kid-walk0-ja"],[6,"kid-run0-ja"],[7,"kid-turn-left-start0-ja"],[8,"kid-turn-left50-end0-ja"],[9,"kid-turn-left100-end0-ja"],[10,"kid-turn-left150-end0-ja"],[11,"kid-turn-right-start0-ja"],[12,"kid-turn-right50-end0-ja"],[13,"kid-turn-right100-end0-ja"],[14,"kid-turn-right150-end0-ja"],[15,"kid-arrest-start-ja"],[16,"kid-arrest-idle0-ja"],[17,"kid-knocked0-ja"],[18,"kid-knocked-land0-ja"]],"kid-escort-ag":[[0,"kid-escort-lod0-jg"],[1,"kid-escort-lod0-mg"],[2,"kid-escort-shadow-mg"],[3,"kid-escort-idle0-ja"],[4,"kid-escort-run0-ja"],[5,"kid-escort-turn0-ja"],[6,"kid-escort-knocked0-ja"],[7,"kid-escort-knocked-land0-ja"],[8,"kid-escort-arrest-start-ja"],[9,"kid-escort-arrest-idle0-ja"],[10,"kid-escort-jump-in-vehicle-ja"],[11,"kid-escort-vehicle-lean-x-ja"],[12,"kid-escort-vehicle-lean-z-ja"]],"kid-highres-ag":[[0,"kid-highres-lod0-jg"],[1,"kid-highres-lod0-mg"],[2,"kid-highres-shadow-mg"],[3,"kid-highres-idle-ja"],[6,"kid-highres-idle-shuttle-ugrnd-ja"],[5,"kid-highres-idle-alley-ja"],[4,"kid-highres-idle-tomb-ja"]],"kid-medallion-ag":[[0,"kid-medallion-lod0-jg"],[1,"kid-medallion-lod0-mg"],[2,"kid-medallion-idle-ja"]],"kiosk-banner-ag":[[0,"kiosk-banner-lod0-jg"],[1,"kiosk-banner-lod0-mg"],[2,"kiosk-banner-idle-ja"]],"kiosk-fish-sign-ag":[[0,"kiosk-fish-sign-lod0-jg"],[1,"kiosk-fish-sign-lod0-mg"],[2,"kiosk-fish-sign-idle-ja"]],"kor-ag":[[0,"kor-lod0-jg"],[1,"kor-lod0-mg"],[2,"kor-shadow-mg"],[3,"kor-idle0-ja"],[4,"kor-scared0-ja"],[5,"kor-walk0-ja"],[6,"kor-run0-ja"],[7,"kor-turn-left-start0-ja"],[8,"kor-turn-left50-end0-ja"],[9,"kor-turn-left100-end0-ja"],[10,"kor-turn-left150-end0-ja"],[11,"kor-turn-right-start0-ja"],[12,"kor-turn-right50-end0-ja"],[13,"kor-turn-right100-end0-ja"],[14,"kor-turn-right150-end0-ja"],[15,"kor-knocked0-ja"],[16,"kor-knocked-land0-ja"],[17,"kor-arrest-start-ja"],[18,"kor-arrest-idle0-ja"]],"kor-break-ag":[[0,"kor-break-lod0-jg"],[1,"kor-break-lod0-mg"],[2,"kor-break-idle-ja"]],"kor-break-ray-ag":[[0,"kor-break-ray-lod0-jg"],[1,"kor-break-ray-lod0-mg"],[2,"kor-break-ray-idle-ja"]],"kor-highres-ag":[[0,"kor-highres-lod0-jg"],[1,"kor-highres-lod0-mg"],[2,"kor-highres-shadow-mg"],[3,"kor-highres-idle-ja"],[4,"kor-highres-idle-stand-ja"],[5,"kor-highres-idle-shuttle-ugrnd-ja"]],"kor-transform-ag":[[8,"kor-transform-monsterparts-idle-ja"],[0,"kor-transform-lod0-jg"],[1,"kor-transform-lod0-mg"],[2,"kor-transform-shadow-mg"],[3,"kor-transform-idle-ja"],[5,"kor-transform-monsterparts-lod0-jg"],[6,"kor-transform-monsterparts-lod0-mg"],[7,"kor-transform-monsterparts-shadow-mg"]],"krew-clone-ag":[[0,"krew-clone-lod0-jg"],[1,"krew-clone-lod0-mg"],[2,"krew-clone-shadow-mg"],[3,"krew-clone-idle-ja"],[4,"krew-clone-idle-left-ja"],[5,"krew-clone-idle-right-ja"],[6,"krew-clone-run-ja"],[7,"krew-clone-run-left-ja"],[8,"krew-clone-run-right-ja"],[9,"krew-clone-attack-ja"],[10,"krew-clone-knocked-ja"],[11,"krew-clone-knocked-land-ja"],[12,"krew-clone-birth-ja"]],"krew-highres-ag":[[0,"krew-highres-lod0-jg"],[1,"krew-highres-lod0-mg"],[2,"krew-highres-shadow-mg"],[3,"krew-highres-idle-ja"],[4,"krew-highres-idle-float-ja"]],"krew-lowres-ag":[[0,"krew-lowres-lod0-jg"],[1,"krew-lowres-lod0-mg"],[2,"krew-lowres-lod1-mg"],[3,"krew-lowres-shadow-mg"],[4,"krew-lowres-idle-ja"],[5,"krew-lowres-idle-left-ja"],[6,"krew-lowres-idle-right-ja"],[7,"krew-lowres-run-ja"],[8,"krew-lowres-run-left-ja"],[9,"krew-lowres-run-right-ja"],[10,"krew-lowres-attack-ja"],[11,"krew-lowres-knocked-ja"],[12,"krew-lowres-knocked-land-ja"],[13,"krew-lowres-death-knocked-ja"],[14,"krew-lowres-death-spin-ja"],[15,"krew-lowres-death-land-ja"],[16,"krew-lowres-activate-clone-ja"],[17,"krew-lowres-fire-straight-ja"],[18,"krew-lowres-fire-rise-ja"]],"krew-moneybag-ag":[[0,"krew-moneybag-lod0-jg"],[1,"krew-moneybag-lod0-mg"],[2,"krew-moneybag-shadow-mg"],[3,"krew-moneybag-idle-ja"]],"krew-package-ag":[[0,"krew-package-lod0-jg"],[1,"krew-package-lod0-mg"],[2,"krew-package-lod1-mg"],[3,"krew-package-lod2-mg"],[4,"krew-package-idle-ja"]],"lgconveyor-ag":[[0,"lgconveyor-lod0-jg"],[1,"lgconveyor-lod0-mg"],[2,"lgconveyor-lod1-mg"],[3,"lgconveyor-idle-ja"]],"life-seed-ag":[[0,"life-seed-lod0-jg"],[1,"life-seed-lod0-mg"],[2,"life-seed-idle-ja"]],"liftcat-ag":[[0,"liftcat-lod0-jg"],[1,"liftcat-lod0-mg"],[2,"liftcat-lod1-mg"],[3,"liftcat-idle-ja"]],"lurker-pipe-lid-ag":[[0,"lurker-pipe-lid-lod0-jg"],[1,"lurker-pipe-lid-lod0-mg"],[2,"lurker-pipe-lid-idle-ja"]],"mammoth-ag":[[0,"mammoth-lod0-jg"],[1,"mammoth-lod0-mg"],[2,"mammoth-lod1-mg"],[3,"mammoth-shadow-mg"],[4,"mammoth-idle0-ja"],[5,"mammoth-idle0-to-walk-ja"],[6,"mammoth-walk0-ja"],[7,"mammoth-walk1-ja"],[8,"mammoth-walk-fire0-ja"],[9,"mammoth-death-right-ja"],[10,"mammoth-death-right-fall-ja"],[11,"mammoth-death-right-fall-end-ja"],[12,"mammoth-turn-left-50-start-ja"],[13,"mammoth-turn-left-50-ja"],[14,"mammoth-turn-left-150-start-ja"],[15,"mammoth-turn-left-150-ja"],[16,"mammoth-turn-right-50-ja"],[17,"mammoth-turn-right-150-ja"],[18,"mammoth-turn-right-150-end-ja"]],"mantis-ag":[[0,"mantis-lod0-jg"],[1,"mantis-lod0-mg"],[2,"mantis-lod1-mg"],[3,"mantis-lod2-mg"],[4,"mantis-shadow-mg"],[5,"mantis-idle0-ja"],[6,"mantis-idle1-ja"],[7,"mantis-idle0-to-idle1-ja"],[8,"mantis-idle1-to-idle0-ja"],[9,"mantis-run0-ja"],[10,"mantis-knocked-red0-ja"],[11,"mantis-knocked-red-land0-ja"],[12,"mantis-hop-forward-wind-up-ja"],[13,"mantis-hop-forward-go-ja"],[14,"mantis-hop-backward-wind-up-ja"],[15,"mantis-hop-backward-go-ja"],[16,"mantis-hop-backward-land-ja"],[17,"mantis-flip-forward-wind-up-ja"],[18,"mantis-flip-forward-go-ja"],[19,"mantis-flip-forward-land-ja"],[20,"mantis-flip-backward-wind-up-ja"],[21,"mantis-flip-backward-go-ja"],[22,"mantis-flip-backward-land-ja"],[23,"mantis-ground-jump-out-ja"],[24,"mantis-ground-jump-out-land-ja"],[25,"mantis-ground-crawl-out-ja"],[26,"mantis-death0-ja"],[27,"mantis-knocked-blue0-ja"],[28,"mantis-knocked-blue-land0-ja"],[29,"mantis-attack0-ja"],[30,"mantis-attack0-land-ja"],[31,"mantis-attack1-wind-up-ja"],[32,"mantis-attack1-go-ja"],[33,"mantis-attack1-land-ja"],[34,"mantis-roll-right-ja"],[35,"mantis-roll-right-land-ja"],[36,"mantis-roll-left-ja"],[37,"mantis-hop-left-ja"],[38,"mantis-hop-left-land-ja"]],"market-basket-a-ag":[[0,"market-basket-a-lod0-jg"],[1,"market-basket-a-lod0-mg"],[2,"market-basket-a-idle-ja"]],"market-basket-b-ag":[[0,"market-basket-b-lod0-jg"],[1,"market-basket-b-lod0-mg"],[2,"market-basket-b-idle-ja"]],"market-crate-ag":[[0,"market-crate-lod0-jg"],[1,"market-crate-lod0-mg"],[2,"market-crate-idle-ja"]],"market-sack-a-ag":[[0,"market-sack-a-lod0-jg"],[1,"market-sack-a-lod0-mg"],[2,"market-sack-a-idle-ja"]],"market-sack-b-ag":[[0,"market-sack-b-lod0-jg"],[1,"market-sack-b-lod0-mg"],[2,"market-sack-b-idle-ja"]],"mech-ag":[[40,"mech-explode-lod0-mg"],[0,"mech-lod0-jg"],[41,"mech-explode-idle-ja"],[1,"mech-lod0-mg"],[42,"mech-target-lod0-jg"],[2,"mech-shadow-mg"],[3,"mech-mech-idle-ja"],[39,"mech-explode-lod0-jg"],[43,"mech-target-lod0-mg"],[44,"mech-target-idle-ja"],[4,"mech-mech-stance-ja"],[5,"mech-mech-run-ja"],[6,"mech-mech-walk-ja"],[7,"mech-mech-turn90-ja"],[8,"mech-mech-jump-ja"],[9,"mech-mech-jump-thrust-ja"],[10,"mech-mech-jump-loop-ja"],[11,"mech-mech-jump-land-ja"],[12,"mech-mech-turn20-ja"],[13,"mech-mech-punch-l-ja"],[14,"mech-mech-punch-r-ja"],[15,"mech-mech-punch-b-ja"],[16,"mech-mech-carry-pickup-low-ja"],[17,"mech-mech-carry-pickup-high-ja"],[18,"mech-mech-carry-stance-ja"],[19,"mech-mech-carry-walk-ja"],[20,"mech-mech-carry-jump-ja"],[21,"mech-mech-carry-jump-loop-ja"],[22,"mech-mech-carry-jump-land-ja"],[23,"mech-mech-carry-throw-ja"],[24,"mech-mech-carry-turn45-ja"],[25,"mech-mech-push-ja"],[26,"mech-mech-pull-ja"],[27,"mech-mech-drag-pickup-ja"],[28,"mech-mech-hit-front-ja"],[29,"mech-mech-get-off-ja"],[30,"mech-mech-get-on-ja"],[31,"mech-mech-death-a-ja"],[32,"mech-mech-death-b-ja"],[33,"mech-mech-punch-u-ja"]],"mecha-daxter-ag":[[0,"mecha-daxter-lod0-jg"],[1,"mecha-daxter-lod0-mg"],[2,"mecha-daxter-idle-ja"]],"metalkor-ag":[[0,"metalkor-lod0-jg"],[1,"metalkor-lod0-mg"],[2,"metalkor-shadow-mg"],[3,"metalkor-idle-ja"],[4,"metalkor-idle-alt-ja"],[5,"metalkor-walk-ja"],[6,"metalkor-run-ja"],[7,"metalkor-collapse-ja"],[8,"metalkor-collapse-breathe-ja"],[9,"metalkor-hang-ja"],[10,"metalkor-hang-turn-right-start-ja"],[11,"metalkor-hang-turn-right-ja"],[12,"metalkor-hang-turn-right-end-ja"],[13,"metalkor-hang-turn-left-start-ja"],[14,"metalkor-hang-turn-left-ja"],[15,"metalkor-hang-turn-left-end-ja"],[16,"metalkor-hang-turn-right-end-alt-ja"],[17,"metalkor-hang-turn-left-end-alt-ja"],[18,"metalkor-hang-hit-ja"],[19,"metalkor-hang-hit-left-ja"],[20,"metalkor-hang-hit-right-ja"],[21,"metalkor-hang-roar-ja"],[22,"metalkor-breathe-ja"],[23,"metalkor-hang-pre-shot-ja"],[24,"metalkor-hang-shot-ja"],[25,"metalkor-collapse-hit-ja"],[26,"metalkor-collapse-hit-left-ja"],[27,"metalkor-collapse-hit-right-ja"],[28,"metalkor-collapse-hit-top-ja"],[29,"metalkor-collapse-hit-back-ja"],[30,"metalkor-collapse-recover-ja"],[31,"metalkor-attack-tail-ja"],[32,"metalkor-pre-shot-ja"],[33,"metalkor-shot-ja"],[34,"metalkor-hit-ja"],[35,"metalkor-hit-left-ja"],[36,"metalkor-hit-right-ja"],[37,"metalkor-walk-left-ja"],[38,"metalkor-walk-right-ja"],[39,"metalkor-walk-back-ja"],[40,"metalkor-run-back-ja"],[41,"metalkor-walk-to-stance-ja"],[42,"metalkor-attack-sweep-left-ja"],[43,"metalkor-attack-sweep-right-ja"],[44,"metalkor-hang-hit-major-ja"],[45,"metalkor-wings-open-ja"],[46,"metalkor-fly-ja"],[47,"metalkor-impact-ja"],[48,"metalkor-spinner-lod0-jg"],[49,"metalkor-spinner-lod0-mg"],[50,"metalkor-spinner-idle-ja"],[51,"metalkor-spinner-fire-ja"],[52,"metalkor-spinner-short-ja"],[53,"metalkor-spinner-dissolve-ja"]],"metalkor-bomb-ag":[[0,"metalkor-bomb-lod0-jg"],[1,"metalkor-bomb-lod0-mg"],[2,"metalkor-bomb-idle-ja"]],"metalkor-chopped-ag":[[0,"metalkor-chopped-lod0-jg"],[1,"metalkor-chopped-lod0-mg"],[2,"metalkor-chopped-idle-ja"]],"metalkor-distort-ag":[[0,"metalkor-distort-lod0-jg"],[1,"metalkor-distort-lod0-mg"],[2,"metalkor-distort-idle-ja"]],"metalkor-egg-ag":[[0,"metalkor-egg-lod0-jg"],[1,"metalkor-egg-lod0-mg"],[2,"metalkor-egg-shadow-mg"],[3,"metalkor-egg-idle-ja"],[4,"metalkor-egg-land-ja"],[5,"metalkor-egg-hatch-ja"],[6,"metalkor-egg-tumble-ja"],[7,"metalkor-egg-hop-ja"]],"metalkor-explode-ag":[[0,"metalkor-explode-lod0-jg"],[1,"metalkor-explode-lod0-mg"],[2,"metalkor-explode-idle-ja"]],"metalkor-fma-spinner-ag":[[0,"metalkor-fma-spinner-lod0-jg"],[1,"metalkor-fma-spinner-lod0-mg"],[2,"metalkor-fma-spinner-idle-ja"]],"metalkor-head-ag":[[0,"metalkor-head-lod0-jg"],[1,"metalkor-head-lod0-mg"],[2,"metalkor-head-idle-ja"]],"metalkor-highres-ag":[[8,"metalkor-highres-lowtorso-lod0-mg"],[0,"metalkor-highres-lod0-jg"],[9,"metalkor-highres-lowtorso-shadow-mg"],[1,"metalkor-highres-lod0-mg"],[10,"metalkor-highres-lowtorso-idle-ja"],[2,"metalkor-highres-shadow-mg"],[3,"metalkor-highres-idle-ja"],[7,"metalkor-highres-lowtorso-lod0-jg"],[14,"metalkor-highres-legs-lod0-jg"],[15,"metalkor-highres-legs-lod0-mg"],[16,"metalkor-highres-legs-shadow-mg"],[17,"metalkor-highres-legs-idle-ja"],[21,"metalkor-highres-wings-lod0-jg"],[22,"metalkor-highres-wings-lod0-mg"],[23,"metalkor-highres-wings-shadow-mg"],[24,"metalkor-highres-wings-idle-ja"]],"metalkor-legs-ag":[[0,"metalkor-legs-lod0-jg"],[1,"metalkor-legs-lod0-mg"],[2,"metalkor-legs-shadow-mg"],[3,"metalkor-legs-idle-ja"],[4,"metalkor-legs-idle-alt-ja"],[5,"metalkor-legs-walk-ja"],[6,"metalkor-legs-run-ja"],[7,"metalkor-legs-collapse-ja"],[8,"metalkor-legs-collapse-breathe-ja"],[9,"metalkor-legs-collapse-hit-ja"],[10,"metalkor-legs-collapse-hit-left-ja"],[11,"metalkor-legs-collapse-hit-right-ja"],[12,"metalkor-legs-collapse-hit-top-ja"],[13,"metalkor-legs-collapse-hit-back-ja"],[14,"metalkor-legs-collapse-recover-ja"],[15,"metalkor-legs-attack-tail-ja"],[16,"metalkor-legs-pre-shot-ja"],[17,"metalkor-legs-shot-ja"],[18,"metalkor-legs-hit-ja"],[19,"metalkor-legs-hit-left-ja"],[20,"metalkor-legs-hit-right-ja"],[21,"metalkor-legs-walk-left-ja"],[22,"metalkor-legs-walk-right-ja"],[23,"metalkor-legs-walk-back-ja"],[24,"metalkor-legs-run-back-ja"],[25,"metalkor-legs-walk-to-stance-ja"],[26,"metalkor-legs-wings-open-ja"],[27,"metalkor-legs-fly-ja"],[28,"metalkor-legs-impact-ja"]],"metalkor-lowtorso-ag":[[0,"metalkor-lowtorso-lod0-jg"],[1,"metalkor-lowtorso-lod0-mg"],[2,"metalkor-lowtorso-shadow-mg"],[3,"metalkor-lowtorso-idle-ja"],[4,"metalkor-lowtorso-idle-alt-ja"],[5,"metalkor-lowtorso-walk-ja"],[6,"metalkor-lowtorso-run-ja"],[7,"metalkor-lowtorso-collapse-ja"],[8,"metalkor-lowtorso-collapse-breathe-ja"],[9,"metalkor-lowtorso-hang-ja"],[10,"metalkor-lowtorso-hang-turn-right-start-ja"],[11,"metalkor-lowtorso-hang-turn-right-ja"],[12,"metalkor-lowtorso-hang-turn-right-end-ja"],[13,"metalkor-lowtorso-hang-turn-left-start-ja"],[14,"metalkor-lowtorso-hang-turn-left-ja"],[15,"metalkor-lowtorso-hang-turn-left-end-ja"],[16,"metalkor-lowtorso-hang-turn-right-end-alt-ja"],[17,"metalkor-lowtorso-hang-turn-left-end-alt-ja"],[18,"metalkor-lowtorso-hang-hit-ja"],[19,"metalkor-lowtorso-hang-hit-left-ja"],[20,"metalkor-lowtorso-hang-hit-right-ja"],[21,"metalkor-lowtorso-hang-roar-ja"],[22,"metalkor-lowtorso-breathe-ja"],[23,"metalkor-lowtorso-hang-pre-shot-ja"],[24,"metalkor-lowtorso-hang-shot-ja"],[25,"metalkor-lowtorso-collapse-hit-ja"],[26,"metalkor-lowtorso-collapse-hit-left-ja"],[27,"metalkor-lowtorso-collapse-hit-right-ja"],[28,"metalkor-lowtorso-collapse-hit-top-ja"],[29,"metalkor-lowtorso-collapse-hit-back-ja"],[30,"metalkor-lowtorso-collapse-recover-ja"],[31,"metalkor-lowtorso-attack-tail-ja"],[32,"metalkor-lowtorso-pre-shot-ja"],[33,"metalkor-lowtorso-shot-ja"],[34,"metalkor-lowtorso-hit-ja"],[35,"metalkor-lowtorso-hit-left-ja"],[36,"metalkor-lowtorso-hit-right-ja"],[37,"metalkor-lowtorso-walk-left-ja"],[38,"metalkor-lowtorso-walk-right-ja"],[39,"metalkor-lowtorso-walk-back-ja"],[40,"metalkor-lowtorso-run-back-ja"],[41,"metalkor-lowtorso-walk-to-stance-ja"],[42,"metalkor-lowtorso-hang-hit-major-ja"],[43,"metalkor-lowtorso-wings-open-ja"],[44,"metalkor-lowtorso-fly-ja"],[45,"metalkor-lowtorso-impact-ja"]],"metalkor-rays-ag":[[0,"metalkor-rays-lod0-jg"],[1,"metalkor-rays-lod0-mg"],[2,"metalkor-rays-idle-ja"]],"metalkor-torso-ag":[[0,"metalkor-torso-lod0-jg"],[1,"metalkor-torso-lod0-mg"],[2,"metalkor-torso-idle-ja"]],"metalkor-wings-ag":[[0,"metalkor-wings-lod0-jg"],[1,"metalkor-wings-lod0-mg"],[2,"metalkor-wings-shadow-mg"],[3,"metalkor-wings-idle-ja"],[4,"metalkor-wings-wings-open-ja"],[5,"metalkor-wings-fly-ja"],[6,"metalkor-wings-impact-ja"]],"metalmonk-ag":[[0,"metalmonk-lod0-jg"],[1,"metalmonk-lod0-mg"],[2,"metalmonk-lod1-mg"],[3,"metalmonk-lod2-mg"],[4,"metalmonk-shadow-mg"],[5,"metalmonk-idle-ja"],[6,"metalmonk-idle-look-left-ja"],[7,"metalmonk-idle-look-right-ja"],[8,"metalmonk-patrol0-ja"],[9,"metalmonk-patrol1-ja"],[10,"metalmonk-notice-ja"],[11,"metalmonk-notice1-ja"],[12,"metalmonk-charge0-ja"],[13,"metalmonk-charge1-ja"],[14,"metalmonk-attack0-ja"],[15,"metalmonk-attack1-ja"],[16,"metalmonk-knocked0-ja"],[17,"metalmonk-knocked-land0-ja"],[18,"metalmonk-knocked1-ja"],[19,"metalmonk-knocked-land1-ja"],[20,"metalmonk-knocked-forward0-ja"],[21,"metalmonk-knocked-forward-land0-ja"],[22,"metalmonk-celebrate-ja"],[23,"metalmonk-celebrate1-ja"],[24,"metalmonk-blue-hit0-ja"],[25,"metalmonk-blue-hit1-ja"],[26,"metalmonk-blue-hit2-ja"],[27,"metalmonk-blue-land-ja"],[28,"metalmonk-yellow-hit0-ja"],[29,"metalmonk-yellow-hit1-ja"],[30,"metalmonk-yellow-hit2-ja"],[31,"metalmonk-yellow-hit3-ja"],[32,"metalmonk-death-ja"],[33,"metalmonk-die-falling-ja"]],"meteor-ag":[[0,"meteor-lod0-jg"],[1,"meteor-lod0-mg"],[2,"meteor-idle-ja"]],"mincan-cogs-ag":[[0,"mincan-cogs-lod0-jg"],[1,"mincan-cogs-lod0-mg"],[2,"mincan-cogs-idle-ja"]],"mincan-lens-ag":[[0,"mincan-lens-lod0-jg"],[1,"mincan-lens-lod0-mg"],[2,"mincan-lens-idle-ja"],[3,"mincan-lens-idle-closed-ja"]],"mincan-lighthouse-ag":[[8,"mincan-lighthouse-lens-idle-erect-ja"],[0,"mincan-lighthouse-lod0-jg"],[1,"mincan-lighthouse-lod0-mg"],[2,"mincan-lighthouse-idle-ja"],[3,"mincan-lighthouse-idle-erect-ja"],[5,"mincan-lighthouse-lens-lod0-jg"],[6,"mincan-lighthouse-lens-lod0-mg"],[7,"mincan-lighthouse-lens-idle-ja"]],"minnow-ag":[[0,"minnow-lod0-jg"],[1,"minnow-lod0-mg"],[2,"minnow-idle-ja"]],"monster-frog-ag":[[0,"monster-frog-lod0-jg"],[1,"monster-frog-lod0-mg"],[2,"monster-frog-lod1-mg"],[3,"monster-frog-shadow-mg"],[4,"monster-frog-idle0-ja"],[5,"monster-frog-idle1-ja"],[6,"monster-frog-popup0-ja"],[7,"monster-frog-submerge0-ja"],[8,"monster-frog-notice0-ja"],[9,"monster-frog-notice0-jump-ja"],[10,"monster-frog-notice0-land-ja"],[11,"monster-frog-rotate-left-start-ja"],[12,"monster-frog-rotate-right-start-ja"],[13,"monster-frog-rotate-left-end-ja"],[14,"monster-frog-hop-small-start-ja"],[15,"monster-frog-hop-small-end-ja"],[16,"monster-frog-hop-slow-start-ja"],[17,"monster-frog-hop-slow-end-ja"],[18,"monster-frog-hop-fast-start-ja"],[19,"monster-frog-hop-fast-end-ja"],[20,"monster-frog-attack0-start-ja"],[21,"monster-frog-attack0-end-ja"],[22,"monster-frog-blue-hit0-ja"],[23,"monster-frog-blue-hit0-land-ja"],[24,"monster-frog-blue-hit1-ja"],[25,"monster-frog-blue-hit1-land-ja"],[26,"monster-frog-knocked-yellow-left-ja"],[27,"monster-frog-knocked-yellow-left-land-ja"],[28,"monster-frog-knocked-yellow-right-ja"],[29,"monster-frog-knocked-yellow-right-land-ja"],[30,"monster-frog-knocked0-ja"],[31,"monster-frog-knocked0-land-ja"],[32,"monster-frog-knocked1-ja"],[33,"monster-frog-knocked1-land-ja"]],"mtn-aval-rocks-ag":[[0,"mtn-aval-rocks-1-lod0-jg"],[1,"mtn-aval-rocks-1-lod0-mg"],[2,"mtn-aval-rocks-1-idle-ja"],[4,"mtn-aval-rocks-shadow-lod0-jg"],[5,"mtn-aval-rocks-shadow-lod0-mg"],[6,"mtn-aval-rocks-shadow-shadow-mg"],[7,"mtn-aval-rocks-shadow-idle-ja"]],"mtn-button-ag":[[0,"mtn-button-lod0-jg"],[1,"mtn-button-lod0-mg"],[2,"mtn-button-open-ja"],[3,"mtn-button-press-ja"]],"mtn-dice-ag":[[0,"mtn-dice-lod0-jg"],[1,"mtn-dice-lod0-mg"],[2,"mtn-dice-idle-ja"]],"mtn-dice-button-ag":[[0,"mtn-dice-button-lod0-jg"],[1,"mtn-dice-button-lod0-mg"],[2,"mtn-dice-button-lod1-mg"],[3,"mtn-dice-button-idle-ja"]],"mtn-gate-ag":[[0,"mtn-gate-lod0-jg"],[1,"mtn-gate-lod0-mg"],[2,"mtn-gate-lod1-mg"],[3,"mtn-gate-idle-ja"]],"mtn-gear-device-ag":[[0,"mtn-gear-device-lod0-jg"],[1,"mtn-gear-device-lod0-mg"],[2,"mtn-gear-device-idle-ja"],[4,"mtn-gear-device-collapse-lod0-jg"],[5,"mtn-gear-device-collapse-lod0-mg"],[6,"mtn-gear-device-collapse-idle-ja"]],"mtn-gear-device-gear-ag":[[0,"mtn-gear-device-gear-lod0-jg"],[1,"mtn-gear-device-gear-lod0-mg"],[2,"mtn-gear-device-gear-idle-ja"]],"mtn-iris-door-ag":[[0,"mtn-iris-door-lod0-jg"],[1,"mtn-iris-door-lod0-mg"],[2,"mtn-iris-door-idle-ja"]],"mtn-lens-ag":[[0,"mtn-lens-lod0-jg"],[1,"mtn-lens-lod0-mg"],[2,"mtn-lens-idle-ja"]],"mtn-lens-base-ag":[[0,"mtn-lens-base-lod0-jg"],[1,"mtn-lens-base-lod0-mg"],[2,"mtn-lens-base-idle-ja"],[3,"mtn-lens-base-opened-ja"]],"mtn-lens-floor-ag":[[0,"mtn-lens-floor-lod0-jg"],[1,"mtn-lens-floor-lod0-mg"],[2,"mtn-lens-floor-idle-ja"]],"mtn-plat-buried-ag":[[0,"mtn-plat-buried-lod0-jg"],[1,"mtn-plat-buried-lod0-mg"],[2,"mtn-plat-buried-lod1-mg"],[3,"mtn-plat-buried-lod2-mg"],[4,"mtn-plat-buried-idle-ja"]],"mtn-plat-buried-rocks-ag":[[0,"mtn-plat-buried-rocks-lod0-jg"],[1,"mtn-plat-buried-rocks-lod0-mg"],[2,"mtn-plat-buried-rocks-lod1-mg"],[3,"mtn-plat-buried-rocks-idle-ja"]],"mtn-plat-eject-ag":[[0,"mtn-plat-eject-lod0-jg"],[1,"mtn-plat-eject-lod0-mg"],[2,"mtn-plat-eject-lod1-mg"],[3,"mtn-plat-eject-idle-ja"]],"mtn-plat-elevator-ag":[[0,"mtn-plat-elevator-lod0-jg"],[1,"mtn-plat-elevator-lod0-mg"],[2,"mtn-plat-elevator-lod1-mg"],[3,"mtn-plat-elevator-idle-ja"]],"mtn-plat-long-ag":[[0,"mtn-plat-long-lod0-jg"],[1,"mtn-plat-long-lod0-mg"],[2,"mtn-plat-long-lod1-mg"],[3,"mtn-plat-long-idle-ja"]],"mtn-plat-return-ag":[[0,"mtn-plat-return-lod0-jg"],[1,"mtn-plat-return-lod0-mg"],[2,"mtn-plat-return-lod1-mg"],[3,"mtn-plat-return-lod2-mg"],[4,"mtn-plat-return-idle-ja"]],"mtn-plat-shoot-ag":[[0,"mtn-plat-shoot-lod0-jg"],[1,"mtn-plat-shoot-lod0-mg"],[2,"mtn-plat-shoot-lod1-mg"],[3,"mtn-plat-shoot-idle-ja"]],"mtn-plat-updown-ag":[[0,"mtn-plat-updown-lod0-jg"],[1,"mtn-plat-updown-lod0-mg"],[2,"mtn-plat-updown-idle-ja"]],"mtn-shard-ag":[[0,"mtn-shard-lod0-jg"],[1,"mtn-shard-lod0-mg"],[2,"mtn-shard-idle-ja"]],"mtn-step-plat-rocks-ag":[[8,"mtn-step-plat-rocks-b-lod1-mg"],[0,"mtn-step-plat-rocks-a-lod0-jg"],[1,"mtn-step-plat-rocks-a-lod0-mg"],[2,"mtn-step-plat-rocks-a-lod1-mg"],[3,"mtn-step-plat-rocks-a-idle-ja"],[4,"mtn-step-plat-rocks-a-end-ja"],[6,"mtn-step-plat-rocks-b-lod0-jg"],[7,"mtn-step-plat-rocks-b-lod0-mg"],[9,"mtn-step-plat-rocks-b-idle-ja"],[10,"mtn-step-plat-rocks-b-end-ja"],[12,"mtn-step-plat-rocks-c-lod0-jg"],[13,"mtn-step-plat-rocks-c-lod0-mg"],[14,"mtn-step-plat-rocks-c-lod1-mg"],[15,"mtn-step-plat-rocks-c-idle-ja"],[16,"mtn-step-plat-rocks-c-end-ja"]],"nest-break-precipice-ag":[[0,"nest-break-precipice-lod0-jg"],[1,"nest-break-precipice-lod0-mg"],[2,"nest-break-precipice-idle-ja"]],"nest-break-rocks-ag":[[8,"nest-break-rocks-break-b-lod0-jg"],[0,"nest-break-rocks-break-lod0-jg"],[9,"nest-break-rocks-break-b-lod0-mg"],[1,"nest-break-rocks-break-lod0-mg"],[2,"nest-break-rocks-break-idle-ja"],[4,"nest-break-rocks-break-a-lod0-jg"],[5,"nest-break-rocks-break-a-lod0-mg"],[6,"nest-break-rocks-break-a-idle-ja"],[10,"nest-break-rocks-break-b-idle-ja"]],"nest-gun-elevator-ag":[[0,"nest-gun-elevator-lod0-jg"],[1,"nest-gun-elevator-lod0-mg"],[2,"nest-gun-elevator-idle-ja"],[3,"nest-gun-elevator-raiserail-ja"]],"nest-gun-parts-ag":[[0,"nest-gun-parts-lod0-jg"],[1,"nest-gun-parts-lod0-mg"],[2,"nest-gun-parts-idle-ja"]],"nest-unbroken-rocks-ag":[[0,"nest-unbroken-rocks-lod0-jg"],[1,"nest-unbroken-rocks-lod0-mg"],[2,"nest-unbroken-rocks-idle-ja"]],"nestb-tail-bound-ag":[[0,"nestb-tail-bound-lod0-jg"],[1,"nestb-tail-bound-lod0-mg"],[2,"nestb-tail-bound-idle-ja"]],"onin-brain-ag":[[0,"onin-brain-lod0-jg"],[1,"onin-brain-lod0-mg"],[2,"onin-brain-idle-ja"]],"onin-highres-ag":[[0,"onin-highres-lod0-jg"],[1,"onin-highres-lod0-mg"],[2,"onin-highres-shadow-mg"],[3,"onin-highres-idle-ja"],[4,"onin-highres-idle-sleep-ja"],[5,"onin-highres-idle-wakeup-ja"],[6,"onin-highres-idle-game-ja"]],"oracle-door-ag":[[0,"oracle-door-lod0-jg"],[1,"oracle-door-lod0-mg"],[2,"oracle-door-idle-ja"]],"oracle-roof-banner-ag":[[0,"oracle-roof-banner-lod0-jg"],[1,"oracle-roof-banner-lod0-mg"],[2,"oracle-roof-banner-idle-ja"]],"oracle-roof-banner-b-ag":[[0,"oracle-roof-banner-b-lod0-jg"],[1,"oracle-roof-banner-b-lod0-mg"],[2,"oracle-roof-banner-b-idle-ja"]],"oracle-wall-banner-ag":[[0,"oracle-wall-banner-lod0-jg"],[1,"oracle-wall-banner-lod0-mg"],[2,"oracle-wall-banner-idle-ja"]],"paddy-wagon-ag":[[0,"paddy-wagon-lod0-jg"],[1,"paddy-wagon-lod0-mg"],[2,"paddy-wagon-shadow-mg"],[3,"paddy-wagon-idle-ja"]],"pal-breakable-window-ag":[[0,"pal-breakable-window-lod0-jg"],[1,"pal-breakable-window-lod0-mg"],[2,"pal-breakable-window-idle-ja"],[3,"pal-breakable-window-explode-lod0-jg"],[4,"pal-breakable-window-explode-lod0-mg"],[5,"pal-breakable-window-explode-idle-ja"]],"pal-cable-nut-ag":[[0,"pal-cable-nut-lod0-jg"],[1,"pal-cable-nut-lod0-mg"],[2,"pal-cable-nut-lod1-mg"],[3,"pal-cable-nut-idle-ja"]],"pal-electric-fan-ag":[[0,"pal-electric-fan-lod0-jg"],[1,"pal-electric-fan-lod0-mg"],[2,"pal-electric-fan-lod1-mg"],[3,"pal-electric-fan-idle-ja"]],"pal-ent-door-ag":[[0,"pal-ent-door-lod0-jg"],[1,"pal-ent-door-lod0-mg"],[2,"pal-ent-door-idle-ja"]],"pal-ent-glass-ag":[[0,"pal-ent-glass-lod0-jg"],[1,"pal-ent-glass-lod0-mg"],[2,"pal-ent-glass-idle-ja"],[3,"pal-ent-glass-explode-lod0-jg"],[4,"pal-ent-glass-explode-lod0-mg"],[5,"pal-ent-glass-explode-idle-ja"]],"pal-falling-plat-ag":[[0,"pal-falling-plat-lod0-jg"],[1,"pal-falling-plat-lod0-mg"],[2,"pal-falling-plat-idle-ja"],[3,"pal-falling-plat-shake-ja"]],"pal-flip-step-ag":[[0,"pal-flip-step-lod0-jg"],[1,"pal-flip-step-lod0-mg"],[2,"pal-flip-step-idle-ja"],[3,"pal-flip-step-fall-ja"]],"pal-grind-ring-ag":[[0,"pal-grind-ring-lod0-jg"],[1,"pal-grind-ring-lod0-mg"],[2,"pal-grind-ring-idle-ja"]],"pal-grind-ring-center-ag":[[0,"pal-grind-ring-center-lod0-jg"],[1,"pal-grind-ring-center-lod0-mg"],[2,"pal-grind-ring-center-idle-ja"],[3,"pal-grind-ring-center-explode-lod0-jg"],[4,"pal-grind-ring-center-explode-lod0-mg"],[5,"pal-grind-ring-center-explode-idle-ja"]],"pal-gun-turret-ag":[[0,"pal-gun-turret-lod0-jg"],[1,"pal-gun-turret-lod0-mg"],[2,"pal-gun-turret-idle-ja"],[3,"pal-gun-turret-shoot-ja"],[4,"pal-gun-turret-explode-lod0-jg"],[5,"pal-gun-turret-explode-lod0-mg"],[6,"pal-gun-turret-explode-idle-ja"]],"pal-lowrez-throne-ag":[[0,"pal-lowrez-throne-lod0-jg"],[1,"pal-lowrez-throne-lod0-mg"],[2,"pal-lowrez-throne-idle-ja"]],"pal-prong-ag":[[0,"pal-prong-lod0-jg"],[1,"pal-prong-lod0-mg"],[2,"pal-prong-idle-ja"],[3,"pal-prong-explode-lod0-jg"],[4,"pal-prong-explode-lod0-mg"],[5,"pal-prong-explode-idle-ja"]],"pal-rot-gun-ag":[[0,"pal-rot-gun-lod0-jg"],[1,"pal-rot-gun-lod0-mg"],[2,"pal-rot-gun-idle-ja"]],"pal-throne-door-ag":[[0,"pal-throne-door-lod0-jg"],[1,"pal-throne-door-lod0-mg"],[2,"pal-throne-door-idle-ja"]],"pal-windmill-ag":[[0,"pal-windmill-lod0-jg"],[1,"pal-windmill-lod0-mg"],[2,"pal-windmill-idle-ja"]],"palace-door-ag":[[0,"palace-door-lod0-jg"],[1,"palace-door-lod0-mg"],[2,"palace-door-idle-ja"]],"palent-turret-ag":[[0,"palent-turret-lod0-jg"],[1,"palent-turret-lod0-mg"],[2,"palent-turret-idle-ja"],[3,"palent-turret-shoot-ja"],[4,"palent-turret-explode-lod0-jg"],[5,"palent-turret-explode-lod0-mg"],[6,"palent-turret-explode-idle-ja"]],"palmpilot-ag":[[0,"palmpilot-lod0-jg"],[1,"palmpilot-lod0-mg"],[2,"palmpilot-idle-ja"]],"particleman-ag":[[0,"particleman-lod0-jg"],[1,"particleman-lod0-mg"],[2,"particleman-idle-ja"]],"pecker-highres-ag":[[0,"pecker-highres-lod0-jg"],[1,"pecker-highres-lod0-mg"],[2,"pecker-highres-shadow-mg"],[3,"pecker-highres-idle-ja"],[4,"pecker-highres-idle-sleep-ja"],[5,"pecker-highres-idle-wakeup-ja"],[6,"pecker-highres-idle-game-ja"]],"pegasus-ag":[[0,"pegasus-lod0-jg"],[1,"pegasus-lod0-mg"],[2,"pegasus-lod1-mg"],[3,"pegasus-lod2-mg"],[4,"pegasus-shadow-mg"],[5,"pegasus-idle-ja"],[6,"pegasus-idle-takeoff-on-ground-ja"],[7,"pegasus-idle-takeoff-in-air-ja"],[8,"pegasus-fly-ja"],[9,"pegasus-fly-doublespeed-ja"],[10,"pegasus-fly-glide-ja"],[11,"pegasus-fly-turn-left-ja"],[12,"pegasus-fly-turn-right-ja"],[13,"pegasus-flip-around-a-ja"],[14,"pegasus-flip-around-b-ja"],[15,"pegasus-die-flying-ja"],[16,"pegasus-fly-to-run-ja"],[17,"pegasus-run-ja"],[18,"pegasus-run-to-fly-ja"],[19,"pegasus-fly-to-idle-ja"],[20,"pegasus-board-attack-pegasus-ja"]],"piston-ag":[[0,"piston-lod0-jg"],[1,"piston-lod0-mg"],[2,"piston-lod1-mg"],[3,"piston-idle-ja"]],"pitspikes-ag":[[0,"pitspikes-lod0-jg"],[1,"pitspikes-lod0-mg"],[2,"pitspikes-lod1-mg"],[3,"pitspikes-idle-ja"]],"plasmitebomb-ag":[[0,"plasmitebomb-lod0-jg"],[1,"plasmitebomb-lod0-mg"],[2,"plasmitebomb-idle-ja"]],"plasmitebox-ag":[[0,"plasmitebox-lod0-jg"],[1,"plasmitebox-lod0-mg"],[2,"plasmitebox-idle-ja"]],"port-turret-ag":[[0,"port-turret-lod0-jg"],[1,"port-turret-lod0-mg"],[2,"port-turret-idle-ja"]],"pow-mov-plat-ag":[[0,"pow-mov-plat-lod0-jg"],[1,"pow-mov-plat-lod0-mg"],[2,"pow-mov-plat-idle-ja"]],"precipice-a-ag":[[0,"precipice-a-lod0-jg"],[1,"precipice-a-lod0-mg"],[2,"precipice-a-idle-ja"]],"precipice-b-ag":[[0,"precipice-b-lod0-jg"],[1,"precipice-b-lod0-mg"],[2,"precipice-b-idle-ja"]],"precursor-ag":[[0,"precursor-lod0-jg"],[1,"precursor-lod0-mg"],[2,"precursor-idle-ja"]],"precursor-stone-ag":[[0,"precursor-stone-lod0-jg"],[1,"precursor-stone-lod0-mg"],[2,"precursor-stone-idle-ja"]],"predator-ag":[[0,"predator-lod0-jg"],[1,"predator-lod0-mg"],[2,"predator-lod1-mg"],[3,"predator-lod2-mg"],[4,"predator-shadow-mg"],[5,"predator-idle-ja"],[6,"predator-walk0-ja"],[7,"predator-run0-ja"],[8,"predator-close-attack-ja"],[9,"predator-close-attack-recover-ja"],[10,"predator-shoot-guns0-ja"],[11,"predator-death-standing-ja"],[12,"predator-knocked-ja"],[13,"predator-knocked-land-ja"],[14,"predator-knocked-death-ja"],[15,"predator-knocked-death-land-ja"],[16,"predator-jump-attack-ja"],[17,"predator-jump-attack-land-ja"],[18,"predator-knocked-big-ja"],[19,"predator-knocked-big-land-ja"],[20,"predator-knocked-big-death-ja"],[21,"predator-blue-hit-front-ja"],[22,"predator-blue-hit-back-ja"],[23,"predator-blue-hit-land-ja"]],"propa-ag":[[0,"propa-lod0-jg"],[1,"propa-lod0-mg"],[2,"propa-idle-ja"]],"prsn-cell-door-ag":[[0,"prsn-cell-door-lod0-jg"],[1,"prsn-cell-door-lod0-mg"],[2,"prsn-cell-door-idle-ja"]],"prsn-chair-shackle-ag":[[0,"prsn-chair-shackle-lod0-jg"],[1,"prsn-chair-shackle-lod0-mg"],[2,"prsn-chair-shackle-idle-ja"]],"prsn-daxter-plat-ag":[[0,"prsn-daxter-plat-lod0-jg"],[1,"prsn-daxter-plat-lod0-mg"],[2,"prsn-daxter-plat-idle-ja"]],"prsn-hang-cell-ag":[[0,"prsn-hang-cell-lod0-jg"],[1,"prsn-hang-cell-lod0-mg"],[2,"prsn-hang-cell-idle-ja"]],"prsn-torture-ag":[[0,"prsn-torture-lod0-jg"],[1,"prsn-torture-lod0-mg"],[2,"prsn-torture-idle-ja"]],"prsn-vent-fan-ag":[[0,"prsn-vent-fan-lod0-jg"],[1,"prsn-vent-fan-lod0-mg"],[2,"prsn-vent-fan-lod1-mg"],[3,"prsn-vent-fan-idle-ja"]],"pushblock-ag":[[0,"pushblock-lod0-jg"],[1,"pushblock-lod0-mg"],[2,"pushblock-lod1-mg"],[3,"pushblock-idle-ja"]],"race-bike-a-ag":[[0,"race-bike-a-lod0-jg"],[1,"race-bike-a-lod0-mg"],[2,"race-bike-a-lod1-mg"],[3,"race-bike-a-lod2-mg"],[4,"race-bike-a-shadow-mg"],[5,"race-bike-a-idle-ja"]],"race-bike-b-ag":[[0,"race-bike-b-lod0-jg"],[1,"race-bike-b-lod0-mg"],[2,"race-bike-b-lod1-mg"],[3,"race-bike-b-shadow-mg"],[4,"race-bike-b-idle-ja"]],"race-bike-c-ag":[[0,"race-bike-c-lod0-jg"],[1,"race-bike-c-lod0-mg"],[2,"race-bike-c-lod1-mg"],[3,"race-bike-c-shadow-mg"],[4,"race-bike-c-idle-ja"]],"race-start-light-ag":[[0,"race-start-light-lod0-jg"],[1,"race-start-light-lod0-mg"],[2,"race-start-light-idle-ja"]],"race-start-light-banner-ag":[[0,"race-start-light-banner-lod0-jg"],[1,"race-start-light-banner-lod0-mg"],[2,"race-start-light-banner-idle-ja"]],"rapid-gunner-ag":[[0,"rapid-gunner-lod0-jg"],[1,"rapid-gunner-lod0-mg"],[2,"rapid-gunner-lod1-mg"],[3,"rapid-gunner-lod2-mg"],[4,"rapid-gunner-shadow-mg"],[5,"rapid-gunner-idle-ja"],[6,"rapid-gunner-notice-ja"],[7,"rapid-gunner-turn-ja"],[8,"rapid-gunner-hop-forward-ja"],[9,"rapid-gunner-hop-back-ja"],[10,"rapid-gunner-hop-left-ja"],[11,"rapid-gunner-hop-right-ja"],[12,"rapid-gunner-aim-ja"],[13,"rapid-gunner-shift-gun-ja"],[14,"rapid-gunner-shoot-ja"],[15,"rapid-gunner-shoot1-ja"],[16,"rapid-gunner-shoottoreload-ja"],[17,"rapid-gunner-shoot-track-ja"],[18,"rapid-gunner-spin-attack-ja"],[19,"rapid-gunner-reload-ja"],[20,"rapid-gunner-hit-ja"],[21,"rapid-gunner-hit-left-ja"],[22,"rapid-gunner-hit-right-ja"],[23,"rapid-gunner-knocked0-ja"],[24,"rapid-gunner-blue-hit0-ja"],[25,"rapid-gunner-blue-hit1-ja"],[26,"rapid-gunner-blue-hit2-ja"],[27,"rapid-gunner-land-ja"],[28,"rapid-gunner-die-in-place-ja"],[29,"rapid-gunner-die-falling-ja"],[30,"rapid-gunner-knocked-land0-ja"]],"rhino-ag":[[0,"rhino-lod0-jg"],[1,"rhino-lod0-mg"],[2,"rhino-shadow-mg"],[3,"rhino-idle-ja"],[4,"rhino-idleB-ja"],[5,"rhino-jump-ja"],[6,"rhino-patrol-ja"],[7,"rhino-notice-ja"],[8,"rhino-attack-ja"],[9,"rhino-attack-to-charge-ja"],[10,"rhino-charge-ja"],[11,"rhino-victory-begin-ja"],[12,"rhino-victory-loop-ja"],[13,"rhino-victory-end-ja"],[14,"rhino-die-ja"],[15,"rhino-death-ja"],[16,"rhino-knocked-soft-ja"],[17,"rhino-knocked-soft-left-ja"],[18,"rhino-knocked-soft-right-ja"],[19,"rhino-knocked-soft-behind-ja"],[20,"rhino-skid-ja"],[21,"rhino-skid-left-ja"],[22,"rhino-skid-right-ja"],[23,"rhino-victory-hit-ja"],[24,"rhino-victory-hit2-ja"]],"rhino-wall-ag":[[0,"rhino-wall-1-lod0-jg"],[9,"rhino-wall-2-end-ja"],[1,"rhino-wall-1-lod0-mg"],[2,"rhino-wall-1-idle-ja"],[4,"rhino-wall-1-end-ja"],[5,"rhino-wall-2-lod0-jg"],[6,"rhino-wall-2-lod0-mg"],[7,"rhino-wall-2-idle-ja"]],"rift-break-ring-ag":[[0,"rift-break-ring-lod0-jg"],[1,"rift-break-ring-lod0-mg"],[2,"rift-break-ring-idle-ja"]],"rift-occlude-ag":[[0,"rift-occlude-lod0-jg"],[1,"rift-occlude-lod0-mg"],[2,"rift-occlude-idle-ja"]],"rift-rider-ag":[[0,"rift-rider-lod0-jg"],[1,"rift-rider-lod0-mg"],[2,"rift-rider-shadow-mg"],[3,"rift-rider-shadow-no-lift-mg"],[4,"rift-rider-idle-ja"]],"rift-rider-bar-ag":[[0,"rift-rider-bar-lod0-jg"],[1,"rift-rider-bar-lod0-mg"],[2,"rift-rider-bar-idle-ja"]],"rift-rider-break-ag":[[8,"rift-rider-break-a-lod0-mg"],[0,"rift-rider-break-lod0-jg"],[1,"rift-rider-break-lod0-mg"],[10,"rift-rider-break-a-end-ja"],[2,"rift-rider-break-idle-ja"],[4,"rift-rider-break-end-ja"],[7,"rift-rider-break-a-lod0-jg"]],"rift-rider-break-b-ag":[[0,"rift-rider-break-b-lod0-jg"],[1,"rift-rider-break-b-lod0-mg"],[2,"rift-rider-break-b-idle-ja"]],"rift-rider-break-c-ag":[[0,"rift-rider-break-c-lod0-jg"],[1,"rift-rider-break-c-lod0-mg"],[2,"rift-rider-break-c-idle-ja"]],"rift-rider-chunk-a-ag":[[0,"rift-rider-chunk-a-lod0-jg"],[1,"rift-rider-chunk-a-lod0-mg"],[2,"rift-rider-chunk-a-idle-ja"]],"rift-rider-dash-ag":[[0,"rift-rider-dash-lod0-jg"],[1,"rift-rider-dash-lod0-mg"],[2,"rift-rider-dash-idle-ja"]],"rift-rider-donut-ag":[[0,"rift-rider-donut-lod0-jg"],[1,"rift-rider-donut-lod0-mg"],[2,"rift-rider-donut-shadow-mg"],[3,"rift-rider-donut-idle-ja"]],"rift-rider-heart-of-mar-ag":[[0,"rift-rider-heart-of-mar-lod0-jg"],[1,"rift-rider-heart-of-mar-lod0-mg"],[2,"rift-rider-heart-of-mar-idle-ja"]],"rift-ring-ag":[[0,"rift-ring-lod0-jg"],[1,"rift-ring-lod0-mg"],[2,"rift-ring-idle-ja"]],"rift-ring-in-game-ag":[[0,"rift-ring-in-game-lod0-jg"],[1,"rift-ring-in-game-lod0-mg"],[2,"rift-ring-in-game-idle-ja"]],"roboguard-ag":[[0,"roboguard-lod0-jg"],[1,"roboguard-lod0-mg"],[2,"roboguard-lod2-mg"],[3,"roboguard-shadow-mg"],[4,"roboguard-idle0-ja"],[5,"roboguard-idle1-ja"],[6,"roboguard-notice-ja"],[7,"roboguard-walk-ja"],[8,"roboguard-run-ja"],[9,"roboguard-idle-to-ball-ja"],[10,"roboguard-ball-ja"],[11,"roboguard-ball-to-idle-ja"],[12,"roboguard-death-standing-ja"],[13,"roboguard-laser-ground-ja"],[14,"roboguard-punch-rotate-ja"],[15,"roboguard-punch-go-ja"],[16,"roboguard-punch-hold-ja"],[17,"roboguard-punch-end-ja"],[18,"roboguard-shoot-left-start-ja"],[19,"roboguard-shoot-left-ja"],[20,"roboguard-shoot-left-end-ja"],[21,"roboguard-knocked-small-ja"],[22,"roboguard-knocked-small-land-ja"],[23,"roboguard-knocked-big-ja"],[24,"roboguard-knocked-big-land-ja"],[25,"roboguard-fall-ja"],[26,"roboguard-shoot-right-ja"],[27,"roboguard-ball-to-dizzy-ja"],[28,"roboguard-dizzy-ja"],[29,"roboguard-explode-lod0-jg"],[30,"roboguard-explode-lod0-mg"],[31,"roboguard-explode-idle-ja"]],"ruins-breakable-wall-ag":[[0,"ruins-breakable-wall-1-lod0-jg"],[9,"ruins-breakable-wall-2-lod0-jg"],[1,"ruins-breakable-wall-1-lod0-mg"],[2,"ruins-breakable-wall-1-lod1-mg"],[3,"ruins-breakable-wall-1-lod2-mg"],[4,"ruins-breakable-wall-1-idle-ja"],[5,"ruins-breakable-wall-1-end-front-ja"],[7,"ruins-breakable-wall-1-end-rear-ja"],[10,"ruins-breakable-wall-2-lod0-mg"],[11,"ruins-breakable-wall-2-lod1-mg"],[12,"ruins-breakable-wall-2-lod2-mg"],[13,"ruins-breakable-wall-2-idle-ja"],[14,"ruins-breakable-wall-2-end-front-ja"],[16,"ruins-breakable-wall-2-end-rear-ja"],[18,"ruins-breakable-wall-3-lod0-jg"],[19,"ruins-breakable-wall-3-lod0-mg"],[20,"ruins-breakable-wall-3-lod1-mg"],[21,"ruins-breakable-wall-3-lod2-mg"],[22,"ruins-breakable-wall-3-idle-ja"],[23,"ruins-breakable-wall-3-end-front-ja"],[25,"ruins-breakable-wall-3-end-rear-ja"],[27,"ruins-breakable-wall-4-lod0-jg"],[28,"ruins-breakable-wall-4-lod0-mg"],[29,"ruins-breakable-wall-4-idle-ja"],[30,"ruins-breakable-wall-4-end-front-ja"],[32,"ruins-breakable-wall-5-lod0-jg"],[33,"ruins-breakable-wall-5-lod0-mg"],[34,"ruins-breakable-wall-5-idle-ja"],[35,"ruins-breakable-wall-5-end-front-ja"],[37,"ruins-breakable-wall-6-lod0-jg"],[38,"ruins-breakable-wall-6-lod0-mg"],[39,"ruins-breakable-wall-6-idle-ja"],[40,"ruins-breakable-wall-6-end-front-ja"]],"ruins-bridge-ag":[[0,"ruins-bridge-1-lod0-jg"],[1,"ruins-bridge-1-lod0-mg"],[2,"ruins-bridge-1-lod1-mg"],[3,"ruins-bridge-1-idle-ja"],[4,"ruins-bridge-1-end-ja"]],"ruins-drop-plat-ag":[[0,"ruins-drop-plat-a-lod0-jg"],[9,"ruins-drop-plat-a-3-idle-ja"],[1,"ruins-drop-plat-a-lod0-mg"],[2,"ruins-drop-plat-a-lod1-mg"],[3,"ruins-drop-plat-a-1-idle-ja"],[4,"ruins-drop-plat-a-1-end-ja"],[6,"ruins-drop-plat-a-2-idle-ja"],[7,"ruins-drop-plat-a-2-end-ja"],[10,"ruins-drop-plat-a-3-end-ja"],[12,"ruins-drop-plat-b-lod0-jg"],[13,"ruins-drop-plat-b-lod0-mg"],[14,"ruins-drop-plat-b-lod1-mg"],[15,"ruins-drop-plat-b-1-idle-ja"],[16,"ruins-drop-plat-b-1-end-ja"],[18,"ruins-drop-plat-b-2-idle-ja"],[19,"ruins-drop-plat-b-2-end-ja"],[21,"ruins-drop-plat-c-lod0-jg"],[22,"ruins-drop-plat-c-lod0-mg"],[23,"ruins-drop-plat-c-lod1-mg"],[24,"ruins-drop-plat-c-1-idle-ja"],[25,"ruins-drop-plat-c-1-end-ja"],[27,"ruins-drop-plat-c-2-idle-ja"],[28,"ruins-drop-plat-c-2-end-ja"],[30,"ruins-drop-plat-c-3-idle-ja"],[31,"ruins-drop-plat-c-3-end-ja"]],"ruins-pillar-collapse-ag":[[8,"ruins-pillar-collapse-3-idle-ja"],[0,"ruins-pillar-collapse-lod0-jg"],[9,"ruins-pillar-collapse-3-end-ja"],[1,"ruins-pillar-collapse-lod0-mg"],[2,"ruins-pillar-collapse-1-idle-ja"],[3,"ruins-pillar-collapse-1-end-ja"],[5,"ruins-pillar-collapse-2-idle-ja"],[6,"ruins-pillar-collapse-2-end-ja"]],"ruins-precipice-ag":[[0,"ruins-precipice-lod0-jg"],[1,"ruins-precipice-lod0-mg"],[2,"ruins-precipice-idle-ja"]],"ruins-tower-a-ag":[[0,"ruins-tower-a-lod0-jg"],[1,"ruins-tower-a-lod0-mg"],[2,"ruins-tower-a-idle-ja"]],"ruins-tower-b-ag":[[0,"ruins-tower-b-lod0-jg"],[1,"ruins-tower-b-lod0-mg"],[2,"ruins-tower-b-idle-ja"]],"ruins-tower-c-ag":[[0,"ruins-tower-c-lod0-jg"],[1,"ruins-tower-c-lod0-mg"],[2,"ruins-tower-c-idle-ja"]],"ruins-tower-d-ag":[[0,"ruins-tower-d-lod0-jg"],[1,"ruins-tower-d-lod0-mg"],[2,"ruins-tower-d-idle-ja"]],"ruins-tower-e-ag":[[0,"ruins-tower-e-lod0-jg"],[1,"ruins-tower-e-lod0-mg"],[2,"ruins-tower-e-idle-ja"]],"ruins-tower-f-ag":[[0,"ruins-tower-f-lod0-jg"],[1,"ruins-tower-f-lod0-mg"],[2,"ruins-tower-f-idle-ja"]],"ruins-tower-rp-ag":[[0,"ruins-tower-rp-lod0-jg"],[1,"ruins-tower-rp-lod0-mg"],[2,"ruins-tower-rp-idle-ja"]],"samos-ag":[[0,"samos-lod0-jg"],[1,"samos-lod0-mg"],[2,"samos-lod1-mg"],[3,"samos-shadow-mg"],[4,"samos-idle-ja"],[5,"samos-idle-bots-ja"],[6,"samos-raise-ship-ja"],[7,"samos-walk0-ja"],[8,"samos-knocked-forward-ja"],[9,"samos-knocked-forward-land-ja"],[10,"samos-knocked-back-ja"],[11,"samos-knocked-back-land-ja"],[12,"samos-death0-ja"],[13,"samos-death0-end-ja"]],"samos-highres-ag":[[0,"samos-highres-lod0-jg"],[1,"samos-highres-lod0-mg"],[2,"samos-highres-shadow-mg"],[3,"samos-highres-idle-ja"],[5,"samos-highres-idle-garage-ja"],[4,"samos-highres-idle-bots-ja"]],"scenecamera-ag":[[0,"scenecamera-lod0-jg"],[1,"scenecamera-lod0-mg"],[2,"scenecamera-idle-ja"]],"seal-of-mar-ag":[[0,"seal-of-mar-lod0-jg"],[1,"seal-of-mar-lod0-mg"],[2,"seal-of-mar-idle-ja"]],"seal-of-mar-base-ag":[[0,"seal-of-mar-base-lod0-jg"],[1,"seal-of-mar-base-lod0-mg"],[2,"seal-of-mar-base-idle-ja"]],"seal-of-mar-top-ag":[[0,"seal-of-mar-top-lod0-jg"],[1,"seal-of-mar-top-lod0-mg"],[2,"seal-of-mar-top-idle-ja"]],"searchlight-ag":[[0,"searchlight-lod0-jg"],[1,"searchlight-lod0-mg"],[2,"searchlight-idle-ja"]],"security-wall-ag":[[0,"security-wall-lod0-jg"],[1,"security-wall-lod0-mg"],[2,"security-wall-idle-ja"]],"sew-arm-blade-ag":[[0,"sew-arm-blade-lod0-jg"],[1,"sew-arm-blade-lod0-mg"],[2,"sew-arm-blade-lod1-mg"],[3,"sew-arm-blade-idle-ja"]],"sew-catwalk-ag":[[0,"sew-catwalk-1-lod0-jg"],[1,"sew-catwalk-1-lod0-mg"],[2,"sew-catwalk-1-lod1-mg"],[3,"sew-catwalk-1-idle-ja"],[4,"sew-catwalk-1-end-ja"]],"sew-elevator-ag":[[0,"sew-elevator-lod0-jg"],[1,"sew-elevator-lod0-mg"],[2,"sew-elevator-lod1-mg"],[3,"sew-elevator-idle-ja"]],"sew-gold-key-ag":[[0,"sew-gold-key-lod0-jg"],[1,"sew-gold-key-lod0-mg"],[2,"sew-gold-key-idle-ja"]],"sew-grill-ag":[[0,"sew-grill-lod0-jg"],[1,"sew-grill-lod0-mg"],[2,"sew-grill-lod1-mg"],[3,"sew-grill-idle-ja"],[5,"sew-grill-sew-scare-grunt-end-ja"]],"sew-gunturret-ag":[[0,"sew-gunturret-lod0-jg"],[1,"sew-gunturret-lod0-mg"],[2,"sew-gunturret-idle-ja"],[3,"sew-gunturret-shoot-ja"],[4,"sew-gunturret-explode-lod0-jg"],[5,"sew-gunturret-explode-lod0-mg"],[6,"sew-gunturret-explode-idle-ja"]],"sew-light-switch-ag":[[0,"sew-light-switch-lod0-jg"],[1,"sew-light-switch-lod0-mg"],[2,"sew-light-switch-idle-ja"]],"sew-mar-statue-ag":[[0,"sew-mar-statue-lod0-jg"],[1,"sew-mar-statue-lod0-mg"],[2,"sew-mar-statue-idle-ja"]],"sew-mar-statue-explode-ag":[[0,"sew-mar-statue-explode-a-lod0-jg"],[1,"sew-mar-statue-explode-a-lod0-mg"],[2,"sew-mar-statue-explode-a-idle-ja"],[4,"sew-mar-statue-explode-b-lod0-jg"],[5,"sew-mar-statue-explode-b-lod0-mg"],[6,"sew-mar-statue-explode-b-idle-ja"]],"sew-mine-a-ag":[[0,"sew-mine-a-lod0-jg"],[1,"sew-mine-a-lod0-mg"],[2,"sew-mine-a-idle-ja"]],"sew-mine-b-ag":[[0,"sew-mine-b-lod0-jg"],[1,"sew-mine-b-lod0-mg"],[2,"sew-mine-b-idle-ja"]],"sew-multi-blade-ag":[[0,"sew-multi-blade-lod0-jg"],[1,"sew-multi-blade-lod0-mg"],[2,"sew-multi-blade-lod1-mg"],[3,"sew-multi-blade-idle-ja"]],"sew-single-blade-ag":[[0,"sew-single-blade-lod0-jg"],[1,"sew-single-blade-lod0-mg"],[2,"sew-single-blade-idle-ja"]],"sew-tri-blade-ag":[[0,"sew-tri-blade-lod0-jg"],[1,"sew-tri-blade-lod0-mg"],[2,"sew-tri-blade-lod1-mg"],[3,"sew-tri-blade-idle-ja"]],"sew-twist-blade-ag":[[0,"sew-twist-blade-lod0-jg"],[1,"sew-twist-blade-lod0-mg"],[2,"sew-twist-blade-lod1-mg"],[3,"sew-twist-blade-idle-ja"]],"sew-valve-ag":[[0,"sew-valve-lod0-jg"],[1,"sew-valve-lod0-mg"],[2,"sew-valve-lod1-mg"],[3,"sew-valve-idle-ja"]],"sew-wall-ag":[[0,"sew-wall-lod0-jg"],[1,"sew-wall-lod0-mg"],[2,"sew-wall-lod1-mg"],[3,"sew-wall-1-idle-ja"],[4,"sew-wall-1-end-ja"],[6,"sew-wall-2-idle-ja"],[7,"sew-wall-2-end-ja"]],"shield-gunner-ag":[[0,"shield-gunner-lod0-jg"],[1,"shield-gunner-lod0-mg"],[2,"shield-gunner-idle-ja"]],"sig-ag":[[0,"sig-lod0-jg"],[1,"sig-lod0-mg"],[2,"sig-shadow-mg"],[3,"sig-walk-ja"],[4,"sig-idle-right0-ja"],[5,"sig-idle-right0-to-ready0-ja"],[6,"sig-ready0-to-idle-right0-ja"],[7,"sig-ready0-ja"],[8,"sig-run-ja"],[9,"sig-whip-forward-ja"],[10,"sig-whip-left-ja"],[11,"sig-whip-right-ja"],[12,"sig-blast-forward-ja"],[13,"sig-blast-left-ja"],[14,"sig-blast-right-ja"],[15,"sig-yellow-hit-forward0-ja"],[16,"sig-yellow-hit-backward0-ja"],[17,"sig-yellow-hit-left0-ja"],[18,"sig-yellow-hit-right0-ja"],[19,"sig-blue-hit0-ja"],[20,"sig-blue-hit1-ja"],[21,"sig-blue-hit2-ja"],[22,"sig-blue-hit-land-ja"],[23,"sig-hard-hit0-ja"],[24,"sig-hard-hit-land-ja"],[25,"sig-die-in-place0-ja"],[26,"sig-gun-fix-start-ja"],[27,"sig-gun-fix-hit-ja"],[28,"sig-gun-fix-hit-to-look-a-ja"],[29,"sig-gun-fix-look-a-ja"],[30,"sig-gun-fix-look-b-ja"],[31,"sig-gun-fix-shake-look-ja"],[32,"sig-gun-fix-look-to-stomp-ja"],[33,"sig-gun-fix-stomp-ja"],[34,"sig-gun-fix-stomp-to-hit-ja"],[35,"sig-charge-to-crouch-ja"],[36,"sig-charge0-ja"],[37,"sig-charge-to-ready-ja"],[38,"sig-charge-ready-ja"],[39,"sig-standing-jump-wind-up-ja"],[40,"sig-standing-jump-in-air-ja"],[41,"sig-standing-jump-land-ja"],[42,"sig-upper-base-low-ja"],[43,"sig-upper-low-to-high-ja"],[44,"sig-upper-base-high-ja"],[45,"sig-upper-shoot-ja"],[46,"sig-upper-high-to-low-ja"],[47,"sig-idle-crouch-ja"],[48,"sig-turn-left-start0-ja"],[49,"sig-turn-left50-end0-ja"],[50,"sig-turn-left100-end0-ja"],[51,"sig-turn-left150-end0-ja"],[52,"sig-turn-right-start0-ja"],[53,"sig-turn-right50-end0-ja"],[54,"sig-turn-right100-end0-ja"],[55,"sig-turn-right150-end0-ja"],[56,"sig-chased-run0-ja"],[57,"sig-chased-run-jump0-ja"],[58,"sig-chased-run-jump-land0-ja"],[59,"sig-chased-shoot-jump0-ja"],[60,"sig-chased-shoot-jump-land0-ja"],[61,"sig-chased-idle-start-ja"],[62,"sig-chased-idle-loop-ja"]],"sig-highres-ag":[[0,"sig-highres-lod0-jg"],[1,"sig-highres-lod0-mg"],[2,"sig-highres-shadow-mg"],[3,"sig-highres-idle-ja"],[4,"sig-highres-idle-stand-ja"]],"sinking-plat-ag":[[0,"sinking-plat-lod0-jg"],[1,"sinking-plat-lod0-mg"],[2,"sinking-plat-lod1-mg"],[3,"sinking-plat-idle-ja"]],"skate-gate-ag":[[0,"skate-gate-lod0-jg"],[1,"skate-gate-lod0-mg"],[2,"skate-gate-idle-ja"]],"skate-training-ramp-ag":[[0,"skate-training-ramp-lod0-jg"],[1,"skate-training-ramp-lod0-mg"],[2,"skate-training-ramp-idle-ja"]],"skatea-floating-ring-ag":[[0,"skatea-floating-ring-lod0-jg"],[1,"skatea-floating-ring-lod0-mg"],[2,"skatea-floating-ring-idle-ja"]],"skatea-jump-pad-ag":[[0,"skatea-jump-pad-lod0-jg"],[1,"skatea-jump-pad-lod0-mg"],[2,"skatea-jump-pad-idle-ja"]],"slider-ag":[[0,"slider-lod0-jg"],[1,"slider-lod0-mg"],[2,"slider-lod1-mg"],[3,"slider-idle-ja"]],"son-of-particleman-ag":[[0,"son-of-particleman-lod0-jg"],[1,"son-of-particleman-lod0-mg"],[2,"son-of-particleman-idle-ja"]],"spider-eyes-ag":[[0,"spider-eyes-lod0-jg"],[1,"spider-eyes-lod0-mg"],[2,"spider-eyes-idle-ja"]],"spotlight-ag":[[0,"spotlight-lod0-jg"],[1,"spotlight-lod0-mg"],[2,"spotlight-idle-ja"]],"spyder-ag":[[0,"spyder-lod0-jg"],[1,"spyder-lod0-mg"],[2,"spyder-lod1-mg"],[3,"spyder-shadow-mg"],[4,"spyder-idle-ja"],[5,"spyder-patrol0-ja"],[6,"spyder-notice-ja"],[7,"spyder-victory-ja"],[8,"spyder-run0-ja"],[9,"spyder-shoot-low-ja"],[10,"spyder-shoot-high-ja"],[11,"spyder-falling-death-ja"],[12,"spyder-death-ja"],[13,"spyder-die-knocked-ja"],[14,"spyder-jump-ja"],[15,"spyder-hit-ja"],[16,"spyder-hit-hard-ja"],[17,"spyder-blue-hit0-ja"],[18,"spyder-blue-hit1-ja"],[19,"spyder-blue-hit2-ja"],[20,"spyder-hit-land-ja"],[21,"spyder-jump-wind-up-ja"],[22,"spyder-jump-in-air-ja"],[23,"spyder-jump-land-ja"]],"spydroid-ag":[[0,"spydroid-lod0-jg"],[1,"spydroid-lod0-mg"],[2,"spydroid-shadow-mg"],[3,"spydroid-idle-ja"],[4,"spydroid-walk-ja"],[5,"spydroid-run-ja"],[6,"spydroid-attack-jump-ja"],[7,"spydroid-attack-land-ja"],[8,"spydroid-jump-wind-up-ja"],[9,"spydroid-jump-ja"],[10,"spydroid-jump-land-ja"],[11,"spydroid-knocked0-ja"],[12,"spydroid-knocked0-land-ja"],[13,"spydroid-knocked1-ja"],[14,"spydroid-knocked1-land-ja"],[15,"spydroid-explode-ja"],[16,"spydroid-turn-right-ja"],[17,"spydroid-turn-left-ja"],[18,"spydroid-exploding-lod0-jg"],[19,"spydroid-exploding-lod0-mg"],[20,"spydroid-exploding-idle-ja"]],"squid-ag":[[3,"squid-squid-idle-ja"],[4,"squid-shields-up-ja"],[5,"squid-shields-idle-ja"],[6,"squid-shields-down-ja"],[7,"squid-pods-down-ja"],[8,"squid-hatch-fore-open-ja"],[9,"squid-hatch-fore-launch-ja"],[10,"squid-hatch-fore-close-ja"],[11,"squid-hatch-aft-open-ja"],[12,"squid-hatch-aft-launch-ja"],[13,"squid-hatch-aft-close-ja"],[14,"squid-breathe-between-grenades-ja"],[15,"squid-pods-up-ja"],[16,"squid-fire-guns-start-ja"],[17,"squid-fire-guns-loop-ja"],[18,"squid-fire-guns-end-ja"],[19,"squid-fire-guns-release-ja"],[20,"squid-fire-guns-breathe-ja"],[21,"squid-fly-left-start-ja"],[22,"squid-fly-left-idle-ja"],[23,"squid-fly-left-end-ja"],[24,"squid-fly-right-start-ja"],[25,"squid-fly-right-idle-ja"],[26,"squid-fly-right-end-ja"],[27,"squid-fly-foreward-start-ja"],[28,"squid-fly-foreward-idle-ja"],[29,"squid-fly-foreward-end-ja"],[30,"squid-fly-backward-start-ja"],[31,"squid-fly-backward-idle-ja"],[32,"squid-fly-backward-end-ja"],[33,"squid-recharge-landing-ja"],[34,"squid-recharge-liftoff-ja"],[35,"squid-recharge-ja"],[36,"squid-damaged-ja"],[37,"squid-dummy17-ja"],[38,"squid-dummy18-ja"],[39,"squid-dummy19-ja"],[40,"squid-dummy20-ja"],[55,"squid-driver-squid-idle-ja"],[64,"squid-firepool-dissipate-ja"],[0,"squid-lod0-jg"],[1,"squid-lod0-mg"],[2,"squid-shadow-mg"],[42,"squid-tentacle-lod0-jg"],[43,"squid-tentacle-lod0-mg"],[44,"squid-tentacle-shadow-mg"],[45,"squid-tentacle-idle-ja"],[46,"squid-tentacle-recharge-start-ja"],[47,"squid-tentacle-recharge-ja"],[48,"squid-tentacle-recharge-end-ja"],[49,"squid-lights-lod0-jg"],[50,"squid-lights-lod0-mg"],[51,"squid-lights-idle-ja"],[52,"squid-driver-lod0-jg"],[53,"squid-driver-lod0-mg"],[54,"squid-driver-test-ja"],[56,"squid-grenade-lod0-jg"],[57,"squid-grenade-lod0-mg"],[58,"squid-grenade-shadow-mg"],[59,"squid-grenade-idle-ja"],[60,"squid-firepool-lod0-jg"],[61,"squid-firepool-lod0-mg"],[62,"squid-firepool-idle-ja"],[63,"squid-firepool-form-ja"],[65,"squid-tentacle-shield-lod0-jg"],[66,"squid-tentacle-shield-lod0-mg"],[67,"squid-tentacle-shield-idle-ja"],[68,"squid-squid-shield-lod0-jg"],[69,"squid-squid-shield-lod0-mg"],[70,"squid-squid-shield-idle-ja"]],"squid-break-ag":[[8,"squid-break-b-lod0-jg"],[0,"squid-break-pod-lod0-jg"],[9,"squid-break-b-lod0-mg"],[1,"squid-break-pod-lod0-mg"],[2,"squid-break-pod-idle-ja"],[4,"squid-break-a-lod0-jg"],[5,"squid-break-a-lod0-mg"],[6,"squid-break-a-idle-ja"],[10,"squid-break-b-idle-ja"],[12,"squid-break-c-lod0-jg"],[13,"squid-break-c-lod0-mg"],[14,"squid-break-c-idle-ja"],[16,"squid-break-d-lod0-jg"],[17,"squid-break-d-lod0-mg"],[18,"squid-break-d-idle-ja"],[20,"squid-break-e-lod0-jg"],[21,"squid-break-e-lod0-mg"],[22,"squid-break-e-idle-ja"],[24,"squid-break-tentacle-lod0-jg"],[25,"squid-break-tentacle-lod0-mg"],[26,"squid-break-tentacle-idle-ja"]],"squid-collision-ag":[[0,"squid-collision-lod0-jg"],[1,"squid-collision-lod0-mg"],[2,"squid-collision-b-lod0-jg"],[3,"squid-collision-b-lod0-mg"],[4,"squid-collision-c-lod0-jg"],[5,"squid-collision-c-lod0-mg"],[6,"squid-collision-idle-ja"]],"stad-c-force-field-ag":[[0,"stad-c-force-field-lod0-jg"],[1,"stad-c-force-field-lod0-mg"],[2,"stad-c-force-field-idle-ja"]],"stad-d-force-field-ag":[[0,"stad-d-force-field-lod0-jg"],[1,"stad-d-force-field-lod0-mg"],[2,"stad-d-force-field-idle-ja"]],"stad-force-field-ag":[[0,"stad-force-field-lod0-jg"],[1,"stad-force-field-lod0-mg"],[2,"stad-force-field-idle-ja"]],"stadium-barrier-ag":[[0,"stadium-barrier-lod0-jg"],[1,"stadium-barrier-lod0-mg"],[2,"stadium-barrier-idle-ja"]],"stadium-racer-ag":[[0,"stadium-racer-lod0-jg"],[1,"stadium-racer-lod0-mg"],[2,"stadium-racer-lod1-mg"],[3,"stadium-racer-idle-ja"],[4,"stadium-racer-bike-stance-ja"],[5,"stadium-racer-car-stance-ja"],[6,"stadium-racer-car-taunt-left-ja"],[7,"stadium-racer-car-taunt-right-ja"],[8,"stadium-racer-car-taunt-ja"]],"stdm-baron-box-ag":[[0,"stdm-baron-box-lod0-jg"],[1,"stdm-baron-box-lod0-mg"],[2,"stdm-baron-box-idle-ja"]],"stdm-barrels-ag":[[0,"stdm-barrels-lod0-jg"],[1,"stdm-barrels-lod0-mg"],[2,"stdm-barrels-idle-ja"]],"stdmb-race-hatch-ag":[[0,"stdmb-race-hatch-lod0-jg"],[1,"stdmb-race-hatch-lod0-mg"],[2,"stdmb-race-hatch-lod1-mg"],[3,"stdmb-race-hatch-idle-ja"]],"strip-chain-crate-ag":[[0,"strip-chain-crate-lod0-jg"],[1,"strip-chain-crate-lod0-mg"],[2,"strip-chain-crate-idle-ja"]],"strip-conveyor-ag":[[0,"strip-conveyor-lod0-jg"],[1,"strip-conveyor-lod0-mg"],[2,"strip-conveyor-idle-ja"]],"strip-game-crate-ag":[[0,"strip-game-crate-lod0-jg"],[1,"strip-game-crate-lod0-mg"],[2,"strip-game-crate-idle-ja"],[3,"strip-game-crate-final-ja"]],"talk-box-ag":[[0,"talk-box-lod0-jg"],[1,"talk-box-lod0-mg"],[2,"talk-box-idle-ja"]],"tanker-ag":[[0,"tanker-lod0-jg"],[1,"tanker-lod0-mg"],[2,"tanker-idle-ja"]],"tanker-barrels-ag":[[0,"tanker-barrels-lod0-jg"],[1,"tanker-barrels-lod0-mg"],[2,"tanker-barrels-idle-ja"]],"tanker-container-ag":[[0,"tanker-container-lod0-jg"],[1,"tanker-container-lod0-mg"],[2,"tanker-container-idle-ja"]],"tanker-crash-ag":[[0,"tanker-crash-lod0-jg"],[1,"tanker-crash-lod0-mg"],[2,"tanker-crash-idle-ja"]],"tanker-one-barrel-ag":[[0,"tanker-one-barrel-lod0-jg"],[1,"tanker-one-barrel-lod0-mg"],[2,"tanker-one-barrel-idle-ja"]],"tanker-roof-break-ag":[[0,"tanker-roof-break-lod0-jg"],[1,"tanker-roof-break-lod0-mg"],[2,"tanker-roof-break-idle-ja"]],"tess-highres-ag":[[6,"tess-highres-idle-hiphog-ja"],[0,"tess-highres-lod0-jg"],[1,"tess-highres-lod0-mg"],[2,"tess-highres-shadow-mg"],[3,"tess-highres-idle-ja"],[4,"tess-highres-idle-alley-ja"],[5,"tess-highres-idle-whack-ja"]],"throne-throne-ag":[[0,"throne-throne-lod0-jg"],[1,"throne-throne-lod0-mg"],[2,"throne-throne-idle-ja"]],"throwblock-ag":[[0,"throwblock-lod0-jg"],[1,"throwblock-lod0-mg"],[2,"throwblock-idle-ja"]],"time-map-ag":[[0,"time-map-lod0-jg"],[1,"time-map-lod0-mg"],[2,"time-map-idle-ja"]],"tomb-baby-spider-ag":[[0,"tomb-baby-spider-lod0-jg"],[1,"tomb-baby-spider-lod0-mg"],[2,"tomb-baby-spider-lod1-mg"],[3,"tomb-baby-spider-shadow-mg"],[4,"tomb-baby-spider-idle-ja"],[5,"tomb-baby-spider-walk0-ja"],[6,"tomb-baby-spider-notice-spin-ja"],[7,"tomb-baby-spider-notice-land-ja"],[8,"tomb-baby-spider-run0-ja"],[9,"tomb-baby-spider-turn-right-ja"],[10,"tomb-baby-spider-turn-left-ja"],[11,"tomb-baby-spider-attack0-start-ja"],[12,"tomb-baby-spider-attack0-stop-ja"],[13,"tomb-baby-spider-die-ja"],[14,"tomb-baby-spider-knocked0-ja"],[15,"tomb-baby-spider-knocked0-land-ja"],[16,"tomb-baby-spider-knocked0-land-fadeout-ja"],[17,"tomb-baby-spider-knocked1-ja"],[18,"tomb-baby-spider-knocked1-land-ja"],[19,"tomb-baby-spider-knocked1-land-fadeout-ja"],[20,"tomb-baby-spider-hit-blue-front-ja"],[21,"tomb-baby-spider-hit-blue-back-ja"],[22,"tomb-baby-spider-hit-blue-land-ja"]],"tomb-beetle-ag":[[0,"tomb-beetle-lod0-jg"],[1,"tomb-beetle-lod0-mg"],[2,"tomb-beetle-shadow-mg"],[3,"tomb-beetle-falling-ja"],[4,"tomb-beetle-land-ja"],[5,"tomb-beetle-wiggle-ja"],[6,"tomb-beetle-flip-ja"],[7,"tomb-beetle-run0-ja"],[8,"tomb-beetle-run1-ja"],[9,"tomb-beetle-stand0-ja"],[10,"tomb-beetle-fly-takeoff-ja"],[11,"tomb-beetle-fly-ja"],[12,"tomb-beetle-fly-land-ja"],[13,"tomb-beetle-die-ja"]],"tomb-beetle-door-ag":[[0,"tomb-beetle-door-lod0-jg"],[1,"tomb-beetle-door-lod0-mg"],[2,"tomb-beetle-door-idle-ja"],[3,"tomb-beetle-door-open-ja"]],"tomb-boss-bridge-ag":[[8,"tomb-boss-bridge-b-idle-ja"],[0,"tomb-boss-bridge-a-lod0-jg"],[1,"tomb-boss-bridge-a-lod0-mg"],[2,"tomb-boss-bridge-a-idle-ja"],[3,"tomb-boss-bridge-a-break-ja"],[4,"tomb-boss-bridge-a-end-ja"],[6,"tomb-boss-bridge-b-lod0-jg"],[7,"tomb-boss-bridge-b-lod0-mg"],[9,"tomb-boss-bridge-b-break-ja"],[10,"tomb-boss-bridge-b-end-ja"]],"tomb-boss-catwalk-ag":[[0,"tomb-boss-catwalk-a-lod0-jg"],[1,"tomb-boss-catwalk-a-lod0-mg"],[2,"tomb-boss-catwalk-a-idle-ja"],[3,"tomb-boss-catwalk-a-break-ja"],[4,"tomb-boss-catwalk-a-end-ja"],[5,"tomb-boss-catwalk-b-lod0-jg"],[6,"tomb-boss-catwalk-b-lod0-mg"],[7,"tomb-boss-catwalk-b-idle-ja"],[8,"tomb-boss-catwalk-b-break-ja"],[9,"tomb-boss-catwalk-b-end-ja"],[10,"tomb-boss-catwalk-c-lod0-jg"],[11,"tomb-boss-catwalk-c-lod0-mg"],[12,"tomb-boss-catwalk-c-idle-ja"],[13,"tomb-boss-catwalk-c-break-ja"],[14,"tomb-boss-catwalk-c-end-ja"],[15,"tomb-boss-catwalk-d-lod0-jg"],[16,"tomb-boss-catwalk-d-lod0-mg"],[17,"tomb-boss-catwalk-d-idle-ja"],[18,"tomb-boss-catwalk-d-break-ja"],[19,"tomb-boss-catwalk-d-end-ja"],[20,"tomb-boss-catwalk-e-lod0-jg"],[21,"tomb-boss-catwalk-e-lod0-mg"],[22,"tomb-boss-catwalk-e-idle-ja"],[23,"tomb-boss-catwalk-e-break-ja"],[24,"tomb-boss-catwalk-e-end-ja"],[25,"tomb-boss-catwalk-f-lod0-jg"],[26,"tomb-boss-catwalk-f-lod0-mg"],[27,"tomb-boss-catwalk-f-idle-ja"],[28,"tomb-boss-catwalk-f-break-ja"],[29,"tomb-boss-catwalk-f-end-ja"],[30,"tomb-boss-catwalk-g-lod0-jg"],[31,"tomb-boss-catwalk-g-lod0-mg"],[32,"tomb-boss-catwalk-g-idle-ja"],[33,"tomb-boss-catwalk-g-break-ja"],[34,"tomb-boss-catwalk-g-end-ja"],[35,"tomb-boss-catwalk-main-lod0-jg"],[36,"tomb-boss-catwalk-main-lod0-mg"],[37,"tomb-boss-catwalk-main-idle-ja"]],"tomb-boss-debris-ag":[[0,"tomb-boss-debris-a-lod0-jg"],[1,"tomb-boss-debris-a-lod0-mg"],[2,"tomb-boss-debris-a-idle-ja"],[3,"tomb-boss-debris-b-lod0-jg"],[4,"tomb-boss-debris-b-lod0-mg"],[5,"tomb-boss-debris-b-idle-ja"],[6,"tomb-boss-debris-c-lod0-jg"],[7,"tomb-boss-debris-c-lod0-mg"],[8,"tomb-boss-debris-c-idle-ja"],[9,"tomb-boss-debris-d-lod0-jg"],[10,"tomb-boss-debris-d-lod0-mg"],[11,"tomb-boss-debris-d-idle-ja"],[12,"tomb-boss-debris-e-lod0-jg"],[13,"tomb-boss-debris-e-lod0-mg"],[14,"tomb-boss-debris-e-idle-ja"],[15,"tomb-boss-debris-f-lod0-jg"],[16,"tomb-boss-debris-f-lod0-mg"],[17,"tomb-boss-debris-f-idle-ja"],[18,"tomb-boss-debris-g-lod0-jg"],[19,"tomb-boss-debris-g-lod0-mg"],[20,"tomb-boss-debris-g-idle-ja"],[21,"tomb-boss-debris-h-lod0-jg"],[22,"tomb-boss-debris-h-lod0-mg"],[23,"tomb-boss-debris-h-idle-ja"],[24,"tomb-boss-debris-i-lod0-jg"],[25,"tomb-boss-debris-i-lod0-mg"],[26,"tomb-boss-debris-i-idle-ja"]],"tomb-boss-door-ag":[[0,"tomb-boss-door-lod0-jg"],[1,"tomb-boss-door-lod0-mg"],[2,"tomb-boss-door-idle-ja"]],"tomb-boss-explode-ag":[[0,"tomb-boss-explode-lod0-jg"],[1,"tomb-boss-explode-lod0-mg"],[3,"tomb-boss-explode-a-lod0-jg"],[4,"tomb-boss-explode-a-lod0-mg"]],"tomb-boss-firepot-ag":[[0,"tomb-boss-firepot-lod0-jg"],[1,"tomb-boss-firepot-lod0-mg"],[2,"tomb-boss-firepot-lod1-mg"],[3,"tomb-boss-firepot-idle-ja"],[4,"tomb-boss-firepot-break-ja"],[5,"tomb-boss-firepot-end-ja"]],"tomb-boss-pillar-ag":[[0,"tomb-boss-pillar-lod0-jg"],[1,"tomb-boss-pillar-lod0-mg"],[2,"tomb-boss-pillar-lod1-mg"],[3,"tomb-boss-pillar-idle-ja"],[4,"tomb-boss-pillar-break-ja"],[5,"tomb-boss-pillar-end-ja"]],"tomb-boulder-ag":[[0,"tomb-boulder-lod0-jg"],[9,"tomb-boulder-explode-lod0-jg"],[1,"tomb-boulder-lod0-mg"],[10,"tomb-boulder-explode-lod0-mg"],[2,"tomb-boulder-idle-ja"],[3,"tomb-boulder-mid-ja"],[12,"tomb-boulder-explode-a-mid-ja"],[4,"tomb-boulder-end-ja"],[15,"tomb-boulder-stop-lod0-jg"],[16,"tomb-boulder-stop-lod0-mg"],[18,"tomb-boulder-stop-a-mid-ja"],[24,"tomb-boulder-pillar-lod0-jg"],[25,"tomb-boulder-pillar-lod0-mg"],[38,"tomb-boulder-spider-lod0-jg"],[39,"tomb-boulder-spider-lod0-mg"],[40,"tomb-boulder-spider-shadow-mg"],[41,"tomb-boulder-spider-idle-ja"],[42,"tomb-boulder-spider-mid-ja"],[43,"tomb-boulder-spider-end-ja"],[48,"tomb-boulder-stick-lod0-jg"],[49,"tomb-boulder-stick-lod0-mg"],[50,"tomb-boulder-stick-idle-ja"],[52,"tomb-boulder-wing-door-lod0-jg"],[53,"tomb-boulder-wing-door-lod0-mg"],[54,"tomb-boulder-wing-door-idle-ja"],[55,"tomb-boulder-wing-door-mid-ja"],[56,"tomb-boulder-wing-door-end-ja"]],"tomb-boulder-door-ag":[[0,"tomb-boulder-door-lod0-jg"],[1,"tomb-boulder-door-lod0-mg"],[2,"tomb-boulder-door-idle-ja"]],"tomb-bounce-web-ag":[[0,"tomb-bounce-web-lod0-jg"],[1,"tomb-bounce-web-lod0-mg"],[2,"tomb-bounce-web-idle-ja"]],"tomb-button-ag":[[0,"tomb-button-lod0-jg"],[1,"tomb-button-lod0-mg"],[2,"tomb-button-idle-ja"]],"tomb-door-ag":[[0,"tomb-door-lod0-jg"],[1,"tomb-door-lod0-mg"],[2,"tomb-door-idle-ja"],[3,"tomb-door-open-ja"]],"tomb-elevator-ag":[[0,"tomb-elevator-lod0-jg"],[1,"tomb-elevator-lod0-mg"],[2,"tomb-elevator-lod1-mg"],[3,"tomb-elevator-idle-ja"],[4,"tomb-elevator-run-ja"]],"tomb-mar-door-ag":[[0,"tomb-mar-door-lod0-jg"],[1,"tomb-mar-door-lod0-mg"],[2,"tomb-mar-door-idle-ja"]],"tomb-move-swing-pole-ag":[[0,"tomb-move-swing-pole-lod0-jg"],[1,"tomb-move-swing-pole-lod0-mg"],[2,"tomb-move-swing-pole-idle-ja"]],"tomb-plat-pillar-ag":[[0,"tomb-plat-pillar-lod0-jg"],[1,"tomb-plat-pillar-lod0-mg"],[2,"tomb-plat-pillar-idle-ja"]],"tomb-plat-return-ag":[[0,"tomb-plat-return-lod0-jg"],[1,"tomb-plat-return-lod0-mg"],[2,"tomb-plat-return-idle-ja"]],"tomb-plat-simon-ag":[[0,"tomb-plat-simon-lod0-jg"],[1,"tomb-plat-simon-lod0-mg"],[2,"tomb-plat-simon-lod1-mg"],[3,"tomb-plat-simon-idle-ja"]],"tomb-plat-wall-ag":[[0,"tomb-plat-wall-lod0-jg"],[1,"tomb-plat-wall-lod0-mg"],[2,"tomb-plat-wall-lod1-mg"],[3,"tomb-plat-wall-idle-ja"]],"tomb-simon-button-ag":[[0,"tomb-simon-button-lod0-jg"],[1,"tomb-simon-button-lod0-mg"],[2,"tomb-simon-button-lod1-mg"],[3,"tomb-simon-button-open-ja"],[4,"tomb-simon-button-press-ja"],[5,"tomb-simon-button-unpress-ja"]],"tomb-stair-block-ag":[[0,"tomb-stair-block-lod0-jg"],[1,"tomb-stair-block-lod0-mg"],[2,"tomb-stair-block-idle-ja"],[3,"tomb-stair-block-straight-ja"],[4,"tomb-stair-block-sink-ja"]],"tomb-stair-block-spikes-ag":[[0,"tomb-stair-block-spikes-lod0-jg"],[1,"tomb-stair-block-spikes-lod0-mg"],[2,"tomb-stair-block-spikes-idle-ja"]],"tomb-vibe-ag":[[0,"tomb-vibe-lod0-jg"],[1,"tomb-vibe-lod0-mg"],[2,"tomb-vibe-lod1-mg"],[3,"tomb-vibe-idle-ja"],[4,"tomb-vibe-vibrate-ja"],[5,"tomb-vibe-fall-ja"]],"tomb-wing-door-ag":[[0,"tomb-wing-door-lod0-jg"],[1,"tomb-wing-door-lod0-mg"],[2,"tomb-wing-door-idle-ja"]],"torn-highres-ag":[[0,"torn-highres-lod0-jg"],[1,"torn-highres-lod0-mg"],[2,"torn-highres-shadow-mg"],[3,"torn-highres-idle-ja"],[4,"torn-highres-idle-table-ja"],[5,"torn-highres-idle-alley-ja"]],"transport-ag":[[0,"transport-lod0-jg"],[1,"transport-lod0-mg"],[2,"transport-lod1-mg"],[3,"transport-lod2-mg"],[4,"transport-idle-ja"],[5,"transport-hatch-open-ja"],[6,"transport-hatch-close-ja"]],"turbine-ag":[[0,"turbine-lod0-jg"],[1,"turbine-lod0-mg"],[2,"turbine-lod1-mg"],[3,"turbine-idle-ja"]],"under-break-bridge-ag":[[0,"under-break-bridge-lod0-jg"],[1,"under-break-bridge-lod0-mg"],[2,"under-break-bridge-idle-ja"],[3,"under-break-bridge-broken-sig-dead-ja"]],"under-break-bridge-b-ag":[[0,"under-break-bridge-b-lod0-jg"],[1,"under-break-bridge-b-lod0-mg"],[2,"under-break-bridge-b-idle-ja"],[3,"under-break-bridge-b-broken-sig-dead-ja"]],"under-break-ceiling-ag":[[0,"under-break-ceiling-lod0-jg"],[1,"under-break-ceiling-lod0-mg"],[2,"under-break-ceiling-idle-ja"]],"under-break-door-ag":[[8,"under-break-door-3-idle-ja"],[0,"under-break-door-lod0-jg"],[9,"under-break-door-3-end-ja"],[1,"under-break-door-lod0-mg"],[2,"under-break-door-1-idle-ja"],[3,"under-break-door-1-end-ja"],[5,"under-break-door-2-idle-ja"],[6,"under-break-door-2-end-ja"],[11,"under-break-door-4-idle-ja"],[12,"under-break-door-4-end-ja"]],"under-break-floor-ag":[[0,"under-break-floor-lod0-jg"],[1,"under-break-floor-lod0-mg"],[2,"under-break-floor-idle-ja"],[3,"under-break-floor-explode-lod0-jg"],[4,"under-break-floor-explode-lod0-mg"],[5,"under-break-floor-explode-idle-ja"]],"under-break-wall-ag":[[0,"under-break-wall-lod0-jg"],[1,"under-break-wall-lod0-mg"],[2,"under-break-wall-idle-ja"]],"under-break-wall-b-ag":[[0,"under-break-wall-b-lod0-jg"],[1,"under-break-wall-b-lod0-mg"],[2,"under-break-wall-b-idle-ja"]],"under-buoy-base-ag":[[0,"under-buoy-base-lod0-jg"],[1,"under-buoy-base-lod0-mg"],[2,"under-buoy-base-idle-ja"]],"under-buoy-chain-ag":[[0,"under-buoy-chain-lod0-jg"],[1,"under-buoy-chain-lod0-mg"],[2,"under-buoy-chain-idle-ja"]],"under-buoy-plat-ag":[[0,"under-buoy-plat-lod0-jg"],[1,"under-buoy-plat-lod0-mg"],[2,"under-buoy-plat-idle-ja"]],"under-int-door-ag":[[0,"under-int-door-lod0-jg"],[1,"under-int-door-lod0-mg"],[2,"under-int-door-open-ja"]],"under-laser-ag":[[0,"under-laser-lod0-jg"],[1,"under-laser-lod0-mg"],[2,"under-laser-idle-ja"]],"under-laser-shadow-ag":[[0,"under-laser-shadow-lod0-jg"],[1,"under-laser-shadow-lod0-mg"],[2,"under-laser-shadow-shadow-mg"],[3,"under-laser-shadow-idle-ja"]],"under-lift-ag":[[0,"under-lift-lod0-jg"],[1,"under-lift-lod0-mg"],[2,"under-lift-lod1-mg"],[3,"under-lift-idle-ja"]],"under-mine-ag":[[0,"under-mine-lod0-jg"],[1,"under-mine-lod0-mg"],[2,"under-mine-lod1-mg"],[3,"under-mine-shadow-mg"],[4,"under-mine-idle-ja"],[5,"under-mine-explode-lod0-jg"],[6,"under-mine-explode-lod0-mg"],[7,"under-mine-explode-idle-ja"]],"under-plat-long-ag":[[0,"under-plat-long-lod0-jg"],[1,"under-plat-long-lod0-mg"],[2,"under-plat-long-idle-ja"]],"under-plat-shoot-ag":[[0,"under-plat-shoot-lod0-jg"],[1,"under-plat-shoot-lod0-mg"],[2,"under-plat-shoot-lod1-mg"],[3,"under-plat-shoot-idle-ja"]],"under-plat-wall-ag":[[0,"under-plat-wall-lod0-jg"],[1,"under-plat-wall-lod0-mg"],[2,"under-plat-wall-idle-ja"]],"under-rise-plat-ag":[[0,"under-rise-plat-lod0-jg"],[1,"under-rise-plat-lod0-mg"],[2,"under-rise-plat-rise1-ja"],[3,"under-rise-plat-idle-ja"],[4,"under-rise-plat-rise2-ja"],[5,"under-rise-plat-idle2-ja"]],"under-seaweed-a-ag":[[0,"under-seaweed-a-lod0-jg"],[1,"under-seaweed-a-lod0-mg"],[2,"under-seaweed-a-idle-ja"]],"under-seaweed-b-ag":[[0,"under-seaweed-b-lod0-jg"],[1,"under-seaweed-b-lod0-mg"],[2,"under-seaweed-b-idle-ja"]],"under-seaweed-c-ag":[[0,"under-seaweed-c-lod0-jg"],[1,"under-seaweed-c-lod0-mg"],[2,"under-seaweed-c-idle-ja"]],"under-seaweed-d-ag":[[0,"under-seaweed-d-lod0-jg"],[1,"under-seaweed-d-lod0-mg"],[2,"under-seaweed-d-idle-ja"]],"under-shoot-block-ag":[[0,"under-shoot-block-lod0-jg"],[1,"under-shoot-block-lod0-mg"],[2,"under-shoot-block-idle-ja"],[3,"under-shoot-block-explode-lod0-jg"],[4,"under-shoot-block-explode-lod0-mg"],[5,"under-shoot-block-explode-idle-ja"]],"under-warp-ag":[[0,"under-warp-lod0-jg"],[1,"under-warp-lod0-mg"],[2,"under-warp-idle-ja"],[3,"under-warp-none-ja"]],"vehicle-explosion-ag":[[0,"vehicle-explosion-lod0-jg"],[1,"vehicle-explosion-lod0-mg"],[2,"vehicle-explosion-idle-ja"]],"vehicle-turret-ag":[[0,"vehicle-turret-lod0-jg"],[1,"vehicle-turret-lod0-mg"],[2,"vehicle-turret-lod1-mg"],[3,"vehicle-turret-lod2-mg"],[4,"vehicle-turret-idle-ja"]],"vil-break-support-ag":[[0,"vil-break-support-lod0-jg"],[1,"vil-break-support-lod0-mg"],[2,"vil-break-support-idle-ja"]],"vil-sagesail-ag":[[0,"vil-sagesail-lod0-jg"],[1,"vil-sagesail-lod0-mg"],[2,"vil-sagesail-lod1-mg"],[3,"vil-sagesail-lod2-mg"],[4,"vil-sagesail-idle-ja"]],"vil-windmill-sail-ag":[[0,"vil-windmill-sail-lod0-jg"],[1,"vil-windmill-sail-lod0-mg"],[2,"vil-windmill-sail-lod1-mg"],[3,"vil-windmill-sail-lod2-mg"],[4,"vil-windmill-sail-idle-ja"]],"vil-windspinner-ag":[[0,"vil-windspinner-lod0-jg"],[1,"vil-windspinner-lod0-mg"],[2,"vil-windspinner-lod1-mg"],[3,"vil-windspinner-lod2-mg"],[4,"vil-windspinner-idle-ja"]],"vin-ag":[[0,"vin-lod0-jg"],[1,"vin-lod0-mg"],[2,"vin-shadow-mg"],[3,"vin-idle-ja"]],"vin-door-ag":[[0,"vin-door-lod0-jg"],[1,"vin-door-lod0-mg"],[2,"vin-door-idle-ja"]],"vin-door-ctyinda-ag":[[0,"vin-door-ctyinda-lod0-jg"],[1,"vin-door-ctyinda-lod0-mg"],[2,"vin-door-ctyinda-idle-ja"]],"vin-turbine-ag":[[0,"vin-turbine-lod0-jg"],[1,"vin-turbine-lod0-mg"],[2,"vin-turbine-idle-ja"]],"vortex-light-ag":[[0,"vortex-light-lod0-jg"],[1,"vortex-light-lod0-mg"],[2,"vortex-light-idle-ja"]],"warp-gate-ag":[[0,"warp-gate-lod0-jg"],[1,"warp-gate-lod0-mg"],[2,"warp-gate-idle-ja"]],"warp-gate-b-ag":[[0,"warp-gate-b-lod0-jg"],[1,"warp-gate-b-lod0-mg"],[2,"warp-gate-b-idle-ja"]],"wasp-ag":[[0,"wasp-lod0-jg"],[1,"wasp-lod0-mg"],[2,"wasp-lod1-mg"],[3,"wasp-shadow-mg"],[4,"wasp-idle-ja"],[5,"wasp-fly-right-ja"],[6,"wasp-fly-left-ja"],[7,"wasp-fly-forward-ja"],[8,"wasp-fly-back-ja"],[9,"wasp-shoot0-ja"],[10,"wasp-knocked0-ja"],[11,"wasp-knocked0-recover-ja"],[12,"wasp-knocked1-ja"],[13,"wasp-knocked1-recover-ja"],[14,"wasp-death-left-ja"],[15,"wasp-death-left-fall-ja"],[16,"wasp-death-right-ja"],[17,"wasp-death-right-fall-ja"],[18,"wasp-death-instant-ja"],[19,"wasp-death-land-ja"],[20,"wasp-explode-lod0-jg"],[21,"wasp-explode-lod0-mg"],[22,"wasp-explode-idle-ja"]],"water-anim-ctypal-ag":[[0,"water-anim-ctypal-lrgsqr-pool-lod0-jg"],[1,"water-anim-ctypal-lrgsqr-pool-lod0-mg"],[2,"water-anim-ctypal-smlsqr-pool-lod0-jg"],[3,"water-anim-ctypal-smlsqr-pool-lod0-mg"],[4,"water-anim-ctypal-lrgfloor-pool-lod0-jg"],[5,"water-anim-ctypal-lrgfloor-pool-lod0-mg"],[6,"water-anim-ctypal-smlground-pool-lod0-jg"],[7,"water-anim-ctypal-smlground-pool-lod0-mg"],[8,"water-anim-ctypal-middle-fountain-lod0-jg"],[9,"water-anim-ctypal-middle-fountain-lod0-mg"],[10,"water-anim-ctypal-long-grnd-pool-lod0-jg"],[11,"water-anim-ctypal-long-grnd-pool-lod0-mg"],[12,"water-anim-ctypal-idle-ja"]],"water-anim-fortress-ag":[[0,"water-anim-fortress-exitb-pool-lod0-jg"],[1,"water-anim-fortress-exitb-pool-lod0-mg"],[2,"water-anim-fortress-idle-ja"]],"water-anim-mincan-ag":[[0,"water-anim-mincan-exitb-pool-lod0-jg"],[1,"water-anim-mincan-exitb-pool-lod0-mg"],[2,"water-anim-mincan-idle-ja"]],"water-anim-mountain-ag":[[0,"water-anim-mountain-fall-hi-lod0-jg"],[1,"water-anim-mountain-fall-hi-lod0-mg"],[2,"water-anim-mountain-fall-med-lod0-jg"],[3,"water-anim-mountain-fall-med-lod0-mg"],[4,"water-anim-mountain-fall-low-lod0-jg"],[5,"water-anim-mountain-fall-low-lod0-mg"],[6,"water-anim-mountain-idle-ja"]],"water-anim-mountain-dark-eco-ag":[[0,"water-anim-mountain-dark-eco-dice-lod0-jg"],[1,"water-anim-mountain-dark-eco-dice-lod0-mg"],[2,"water-anim-mountain-dark-eco-idle-ja"]],"water-anim-nest-dark-eco-ag":[[0,"water-anim-nest-dark-eco-largepool-lod0-jg"],[1,"water-anim-nest-dark-eco-largepool-lod0-mg"],[2,"water-anim-nest-dark-eco-smlupperpool-lod0-jg"],[3,"water-anim-nest-dark-eco-smlupperpool-lod0-mg"],[4,"water-anim-nest-dark-eco-middlepool-lod0-jg"],[5,"water-anim-nest-dark-eco-middlepool-lod0-mg"],[6,"water-anim-nest-dark-eco-botpool-lod0-jg"],[7,"water-anim-nest-dark-eco-botpool-lod0-mg"],[8,"water-anim-nest-dark-eco-idle-ja"]],"water-anim-stadium-ag":[[0,"water-anim-stadium-middle-pool-lod0-jg"],[1,"water-anim-stadium-middle-pool-lod0-mg"],[2,"water-anim-stadium-top-fountain-lod0-jg"],[3,"water-anim-stadium-top-fountain-lod0-mg"],[4,"water-anim-stadium-floor-pool-lod0-jg"],[5,"water-anim-stadium-floor-pool-lod0-mg"],[6,"water-anim-stadium-idle-ja"]],"water-anim-strip-dark-eco-ag":[[0,"water-anim-strip-dark-eco-near-lift-lod0-jg"],[1,"water-anim-strip-dark-eco-near-lift-lod0-mg"],[2,"water-anim-strip-dark-eco-near-lift-lod1-mg"],[3,"water-anim-strip-dark-eco-near-crane-lod0-jg"],[4,"water-anim-strip-dark-eco-near-crane-lod0-mg"],[5,"water-anim-strip-dark-eco-near-crane-lod1-mg"],[6,"water-anim-strip-dark-eco-with-eggs-lod0-jg"],[7,"water-anim-strip-dark-eco-with-eggs-lod0-mg"],[8,"water-anim-strip-dark-eco-with-eggs-lod1-mg"],[9,"water-anim-strip-dark-eco-under-bridge-lod0-jg"],[10,"water-anim-strip-dark-eco-under-bridge-lod0-mg"],[11,"water-anim-strip-dark-eco-under-bridge-lod1-mg"],[12,"water-anim-strip-dark-eco-idle-ja"]],"water-anim-tomb-ag":[[0,"water-anim-tomb-main-hall-lod0-jg"],[1,"water-anim-tomb-main-hall-lod0-mg"],[2,"water-anim-tomb-tunnel-b-lod0-jg"],[3,"water-anim-tomb-tunnel-b-lod0-mg"],[4,"water-anim-tomb-tunnel-c-lod0-jg"],[5,"water-anim-tomb-tunnel-c-lod0-mg"],[6,"water-anim-tomb-tunnel-d-lod0-jg"],[7,"water-anim-tomb-tunnel-d-lod0-mg"],[8,"water-anim-tomb-tunnel-e-lod0-jg"],[9,"water-anim-tomb-tunnel-e-lod0-mg"],[10,"water-anim-tomb-tunnel-f-lod0-jg"],[11,"water-anim-tomb-tunnel-f-lod0-mg"],[12,"water-anim-tomb-idle-ja"]],"water-anim-tomb-dark-eco-ag":[[0,"water-anim-tomb-dark-eco-stair-block-lod0-jg"],[1,"water-anim-tomb-dark-eco-stair-block-lod0-mg"],[2,"water-anim-tomb-dark-eco-raised-block-lod0-jg"],[3,"water-anim-tomb-dark-eco-raised-block-lod0-mg"],[4,"water-anim-tomb-dark-eco-idle-ja"]],"water-anim-under-ag":[[0,"water-anim-under-pool-lod0-jg"],[1,"water-anim-under-pool-lod0-mg"],[2,"water-anim-under-drainout-lod0-jg"],[3,"water-anim-under-drainout-lod0-mg"],[4,"water-anim-under-fillup-lod0-jg"],[5,"water-anim-under-fillup-lod0-mg"],[6,"water-anim-under-idle-ja"]],"widow-ag":[[4,"widow-grab-success-ja"],[5,"widow-fly-ja"],[6,"widow-return-ja"],[7,"widow-landing-ja"],[8,"widow-drill-ja"],[9,"widow-drill-right-high-ja"],[10,"widow-drill-right-mid-ja"],[11,"widow-drill-right-low-ja"],[12,"widow-drill-left-high-ja"],[13,"widow-drill-left-mid-ja"],[14,"widow-drill-left-low-ja"],[15,"widow-fire-start-ja"],[16,"widow-fire-loop-ja"],[17,"widow-fire-end-ja"],[18,"widow-grab-stone-ja"],[19,"widow-launch-left-ja"],[20,"widow-grab-fail-ja"],[21,"widow-grab-punch-ja"],[22,"widow-launch-right-ja"],[23,"widow-hit-pod-left-ja"],[24,"widow-hit-pod-right-ja"],[25,"widow-hit-front-ja"],[26,"widow-hit-gun-left-ja"],[27,"widow-hit-gun-right-ja"],[28,"widow-grab-pull-loop-ja"],[29,"widow-grab-yank-loop-ja"],[30,"widow-grab-tug-loop-ja"],[31,"widow-grab-footing-loop-ja"],[32,"widow-grab-launch-left-ja"],[33,"widow-grab-launch-right-ja"],[34,"widow-flight-launch-left-ja"],[35,"widow-flight-launch-right-ja"],[36,"widow-flight-hit-right-ja"],[37,"widow-flight-hit-left-ja"],[38,"widow-flight-hit-final-ja"],[0,"widow-lod0-jg"],[1,"widow-lod0-mg"],[2,"widow-shadow-mg"],[3,"widow-idle-ja"]],"widow-bomb-ag":[[0,"widow-bomb-lod0-jg"],[1,"widow-bomb-lod0-mg"],[2,"widow-bomb-lod1-mg"],[3,"widow-bomb-lod2-mg"],[4,"widow-bomb-shadow-mg"],[5,"widow-bomb-idle-ja"]],"wren-ag":[[0,"wren-lod0-jg"],[1,"wren-lod0-mg"],[2,"wren-idle-ja"],[3,"wren-hop-ja"],[4,"wren-peck-ja"],[5,"wren-takeoff-ja"],[6,"wren-fly-ja"],[7,"wren-glide-ja"],[8,"wren-land-ja"]],"yakow-ag":[[0,"yakow-lod0-jg"],[1,"yakow-lod0-mg"],[2,"yakow-shadow-mg"],[3,"yakow-idle-ja"],[4,"yakow-graze-ja"],[5,"yakow-walk-ja"],[6,"yakow-run-ja"],[7,"yakow-kicked-ja"],[8,"yakow-walk-right-ja"],[9,"yakow-walk-left-ja"],[10,"yakow-kicked-in-place-ja"]],"yellow-barrel-ag":[[0,"yellow-barrel-lod0-jg"],[1,"yellow-barrel-lod0-mg"],[2,"yellow-barrel-idle-ja"]],"youngsamos-highres-ag":[[6,"youngsamos-highres-idle-stand3-ja"],[0,"youngsamos-highres-lod0-jg"],[1,"youngsamos-highres-lod0-mg"],[10,"youngsamos-highres-stand-to-meditate0-ja"],[2,"youngsamos-highres-shadow-mg"],[11,"youngsamos-highres-idle-deep-meditate0-ja"],[3,"youngsamos-highres-idle-ja"],[12,"youngsamos-highres-hit-back0-ja"],[13,"youngsamos-highres-hit-right0-ja"],[14,"youngsamos-highres-hit-left0-ja"],[15,"youngsamos-highres-death-fall-ja"],[16,"youngsamos-highres-death-land-ja"],[17,"youngsamos-highres-stand0-ja"],[18,"youngsamos-highres-raise-ship-ja"],[19,"youngsamos-highres-knocked-back-ja"],[20,"youngsamos-highres-knocked-back-land-ja"],[21,"youngsamos-highres-knocked-forward-ja"],[22,"youngsamos-highres-knocked-forward-land-ja"],[23,"youngsamos-highres-death0-ja"],[24,"youngsamos-highres-death0-end-ja"],[25,"youngsamos-highres-walk0-ja"],[26,"youngsamos-highres-walk1-ja"],[4,"youngsamos-highres-idle-meditate-ja"],[7,"youngsamos-highres-idle-alley-ja"],[8,"youngsamos-highres-idle-tomb-ja"],[9,"youngsamos-highres-idle-onintent-ja"],[5,"youngsamos-highres-idle-stand2-ja"]],"zipline-ag":[[0,"zipline-lod0-jg"],[1,"zipline-lod0-mg"],[2,"zipline-idle-ja"]]} diff --git a/decompiler/config/jak2/ntsc_v1/art_info.jsonc b/decompiler/config/jak2/ntsc_v1/art_info.jsonc index 7a115d726a1..741ed748508 100644 --- a/decompiler/config/jak2/ntsc_v1/art_info.jsonc +++ b/decompiler/config/jak2/ntsc_v1/art_info.jsonc @@ -1,4 +1,29 @@ { - "files": {}, - "functions": {} + ////////////////////// + // ART INFO + ////////////////////// + + // defines what art group each file or function is using. + // by default, the decompiler assumes to be the name of the current file + -ag + // so you only need to specify it when that's not the case. + // NOTE: it's fine to have a function and its file both in here. the function takes priority. + + "files": { + "target": "jakb-ag", + "target2": "jakb-ag", + "target-death": "jakb-ag", + "target-gun": "jakb-ag", + "target-swim": "jakb-ag", + "target-tube": "jakb-ag", + "target-board": "jakb-ag", + "target-carry": "jakb-ag", + "target-darkjak": "jakb-ag", + "target-anim": "jakb-ag", + "powerups": "jakb-ag", + "sidekick": "daxter-ag" + }, + + "functions": { + // "(code target-warp-out)": "eichar-ag" + } } diff --git a/decompiler/util/DecompilerTypeSystem.h b/decompiler/util/DecompilerTypeSystem.h index 456728b5b22..5eaa0e8b302 100644 --- a/decompiler/util/DecompilerTypeSystem.h +++ b/decompiler/util/DecompilerTypeSystem.h @@ -69,6 +69,15 @@ class DecompilerTypeSystem { TypeSpec lookup_symbol_type(const std::string& name) const; bool should_attempt_cast_simplify(const TypeSpec& expected, const TypeSpec& actual) const; + void add_art_group_elt(const std::string& ag_name, const std::string& elt_name, int elt_index) { + if (art_group_info.count(ag_name) == 0) { + art_group_info[ag_name] = {}; + } + if (art_group_info.at(ag_name).count(elt_index) == 0) { + art_group_info.at(ag_name)[elt_index] = elt_name; + } + } + // todo - totally eliminate this. struct { std::string current_method_type; diff --git a/game/graphics/opengl_renderer/CollideMeshRenderer.cpp b/game/graphics/opengl_renderer/CollideMeshRenderer.cpp index 0b5df425fc3..ba60a1b6aaf 100644 --- a/game/graphics/opengl_renderer/CollideMeshRenderer.cpp +++ b/game/graphics/opengl_renderer/CollideMeshRenderer.cpp @@ -270,7 +270,5 @@ void CollideMeshRenderer::render(SharedRenderState* render_state, ScopedProfiler prof.add_draw_call(); prof.add_tri(lev->level->collision.vertices.size() / 3); - - last_render_time = current_time; } } diff --git a/game/graphics/opengl_renderer/CollideMeshRenderer.h b/game/graphics/opengl_renderer/CollideMeshRenderer.h index de01b3325d3..e73daad66f3 100644 --- a/game/graphics/opengl_renderer/CollideMeshRenderer.h +++ b/game/graphics/opengl_renderer/CollideMeshRenderer.h @@ -15,9 +15,6 @@ class CollideMeshRenderer { void render(SharedRenderState* render_state, ScopedProfilerNode& prof); ~CollideMeshRenderer(); - int current_time = 0; - int last_render_time = 0; - private: void init_pat_colors(GameVersion version); diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp index e58bca16e8a..3a7cbcf97af 100644 --- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp +++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp @@ -1010,8 +1010,6 @@ void OpenGLRenderer::dispatch_buckets_jak2(DmaFollower dma, m_render_state.bucket_for_vis_copy = (int)jak2::BucketId::BUCKET_2; m_render_state.num_vis_to_copy = jak2::LEVEL_MAX; - ++m_collide_renderer.current_time; - for (size_t bucket_id = 0; bucket_id < m_bucket_renderers.size(); bucket_id++) { auto& renderer = m_bucket_renderers[bucket_id]; auto bucket_prof = prof.make_scoped_child(renderer->name_and_id()); @@ -1032,8 +1030,7 @@ void OpenGLRenderer::dispatch_buckets_jak2(DmaFollower dma, // hack to draw the collision mesh in the middle the drawing if (bucket_id + 1 == (int)jak2::BucketId::TEX_L0_ALPHA && - Gfx::g_global_settings.collision_enable && - m_collide_renderer.last_render_time != m_collide_renderer.current_time) { + Gfx::g_global_settings.collision_enable) { auto p = prof.make_scoped_child("collision-draw"); m_collide_renderer.render(&m_render_state, p); } diff --git a/goal_src/jak1/engine/anim/joint-exploder.gc b/goal_src/jak1/engine/anim/joint-exploder.gc index fa4715eeef7..5e1f4ee8ce5 100644 --- a/goal_src/jak1/engine/anim/joint-exploder.gc +++ b/goal_src/jak1/engine/anim/joint-exploder.gc @@ -523,7 +523,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior joint-exploder) ja-post) + :post ja-post ) (defmethod joint-exploder-method-23 joint-exploder ((obj joint-exploder)) diff --git a/goal_src/jak1/engine/common-obs/basebutton.gc b/goal_src/jak1/engine/common-obs/basebutton.gc index c901b81133c..3015cde67c7 100644 --- a/goal_src/jak1/engine/common-obs/basebutton.gc +++ b/goal_src/jak1/engine/common-obs/basebutton.gc @@ -102,7 +102,7 @@ (rider-trans) ) ) - :code (the-as (function none :behavior basebutton) anim-loop) + :code anim-loop :post (behavior () (when (-> self move-to?) (set! (-> self move-to?) #f) @@ -129,7 +129,7 @@ :enter (behavior () (press! self #t) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! max (-> self anim-speed))) (until (ja-done? 0) @@ -212,7 +212,7 @@ :enter (behavior () (press! self #f) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! 0.0 (-> self anim-speed))) (until (ja-done? 0) diff --git a/goal_src/jak1/engine/common-obs/baseplat.gc b/goal_src/jak1/engine/common-obs/baseplat.gc index 935df48b38f..362f6644d31 100644 --- a/goal_src/jak1/engine/common-obs/baseplat.gc +++ b/goal_src/jak1/engine/common-obs/baseplat.gc @@ -251,7 +251,7 @@ eco-door-event-handler ) (go-virtual door-open) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) (defstate door-open (eco-door) @@ -309,7 +309,7 @@ eco-door-event-handler ) (go-virtual door-closed) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) (defmethod eco-door-method-26 eco-door ((obj eco-door)) diff --git a/goal_src/jak1/engine/common-obs/collectables.gc b/goal_src/jak1/engine/common-obs/collectables.gc index aa675ba562f..be91f0b5f78 100644 --- a/goal_src/jak1/engine/common-obs/collectables.gc +++ b/goal_src/jak1/engine/common-obs/collectables.gc @@ -391,7 +391,7 @@ (go-virtual wait) ) ) - :code (the-as (function none :behavior eco-collectable) anim-loop) + :code anim-loop ) (defstate jump (eco-collectable) diff --git a/goal_src/jak1/engine/common-obs/crates.gc b/goal_src/jak1/engine/common-obs/crates.gc index 5746a6182a6..eb757ff8903 100644 --- a/goal_src/jak1/engine/common-obs/crates.gc +++ b/goal_src/jak1/engine/common-obs/crates.gc @@ -664,7 +664,7 @@ (suspend) ) ) - :post (the-as (function none :behavior crate) ja-post) + :post ja-post ) (defstate bounce-on (crate) @@ -676,7 +676,7 @@ ) (go-virtual wait) ) - :post (the-as (function none :behavior crate) crate-post) + :post crate-post ) (defstate notice-blue (crate) @@ -751,7 +751,7 @@ (suspend) ) ) - :post (the-as (function none :behavior crate) crate-post) + :post crate-post ) (defstate die (crate) @@ -1292,7 +1292,7 @@ (set! (-> self root-override trans y) (-> self base y)) ) ) - :post (the-as (function none :behavior crate-buzzer) #f) + :post #f ) (defstate bounce-on (crate-buzzer) diff --git a/goal_src/jak1/engine/common-obs/generic-obs.gc b/goal_src/jak1/engine/common-obs/generic-obs.gc index dca0fae7200..8bb71b82cfd 100644 --- a/goal_src/jak1/engine/common-obs/generic-obs.gc +++ b/goal_src/jak1/engine/common-obs/generic-obs.gc @@ -157,7 +157,7 @@ (defstate die (process-hidden) :virtual #t - :code (the-as (function none :behavior process-hidden) nothing) + :code nothing ) (defmethod init-from-entity! process-hidden ((obj process-hidden) (arg0 entity-actor)) @@ -1247,7 +1247,7 @@ ) ) ) - :post (the-as (function none :behavior med-res-level) ja-post) + :post ja-post ) (define *lev-string* (new 'global 'string 64 (the-as string #f))) @@ -1899,7 +1899,7 @@ ) ) ) - :code (the-as (function none :behavior launcher) anim-loop) + :code anim-loop ) (defstate launcher-active (launcher) @@ -1956,7 +1956,7 @@ ) (defstate launcher-deactivated (launcher) - :code (the-as (function none :behavior launcher) anim-loop) + :code anim-loop ) (defmethod init-from-entity! launcher ((obj launcher) (arg0 entity-actor)) diff --git a/goal_src/jak1/engine/common-obs/nav-enemy.gc b/goal_src/jak1/engine/common-obs/nav-enemy.gc index 7f6fc3e9b33..91c2b5c00f8 100644 --- a/goal_src/jak1/engine/common-obs/nav-enemy.gc +++ b/goal_src/jak1/engine/common-obs/nav-enemy.gc @@ -773,7 +773,7 @@ nav-enemy-default-event-handler ) ) ) - :post (the-as (function none :behavior nav-enemy) ja-post) + :post ja-post ) (defstate nav-enemy-patrol (nav-enemy) @@ -1234,10 +1234,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-die (nav-enemy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior nav-enemy) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :enter (behavior () (send-event (ppointer->process (-> self parent)) 'child-die) ) @@ -1265,10 +1262,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-fuel-cell (nav-enemy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior nav-enemy) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (ja-channel-set! 0) (clear-collide-with-as (-> self collide-info)) diff --git a/goal_src/jak1/engine/common-obs/orb-cache.gc b/goal_src/jak1/engine/common-obs/orb-cache.gc index a3d3a30bd5f..1bc0ad3edcc 100644 --- a/goal_src/jak1/engine/common-obs/orb-cache.gc +++ b/goal_src/jak1/engine/common-obs/orb-cache.gc @@ -190,11 +190,11 @@ ) (defstate orb-cache-top-activate (orb-cache-top) - :event (the-as (function process int symbol event-message-block object :behavior orb-cache-top) plat-event) + :event plat-event :exit (behavior () (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior orb-cache-top) plat-trans) + :trans plat-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status bit-3) #t) (calculate-pos self arg0) @@ -261,12 +261,12 @@ ) ) ) - :post (the-as (function none :behavior orb-cache-top) plat-post) + :post plat-post ) (defstate orb-cache-top-complete (orb-cache-top) - :event (the-as (function process int symbol event-message-block object :behavior orb-cache-top) plat-event) - :trans (the-as (function none :behavior orb-cache-top) plat-trans) + :event plat-event + :trans plat-trans :code (behavior ((arg0 symbol)) (if (not arg0) (sound-play "close-orb-cash") @@ -276,7 +276,7 @@ (set! (-> self basetrans y) (+ 2048.0 (-> self root-pos))) (anim-loop) ) - :post (the-as (function none :behavior orb-cache-top) plat-post) + :post plat-post ) (defmethod init-from-entity! orb-cache-top ((obj orb-cache-top) (arg0 entity-actor)) diff --git a/goal_src/jak1/engine/common-obs/plat-button.gc b/goal_src/jak1/engine/common-obs/plat-button.gc index 7c791a8265f..41e3e7e38a7 100644 --- a/goal_src/jak1/engine/common-obs/plat-button.gc +++ b/goal_src/jak1/engine/common-obs/plat-button.gc @@ -127,7 +127,7 @@ (defstate plat-button-pressed (plat-button) :virtual #t - :trans (the-as (function none :behavior plat-button) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek!)) (until (ja-done? 0) @@ -141,7 +141,7 @@ (go-virtual plat-button-move-upward) ) ) - :post (the-as (function none :behavior plat-button) rider-post) + :post rider-post ) (defbehavior plat-button-camera-on plat-button () @@ -226,8 +226,8 @@ (set! (-> self grab-player?) (not (process-release? *target*))) ) ) - :code (the-as (function none :behavior plat-button) anim-loop) - :post (the-as (function none :behavior plat-button) rider-post) + :code anim-loop + :post rider-post ) (defstate plat-button-move-upward (plat-button) @@ -296,8 +296,8 @@ (set! (-> self grab-player?) (not (process-release? *target*))) ) ) - :code (the-as (function none :behavior plat-button) anim-loop) - :post (the-as (function none :behavior plat-button) rider-post) + :code anim-loop + :post rider-post ) (defstate plat-button-at-end (plat-button) diff --git a/goal_src/jak1/engine/common-obs/plat-eco.gc b/goal_src/jak1/engine/common-obs/plat-eco.gc index 1d3f16550ca..a8df9400736 100644 --- a/goal_src/jak1/engine/common-obs/plat-eco.gc +++ b/goal_src/jak1/engine/common-obs/plat-eco.gc @@ -77,7 +77,7 @@ (update-transforms! (-> self root-override)) (anim-loop) ) - :post (the-as (function none :behavior plat-eco) ja-post) + :post ja-post ) (defstate notice-blue (plat-eco) diff --git a/goal_src/jak1/engine/common-obs/plat.gc b/goal_src/jak1/engine/common-obs/plat.gc index 382bea17012..e30b85abc82 100644 --- a/goal_src/jak1/engine/common-obs/plat.gc +++ b/goal_src/jak1/engine/common-obs/plat.gc @@ -192,7 +192,7 @@ (defstate plat-idle (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :trans (behavior () (baseplat-method-20 self) ) @@ -219,7 +219,7 @@ (defstate plat-path-active (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :exit (behavior () (sound-stop (-> self sound-id)) ) @@ -235,8 +235,8 @@ ) (plat-trans) ) - :code (the-as (function plat none :behavior plat) anim-loop) - :post (the-as (function none :behavior plat) plat-post) + :code (the-as (function plat object) anim-loop) + :post plat-post ) (defmethod init-from-entity! plat ((obj plat) (arg0 entity-actor)) diff --git a/goal_src/jak1/engine/common-obs/process-taskable.gc b/goal_src/jak1/engine/common-obs/process-taskable.gc index 45cc27811f2..ad1d7516f79 100644 --- a/goal_src/jak1/engine/common-obs/process-taskable.gc +++ b/goal_src/jak1/engine/common-obs/process-taskable.gc @@ -302,7 +302,7 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defstate give-cell (process-taskable) @@ -334,7 +334,7 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defstate lose (process-taskable) @@ -353,13 +353,13 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defstate enter-playing (process-taskable) :virtual #t :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defbehavior process-taskable-play-anim-enter process-taskable () @@ -492,7 +492,7 @@ (defstate play-accept (process-taskable) :virtual #t - :enter (the-as (function none :behavior process-taskable) process-taskable-play-anim-enter) + :enter process-taskable-play-anim-enter :exit process-taskable-play-anim-exit :trans (behavior () (process-taskable-play-anim-trans) @@ -505,12 +505,12 @@ ) (go-virtual enter-playing) ) - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defstate play-reject (process-taskable) :virtual #t - :enter (the-as (function none :behavior process-taskable) process-taskable-play-anim-enter) + :enter process-taskable-play-anim-enter :exit process-taskable-play-anim-exit :trans (behavior () (process-taskable-play-anim-trans) @@ -520,7 +520,7 @@ (process-taskable-play-anim-code (the-as art-joint-anim (get-art-elem self)) (get-reject-anim self #t)) (go-virtual release) ) - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defstate query (process-taskable) @@ -568,7 +568,7 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defstate play-anim (process-taskable) @@ -601,7 +601,7 @@ ) ) ) - :enter (the-as (function none :behavior process-taskable) process-taskable-play-anim-enter) + :enter process-taskable-play-anim-enter :exit process-taskable-play-anim-exit :trans (behavior () (process-taskable-play-anim-trans) @@ -616,7 +616,7 @@ (process-taskable-play-anim-code (the-as art-joint-anim (get-art-elem self)) (play-anim! self #t)) (process-taskable-method-38 self) ) - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) (defbehavior process-taskable-clean-up-after-talking process-taskable () @@ -681,7 +681,7 @@ (defstate hidden (process-taskable) :virtual #t :event process-taskable-hide-handler - :enter (the-as (function none :behavior process-taskable) process-taskable-hide-enter) + :enter process-taskable-hide-enter :exit (behavior () (process-taskable-hide-exit (= (-> self next-state name) 'hidden)) ) @@ -693,7 +693,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior process-taskable) anim-loop) + :code anim-loop ) ;; WARN: disable def twice: 4. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. @@ -711,7 +711,7 @@ (defstate hidden-other (process-taskable) :virtual #t :event process-taskable-hide-handler - :enter (the-as (function none :behavior process-taskable) process-taskable-hide-enter) + :enter process-taskable-hide-enter :exit (behavior () (process-taskable-hide-exit (= (-> self next-state name) 'hidden-other)) ) @@ -731,7 +731,7 @@ ) ) ) - :code (the-as (function none :behavior process-taskable) anim-loop) + :code anim-loop ) (defstate be-clone (process-taskable) diff --git a/goal_src/jak1/engine/common-obs/rigid-body.gc b/goal_src/jak1/engine/common-obs/rigid-body.gc index b11bc730d72..390da65635e 100644 --- a/goal_src/jak1/engine/common-obs/rigid-body.gc +++ b/goal_src/jak1/engine/common-obs/rigid-body.gc @@ -627,7 +627,7 @@ (suspend) ) ) - :post (the-as (function none :behavior rigid-body-platform) ja-post) + :post ja-post ) (defstate rigid-body-platform-float (rigid-body-platform) @@ -646,7 +646,7 @@ (suspend) ) ) - :post (the-as (function none :behavior rigid-body-platform) rigid-body-platform-post) + :post rigid-body-platform-post ) (defmethod rigid-body-platform-method-29 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-platform-constants)) diff --git a/goal_src/jak1/engine/common-obs/sharkey.gc b/goal_src/jak1/engine/common-obs/sharkey.gc index d271fd9a653..321c3ee9d91 100644 --- a/goal_src/jak1/engine/common-obs/sharkey.gc +++ b/goal_src/jak1/engine/common-obs/sharkey.gc @@ -208,10 +208,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-idle (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf0)) @@ -270,15 +267,12 @@ nav-enemy-default-event-handler (logior! (-> self draw status) (draw-status hidden)) (anim-loop) ) - :post (the-as (function none :behavior sharkey) #f) + :post #f ) (defstate nav-enemy-patrol (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (sharkey-notice-player?) (go-virtual nav-enemy-chase) @@ -316,10 +310,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-notice (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (go-virtual nav-enemy-chase) ) @@ -339,10 +330,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-attack (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) @@ -411,10 +399,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-chase (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (sound-stop (-> self sound-id)) ) @@ -502,10 +487,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-stop-chase (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.17)) (loop @@ -525,10 +507,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-stare (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) @@ -552,10 +531,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-victory (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (dotimes (gp-0 3) diff --git a/goal_src/jak1/engine/common-obs/voicebox.gc b/goal_src/jak1/engine/common-obs/voicebox.gc index 05fa8bf803b..a3b1bc69f26 100644 --- a/goal_src/jak1/engine/common-obs/voicebox.gc +++ b/goal_src/jak1/engine/common-obs/voicebox.gc @@ -40,7 +40,7 @@ (defstate empty-state (process) - :code (the-as (function none :behavior process) nothing) + :code nothing ) (defskelgroup *voicebox-sg* speaker speaker-lod0-jg speaker-idle-ja @@ -150,7 +150,7 @@ (set! (-> self blend) 0.0) (go-virtual idle) ) - :post (the-as (function none :behavior voicebox) ja-post) + :post ja-post ) (defstate idle (voicebox) @@ -163,7 +163,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior voicebox) ja-post) + :post ja-post ) (defstate exit (voicebox) @@ -189,7 +189,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior voicebox) ja-post) + :post ja-post ) (defbehavior voicebox-init-by-other voicebox ((arg0 vector) (arg1 handle)) diff --git a/goal_src/jak1/engine/common-obs/water.gc b/goal_src/jak1/engine/common-obs/water.gc index 330716dd806..fd05158a291 100644 --- a/goal_src/jak1/engine/common-obs/water.gc +++ b/goal_src/jak1/engine/common-obs/water.gc @@ -1246,7 +1246,7 @@ :trans (behavior () (update! self) ) - :code (the-as (function none :behavior water-vol) anim-loop) + :code anim-loop ) (defmethod set-stack-size! water-vol ((obj water-vol)) diff --git a/goal_src/jak1/engine/data/art-elts.gc b/goal_src/jak1/engine/data/art-elts.gc index 691abaf89d6..e656082a265 100644 --- a/goal_src/jak1/engine/data/art-elts.gc +++ b/goal_src/jak1/engine/data/art-elts.gc @@ -1,13 +1,10 @@ -;; accordian-ag.gc (def-art-elt accordian-ag accordian-lod0-jg 0) (def-art-elt accordian-ag accordian-lod0-mg 1) (def-art-elt accordian-ag accordian-lod1-mg 2) (def-art-elt accordian-ag accordian-idle-ja 3) -;; allpontoons-ag.gc (def-art-elt allpontoons-ag allpontoons-lod0-jg 0) (def-art-elt allpontoons-ag allpontoons-lod0-mg 1) (def-art-elt allpontoons-ag allpontoons-idle-ja 2) -;; aphid-lurker-ag.gc (def-art-elt aphid-lurker-ag aphid-lurker-lod0-jg 0) (def-art-elt aphid-lurker-ag aphid-lurker-lod0-mg 1) (def-art-elt aphid-lurker-ag aphid-lurker-shadow-mg 2) @@ -20,7 +17,6 @@ (def-art-elt aphid-lurker-ag aphid-lurker-turn-ja 9) (def-art-elt aphid-lurker-ag aphid-lurker-win-ja 10) (def-art-elt aphid-lurker-ag aphid-lurker-die-ja 11) -;; assistant-ag.gc (def-art-elt assistant-ag assistant-lod0-jg 0) (def-art-elt assistant-ag assistant-lod0-mg 1) (def-art-elt assistant-ag assistant-shadow-mg 2) @@ -31,7 +27,6 @@ (def-art-elt assistant-ag assistant-idle-wiping-brow-ja 7) (def-art-elt assistant-ag assistant-idle-transition-to-welding-ja 8) (def-art-elt assistant-ag assistant-idle-welding-ja 9) -;; assistant-firecanyon-ag.gc (def-art-elt assistant-firecanyon-ag assistant-firecanyon-lod0-jg 0) (def-art-elt assistant-firecanyon-ag assistant-firecanyon-lod0-mg 1) (def-art-elt assistant-firecanyon-ag assistant-firecanyon-shadow-mg 2) @@ -45,18 +40,15 @@ (def-art-elt assistant-firecanyon-ag assistant-firecanyon-idle-b-ja 10) (def-art-elt assistant-firecanyon-ag assistant-firecanyon-idle-to-a-ja 11) (def-art-elt assistant-firecanyon-ag assistant-firecanyon-idle-wipe-brow-ja 12) -;; assistant-lavatube-end-ag.gc (def-art-elt assistant-lavatube-end-ag assistant-lavatube-end-lod0-jg 0) (def-art-elt assistant-lavatube-end-ag assistant-lavatube-end-lod0-mg 1) (def-art-elt assistant-lavatube-end-ag assistant-lavatube-end-shadow-mg 2) (def-art-elt assistant-lavatube-end-ag assistant-lavatube-end-idle-ja 3) -;; assistant-lavatube-start-ag.gc (def-art-elt assistant-lavatube-start-ag assistant-lavatube-start-lod0-jg 0) (def-art-elt assistant-lavatube-start-ag assistant-lavatube-start-lod0-mg 1) (def-art-elt assistant-lavatube-start-ag assistant-lavatube-start-shadow-mg 2) (def-art-elt assistant-lavatube-start-ag assistant-lavatube-start-idle-ja 3) (def-art-elt assistant-lavatube-start-ag assistant-lavatube-start-idle-b-ja 4) -;; assistant-village2-ag.gc (def-art-elt assistant-village2-ag assistant-village2-lod0-jg 0) (def-art-elt assistant-village2-ag assistant-village2-lod0-mg 1) (def-art-elt assistant-village2-ag assistant-village2-lod1-mg 2) @@ -72,12 +64,10 @@ (def-art-elt assistant-village2-ag assistant-village2-idle-hut-start-welding-ja 12) (def-art-elt assistant-village2-ag assistant-village2-idle-hut-welding-ja 13) (def-art-elt assistant-village2-ag assistant-village2-idle-hut-stop-welding-ja 14) -;; assistant-village3-ag.gc (def-art-elt assistant-village3-ag assistant-village3-lod0-jg 0) (def-art-elt assistant-village3-ag assistant-village3-lod0-mg 1) (def-art-elt assistant-village3-ag assistant-village3-shadow-mg 2) (def-art-elt assistant-village3-ag assistant-village3-idle-ja 3) -;; babak-ag.gc (def-art-elt babak-ag babak-lod0-jg 0) (def-art-elt babak-ag babak-lod0-mg 1) (def-art-elt babak-ag babak-lod1-mg 2) @@ -97,7 +87,6 @@ (def-art-elt babak-ag babak-turn-ja 16) (def-art-elt babak-ag babak-look-ja 17) (def-art-elt babak-ag babak-stop-look-ja 18) -;; baby-spider-ag.gc (def-art-elt baby-spider-ag baby-spider-lod0-jg 0) (def-art-elt baby-spider-ag baby-spider-lod0-mg 1) (def-art-elt baby-spider-ag baby-spider-lod1-mg 2) @@ -112,18 +101,15 @@ (def-art-elt baby-spider-ag baby-spider-notice-ja 11) (def-art-elt baby-spider-ag baby-spider-celebrate-ja 12) (def-art-elt baby-spider-ag baby-spider-die-ja 13) -;; balance-plat-ag.gc (def-art-elt balance-plat-ag balance-plat-lod0-jg 0) (def-art-elt balance-plat-ag balance-plat-lod0-mg 1) (def-art-elt balance-plat-ag balance-plat-lod1-mg 2) (def-art-elt balance-plat-ag balance-plat-lod2-mg 3) (def-art-elt balance-plat-ag balance-plat-idle-ja 4) -;; balloon-ag.gc (def-art-elt balloon-ag balloon-lod0-jg 0) (def-art-elt balloon-ag balloon-lod0-mg 1) (def-art-elt balloon-ag balloon-lod1-mg 2) (def-art-elt balloon-ag balloon-idle-ja 3) -;; balloonlurker-ag.gc (def-art-elt balloonlurker-ag balloonlurker-lod0-jg 0) (def-art-elt balloonlurker-ag balloonlurker-lod0-mg 1) (def-art-elt balloonlurker-ag balloonlurker-lod1-mg 2) @@ -136,56 +122,46 @@ (def-art-elt balloonlurker-ag balloonlurker-pilot-lod2-mg 9) (def-art-elt balloonlurker-ag balloonlurker-pilot-idle-ja 10) (def-art-elt balloonlurker-ag balloonlurker-pilot-death-ja 11) -;; barrel-ag.gc (def-art-elt barrel-ag barrel-lod0-jg 0) (def-art-elt barrel-ag barrel-lod0-mg 1) (def-art-elt barrel-ag barrel-idle-ja 2) -;; beachcam-ag.gc -(def-art-elt beachcam-ag beachcam-lod0-jg 0) (def-art-elt beachcam-ag beachcam-ecoventrock-7-ja 8) +(def-art-elt beachcam-ag beachcam-lod0-jg 0) (def-art-elt beachcam-ag beachcam-lod0-mg 1) (def-art-elt beachcam-ag beachcam-anim-ja 2) (def-art-elt beachcam-ag beachcam-ecoventrock-4-ja 4) (def-art-elt beachcam-ag beachcam-ecoventrock-5-ja 5) (def-art-elt beachcam-ag beachcam-ecoventrock-6-ja 6) (def-art-elt beachcam-ag beachcam-ecoventrock-3-ja 7) -;; billy-ag.gc (def-art-elt billy-ag billy-lod0-jg 0) (def-art-elt billy-ag billy-lod0-mg 1) -(def-art-elt billy-ag billy-shadow-mg 2) (def-art-elt billy-ag billy-billy-after-ja 10) +(def-art-elt billy-ag billy-shadow-mg 2) (def-art-elt billy-ag billy-idle-breath-ja 3) (def-art-elt billy-ag billy-idle-shoo-ja 4) -;; billy-sidekick-ag.gc (def-art-elt billy-sidekick-ag billy-sidekick-lod0-jg 0) (def-art-elt billy-sidekick-ag billy-sidekick-lod0-mg 1) (def-art-elt billy-sidekick-ag billy-sidekick-idle-ja 2) (def-art-elt billy-sidekick-ag billy-sidekick-billy-after-ja 3) -;; bird-lady-ag.gc (def-art-elt bird-lady-ag bird-lady-lod0-jg 0) (def-art-elt bird-lady-ag bird-lady-lod0-mg 1) (def-art-elt bird-lady-ag bird-lady-shadow-mg 2) (def-art-elt bird-lady-ag bird-lady-idle-ja 3) -;; bird-lady-beach-ag.gc (def-art-elt bird-lady-beach-ag bird-lady-beach-lod0-jg 0) (def-art-elt bird-lady-beach-ag bird-lady-beach-lod0-mg 1) (def-art-elt bird-lady-beach-ag bird-lady-beach-shadow-mg 2) (def-art-elt bird-lady-beach-ag bird-lady-beach-idle-ja 3) -;; bladeassm-ag.gc (def-art-elt bladeassm-ag bladeassm-lod0-jg 0) (def-art-elt bladeassm-ag bladeassm-lod0-mg 1) (def-art-elt bladeassm-ag bladeassm-lod1-mg 2) (def-art-elt bladeassm-ag bladeassm-lod2-mg 3) (def-art-elt bladeassm-ag bladeassm-idle-ja 4) -;; blue-eco-charger-ag.gc (def-art-elt blue-eco-charger-ag blue-eco-charger-lod0-jg 0) (def-art-elt blue-eco-charger-ag blue-eco-charger-lod0-mg 1) (def-art-elt blue-eco-charger-ag blue-eco-charger-open-ja 2) -;; blue-eco-charger-orb-ag.gc (def-art-elt blue-eco-charger-orb-ag blue-eco-charger-orb-lod0-jg 0) (def-art-elt blue-eco-charger-orb-ag blue-eco-charger-orb-lod0-mg 1) (def-art-elt blue-eco-charger-orb-ag blue-eco-charger-orb-idle-ja 2) -;; bluesage-ag.gc (def-art-elt bluesage-ag bluesage-lod0-jg 0) (def-art-elt bluesage-ag bluesage-lod0-mg 1) (def-art-elt bluesage-ag bluesage-lod1-mg 2) @@ -193,12 +169,10 @@ (def-art-elt bluesage-ag bluesage-bluesage-idle-ja 4) (def-art-elt bluesage-ag bluesage-bluesage-attack-start-ja 5) (def-art-elt bluesage-ag bluesage-bluesage-attack-loop-ja 6) -;; boatpaddle-ag.gc (def-art-elt boatpaddle-ag boatpaddle-lod0-jg 0) (def-art-elt boatpaddle-ag boatpaddle-lod0-mg 1) (def-art-elt boatpaddle-ag boatpaddle-lod1-mg 2) (def-art-elt boatpaddle-ag boatpaddle-idle-ja 3) -;; bonelurker-ag.gc (def-art-elt bonelurker-ag bonelurker-lod0-jg 0) (def-art-elt bonelurker-ag bonelurker-lod0-mg 1) (def-art-elt bonelurker-ag bonelurker-lod1-mg 2) @@ -218,23 +192,18 @@ (def-art-elt bonelurker-ag bonelurker-turn-ja 16) (def-art-elt bonelurker-ag bonelurker-jump-ja 17) (def-art-elt bonelurker-ag bonelurker-jump-land-ja 18) -;; bounceytarp-ag.gc (def-art-elt bounceytarp-ag bounceytarp-lod0-jg 0) (def-art-elt bounceytarp-ag bounceytarp-lod0-mg 1) (def-art-elt bounceytarp-ag bounceytarp-idle-ja 2) -;; breakaway-left-ag.gc (def-art-elt breakaway-left-ag breakaway-left-lod0-jg 0) (def-art-elt breakaway-left-ag breakaway-left-lod0-mg 1) (def-art-elt breakaway-left-ag breakaway-left-idle-ja 2) -;; breakaway-mid-ag.gc (def-art-elt breakaway-mid-ag breakaway-mid-lod0-jg 0) (def-art-elt breakaway-mid-ag breakaway-mid-lod0-mg 1) (def-art-elt breakaway-mid-ag breakaway-mid-idle-ja 2) -;; breakaway-right-ag.gc (def-art-elt breakaway-right-ag breakaway-right-lod0-jg 0) (def-art-elt breakaway-right-ag breakaway-right-lod0-mg 1) (def-art-elt breakaway-right-ag breakaway-right-idle-ja 2) -;; bully-ag.gc (def-art-elt bully-ag bully-lod0-jg 0) (def-art-elt bully-ag bully-lod0-mg 1) (def-art-elt bully-ag bully-lod1-mg 2) @@ -252,55 +221,44 @@ (def-art-elt bully-ag bully-broken-cage-lod0-jg 14) (def-art-elt bully-ag bully-broken-cage-lod0-mg 15) (def-art-elt bully-ag bully-broken-cage-explode-ja 16) -;; buzzer-ag.gc (def-art-elt buzzer-ag buzzer-lod0-jg 0) (def-art-elt buzzer-ag buzzer-lod0-mg 1) (def-art-elt buzzer-ag buzzer-idle-ja 2) -;; catch-fisha-ag.gc (def-art-elt catch-fisha-ag catch-fisha-lod0-jg 0) (def-art-elt catch-fisha-ag catch-fisha-lod0-mg 1) (def-art-elt catch-fisha-ag catch-fisha-idle-ja 2) -;; catch-fishb-ag.gc (def-art-elt catch-fishb-ag catch-fishb-lod0-jg 0) (def-art-elt catch-fishb-ag catch-fishb-lod0-mg 1) (def-art-elt catch-fishb-ag catch-fishb-idle-ja 2) -;; catch-fishc-ag.gc (def-art-elt catch-fishc-ag catch-fishc-lod0-jg 0) (def-art-elt catch-fishc-ag catch-fishc-lod0-mg 1) (def-art-elt catch-fishc-ag catch-fishc-idle-ja 2) -;; cavecrusher-ag.gc (def-art-elt cavecrusher-ag cavecrusher-lod0-jg 0) (def-art-elt cavecrusher-ag cavecrusher-lod0-mg 1) (def-art-elt cavecrusher-ag cavecrusher-lod1-mg 2) (def-art-elt cavecrusher-ag cavecrusher-lod2-mg 3) (def-art-elt cavecrusher-ag cavecrusher-idle-ja 4) -;; cavecrystal-ag.gc (def-art-elt cavecrystal-ag cavecrystal-lod0-jg 0) (def-art-elt cavecrystal-ag cavecrystal-lod0-mg 1) (def-art-elt cavecrystal-ag cavecrystal-lod1-mg 2) (def-art-elt cavecrystal-ag cavecrystal-idle-ja 3) -;; caveelevator-ag.gc (def-art-elt caveelevator-ag caveelevator-lod0-jg 0) (def-art-elt caveelevator-ag caveelevator-lod0-mg 1) (def-art-elt caveelevator-ag caveelevator-cycle-12m-ja 2) (def-art-elt caveelevator-ag caveelevator-one-way-58m-ja 3) (def-art-elt caveelevator-ag caveelevator-one-way-58m-reverse-ja 4) (def-art-elt caveelevator-ag caveelevator-cycle-3-floors-36m-ja 5) -;; cavegem-ag.gc (def-art-elt cavegem-ag cavegem-lod0-jg 0) (def-art-elt cavegem-ag cavegem-lod0-mg 1) (def-art-elt cavegem-ag cavegem-idle-ja 2) -;; cavespatula-darkcave-ag.gc (def-art-elt cavespatula-darkcave-ag cavespatula-darkcave-lod0-jg 0) (def-art-elt cavespatula-darkcave-ag cavespatula-darkcave-lod0-mg 1) (def-art-elt cavespatula-darkcave-ag cavespatula-darkcave-lod1-mg 2) (def-art-elt cavespatula-darkcave-ag cavespatula-darkcave-idle-ja 3) -;; cavespatulatwo-ag.gc (def-art-elt cavespatulatwo-ag cavespatulatwo-lod0-jg 0) (def-art-elt cavespatulatwo-ag cavespatulatwo-lod0-mg 1) (def-art-elt cavespatulatwo-ag cavespatulatwo-lod1-mg 2) (def-art-elt cavespatulatwo-ag cavespatulatwo-idle-ja 3) -;; cavetrapdoor-ag.gc (def-art-elt cavetrapdoor-ag cavetrapdoor-lod0-jg 0) (def-art-elt cavetrapdoor-ag cavetrapdoor-lod0-mg 1) (def-art-elt cavetrapdoor-ag cavetrapdoor-lod1-mg 2) @@ -310,21 +268,17 @@ (def-art-elt cavetrapdoor-ag cavetrapdoor-swing-ja 6) (def-art-elt cavetrapdoor-ag cavetrapdoor-idle-down-ja 7) (def-art-elt cavetrapdoor-ag cavetrapdoor-reset-ja 8) -;; ceilingflag-ag.gc (def-art-elt ceilingflag-ag ceilingflag-geo-jg 0) (def-art-elt ceilingflag-ag ceilingflag-geo-mg 1) (def-art-elt ceilingflag-ag ceilingflag-idle-ja 2) -;; chainmine-ag.gc (def-art-elt chainmine-ag chainmine-lod0-jg 0) (def-art-elt chainmine-ag chainmine-lod0-mg 1) (def-art-elt chainmine-ag chainmine-idle-ja 2) -;; citadelcam-ag.gc (def-art-elt citadelcam-ag citadelcam-lod0-jg 0) (def-art-elt citadelcam-ag citadelcam-lod0-mg 1) (def-art-elt citadelcam-ag citadelcam-idle-ja 2) (def-art-elt citadelcam-ag citadelcam-stair-plats-ja 3) (def-art-elt citadelcam-ag citadelcam-citadel-bunnies-ja 4) -;; citb-arm-ag.gc (def-art-elt citb-arm-ag citb-arm-a-lod0-jg 0) (def-art-elt citb-arm-ag citb-arm-a-lod0-mg 1) (def-art-elt citb-arm-ag citb-arm-a-lod1-mg 2) @@ -341,14 +295,12 @@ (def-art-elt citb-arm-ag citb-arm-d-lod0-mg 13) (def-art-elt citb-arm-ag citb-arm-d-lod1-mg 14) (def-art-elt citb-arm-ag citb-arm-d-idle-ja 15) -;; citb-arm-shoulder-ag.gc (def-art-elt citb-arm-shoulder-ag citb-arm-shoulder-a-lod0-jg 0) (def-art-elt citb-arm-shoulder-ag citb-arm-shoulder-a-lod0-mg 1) (def-art-elt citb-arm-shoulder-ag citb-arm-shoulder-a-idle-ja 2) (def-art-elt citb-arm-shoulder-ag citb-arm-shoulder-b-lod0-jg 3) (def-art-elt citb-arm-shoulder-ag citb-arm-shoulder-b-lod0-mg 4) (def-art-elt citb-arm-shoulder-ag citb-arm-shoulder-b-idle-ja 5) -;; citb-bunny-ag.gc (def-art-elt citb-bunny-ag citb-bunny-lod0-jg 0) (def-art-elt citb-bunny-ag citb-bunny-lod0-mg 1) (def-art-elt citb-bunny-ag citb-bunny-shadow-mg 2) @@ -359,29 +311,24 @@ (def-art-elt citb-bunny-ag citb-bunny-sees-player-ja 7) (def-art-elt citb-bunny-ag citb-bunny-sees-player-land-ja 8) (def-art-elt citb-bunny-ag citb-bunny-die-ja 9) -;; citb-button-ag.gc (def-art-elt citb-button-ag citb-button-lod0-jg 0) (def-art-elt citb-button-ag citb-button-lod0-mg 1) (def-art-elt citb-button-ag citb-button-idle-ja 2) -;; citb-chain-plat-ag.gc (def-art-elt citb-chain-plat-ag citb-chain-plat-lod0-jg 0) (def-art-elt citb-chain-plat-ag citb-chain-plat-lod0-mg 1) (def-art-elt citb-chain-plat-ag citb-chain-plat-lod1-mg 2) (def-art-elt citb-chain-plat-ag citb-chain-plat-idle-ja 3) -;; citb-chains-ag.gc (def-art-elt citb-chains-ag citb-chains-lod0-jg 0) (def-art-elt citb-chains-ag citb-chains-lod0-mg 1) (def-art-elt citb-chains-ag citb-chains-lod1-mg 2) (def-art-elt citb-chains-ag citb-chains-lod2-mg 3) (def-art-elt citb-chains-ag citb-chains-idle-ja 4) -;; citb-coil-ag.gc (def-art-elt citb-coil-ag citb-coil-lod0-jg 0) (def-art-elt citb-coil-ag citb-coil-lod0-mg 1) (def-art-elt citb-coil-ag citb-coil-lod1-mg 2) (def-art-elt citb-coil-ag citb-coil-idle-ja 3) (def-art-elt citb-coil-ag citb-coil-die-ja 4) (def-art-elt citb-coil-ag citb-coil-dead-ja 5) -;; citb-disc-ag.gc (def-art-elt citb-disc-ag citb-disc-a-lod0-jg 0) (def-art-elt citb-disc-ag citb-disc-a-lod0-mg 1) (def-art-elt citb-disc-ag citb-disc-a-lod1-mg 2) @@ -402,12 +349,10 @@ (def-art-elt citb-disc-ag citb-disc-d-lod1-mg 17) (def-art-elt citb-disc-ag citb-disc-d-lod2-mg 18) (def-art-elt citb-disc-ag citb-disc-d-idle-ja 19) -;; citb-donut-ag.gc (def-art-elt citb-donut-ag citb-donut-lod0-jg 0) (def-art-elt citb-donut-ag citb-donut-lod0-mg 1) (def-art-elt citb-donut-ag citb-donut-lod1-mg 2) (def-art-elt citb-donut-ag citb-donut-idle-ja 3) -;; citb-drop-plat-ag.gc (def-art-elt citb-drop-plat-ag citb-drop-plat-lod0-jg 0) (def-art-elt citb-drop-plat-ag citb-drop-plat-lod0-mg 1) (def-art-elt citb-drop-plat-ag citb-drop-plat-lod1-mg 2) @@ -428,40 +373,33 @@ (def-art-elt citb-drop-plat-ag citb-drop-plat-yellow-lod0-mg 17) (def-art-elt citb-drop-plat-ag citb-drop-plat-yellow-lod1-mg 18) (def-art-elt citb-drop-plat-ag citb-drop-plat-yellow-idle-ja 19) -;; citb-exit-plat-ag.gc (def-art-elt citb-exit-plat-ag citb-exit-plat-lod0-jg 0) (def-art-elt citb-exit-plat-ag citb-exit-plat-lod0-mg 1) (def-art-elt citb-exit-plat-ag citb-exit-plat-idle-ja 2) -;; citb-firehose-ag.gc (def-art-elt citb-firehose-ag citb-firehose-lod0-jg 0) (def-art-elt citb-firehose-ag citb-firehose-lod0-mg 1) (def-art-elt citb-firehose-ag citb-firehose-idle-ja 2) (def-art-elt citb-firehose-ag citb-firehose-start-ja 3) (def-art-elt citb-firehose-ag citb-firehose-loopflame-ja 4) (def-art-elt citb-firehose-ag citb-firehose-end-ja 5) -;; citb-generator-ag.gc (def-art-elt citb-generator-ag citb-generator-lod0-jg 0) (def-art-elt citb-generator-ag citb-generator-lod0-mg 1) (def-art-elt citb-generator-ag citb-generator-broken-lod0-jg 2) (def-art-elt citb-generator-ag citb-generator-broken-lod0-mg 3) (def-art-elt citb-generator-ag citb-generator-idle-ja 4) -;; citb-hose-ag.gc (def-art-elt citb-hose-ag citb-hose-lod0-jg 0) (def-art-elt citb-hose-ag citb-hose-lod0-mg 1) (def-art-elt citb-hose-ag citb-hose-lod1-mg 2) (def-art-elt citb-hose-ag citb-hose-idle-ja 3) (def-art-elt citb-hose-ag citb-hose-spit-ja 4) (def-art-elt citb-hose-ag citb-hose-die-ja 5) -;; citb-iris-door-ag.gc (def-art-elt citb-iris-door-ag citb-iris-door-lod0-jg 0) (def-art-elt citb-iris-door-ag citb-iris-door-lod0-mg 1) (def-art-elt citb-iris-door-ag citb-iris-door-lod1-mg 2) (def-art-elt citb-iris-door-ag citb-iris-door-idle-ja 3) -;; citb-launcher-ag.gc (def-art-elt citb-launcher-ag citb-launcher-lod0-jg 0) (def-art-elt citb-launcher-ag citb-launcher-lod0-mg 1) (def-art-elt citb-launcher-ag citb-launcher-idle-ja 2) -;; citb-robotboss-ag.gc (def-art-elt citb-robotboss-ag citb-robotboss-lod0-jg 0) (def-art-elt citb-robotboss-ag citb-robotboss-lod0-mg 1) (def-art-elt citb-robotboss-ag citb-robotboss-idle-ja 2) @@ -489,11 +427,9 @@ (def-art-elt citb-robotboss-ag citb-robotboss-belly-lod0-jg 24) (def-art-elt citb-robotboss-ag citb-robotboss-belly-lod0-mg 25) (def-art-elt citb-robotboss-ag citb-robotboss-belly-idle-ja 26) -;; citb-rotatebox-ag.gc (def-art-elt citb-rotatebox-ag citb-rotatebox-lod0-jg 0) (def-art-elt citb-rotatebox-ag citb-rotatebox-lod0-mg 1) (def-art-elt citb-rotatebox-ag citb-rotatebox-idle-ja 2) -;; citb-sagecage-ag.gc (def-art-elt citb-sagecage-ag citb-sagecage-bluesage-idle-ja 8) (def-art-elt citb-sagecage-ag citb-sagecage-lod0-jg 0) (def-art-elt citb-sagecage-ag citb-sagecage-lod0-mg 1) @@ -508,12 +444,10 @@ (def-art-elt citb-sagecage-ag citb-sagecage-yellowsage-attack-start-ja 13) (def-art-elt citb-sagecage-ag citb-sagecage-yellowsage-attack-loop-ja 14) (def-art-elt citb-sagecage-ag citb-sagecage-green-sagecage-idle-ja 16) -;; citb-stopbox-ag.gc (def-art-elt citb-stopbox-ag citb-stopbox-lod0-jg 0) (def-art-elt citb-stopbox-ag citb-stopbox-lod0-mg 1) (def-art-elt citb-stopbox-ag citb-stopbox-lod1-mg 2) (def-art-elt citb-stopbox-ag citb-stopbox-idle-ja 3) -;; crate-ag.gc (def-art-elt crate-ag crate-wood-lod0-jg 0) (def-art-elt crate-ag crate-wood-lod0-mg 1) (def-art-elt crate-ag crate-wood-lod1-mg 2) @@ -539,42 +473,35 @@ (def-art-elt crate-ag crate-bucket-lod0-jg 22) (def-art-elt crate-ag crate-bucket-lod0-mg 23) (def-art-elt crate-ag crate-bucket-idle-ja 24) -;; crate-darkeco-cluster-ag.gc (def-art-elt crate-darkeco-cluster-ag crate-darkeco-cluster-lod0-jg 0) (def-art-elt crate-darkeco-cluster-ag crate-darkeco-cluster-lod0-mg 1) (def-art-elt crate-darkeco-cluster-ag crate-darkeco-cluster-lod1-mg 2) (def-art-elt crate-darkeco-cluster-ag crate-darkeco-cluster-idle-ja 3) -;; dark-crystal-ag.gc (def-art-elt dark-crystal-ag dark-crystal-lod0-jg 0) (def-art-elt dark-crystal-ag dark-crystal-lod0-mg 1) (def-art-elt dark-crystal-ag dark-crystal-idle-ja 2) (def-art-elt dark-crystal-ag dark-crystal-explode-lod0-jg 3) (def-art-elt dark-crystal-ag dark-crystal-explode-lod0-mg 4) (def-art-elt dark-crystal-ag dark-crystal-explode-idle-ja 5) -;; dark-plant-ag.gc (def-art-elt dark-plant-ag dark-plant-lod0-jg 0) (def-art-elt dark-plant-ag dark-plant-lod0-mg 1) (def-art-elt dark-plant-ag dark-plant-idle-ja 2) (def-art-elt dark-plant-ag dark-plant-death-ja 3) (def-art-elt dark-plant-ag dark-plant-sprout-ja 4) -;; darkecobarrel-ag.gc (def-art-elt darkecobarrel-ag darkecobarrel-lod0-jg 0) (def-art-elt darkecobarrel-ag darkecobarrel-lod0-mg 1) (def-art-elt darkecobarrel-ag darkecobarrel-idle-ja 2) -;; darkecobomb-ag.gc (def-art-elt darkecobomb-ag darkecobomb-lod0-jg 0) (def-art-elt darkecobomb-ag darkecobomb-lod0-mg 1) (def-art-elt darkecobomb-ag darkecobomb-idle-ja 2) (def-art-elt darkecobomb-ag darkecobomb-blast-ja 3) (def-art-elt darkecobomb-ag darkecobomb-open-ja 4) (def-art-elt darkecobomb-ag darkecobomb-spin-cycle-ja 5) -;; darkecocan-ag.gc (def-art-elt darkecocan-ag darkecocan-lod0-jg 0) (def-art-elt darkecocan-ag darkecocan-lod0-mg 1) (def-art-elt darkecocan-ag darkecocan-glow-lod0-jg 2) (def-art-elt darkecocan-ag darkecocan-glow-lod0-mg 3) (def-art-elt darkecocan-ag darkecocan-idle-ja 4) -;; darkvine-ag.gc (def-art-elt darkvine-ag darkvine-lod0-jg 0) (def-art-elt darkvine-ag darkvine-lod0-mg 1) (def-art-elt darkvine-ag darkvine-lod1-mg 2) @@ -582,11 +509,9 @@ (def-art-elt darkvine-ag darkvine-retreat-ja 4) (def-art-elt darkvine-ag darkvine-pushup-ja 5) (def-art-elt darkvine-ag darkvine-dead-ja 6) -;; deathcam-ag.gc (def-art-elt deathcam-ag deathcam-lod0-jg 0) (def-art-elt deathcam-ag deathcam-lod0-mg 1) (def-art-elt deathcam-ag deathcam-idle-ja 2) -;; double-lurker-ag.gc (def-art-elt double-lurker-ag double-lurker-lod0-jg 0) (def-art-elt double-lurker-ag double-lurker-lod0-mg 1) (def-art-elt double-lurker-ag double-lurker-lod1-mg 2) @@ -606,7 +531,6 @@ (def-art-elt double-lurker-ag double-lurker-celebrate-ja 16) (def-art-elt double-lurker-ag double-lurker-die-ja 17) (def-art-elt double-lurker-ag double-lurker-bottom-take-hit-ja 18) -;; double-lurker-top-ag.gc (def-art-elt double-lurker-top-ag double-lurker-top-lod0-jg 0) (def-art-elt double-lurker-top-ag double-lurker-top-lod0-mg 1) (def-art-elt double-lurker-top-ag double-lurker-top-lod1-mg 2) @@ -626,7 +550,6 @@ (def-art-elt double-lurker-top-ag double-lurker-top-celebrate-ja 16) (def-art-elt double-lurker-top-ag double-lurker-top-die-ja 17) (def-art-elt double-lurker-top-ag double-lurker-top-on-shoulders-die-ja 18) -;; driller-lurker-ag.gc (def-art-elt driller-lurker-ag driller-lurker-lod0-jg 0) (def-art-elt driller-lurker-ag driller-lurker-lod0-mg 1) (def-art-elt driller-lurker-ag driller-lurker-lod1-mg 2) @@ -644,28 +567,22 @@ (def-art-elt driller-lurker-ag driller-lurker-attack-up-ja 14) (def-art-elt driller-lurker-ag driller-lurker-idle-drilling-ja 15) (def-art-elt driller-lurker-ag driller-lurker-die-ja 16) -;; ecoclaw-ag.gc (def-art-elt ecoclaw-ag ecoclaw-lod0-jg 0) (def-art-elt ecoclaw-ag ecoclaw-lod0-mg 1) (def-art-elt ecoclaw-ag ecoclaw-idle-ja 2) -;; ecovalve-ag.gc (def-art-elt ecovalve-ag ecovalve-geo-jg 0) (def-art-elt ecovalve-ag ecovalve-geo-mg 1) (def-art-elt ecovalve-ag ecovalve-idle-ja 2) -;; ecoventrock-ag.gc (def-art-elt ecoventrock-ag ecoventrock-lod0-jg 0) (def-art-elt ecoventrock-ag ecoventrock-lod0-mg 1) (def-art-elt ecoventrock-ag ecoventrock-lod1-mg 2) (def-art-elt ecoventrock-ag ecoventrock-idle-ja 3) -;; ef-plane-ag.gc (def-art-elt ef-plane-ag ef-plane-lod0-jg 0) (def-art-elt ef-plane-ag ef-plane-lod0-mg 1) (def-art-elt ef-plane-ag ef-plane-idle-ja 2) -;; eggtop-ag.gc (def-art-elt eggtop-ag eggtop-lod0-jg 0) (def-art-elt eggtop-ag eggtop-lod0-mg 1) (def-art-elt eggtop-ag eggtop-idle-ja 2) -;; eichar-ag.gc (def-art-elt eichar-ag eichar-lod0-jg 0) (def-art-elt eichar-ag eichar-lod0-mg 1) (def-art-elt eichar-ag eichar-shadow-mg 2) @@ -764,221 +681,107 @@ (def-art-elt eichar-ag eichar-periscope-grab-ja 101) (def-art-elt eichar-ag eichar-trip-ja 112) (def-art-elt eichar-ag eichar-fuel-cell-victory-9-ja 121) -;; eichar-fish+0-ag.gc -(def-art-elt eichar-fish+0-ag eichar-fishing-ja 0) -(def-art-elt eichar-fish+0-ag eichar-fishing-lose-ja 1) -(def-art-elt eichar-fish+0-ag sidekick-fishing-ja 2) -(def-art-elt eichar-fish+0-ag sidekick-fishing-lose-ja 3) -;; eichar-flut+0-ag.gc -(def-art-elt eichar-flut+0-ag eichar-flut-idle-ja 0) -(def-art-elt eichar-flut+0-ag eichar-flut-walk-ja 1) -(def-art-elt eichar-flut+0-ag eichar-flut-run-ja 2) -(def-art-elt eichar-flut+0-ag eichar-flut-jump-ja 3) -(def-art-elt eichar-flut+0-ag eichar-flut-jump-loop-ja 4) -(def-art-elt eichar-flut+0-ag eichar-flut-jump-land-ja 5) -(def-art-elt eichar-flut+0-ag eichar-flut-jump-forward-ja 6) -(def-art-elt eichar-flut+0-ag eichar-flut-jump-forward-loop-ja 7) -(def-art-elt eichar-flut+0-ag eichar-flut-jump-forward-land-ja 8) -(def-art-elt eichar-flut+0-ag eichar-flut-double-jump-ja 9) -(def-art-elt eichar-flut+0-ag eichar-flut-running-attack-ja 10) -(def-art-elt eichar-flut+0-ag eichar-flut-running-attack-end-ja 11) -(def-art-elt eichar-flut+0-ag eichar-flut-air-attack-ja 12) -(def-art-elt eichar-flut+0-ag eichar-flut-air-attack-loop-ja 13) -(def-art-elt eichar-flut+0-ag eichar-flut-air-attack-land-ja 14) -(def-art-elt eichar-flut+0-ag eichar-flut-get-on-ja 15) -(def-art-elt eichar-flut+0-ag eichar-flut-get-off-ja 16) -(def-art-elt eichar-flut+0-ag eichar-flut-hit-back-ja 17) -(def-art-elt eichar-flut+0-ag eichar-flut-smack-surface-ja 18) -(def-art-elt eichar-flut+0-ag eichar-flut-smack-surface-end-ja 19) -(def-art-elt eichar-flut+0-ag eichar-flut-deatha-ja 20) -(def-art-elt eichar-flut+0-ag eichar-flut-squash-run-ja 21) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-idle-ja 22) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-walk-ja 23) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-run-ja 24) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-jump-ja 25) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-jump-loop-ja 26) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-jump-land-ja 27) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-jump-forward-ja 28) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-jump-forward-loop-ja 29) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-jump-forward-land-ja 30) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-double-jump-ja 31) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-running-attack-ja 32) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-running-attack-end-ja 33) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-air-attack-ja 34) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-air-attack-loop-ja 35) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-air-attack-land-ja 36) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-get-on-ja 37) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-get-off-ja 38) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-hit-back-ja 39) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-smack-surface-ja 40) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-smack-surface-end-ja 41) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-deatha-ja 42) -(def-art-elt eichar-flut+0-ag flut-saddle-flut-squash-run-ja 43) -(def-art-elt eichar-flut+0-ag sidekick-flut-idle-ja 44) -(def-art-elt eichar-flut+0-ag sidekick-flut-walk-ja 45) -(def-art-elt eichar-flut+0-ag sidekick-flut-run-ja 46) -(def-art-elt eichar-flut+0-ag sidekick-flut-jump-ja 47) -(def-art-elt eichar-flut+0-ag sidekick-flut-jump-loop-ja 48) -(def-art-elt eichar-flut+0-ag sidekick-flut-jump-land-ja 49) -(def-art-elt eichar-flut+0-ag sidekick-flut-jump-forward-ja 50) -(def-art-elt eichar-flut+0-ag sidekick-flut-jump-forward-loop-ja 51) -(def-art-elt eichar-flut+0-ag sidekick-flut-jump-forward-land-ja 52) -(def-art-elt eichar-flut+0-ag sidekick-flut-double-jump-ja 53) -(def-art-elt eichar-flut+0-ag sidekick-flut-running-attack-ja 54) -(def-art-elt eichar-flut+0-ag sidekick-flut-running-attack-end-ja 55) -(def-art-elt eichar-flut+0-ag sidekick-flut-air-attack-ja 56) -(def-art-elt eichar-flut+0-ag sidekick-flut-air-attack-loop-ja 57) -(def-art-elt eichar-flut+0-ag sidekick-flut-air-attack-land-ja 58) -(def-art-elt eichar-flut+0-ag sidekick-flut-get-on-ja 59) -(def-art-elt eichar-flut+0-ag sidekick-flut-get-off-ja 60) -(def-art-elt eichar-flut+0-ag sidekick-flut-hit-back-ja 61) -(def-art-elt eichar-flut+0-ag sidekick-flut-smack-surface-ja 62) -(def-art-elt eichar-flut+0-ag sidekick-flut-smack-surface-end-ja 63) -(def-art-elt eichar-flut+0-ag sidekick-flut-deatha-ja 64) -(def-art-elt eichar-flut+0-ag sidekick-flut-squash-run-ja 65) -;; eichar-ice+0-ag.gc -(def-art-elt eichar-ice+0-ag eichar-ice-skate-ja 0) -(def-art-elt eichar-ice+0-ag eichar-ice-slide-ja 1) -(def-art-elt eichar-ice+0-ag eichar-ice-stance-ja 2) -(def-art-elt eichar-ice+0-ag sidekick-ice-skate-ja 3) -(def-art-elt eichar-ice+0-ag sidekick-ice-slide-ja 4) -(def-art-elt eichar-ice+0-ag sidekick-ice-stance-ja 5) -;; eichar-pole+0-ag.gc -(def-art-elt eichar-pole+0-ag eichar-pole-cycle-ja 0) -(def-art-elt eichar-pole+0-ag eichar-pole-flip-up-ja 1) -(def-art-elt eichar-pole+0-ag eichar-pole-flip-forward-ja 2) -(def-art-elt eichar-pole+0-ag eichar-pole-jump-loop-ja 3) -(def-art-elt eichar-pole+0-ag sidekick-pole-cycle-ja 4) -(def-art-elt eichar-pole+0-ag sidekick-pole-cycle2-ja 5) -(def-art-elt eichar-pole+0-ag sidekick-pole-flip-up-ja 6) -(def-art-elt eichar-pole+0-ag sidekick-pole-flip-forward-ja 7) -(def-art-elt eichar-pole+0-ag sidekick-pole-jump-loop-ja 8) -;; eichar-racer+0-ag.gc -(def-art-elt eichar-racer+0-ag eichar-racer-idle-ja 0) -(def-art-elt eichar-racer+0-ag eichar-racer-turn-ja 1) -(def-art-elt eichar-racer+0-ag eichar-racer-turn2-ja 2) -(def-art-elt eichar-racer+0-ag eichar-racer-dig-ja 3) -(def-art-elt eichar-racer+0-ag eichar-racer-dig2-ja 4) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-ja 5) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-loop-ja 6) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-land-ja 7) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-small-ja 8) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-small-loop-ja 9) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-small-land-ja 10) -(def-art-elt eichar-racer+0-ag eichar-racer-stance-ja 11) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-high-loop-ja 12) -(def-art-elt eichar-racer+0-ag eichar-racer-jump-high-land-ja 13) -(def-art-elt eichar-racer+0-ag eichar-racer-smack-ja 14) -(def-art-elt eichar-racer+0-ag eichar-racer-get-off-ja 15) -(def-art-elt eichar-racer+0-ag eichar-racer-get-on-ja 16) -(def-art-elt eichar-racer+0-ag eichar-racer-death-explode-ja 17) -(def-art-elt eichar-racer+0-ag racer-racer-idle-ja 18) -(def-art-elt eichar-racer+0-ag racer-racer-turn-ja 19) -(def-art-elt eichar-racer+0-ag racer-racer-turn2-ja 20) -(def-art-elt eichar-racer+0-ag racer-racer-dig-ja 21) -(def-art-elt eichar-racer+0-ag racer-racer-dig2-ja 22) -(def-art-elt eichar-racer+0-ag racer-racer-jump-ja 23) -(def-art-elt eichar-racer+0-ag racer-racer-jump-loop-ja 24) -(def-art-elt eichar-racer+0-ag racer-racer-jump-land-ja 25) -(def-art-elt eichar-racer+0-ag racer-racer-jump-small-ja 26) -(def-art-elt eichar-racer+0-ag racer-racer-jump-small-loop-ja 27) -(def-art-elt eichar-racer+0-ag racer-racer-jump-small-land-ja 28) -(def-art-elt eichar-racer+0-ag racer-racer-stance-ja 29) -(def-art-elt eichar-racer+0-ag racer-racer-jump-high-loop-ja 30) -(def-art-elt eichar-racer+0-ag racer-racer-jump-high-land-ja 31) -(def-art-elt eichar-racer+0-ag racer-racer-smack-ja 32) -(def-art-elt eichar-racer+0-ag racer-racer-get-off-ja 33) -(def-art-elt eichar-racer+0-ag racer-racer-get-on-ja 34) -(def-art-elt eichar-racer+0-ag racer-racer-death-explode-ja 35) -(def-art-elt eichar-racer+0-ag sidekick-racer-idle-ja 36) -(def-art-elt eichar-racer+0-ag sidekick-racer-turn-ja 37) -(def-art-elt eichar-racer+0-ag sidekick-racer-turn2-ja 38) -(def-art-elt eichar-racer+0-ag sidekick-racer-dig-ja 39) -(def-art-elt eichar-racer+0-ag sidekick-racer-dig2-ja 40) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-ja 41) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-loop-ja 42) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-land-ja 43) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-small-ja 44) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-small-loop-ja 45) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-small-land-ja 46) -(def-art-elt eichar-racer+0-ag sidekick-racer-stance-ja 47) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-high-loop-ja 48) -(def-art-elt eichar-racer+0-ag sidekick-racer-jump-high-land-ja 49) -(def-art-elt eichar-racer+0-ag sidekick-racer-smack-ja 50) -(def-art-elt eichar-racer+0-ag sidekick-racer-get-off-ja 51) -(def-art-elt eichar-racer+0-ag sidekick-racer-get-on-ja 52) -(def-art-elt eichar-racer+0-ag sidekick-racer-death-explode-ja 53) -;; eichar-tube+0-ag.gc -(def-art-elt eichar-tube+0-ag eichar-tube-turn-ja 0) -(def-art-elt eichar-tube+0-ag eichar-tube-jump-land-ja 1) -(def-art-elt eichar-tube+0-ag eichar-tube-dummy2-ja 2) -(def-art-elt eichar-tube+0-ag eichar-tube-dummy3-ja 3) -(def-art-elt eichar-tube+0-ag eichar-tube-dummy4-ja 4) -(def-art-elt eichar-tube+0-ag eichar-tube-dummy5-ja 5) -(def-art-elt eichar-tube+0-ag eichar-tube-dummy6-ja 6) -(def-art-elt eichar-tube+0-ag sidekick-tube-turn-ja 7) -(def-art-elt eichar-tube+0-ag sidekick-tube-jump-land-ja 8) -(def-art-elt eichar-tube+0-ag sidekick-tube-dummy2-ja 9) -(def-art-elt eichar-tube+0-ag sidekick-tube-dummy3-ja 10) -(def-art-elt eichar-tube+0-ag sidekick-tube-dummy4-ja 11) -(def-art-elt eichar-tube+0-ag sidekick-tube-dummy5-ja 12) -(def-art-elt eichar-tube+0-ag sidekick-tube-dummy6-ja 13) -;; energyarm-ag.gc +(def-art-elt eichar-ag eichar-main-plant-boss-kill-ja 210) +(def-art-elt eichar-ag eichar-main-plant-boss-kill-close-ja 211) +(def-art-elt eichar-ag eichar-fishing-ja 99) +(def-art-elt eichar-ag eichar-fishing-lose-ja 100) +(def-art-elt eichar-ag eichar-racer-idle-ja 122) +(def-art-elt eichar-ag eichar-racer-turn-ja 123) +(def-art-elt eichar-ag eichar-racer-turn2-ja 124) +(def-art-elt eichar-ag eichar-racer-dig-ja 125) +(def-art-elt eichar-ag eichar-racer-dig2-ja 126) +(def-art-elt eichar-ag eichar-racer-jump-ja 127) +(def-art-elt eichar-ag eichar-racer-jump-loop-ja 128) +(def-art-elt eichar-ag eichar-racer-jump-land-ja 129) +(def-art-elt eichar-ag eichar-racer-jump-small-ja 130) +(def-art-elt eichar-ag eichar-racer-jump-small-loop-ja 131) +(def-art-elt eichar-ag eichar-racer-jump-small-land-ja 132) +(def-art-elt eichar-ag eichar-racer-stance-ja 133) +(def-art-elt eichar-ag eichar-racer-jump-high-loop-ja 134) +(def-art-elt eichar-ag eichar-racer-jump-high-land-ja 135) +(def-art-elt eichar-ag eichar-racer-smack-ja 136) +(def-art-elt eichar-ag eichar-racer-get-off-ja 137) +(def-art-elt eichar-ag eichar-racer-get-on-ja 138) +(def-art-elt eichar-ag eichar-racer-death-explode-ja 139) +(def-art-elt eichar-ag eichar-flut-idle-ja 140) +(def-art-elt eichar-ag eichar-flut-walk-ja 141) +(def-art-elt eichar-ag eichar-flut-run-ja 142) +(def-art-elt eichar-ag eichar-flut-jump-ja 143) +(def-art-elt eichar-ag eichar-flut-jump-loop-ja 144) +(def-art-elt eichar-ag eichar-flut-jump-land-ja 145) +(def-art-elt eichar-ag eichar-flut-jump-forward-ja 146) +(def-art-elt eichar-ag eichar-flut-jump-forward-loop-ja 147) +(def-art-elt eichar-ag eichar-flut-jump-forward-land-ja 148) +(def-art-elt eichar-ag eichar-flut-double-jump-ja 149) +(def-art-elt eichar-ag eichar-flut-running-attack-ja 150) +(def-art-elt eichar-ag eichar-flut-running-attack-end-ja 151) +(def-art-elt eichar-ag eichar-flut-air-attack-ja 152) +(def-art-elt eichar-ag eichar-flut-air-attack-loop-ja 153) +(def-art-elt eichar-ag eichar-flut-air-attack-land-ja 154) +(def-art-elt eichar-ag eichar-flut-get-on-ja 155) +(def-art-elt eichar-ag eichar-flut-get-off-ja 156) +(def-art-elt eichar-ag eichar-flut-hit-back-ja 157) +(def-art-elt eichar-ag eichar-flut-smack-surface-ja 158) +(def-art-elt eichar-ag eichar-flut-smack-surface-end-ja 159) +(def-art-elt eichar-ag eichar-flut-deatha-ja 160) +(def-art-elt eichar-ag eichar-flut-squash-run-ja 161) +(def-art-elt eichar-ag eichar-tube-turn-ja 105) +(def-art-elt eichar-ag eichar-tube-jump-land-ja 106) +(def-art-elt eichar-ag eichar-tube-dummy2-ja 107) +(def-art-elt eichar-ag eichar-tube-dummy3-ja 108) +(def-art-elt eichar-ag eichar-tube-dummy4-ja 109) +(def-art-elt eichar-ag eichar-tube-dummy5-ja 110) +(def-art-elt eichar-ag eichar-tube-dummy6-ja 111) +(def-art-elt eichar-ag eichar-pole-cycle-ja 80) +(def-art-elt eichar-ag eichar-pole-flip-up-ja 81) +(def-art-elt eichar-ag eichar-pole-flip-forward-ja 82) +(def-art-elt eichar-ag eichar-pole-jump-loop-ja 83) +(def-art-elt eichar-ag eichar-ice-skate-ja 102) +(def-art-elt eichar-ag eichar-ice-slide-ja 103) +(def-art-elt eichar-ag eichar-ice-stance-ja 104) (def-art-elt energyarm-ag energyarm-lod0-jg 0) (def-art-elt energyarm-ag energyarm-lod0-mg 1) (def-art-elt energyarm-ag energyarm-lod1-mg 2) (def-art-elt energyarm-ag energyarm-idle-ja 3) -;; energyball-ag.gc (def-art-elt energyball-ag energyball-lod0-jg 0) (def-art-elt energyball-ag energyball-lod0-mg 1) (def-art-elt energyball-ag energyball-idle-ja 2) -;; energybase-ag.gc (def-art-elt energybase-ag energybase-lod0-jg 0) (def-art-elt energybase-ag energybase-lod0-mg 1) (def-art-elt energybase-ag energybase-idle-ja 2) -;; energydoor-ag.gc (def-art-elt energydoor-ag energydoor-lod0-jg 0) (def-art-elt energydoor-ag energydoor-lod0-mg 1) (def-art-elt energydoor-ag energydoor-idle-ja 2) -;; energyhub-ag.gc (def-art-elt energyhub-ag energyhub-lod0-jg 0) (def-art-elt energyhub-ag energyhub-lod0-mg 1) (def-art-elt energyhub-ag energyhub-idle-ja 2) -;; evilbro-ag.gc (def-art-elt evilbro-ag evilbro-lod0-jg 0) (def-art-elt evilbro-ag evilbro-lod0-mg 1) (def-art-elt evilbro-ag evilbro-shadow-mg 2) (def-art-elt evilbro-ag evilbro-idle-ja 3) -;; evilbro-citadel-ag.gc (def-art-elt evilbro-citadel-ag evilbro-citadel-lod0-jg 0) (def-art-elt evilbro-citadel-ag evilbro-citadel-lod0-mg 1) (def-art-elt evilbro-citadel-ag evilbro-citadel-shadow-mg 2) (def-art-elt evilbro-citadel-ag evilbro-citadel-idle-ja 3) -;; evilbro-village3-ag.gc (def-art-elt evilbro-village3-ag evilbro-village3-lod0-jg 0) (def-art-elt evilbro-village3-ag evilbro-village3-lod0-mg 1) (def-art-elt evilbro-village3-ag evilbro-village3-shadow-mg 2) (def-art-elt evilbro-village3-ag evilbro-village3-idle-ja 3) -;; evilplant-ag.gc (def-art-elt evilplant-ag evilplant-lod0-jg 0) (def-art-elt evilplant-ag evilplant-lod0-mg 1) (def-art-elt evilplant-ag evilplant-idle-ja 2) -;; evilsis-ag.gc (def-art-elt evilsis-ag evilsis-lod0-jg 0) (def-art-elt evilsis-ag evilsis-lod0-mg 1) (def-art-elt evilsis-ag evilsis-shadow-mg 2) (def-art-elt evilsis-ag evilsis-idle-ja 3) -;; evilsis-citadel-ag.gc (def-art-elt evilsis-citadel-ag evilsis-citadel-lod0-jg 0) (def-art-elt evilsis-citadel-ag evilsis-citadel-lod0-mg 1) (def-art-elt evilsis-citadel-ag evilsis-citadel-shadow-mg 2) (def-art-elt evilsis-citadel-ag evilsis-citadel-idle-ja 3) -;; evilsis-village3-ag.gc (def-art-elt evilsis-village3-ag evilsis-village3-lod0-jg 0) (def-art-elt evilsis-village3-ag evilsis-village3-lod0-mg 1) (def-art-elt evilsis-village3-ag evilsis-village3-shadow-mg 2) (def-art-elt evilsis-village3-ag evilsis-village3-idle-ja 3) -;; exit-chamber-ag.gc (def-art-elt exit-chamber-ag exit-chamber-lod0-jg 0) (def-art-elt exit-chamber-ag exit-chamber-lod0-mg 1) (def-art-elt exit-chamber-ag exit-chamber-idle-ja 2) @@ -989,11 +792,9 @@ (def-art-elt exit-chamber-ag exit-chamber-dive-start-ja 7) (def-art-elt exit-chamber-ag exit-chamber-dive-middle-ja 8) (def-art-elt exit-chamber-ag exit-chamber-dive-end-ja 9) -;; exit-chamber-dummy-ag.gc (def-art-elt exit-chamber-dummy-ag exit-chamber-dummy-lod0-jg 0) (def-art-elt exit-chamber-dummy-ag exit-chamber-dummy-lod0-mg 1) (def-art-elt exit-chamber-dummy-ag exit-chamber-dummy-idle-ja 2) -;; explorer-ag.gc (def-art-elt explorer-ag explorer-lod0-jg 0) (def-art-elt explorer-ag explorer-lod0-mg 1) (def-art-elt explorer-ag explorer-shadow-mg 2) @@ -1003,23 +804,19 @@ (def-art-elt explorer-ag explorer-idle3-step-right-ja 6) (def-art-elt explorer-ag explorer-idle3-looking-ja 7) (def-art-elt explorer-ag explorer-idle3-step-left-ja 8) -;; farmer-ag.gc (def-art-elt farmer-ag farmer-lod0-jg 0) (def-art-elt farmer-ag farmer-lod0-mg 1) (def-art-elt farmer-ag farmer-lod1-mg 2) (def-art-elt farmer-ag farmer-shadow-mg 3) (def-art-elt farmer-ag farmer-sitting-cycle-ja 4) (def-art-elt farmer-ag farmer-standing-cycle-ja 5) -;; farthy-snack-ag.gc (def-art-elt farthy-snack-ag farthy-snack-lod0-jg 0) (def-art-elt farthy-snack-ag farthy-snack-lod0-mg 1) (def-art-elt farthy-snack-ag farthy-snack-idle-ja 2) (def-art-elt farthy-snack-ag farthy-snack-eat-ja 3) -;; finalbosscam-ag.gc (def-art-elt finalbosscam-ag finalbosscam-lod0-jg 0) (def-art-elt finalbosscam-ag finalbosscam-lod0-mg 1) (def-art-elt finalbosscam-ag finalbosscam-idle-ja 2) -;; fireboulder-ag.gc (def-art-elt fireboulder-ag fireboulder-lod0-jg 0) (def-art-elt fireboulder-ag fireboulder-lod0-mg 1) (def-art-elt fireboulder-ag fireboulder-idle-ja 2) @@ -1030,11 +827,9 @@ (def-art-elt fireboulder-ag fireboulder-boulder3b-ja 7) (def-art-elt fireboulder-ag fireboulder-boulder4-ja 8) (def-art-elt fireboulder-ag fireboulder-pre-throw-ja 10) -;; fish-net-ag.gc (def-art-elt fish-net-ag fish-net-lod0-jg 0) (def-art-elt fish-net-ag fish-net-lod0-mg 1) (def-art-elt fish-net-ag fish-net-fishing-ja 2) -;; fisher-ag.gc (def-art-elt fisher-ag fisher-lod0-jg 0) (def-art-elt fisher-ag fisher-lod0-mg 1) (def-art-elt fisher-ag fisher-lod1-mg 2) @@ -1043,42 +838,55 @@ (def-art-elt fisher-ag fisher-idle-less-often-ja 5) (def-art-elt fisher-ag fisher-idle-more-often-ja 6) (def-art-elt fisher-ag fisher-idle-win-ja 7) -;; fishermans-boat-ag.gc (def-art-elt fishermans-boat-ag fishermans-boat-lod0-jg 0) (def-art-elt fishermans-boat-ag fishermans-boat-lod0-mg 1) (def-art-elt fishermans-boat-ag fishermans-boat-lod1-mg 2) (def-art-elt fishermans-boat-ag fishermans-boat-idle-ja 3) -;; floating-launcher-ag.gc (def-art-elt floating-launcher-ag floating-launcher-lod0-jg 0) (def-art-elt floating-launcher-ag floating-launcher-lod0-mg 1) (def-art-elt floating-launcher-ag floating-launcher-idle-ja 2) -;; flut-saddle-ag.gc +(def-art-elt flut-saddle-ag flut-saddle-flut-idle-ja 3) +(def-art-elt flut-saddle-ag flut-saddle-flut-walk-ja 4) +(def-art-elt flut-saddle-ag flut-saddle-flut-run-ja 5) +(def-art-elt flut-saddle-ag flut-saddle-flut-jump-ja 6) +(def-art-elt flut-saddle-ag flut-saddle-flut-jump-loop-ja 7) +(def-art-elt flut-saddle-ag flut-saddle-flut-jump-land-ja 8) +(def-art-elt flut-saddle-ag flut-saddle-flut-jump-forward-ja 9) +(def-art-elt flut-saddle-ag flut-saddle-flut-jump-forward-loop-ja 10) +(def-art-elt flut-saddle-ag flut-saddle-flut-jump-forward-land-ja 11) +(def-art-elt flut-saddle-ag flut-saddle-flut-double-jump-ja 12) +(def-art-elt flut-saddle-ag flut-saddle-flut-running-attack-ja 13) +(def-art-elt flut-saddle-ag flut-saddle-flut-running-attack-end-ja 14) +(def-art-elt flut-saddle-ag flut-saddle-flut-air-attack-ja 15) +(def-art-elt flut-saddle-ag flut-saddle-flut-air-attack-loop-ja 16) +(def-art-elt flut-saddle-ag flut-saddle-flut-air-attack-land-ja 17) +(def-art-elt flut-saddle-ag flut-saddle-flut-get-on-ja 18) +(def-art-elt flut-saddle-ag flut-saddle-flut-get-off-ja 19) +(def-art-elt flut-saddle-ag flut-saddle-flut-hit-back-ja 20) +(def-art-elt flut-saddle-ag flut-saddle-flut-smack-surface-ja 21) +(def-art-elt flut-saddle-ag flut-saddle-flut-smack-surface-end-ja 22) +(def-art-elt flut-saddle-ag flut-saddle-flut-deatha-ja 23) +(def-art-elt flut-saddle-ag flut-saddle-flut-squash-run-ja 24) (def-art-elt flut-saddle-ag flut-saddle-lod0-jg 0) (def-art-elt flut-saddle-ag flut-saddle-lod0-mg 1) (def-art-elt flut-saddle-ag flut-saddle-shadow-mg 2) -;; flutflut-ag.gc (def-art-elt flutflut-ag flutflut-lod0-jg 0) (def-art-elt flutflut-ag flutflut-lod0-mg 1) (def-art-elt flutflut-ag flutflut-flutflut-idle-ja 2) -;; flutflut-bluehut-ag.gc (def-art-elt flutflut-bluehut-ag flutflut-bluehut-lod0-jg 0) (def-art-elt flutflut-bluehut-ag flutflut-bluehut-lod0-mg 1) (def-art-elt flutflut-bluehut-ag flutflut-bluehut-idle-breathe-ja 2) (def-art-elt flutflut-bluehut-ag flutflut-bluehut-idle-start-scratch-ja 3) (def-art-elt flutflut-bluehut-ag flutflut-bluehut-idle-scratch-ja 4) -;; flutflut-plat-large-ag.gc (def-art-elt flutflut-plat-large-ag flutflut-plat-large-lod0-jg 0) (def-art-elt flutflut-plat-large-ag flutflut-plat-large-lod0-mg 1) (def-art-elt flutflut-plat-large-ag flutflut-plat-large-idle-ja 2) -;; flutflut-plat-med-ag.gc (def-art-elt flutflut-plat-med-ag flutflut-plat-med-lod0-jg 0) (def-art-elt flutflut-plat-med-ag flutflut-plat-med-lod0-mg 1) (def-art-elt flutflut-plat-med-ag flutflut-plat-med-idle-ja 2) -;; flutflut-plat-small-ag.gc (def-art-elt flutflut-plat-small-ag flutflut-plat-small-lod0-jg 0) (def-art-elt flutflut-plat-small-ag flutflut-plat-small-lod0-mg 1) (def-art-elt flutflut-plat-small-ag flutflut-plat-small-idle-ja 2) -;; flutflutegg-ag.gc (def-art-elt flutflutegg-ag flutflutegg-lod0-jg 0) (def-art-elt flutflutegg-ag flutflutegg-lod0-mg 1) (def-art-elt flutflutegg-ag flutflutegg-lod1-mg 2) @@ -1086,7 +894,6 @@ (def-art-elt flutflutegg-ag flutflutegg-idle-ja 4) (def-art-elt flutflutegg-ag flutflutegg-crack-ja 5) (def-art-elt flutflutegg-ag flutflutegg-broke-ja 6) -;; flying-lurker-ag.gc (def-art-elt flying-lurker-ag flying-lurker-lod0-jg 0) (def-art-elt flying-lurker-ag flying-lurker-lod0-mg 1) (def-art-elt flying-lurker-ag flying-lurker-lod1-mg 2) @@ -1094,16 +901,13 @@ (def-art-elt flying-lurker-ag flying-lurker-shadow-mg 4) (def-art-elt flying-lurker-ag flying-lurker-fly-ja 5) (def-art-elt flying-lurker-ag flying-lurker-look-ja 6) -;; fuel-cell-ag.gc (def-art-elt fuel-cell-ag fuel-cell-lod0-jg 0) (def-art-elt fuel-cell-ag fuel-cell-lod0-mg 1) (def-art-elt fuel-cell-ag fuel-cell-idle-ja 2) (def-art-elt fuel-cell-ag fuel-cell-fuel-cell-victory-9-ja 11) -;; fuelcell-naked-ag.gc (def-art-elt fuelcell-naked-ag fuelcell-naked-lod0-jg 0) (def-art-elt fuelcell-naked-ag fuelcell-naked-lod0-mg 1) (def-art-elt fuelcell-naked-ag fuelcell-naked-idle-ja 2) -;; gambler-ag.gc (def-art-elt gambler-ag gambler-lod0-jg 0) (def-art-elt gambler-ag gambler-lod0-mg 1) (def-art-elt gambler-ag gambler-lod1-mg 2) @@ -1115,18 +919,15 @@ (def-art-elt gambler-ag gambler-idle-scratch-1-ja 8) (def-art-elt gambler-ag gambler-idle-look-2-ja 9) (def-art-elt gambler-ag gambler-idle-scratch-2-ja 10) -;; generic-button-ag.gc (def-art-elt generic-button-ag generic-button-lod0-jg 0) (def-art-elt generic-button-ag generic-button-lod0-mg 1) (def-art-elt generic-button-ag generic-button-idle-ja 2) -;; geologist-ag.gc (def-art-elt geologist-ag geologist-lod0-jg 0) (def-art-elt geologist-ag geologist-lod0-mg 1) (def-art-elt geologist-ag geologist-lod1-mg 2) (def-art-elt geologist-ag geologist-lod2-mg 3) (def-art-elt geologist-ag geologist-shadow-mg 4) (def-art-elt geologist-ag geologist-idle-ja 5) -;; gnawer-ag.gc (def-art-elt gnawer-ag gnawer-lod0-jg 0) (def-art-elt gnawer-ag gnawer-lod0-mg 1) (def-art-elt gnawer-ag gnawer-lod1-mg 2) @@ -1145,17 +946,14 @@ (def-art-elt gnawer-ag gnawer-segment-lod0-mg 15) (def-art-elt gnawer-ag gnawer-segment-idle-ja 16) (def-art-elt gnawer-ag gnawer-segment-die-ja 17) -;; gondola-ag.gc (def-art-elt gondola-ag gondola-lod0-jg 0) (def-art-elt gondola-ag gondola-lod0-mg 1) (def-art-elt gondola-ag gondola-shadow-mg 2) (def-art-elt gondola-ag gondola-idle-down-ja 3) (def-art-elt gondola-ag gondola-idle-up-ja 4) -;; gondolacables-ag.gc (def-art-elt gondolacables-ag gondolacables-lod0-jg 0) (def-art-elt gondolacables-ag gondolacables-lod0-mg 1) (def-art-elt gondolacables-ag gondolacables-idle-ja 2) -;; green-eco-lurker-ag.gc (def-art-elt green-eco-lurker-ag green-eco-lurker-lod0-jg 0) (def-art-elt green-eco-lurker-ag green-eco-lurker-lod0-mg 1) (def-art-elt green-eco-lurker-ag green-eco-lurker-shadow-mg 2) @@ -1168,43 +966,35 @@ (def-art-elt green-eco-lurker-ag green-eco-lurker-spot-ja 9) (def-art-elt green-eco-lurker-ag green-eco-lurker-turn-ja 10) (def-art-elt green-eco-lurker-ag green-eco-lurker-jump-with-flip-ja 11) -;; green-sagecage-ag.gc (def-art-elt green-sagecage-ag green-sagecage-lod0-jg 0) (def-art-elt green-sagecage-ag green-sagecage-lod0-mg 1) (def-art-elt green-sagecage-ag green-sagecage-lod1-mg 2) (def-art-elt green-sagecage-ag green-sagecage-shadow-mg 3) (def-art-elt green-sagecage-ag green-sagecage-green-sagecage-idle-ja 4) -;; greenshot-ag.gc (def-art-elt greenshot-ag greenshot-lod0-jg 0) (def-art-elt greenshot-ag greenshot-lod0-mg 1) (def-art-elt greenshot-ag greenshot-idle-ja 2) -;; grottopole-ag.gc (def-art-elt grottopole-ag grottopole-lod0-jg 0) (def-art-elt grottopole-ag grottopole-lod0-mg 1) (def-art-elt grottopole-ag grottopole-lod1-mg 2) (def-art-elt grottopole-ag grottopole-idle-ja 3) -;; happy-plant-ag.gc (def-art-elt happy-plant-ag happy-plant-lod0-jg 0) (def-art-elt happy-plant-ag happy-plant-lod0-mg 1) (def-art-elt happy-plant-ag happy-plant-lod1-mg 2) (def-art-elt happy-plant-ag happy-plant-init-ja 3) (def-art-elt happy-plant-ag happy-plant-idle-ja 4) -;; harvester-ag.gc (def-art-elt harvester-ag harvester-lod0-jg 0) (def-art-elt harvester-ag harvester-lod0-mg 1) (def-art-elt harvester-ag harvester-lod1-mg 2) (def-art-elt harvester-ag harvester-lod2-mg 3) (def-art-elt harvester-ag harvester-idle-ja 4) (def-art-elt harvester-ag harvester-inflate-ja 5) -;; helix-button-ag.gc (def-art-elt helix-button-ag helix-button-lod0-jg 0) (def-art-elt helix-button-ag helix-button-lod0-mg 1) (def-art-elt helix-button-ag helix-button-idle-ja 2) -;; helix-slide-door-ag.gc (def-art-elt helix-slide-door-ag helix-slide-door-lod0-jg 0) (def-art-elt helix-slide-door-ag helix-slide-door-lod0-mg 1) (def-art-elt helix-slide-door-ag helix-slide-door-idle-ja 2) -;; hopper-ag.gc (def-art-elt hopper-ag hopper-lod0-jg 0) (def-art-elt hopper-ag hopper-lod0-mg 1) (def-art-elt hopper-ag hopper-lod1-mg 2) @@ -1217,11 +1007,9 @@ (def-art-elt hopper-ag hopper-jump-short-ja 9) (def-art-elt hopper-ag hopper-jump-short-land-ja 10) (def-art-elt hopper-ag hopper-death-ja 11) -;; hutlamp-ag.gc (def-art-elt hutlamp-ag hutlamp-lod0-jg 0) (def-art-elt hutlamp-ag hutlamp-lod0-mg 1) (def-art-elt hutlamp-ag hutlamp-idle-ja 2) -;; ice-cube-ag.gc (def-art-elt ice-cube-ag ice-cube-lod0-jg 0) (def-art-elt ice-cube-ag ice-cube-lod0-mg 1) (def-art-elt ice-cube-ag ice-cube-lod1-mg 2) @@ -1240,24 +1028,19 @@ (def-art-elt ice-cube-ag ice-cube-breathing-ja 15) (def-art-elt ice-cube-ag ice-cube-head-wipe-ja 16) (def-art-elt ice-cube-ag ice-cube-invuln-stopping-upright-ja 17) -;; ice-cube-break-ag.gc (def-art-elt ice-cube-break-ag ice-cube-break-lod0-jg 0) (def-art-elt ice-cube-break-ag ice-cube-break-lod0-mg 1) (def-art-elt ice-cube-break-ag ice-cube-break-idle-ja 2) -;; jak-white-ag.gc (def-art-elt jak-white-ag jak-white-lod0-jg 0) (def-art-elt jak-white-ag jak-white-lod0-mg 1) (def-art-elt jak-white-ag jak-white-idle-ja 2) -;; jaws-ag.gc (def-art-elt jaws-ag jaws-lod0-jg 0) (def-art-elt jaws-ag jaws-lod0-mg 1) (def-art-elt jaws-ag jaws-idle-ja 2) -;; jng-iris-door-ag.gc (def-art-elt jng-iris-door-ag jng-iris-door-lod0-jg 0) (def-art-elt jng-iris-door-ag jng-iris-door-lod0-mg 1) (def-art-elt jng-iris-door-ag jng-iris-door-lod1-mg 2) (def-art-elt jng-iris-door-ag jng-iris-door-idle-ja 3) -;; junglecam-ag.gc (def-art-elt junglecam-ag junglecam-lod0-jg 0) (def-art-elt junglecam-ag junglecam-lod0-mg 1) (def-art-elt junglecam-ag junglecam-beamcam-ja 2) @@ -1267,7 +1050,6 @@ (def-art-elt junglecam-ag junglecam-tower4-ja 6) (def-art-elt junglecam-ag junglecam-tower5-ja 7) (def-art-elt junglecam-ag junglecam-precurbridgecam-ja 8) -;; junglefish-ag.gc (def-art-elt junglefish-ag junglefish-lod0-jg 0) (def-art-elt junglefish-ag junglefish-lod0-mg 1) (def-art-elt junglefish-ag junglefish-lod1-mg 2) @@ -1275,7 +1057,6 @@ (def-art-elt junglefish-ag junglefish-swim-ja 4) (def-art-elt junglefish-ag junglefish-chomp-ja 5) (def-art-elt junglefish-ag junglefish-death-ja 6) -;; junglesnake-ag.gc (def-art-elt junglesnake-ag junglesnake-lod0-jg 0) (def-art-elt junglesnake-ag junglesnake-lod0-mg 1) (def-art-elt junglesnake-ag junglesnake-idle-ja 2) @@ -1284,22 +1065,18 @@ (def-art-elt junglesnake-ag junglesnake-drop-down-ja 5) (def-art-elt junglesnake-ag junglesnake-death-ja 6) (def-art-elt junglesnake-ag junglesnake-give-up-ja 7) -;; keg-ag.gc (def-art-elt keg-ag keg-lod0-jg 0) (def-art-elt keg-ag keg-lod0-mg 1) (def-art-elt keg-ag keg-lod1-mg 2) (def-art-elt keg-ag keg-lod2-mg 3) (def-art-elt keg-ag keg-shadow-mg 4) (def-art-elt keg-ag keg-idle-ja 5) -;; keg-conveyor-ag.gc (def-art-elt keg-conveyor-ag keg-conveyor-lod0-jg 0) (def-art-elt keg-conveyor-ag keg-conveyor-lod0-mg 1) (def-art-elt keg-conveyor-ag keg-conveyor-idle-ja 2) -;; keg-conveyor-paddle-ag.gc (def-art-elt keg-conveyor-paddle-ag keg-conveyor-paddle-lod0-jg 0) (def-art-elt keg-conveyor-paddle-ag keg-conveyor-paddle-lod0-mg 1) (def-art-elt keg-conveyor-paddle-ag keg-conveyor-paddle-idle-ja 2) -;; kermit-ag.gc (def-art-elt kermit-ag kermit-lod0-jg 0) (def-art-elt kermit-ag kermit-lod0-mg 1) (def-art-elt kermit-ag kermit-lod1-mg 2) @@ -1312,61 +1089,48 @@ (def-art-elt kermit-ag kermit-pull-ja 9) (def-art-elt kermit-ag kermit-turn-ja 10) (def-art-elt kermit-ag kermit-die-ja 11) -;; kickrock-ag.gc (def-art-elt kickrock-ag kickrock-lod0-jg 0) (def-art-elt kickrock-ag kickrock-lod0-mg 1) (def-art-elt kickrock-ag kickrock-idle-ja 2) -;; launcherdoor-ag.gc (def-art-elt launcherdoor-ag launcherdoor-geo-jg 0) (def-art-elt launcherdoor-ag launcherdoor-geo-mg 1) (def-art-elt launcherdoor-ag launcherdoor-lod1-mg 2) (def-art-elt launcherdoor-ag launcherdoor-idle-ja 3) -;; launcherdoor-maincave-ag.gc (def-art-elt launcherdoor-maincave-ag launcherdoor-maincave-geo-jg 0) (def-art-elt launcherdoor-maincave-ag launcherdoor-maincave-geo-mg 1) (def-art-elt launcherdoor-maincave-ag launcherdoor-maincave-lod1-mg 2) (def-art-elt launcherdoor-maincave-ag launcherdoor-maincave-idle-ja 3) -;; lavaballoon-ag.gc (def-art-elt lavaballoon-ag lavaballoon-lod0-jg 0) (def-art-elt lavaballoon-ag lavaballoon-lod0-mg 1) (def-art-elt lavaballoon-ag lavaballoon-lod1-mg 2) (def-art-elt lavaballoon-ag lavaballoon-idle-ja 3) -;; lavabase-ag.gc (def-art-elt lavabase-ag lavabase-lod0-jg 0) (def-art-elt lavabase-ag lavabase-lod0-mg 1) (def-art-elt lavabase-ag lavabase-idle-ja 2) -;; lavafall-ag.gc (def-art-elt lavafall-ag lavafall-lod0-jg 0) (def-art-elt lavafall-ag lavafall-lod0-mg 1) (def-art-elt lavafall-ag lavafall-idle-ja 2) -;; lavafallsewera-ag.gc (def-art-elt lavafallsewera-ag lavafallsewera-lod0-jg 0) (def-art-elt lavafallsewera-ag lavafallsewera-lod0-mg 1) (def-art-elt lavafallsewera-ag lavafallsewera-idle-ja 2) -;; lavafallsewerb-ag.gc (def-art-elt lavafallsewerb-ag lavafallsewerb-lod0-jg 0) (def-art-elt lavafallsewerb-ag lavafallsewerb-lod0-mg 1) (def-art-elt lavafallsewerb-ag lavafallsewerb-idle-ja 2) -;; lavashortcut-ag.gc (def-art-elt lavashortcut-ag lavashortcut-lod0-jg 0) (def-art-elt lavashortcut-ag lavashortcut-lod0-mg 1) (def-art-elt lavashortcut-ag lavashortcut-idle-ja 2) -;; lavaspoutdrip-ag.gc (def-art-elt lavaspoutdrip-ag lavaspoutdrip-lod0-jg 0) (def-art-elt lavaspoutdrip-ag lavaspoutdrip-lod0-mg 1) (def-art-elt lavaspoutdrip-ag lavaspoutdrip-idle-ja 2) -;; lavayellowtarp-ag.gc (def-art-elt lavayellowtarp-ag lavayellowtarp-lod0-jg 0) (def-art-elt lavayellowtarp-ag lavayellowtarp-lod0-mg 1) (def-art-elt lavayellowtarp-ag lavayellowtarp-idle-ja 2) -;; light-eco-ag.gc (def-art-elt light-eco-ag light-eco-big-lod0-jg 0) (def-art-elt light-eco-ag light-eco-big-lod0-mg 1) (def-art-elt light-eco-ag light-eco-big-idle-ja 2) (def-art-elt light-eco-ag light-eco-small-lod0-jg 3) (def-art-elt light-eco-ag light-eco-small-lod0-mg 4) (def-art-elt light-eco-ag light-eco-small-idle-ja 5) -;; lightning-mole-ag.gc (def-art-elt lightning-mole-ag lightning-mole-lod0-jg 0) (def-art-elt lightning-mole-ag lightning-mole-lod0-mg 1) (def-art-elt lightning-mole-ag lightning-mole-lod1-mg 2) @@ -1381,42 +1145,35 @@ (def-art-elt lightning-mole-ag lightning-mole-run-to-idle-ja 11) (def-art-elt lightning-mole-ag lightning-mole-dive-ja 12) (def-art-elt lightning-mole-ag lightning-mole-peep-ja 13) -;; logo-ag.gc -(def-art-elt logo-ag logo-english-lod0-jg 0) (def-art-elt logo-ag logo-logo-loop-pre-ja 8) +(def-art-elt logo-ag logo-english-lod0-jg 0) (def-art-elt logo-ag logo-english-lod0-mg 1) (def-art-elt logo-ag logo-japan-lod0-jg 2) (def-art-elt logo-ag logo-japan-lod0-mg 3) (def-art-elt logo-ag logo-idle-ja 4) (def-art-elt logo-ag logo-logo-intro-2-pre-ja 6) -;; logo-black-ag.gc (def-art-elt logo-black-ag logo-black-lod0-jg 0) (def-art-elt logo-black-ag logo-black-lod0-mg 1) (def-art-elt logo-black-ag logo-black-idle-ja 2) -;; logo-cam-ag.gc (def-art-elt logo-cam-ag logo-cam-lod0-jg 0) (def-art-elt logo-cam-ag logo-cam-lod0-mg 1) (def-art-elt logo-cam-ag logo-cam-idle-ja 2) (def-art-elt logo-cam-ag logo-cam-logo-intro-2-pre-ja 4) (def-art-elt logo-cam-ag logo-cam-logo-loop-pre-ja 6) -;; logo-volumes-ag.gc (def-art-elt logo-volumes-ag logo-volumes-english-lod0-jg 0) (def-art-elt logo-volumes-ag logo-volumes-english-lod0-mg 1) (def-art-elt logo-volumes-ag logo-volumes-japan-lod0-jg 2) (def-art-elt logo-volumes-ag logo-volumes-japan-lod0-mg 3) (def-art-elt logo-volumes-ag logo-volumes-idle-ja 4) -;; logtrap-ag.gc (def-art-elt logtrap-ag logtrap-lod0-jg 0) (def-art-elt logtrap-ag logtrap-lod0-mg 1) (def-art-elt logtrap-ag logtrap-lod1-mg 2) (def-art-elt logtrap-ag logtrap-shadow-mg 3) (def-art-elt logtrap-ag logtrap-idle-ja 4) -;; lrocklrg-ag.gc (def-art-elt lrocklrg-ag lrocklrg-lod0-jg 0) (def-art-elt lrocklrg-ag lrocklrg-lod0-mg 1) (def-art-elt lrocklrg-ag lrocklrg-idle-ja 2) (def-art-elt lrocklrg-ag lrocklrg-fallen-ja 3) -;; lurkercrab-ag.gc (def-art-elt lurkercrab-ag lurkercrab-lod0-jg 0) (def-art-elt lurkercrab-ag lurkercrab-lod0-mg 1) (def-art-elt lurkercrab-ag lurkercrab-lod1-mg 2) @@ -1429,17 +1186,14 @@ (def-art-elt lurkercrab-ag lurkercrab-snip-ja 9) (def-art-elt lurkercrab-ag lurkercrab-kickback-ja 10) (def-art-elt lurkercrab-ag lurkercrab-die-ja 11) -;; lurkerm-piston-ag.gc (def-art-elt lurkerm-piston-ag lurkerm-piston-geo-jg 0) (def-art-elt lurkerm-piston-ag lurkerm-piston-geo-mg 1) (def-art-elt lurkerm-piston-ag lurkerm-piston-idle-ja 2) -;; lurkerm-tall-sail-ag.gc (def-art-elt lurkerm-tall-sail-ag lurkerm-tall-sail-lod0-jg 0) (def-art-elt lurkerm-tall-sail-ag lurkerm-tall-sail-lod0-mg 1) (def-art-elt lurkerm-tall-sail-ag lurkerm-tall-sail-lod1-mg 2) (def-art-elt lurkerm-tall-sail-ag lurkerm-tall-sail-lod2-mg 3) (def-art-elt lurkerm-tall-sail-ag lurkerm-tall-sail-idle-ja 4) -;; lurkerpuppy-ag.gc (def-art-elt lurkerpuppy-ag lurkerpuppy-lod0-jg 0) (def-art-elt lurkerpuppy-ag lurkerpuppy-lod0-mg 1) (def-art-elt lurkerpuppy-ag lurkerpuppy-lod1-mg 2) @@ -1452,7 +1206,6 @@ (def-art-elt lurkerpuppy-ag lurkerpuppy-jump-ja 9) (def-art-elt lurkerpuppy-ag lurkerpuppy-jump-land-ja 10) (def-art-elt lurkerpuppy-ag lurkerpuppy-die-ja 11) -;; lurkerworm-ag.gc (def-art-elt lurkerworm-ag lurkerworm-lod0-jg 0) (def-art-elt lurkerworm-ag lurkerworm-lod0-mg 1) (def-art-elt lurkerworm-ag lurkerworm-lod1-mg 2) @@ -1461,109 +1214,83 @@ (def-art-elt lurkerworm-ag lurkerworm-sink-ja 5) (def-art-elt lurkerworm-ag lurkerworm-chomp-ja 6) (def-art-elt lurkerworm-ag lurkerworm-die-ja 7) -;; maincavecam-ag.gc (def-art-elt maincavecam-ag maincavecam-lod0-jg 0) (def-art-elt maincavecam-ag maincavecam-lod0-mg 1) (def-art-elt maincavecam-ag maincavecam-dummy-ja 2) -;; maindoor-ag.gc (def-art-elt maindoor-ag maindoor-lod0-jg 0) (def-art-elt maindoor-ag maindoor-lod0-mg 1) (def-art-elt maindoor-ag maindoor-lod1-mg 2) (def-art-elt maindoor-ag maindoor-idle-ja 3) -;; mayor-ag.gc (def-art-elt mayor-ag mayor-lod0-jg 0) (def-art-elt mayor-ag mayor-lod0-mg 1) (def-art-elt mayor-ag mayor-shadow-mg 2) (def-art-elt mayor-ag mayor-idle-ja 3) -;; mayorgears-ag.gc (def-art-elt mayorgears-ag mayorgears-geo-jg 0) (def-art-elt mayorgears-ag mayorgears-geo-mg 1) (def-art-elt mayorgears-ag mayorgears-idle-ja 2) -;; medres-beach-ag.gc (def-art-elt medres-beach-ag medres-beach-lod0-jg 0) (def-art-elt medres-beach-ag medres-beach-lod0-mg 1) (def-art-elt medres-beach-ag medres-beach-idle-ja 2) -;; medres-beach1-ag.gc (def-art-elt medres-beach1-ag medres-beach1-lod0-jg 0) (def-art-elt medres-beach1-ag medres-beach1-lod0-mg 1) (def-art-elt medres-beach1-ag medres-beach1-idle-ja 2) -;; medres-beach2-ag.gc (def-art-elt medres-beach2-ag medres-beach2-lod0-jg 0) (def-art-elt medres-beach2-ag medres-beach2-lod0-mg 1) (def-art-elt medres-beach2-ag medres-beach2-idle-ja 2) -;; medres-beach3-ag.gc (def-art-elt medres-beach3-ag medres-beach3-lod0-jg 0) (def-art-elt medres-beach3-ag medres-beach3-lod0-mg 1) (def-art-elt medres-beach3-ag medres-beach3-idle-ja 2) -;; medres-finalboss-ag.gc (def-art-elt medres-finalboss-ag medres-finalboss-lod0-jg 0) (def-art-elt medres-finalboss-ag medres-finalboss-lod0-mg 1) (def-art-elt medres-finalboss-ag medres-finalboss-idle-ja 2) -;; medres-firecanyon-ag.gc (def-art-elt medres-firecanyon-ag medres-firecanyon-lod0-jg 0) (def-art-elt medres-firecanyon-ag medres-firecanyon-lod0-mg 1) (def-art-elt medres-firecanyon-ag medres-firecanyon-idle-ja 2) -;; medres-jungle-ag.gc (def-art-elt medres-jungle-ag medres-jungle-lod0-jg 0) (def-art-elt medres-jungle-ag medres-jungle-lod0-mg 1) (def-art-elt medres-jungle-ag medres-jungle-idle-ja 2) -;; medres-jungle1-ag.gc (def-art-elt medres-jungle1-ag medres-jungle1-lod0-jg 0) (def-art-elt medres-jungle1-ag medres-jungle1-lod0-mg 1) (def-art-elt medres-jungle1-ag medres-jungle1-idle-ja 2) -;; medres-jungle2-ag.gc (def-art-elt medres-jungle2-ag medres-jungle2-lod0-jg 0) (def-art-elt medres-jungle2-ag medres-jungle2-lod0-mg 1) (def-art-elt medres-jungle2-ag medres-jungle2-idle-ja 2) -;; medres-misty-ag.gc (def-art-elt medres-misty-ag medres-misty-lod0-jg 0) (def-art-elt medres-misty-ag medres-misty-lod0-mg 1) (def-art-elt medres-misty-ag medres-misty-idle-ja 2) -;; medres-ogre-ag.gc (def-art-elt medres-ogre-ag medres-ogre-lod0-jg 0) (def-art-elt medres-ogre-ag medres-ogre-lod0-mg 1) (def-art-elt medres-ogre-ag medres-ogre-idle-ja 2) -;; medres-ogre2-ag.gc (def-art-elt medres-ogre2-ag medres-ogre2-lod0-jg 0) (def-art-elt medres-ogre2-ag medres-ogre2-lod0-mg 1) (def-art-elt medres-ogre2-ag medres-ogre2-idle-ja 2) -;; medres-ogre3-ag.gc (def-art-elt medres-ogre3-ag medres-ogre3-lod0-jg 0) (def-art-elt medres-ogre3-ag medres-ogre3-lod0-mg 1) (def-art-elt medres-ogre3-ag medres-ogre3-idle-ja 2) -;; medres-rolling-ag.gc (def-art-elt medres-rolling-ag medres-rolling-lod0-jg 0) (def-art-elt medres-rolling-ag medres-rolling-lod0-mg 1) (def-art-elt medres-rolling-ag medres-rolling-idle-ja 2) -;; medres-rolling1-ag.gc (def-art-elt medres-rolling1-ag medres-rolling1-lod0-jg 0) (def-art-elt medres-rolling1-ag medres-rolling1-lod0-mg 1) (def-art-elt medres-rolling1-ag medres-rolling1-idle-ja 2) -;; medres-snow-ag.gc (def-art-elt medres-snow-ag medres-snow-lod0-jg 0) (def-art-elt medres-snow-ag medres-snow-lod0-mg 1) (def-art-elt medres-snow-ag medres-snow-idle-ja 2) -;; medres-training-ag.gc (def-art-elt medres-training-ag medres-training-lod0-jg 0) (def-art-elt medres-training-ag medres-training-lod0-mg 1) (def-art-elt medres-training-ag medres-training-idle-ja 2) -;; medres-village11-ag.gc (def-art-elt medres-village11-ag medres-village11-lod0-jg 0) (def-art-elt medres-village11-ag medres-village11-lod0-mg 1) (def-art-elt medres-village11-ag medres-village11-idle-ja 2) -;; medres-village12-ag.gc (def-art-elt medres-village12-ag medres-village12-lod0-jg 0) (def-art-elt medres-village12-ag medres-village12-lod0-mg 1) (def-art-elt medres-village12-ag medres-village12-idle-ja 2) -;; medres-village13-ag.gc (def-art-elt medres-village13-ag medres-village13-lod0-jg 0) (def-art-elt medres-village13-ag medres-village13-lod0-mg 1) (def-art-elt medres-village13-ag medres-village13-idle-ja 2) -;; medres-village2-ag.gc (def-art-elt medres-village2-ag medres-village2-lod0-jg 0) (def-art-elt medres-village2-ag medres-village2-lod0-mg 1) (def-art-elt medres-village2-ag medres-village2-idle-ja 2) -;; minecartsteel-ag.gc (def-art-elt minecartsteel-ag minecartsteel-lod0-jg 0) (def-art-elt minecartsteel-ag minecartsteel-lod0-mg 1) (def-art-elt minecartsteel-ag minecartsteel-lod1-mg 2) @@ -1572,17 +1299,14 @@ (def-art-elt minecartsteel-ag minecartsteel-rail0-ja 5) (def-art-elt minecartsteel-ag minecartsteel-rail1-ja 6) (def-art-elt minecartsteel-ag minecartsteel-rail2-ja 7) -;; minershort-ag.gc (def-art-elt minershort-ag minershort-lod0-jg 0) (def-art-elt minershort-ag minershort-lod0-mg 1) (def-art-elt minershort-ag minershort-shadow-mg 2) (def-art-elt minershort-ag minershort-idle-ja 3) -;; minertall-ag.gc (def-art-elt minertall-ag minertall-lod0-jg 0) (def-art-elt minertall-ag minertall-lod0-mg 1) (def-art-elt minertall-ag minertall-shadow-mg 2) (def-art-elt minertall-ag minertall-idle-ja 3) -;; mis-bone-bridge-ag.gc (def-art-elt mis-bone-bridge-ag mis-bone-bridge-lod0-jg 0) (def-art-elt mis-bone-bridge-ag mis-bone-bridge-lod0-mg 1) (def-art-elt mis-bone-bridge-ag mis-bone-bridge-idle-ja 2) @@ -1590,29 +1314,24 @@ (def-art-elt mis-bone-bridge-ag mis-bone-bridge-idle7-ja 4) (def-art-elt mis-bone-bridge-ag mis-bone-bridge-kicked-ja 5) (def-art-elt mis-bone-bridge-ag mis-bone-bridge-bumped-ja 6) -;; mis-bone-platform-ag.gc (def-art-elt mis-bone-platform-ag mis-bone-platform-lod0-jg 0) (def-art-elt mis-bone-platform-ag mis-bone-platform-lod0-mg 1) (def-art-elt mis-bone-platform-ag mis-bone-platform-idle-ja 2) -;; mistycam-ag.gc (def-art-elt mistycam-ag mistycam-lod0-jg 0) (def-art-elt mistycam-ag mistycam-lod0-mg 1) (def-art-elt mistycam-ag mistycam-anim-ja 2) (def-art-elt mistycam-ag mistycam-lurkerattack-ja 3) (def-art-elt mistycam-ag mistycam-balloon-fuel-cell-ja 4) (def-art-elt mistycam-ag mistycam-cannon-fuel-cell-ja 6) -;; mistycannon-ag.gc (def-art-elt mistycannon-ag mistycannon-lod0-jg 0) (def-art-elt mistycannon-ag mistycannon-lod0-mg 1) (def-art-elt mistycannon-ag mistycannon-lod1-mg 2) (def-art-elt mistycannon-ag mistycannon-idle-ja 3) -;; money-ag.gc (def-art-elt money-ag money-lod0-jg 0) (def-art-elt money-ag money-lod0-mg 1) (def-art-elt money-ag money-lod1-mg 2) (def-art-elt money-ag money-lod2-mg 3) (def-art-elt money-ag money-idle-ja 4) -;; mother-spider-ag.gc (def-art-elt mother-spider-ag mother-spider-lod0-jg 0) (def-art-elt mother-spider-ag mother-spider-lod0-mg 1) (def-art-elt mother-spider-ag mother-spider-lod1-mg 2) @@ -1630,7 +1349,6 @@ (def-art-elt mother-spider-ag mother-spider-leg-lod0-mg 14) (def-art-elt mother-spider-ag mother-spider-leg-twitching-ja 15) (def-art-elt mother-spider-ag mother-spider-leg-die-ja 16) -;; muse-ag.gc (def-art-elt muse-ag muse-lod0-jg 0) (def-art-elt muse-ag muse-lod0-mg 1) (def-art-elt muse-ag muse-shadow-mg 2) @@ -1640,29 +1358,23 @@ (def-art-elt muse-ag muse-run-to-idle-ja 6) (def-art-elt muse-ag muse-jump-ja 7) (def-art-elt muse-ag muse-jump-land-ja 8) -;; ndi-ag.gc (def-art-elt ndi-ag ndi-lod0-jg 0) (def-art-elt ndi-ag ndi-lod0-mg 1) (def-art-elt ndi-ag ndi-idle-ja 2) -;; ndi-cam-ag.gc (def-art-elt ndi-cam-ag ndi-cam-lod0-jg 0) (def-art-elt ndi-cam-ag ndi-cam-lod0-mg 1) (def-art-elt ndi-cam-ag ndi-cam-idle-ja 2) -;; ndi-volumes-ag.gc (def-art-elt ndi-volumes-ag ndi-volumes-lod0-jg 0) (def-art-elt ndi-volumes-ag ndi-volumes-lod0-mg 1) (def-art-elt ndi-volumes-ag ndi-volumes-idle-ja 2) -;; ogre-bridge-ag.gc (def-art-elt ogre-bridge-ag ogre-bridge-lod0-jg 0) (def-art-elt ogre-bridge-ag ogre-bridge-lod0-mg 1) (def-art-elt ogre-bridge-ag ogre-bridge-idle-ja 2) (def-art-elt ogre-bridge-ag ogre-bridge-assemble-ja 3) (def-art-elt ogre-bridge-ag ogre-bridge-break-ja 4) -;; ogre-bridgeend-ag.gc (def-art-elt ogre-bridgeend-ag ogre-bridgeend-lod0-jg 0) (def-art-elt ogre-bridgeend-ag ogre-bridgeend-lod0-mg 1) (def-art-elt ogre-bridgeend-ag ogre-bridgeend-idle-ja 2) -;; ogre-isle-ag.gc (def-art-elt ogre-isle-ag ogre-isle-a-lod0-jg 0) (def-art-elt ogre-isle-ag ogre-isle-a-lod0-mg 1) (def-art-elt ogre-isle-ag ogre-isle-a-idle-ja 2) @@ -1675,7 +1387,6 @@ (def-art-elt ogre-isle-ag ogre-isle-d-lod0-jg 9) (def-art-elt ogre-isle-ag ogre-isle-d-lod0-mg 10) (def-art-elt ogre-isle-ag ogre-isle-d-idle-ja 11) -;; ogre-step-ag.gc (def-art-elt ogre-step-ag ogre-step-a-lod0-jg 0) (def-art-elt ogre-step-ag ogre-step-a-lod0-mg 1) (def-art-elt ogre-step-ag ogre-step-a-idle-ja 2) @@ -1688,7 +1399,6 @@ (def-art-elt ogre-step-ag ogre-step-d-lod0-jg 9) (def-art-elt ogre-step-ag ogre-step-d-lod0-mg 10) (def-art-elt ogre-step-ag ogre-step-d-idle-ja 11) -;; ogreboss-ag.gc (def-art-elt ogreboss-ag ogreboss-lod0-jg 0) (def-art-elt ogreboss-ag ogreboss-lod0-mg 1) (def-art-elt ogreboss-ag ogreboss-idle-ja 2) @@ -1738,7 +1448,6 @@ (def-art-elt ogreboss-ag ogreboss-column-lod0-mg 46) (def-art-elt ogreboss-ag ogreboss-column-idle-ja 47) (def-art-elt ogreboss-ag ogreboss-column-intro-ja 48) -;; ogreboss-village2-ag.gc (def-art-elt ogreboss-village2-ag ogreboss-village2-lod0-jg 0) (def-art-elt ogreboss-village2-ag ogreboss-village2-lod0-mg 1) (def-art-elt ogreboss-village2-ag ogreboss-village2-idle-ja 2) @@ -1747,27 +1456,21 @@ (def-art-elt ogreboss-village2-ag ogreboss-village2-throw-ja 5) (def-art-elt ogreboss-village2-ag ogreboss-village2-victory-ja 6) (def-art-elt ogreboss-village2-ag ogreboss-village2-pre-throw-ja 7) -;; ogrecam-ag.gc (def-art-elt ogrecam-ag ogrecam-lod0-jg 0) (def-art-elt ogrecam-ag ogrecam-lod0-mg 1) -;; oracle-ag.gc (def-art-elt oracle-ag oracle-lod0-jg 0) (def-art-elt oracle-ag oracle-lod0-mg 1) (def-art-elt oracle-ag oracle-idle-ja 2) -;; orb-cache-top-ag.gc (def-art-elt orb-cache-top-ag orb-cache-top-lod0-jg 0) (def-art-elt orb-cache-top-ag orb-cache-top-lod0-mg 1) (def-art-elt orb-cache-top-ag orb-cache-top-lod1-mg 2) (def-art-elt orb-cache-top-ag orb-cache-top-idle-ja 3) -;; orbit-plat-ag.gc (def-art-elt orbit-plat-ag orbit-plat-lod0-jg 0) (def-art-elt orbit-plat-ag orbit-plat-lod0-mg 1) (def-art-elt orbit-plat-ag orbit-plat-idle-ja 2) -;; orbit-plat-bottom-ag.gc (def-art-elt orbit-plat-bottom-ag orbit-plat-bottom-lod0-jg 0) (def-art-elt orbit-plat-bottom-ag orbit-plat-bottom-lod0-mg 1) (def-art-elt orbit-plat-bottom-ag orbit-plat-bottom-idle-ja 2) -;; pelican-ag.gc (def-art-elt pelican-ag pelican-lod0-jg 0) (def-art-elt pelican-ag pelican-lod0-mg 1) (def-art-elt pelican-ag pelican-lod1-mg 2) @@ -1779,7 +1482,6 @@ (def-art-elt pelican-ag pelican-fly-down-ja 8) (def-art-elt pelican-ag pelican-land-ja 9) (def-art-elt pelican-ag pelican-sleep-ja 10) -;; periscope-ag.gc (def-art-elt periscope-ag periscope-base-lod0-jg 0) (def-art-elt periscope-ag periscope-base-lod0-mg 1) (def-art-elt periscope-ag periscope-base-lod1-mg 2) @@ -1788,15 +1490,15 @@ (def-art-elt periscope-ag periscope-mirror-lod0-mg 5) (def-art-elt periscope-ag periscope-mirror-lod1-mg 6) (def-art-elt periscope-ag periscope-mirror-idle-ja 7) -;; pistons-ag.gc (def-art-elt pistons-ag pistons-lod0-jg 0) (def-art-elt pistons-ag pistons-lod0-mg 1) (def-art-elt pistons-ag pistons-idle-ja 2) -;; plant-boss-ag.gc -(def-art-elt plant-boss-ag plant-boss-main-lod0-jg 0) -(def-art-elt plant-boss-ag plant-boss-main-lod0-mg 1) (def-art-elt plant-boss-ag plant-boss-main-shadow-mg 2) +(def-art-elt plant-boss-ag plant-boss-main-plant-boss-kill-ja 18) (def-art-elt plant-boss-ag plant-boss-main-idle-ja 3) +(def-art-elt plant-boss-ag plant-boss-main-plant-boss-kill-close-ja 19) +(def-art-elt plant-boss-ag plant-boss-main-lod0-jg 0) +(def-art-elt plant-boss-ag plant-boss-main-lod0-mg 1) (def-art-elt plant-boss-ag plant-boss-main-idle-alt-ja 4) (def-art-elt plant-boss-ag plant-boss-main-attack-ja 5) (def-art-elt plant-boss-ag plant-boss-main-attack-close-ja 6) @@ -1847,29 +1549,18 @@ (def-art-elt plant-boss-ag plant-boss-root-lod0-jg 53) (def-art-elt plant-boss-ag plant-boss-root-lod0-mg 54) (def-art-elt plant-boss-ag plant-boss-root-idle-ja 55) -;; plant-boss-main+0-ag.gc -(def-art-elt plant-boss-main+0-ag eichar-main-plant-boss-kill-ja 0) -(def-art-elt plant-boss-main+0-ag eichar-main-plant-boss-kill-close-ja 1) -(def-art-elt plant-boss-main+0-ag plant-boss-main-plant-boss-kill-ja 2) -(def-art-elt plant-boss-main+0-ag plant-boss-main-plant-boss-kill-close-ja 3) -(def-art-elt plant-boss-main+0-ag sidekick-main-plant-boss-kill-ja 4) -(def-art-elt plant-boss-main+0-ag sidekick-main-plant-boss-kill-close-ja 5) -;; plat-ag.gc (def-art-elt plat-ag plat-lod0-jg 0) (def-art-elt plat-ag plat-lod0-mg 1) (def-art-elt plat-ag plat-lod1-mg 2) (def-art-elt plat-ag plat-lod2-mg 3) (def-art-elt plat-ag plat-idle-ja 4) -;; plat-button-ag.gc (def-art-elt plat-button-ag plat-button-geo-jg 0) (def-art-elt plat-button-ag plat-button-geo-mg 1) (def-art-elt plat-button-ag plat-button-pressed-ja 2) -;; plat-citb-ag.gc (def-art-elt plat-citb-ag plat-citb-lod0-jg 0) (def-art-elt plat-citb-ag plat-citb-lod0-mg 1) (def-art-elt plat-citb-ag plat-citb-lod1-mg 2) (def-art-elt plat-citb-ag plat-citb-idle-ja 3) -;; plat-eco-ag.gc (def-art-elt plat-eco-ag plat-eco-lod0-jg 0) (def-art-elt plat-eco-ag plat-eco-lod0-mg 1) (def-art-elt plat-eco-ag plat-eco-lod1-mg 2) @@ -1879,7 +1570,6 @@ (def-art-elt plat-eco-ag plat-eco-lit-lod1-mg 6) (def-art-elt plat-eco-ag plat-eco-lit-lod2-mg 7) (def-art-elt plat-eco-ag plat-eco-idle-ja 8) -;; plat-eco-citb-ag.gc (def-art-elt plat-eco-citb-ag plat-eco-citb-lod0-jg 0) (def-art-elt plat-eco-citb-ag plat-eco-citb-lod0-mg 1) (def-art-elt plat-eco-citb-ag plat-eco-citb-lod1-mg 2) @@ -1889,7 +1579,6 @@ (def-art-elt plat-eco-citb-ag plat-eco-citb-lit-lod1-mg 6) (def-art-elt plat-eco-citb-ag plat-eco-citb-lit-lod2-mg 7) (def-art-elt plat-eco-citb-ag plat-eco-citb-idle-ja 8) -;; plat-eco-finalboss-ag.gc (def-art-elt plat-eco-finalboss-ag plat-eco-finalboss-lod0-jg 0) (def-art-elt plat-eco-finalboss-ag plat-eco-finalboss-lod0-mg 1) (def-art-elt plat-eco-finalboss-ag plat-eco-finalboss-lod1-mg 2) @@ -1899,24 +1588,20 @@ (def-art-elt plat-eco-finalboss-ag plat-eco-finalboss-lit-lod1-mg 6) (def-art-elt plat-eco-finalboss-ag plat-eco-finalboss-lit-lod2-mg 7) (def-art-elt plat-eco-finalboss-ag plat-eco-finalboss-idle-ja 8) -;; plat-flip-ag.gc (def-art-elt plat-flip-ag plat-flip-geo-jg 0) (def-art-elt plat-flip-ag plat-flip-geo-mg 1) (def-art-elt plat-flip-ag plat-flip-turn-down-ja 2) (def-art-elt plat-flip-ag plat-flip-turn-up-ja 3) -;; plat-jungleb-ag.gc (def-art-elt plat-jungleb-ag plat-jungleb-lod0-jg 0) (def-art-elt plat-jungleb-ag plat-jungleb-lod0-mg 1) (def-art-elt plat-jungleb-ag plat-jungleb-lod1-mg 2) (def-art-elt plat-jungleb-ag plat-jungleb-lod2-mg 3) (def-art-elt plat-jungleb-ag plat-jungleb-idle-ja 4) -;; plat-sunken-ag.gc (def-art-elt plat-sunken-ag plat-sunken-lod0-jg 0) (def-art-elt plat-sunken-ag plat-sunken-lod0-mg 1) (def-art-elt plat-sunken-ag plat-sunken-lod1-mg 2) (def-art-elt plat-sunken-ag plat-sunken-lod2-mg 3) (def-art-elt plat-sunken-ag plat-sunken-idle-ja 4) -;; plunger-lurker-ag.gc (def-art-elt plunger-lurker-ag plunger-lurker-lod0-jg 0) (def-art-elt plunger-lurker-ag plunger-lurker-lod0-mg 1) (def-art-elt plunger-lurker-ag plunger-lurker-lod1-mg 2) @@ -1924,42 +1609,34 @@ (def-art-elt plunger-lurker-ag plunger-lurker-idle-ja 4) (def-art-elt plunger-lurker-ag plunger-lurker-notice-ja 5) (def-art-elt plunger-lurker-ag plunger-lurker-death-ja 6) -;; pontoonfive-ag.gc (def-art-elt pontoonfive-ag pontoonfive-lod0-jg 0) (def-art-elt pontoonfive-ag pontoonfive-lod0-mg 1) (def-art-elt pontoonfive-ag pontoonfive-lod1-mg 2) (def-art-elt pontoonfive-ag pontoonfive-lod2-mg 3) (def-art-elt pontoonfive-ag pontoonfive-idle-ja 4) -;; pontoonten-ag.gc (def-art-elt pontoonten-ag pontoonten-lod0-jg 0) (def-art-elt pontoonten-ag pontoonten-lod0-mg 1) (def-art-elt pontoonten-ag pontoonten-lod1-mg 2) (def-art-elt pontoonten-ag pontoonten-lod2-mg 3) (def-art-elt pontoonten-ag pontoonten-idle-ja 4) -;; power-left-ag.gc (def-art-elt power-left-ag power-left-lod0-jg 0) (def-art-elt power-left-ag power-left-lod0-mg 1) (def-art-elt power-left-ag power-left-idle-ja 2) -;; power-right-ag.gc (def-art-elt power-right-ag power-right-lod0-jg 0) (def-art-elt power-right-ag power-right-lod0-mg 1) (def-art-elt power-right-ag power-right-idle-ja 2) -;; powercellalt-ag.gc (def-art-elt powercellalt-ag powercellalt-lod0-jg 0) (def-art-elt powercellalt-ag powercellalt-lod0-mg 1) (def-art-elt powercellalt-ag powercellalt-idle-ja 2) -;; precurbridge-ag.gc (def-art-elt precurbridge-ag precurbridge-geo-jg 0) (def-art-elt precurbridge-ag precurbridge-geo-mg 1) (def-art-elt precurbridge-ag precurbridge-lod1-mg 2) (def-art-elt precurbridge-ag precurbridge-idle-ja 3) (def-art-elt precurbridge-ag precurbridge-float-ja 4) (def-art-elt precurbridge-ag precurbridge-static-ja 5) -;; precursor-arm-ag.gc (def-art-elt precursor-arm-ag precursor-arm-lod0-jg 0) (def-art-elt precursor-arm-ag precursor-arm-lod0-mg 1) (def-art-elt precursor-arm-ag precursor-arm-idle-ja 2) -;; puffer-ag.gc (def-art-elt puffer-ag puffer-main-lod0-jg 0) (def-art-elt puffer-ag puffer-main-lod0-mg 1) (def-art-elt puffer-ag puffer-main-lod1-mg 2) @@ -1976,19 +1653,15 @@ (def-art-elt puffer-ag puffer-puff-up-ja 13) (def-art-elt puffer-ag puffer-puff-down-ja 14) (def-art-elt puffer-ag puffer-die-ja 15) -;; pusher-ag.gc (def-art-elt pusher-ag pusher-lod0-jg 0) (def-art-elt pusher-ag pusher-lod0-mg 1) (def-art-elt pusher-ag pusher-idle-ja 2) -;; qbert-plat-ag.gc (def-art-elt qbert-plat-ag qbert-plat-lod0-jg 0) (def-art-elt qbert-plat-ag qbert-plat-lod0-mg 1) (def-art-elt qbert-plat-ag qbert-plat-idle-ja 2) -;; qbert-plat-on-ag.gc (def-art-elt qbert-plat-on-ag qbert-plat-on-lod0-jg 0) (def-art-elt qbert-plat-on-ag qbert-plat-on-lod0-mg 1) (def-art-elt qbert-plat-on-ag qbert-plat-on-idle-ja 2) -;; quicksandlurker-ag.gc (def-art-elt quicksandlurker-ag quicksandlurker-lod0-jg 0) (def-art-elt quicksandlurker-ag quicksandlurker-lod0-mg 1) (def-art-elt quicksandlurker-ag quicksandlurker-idle-ja 2) @@ -1999,18 +1672,33 @@ (def-art-elt quicksandlurker-ag quicksandlurker-victory2-ja 7) (def-art-elt quicksandlurker-ag quicksandlurker-popup-ja 8) (def-art-elt quicksandlurker-ag quicksandlurker-die-ja 9) -;; race-ring-ag.gc (def-art-elt race-ring-ag race-ring-lod0-jg 0) (def-art-elt race-ring-ag race-ring-lod0-mg 1) (def-art-elt race-ring-ag race-ring-race-ring-idle-ja 2) -;; racer-ag.gc +(def-art-elt racer-ag racer-racer-idle-ja 3) +(def-art-elt racer-ag racer-racer-turn-ja 4) +(def-art-elt racer-ag racer-racer-turn2-ja 5) +(def-art-elt racer-ag racer-racer-dig-ja 6) +(def-art-elt racer-ag racer-racer-dig2-ja 7) +(def-art-elt racer-ag racer-racer-jump-ja 8) +(def-art-elt racer-ag racer-racer-jump-loop-ja 9) +(def-art-elt racer-ag racer-racer-jump-land-ja 10) +(def-art-elt racer-ag racer-racer-jump-small-ja 11) +(def-art-elt racer-ag racer-racer-jump-small-loop-ja 12) +(def-art-elt racer-ag racer-racer-jump-small-land-ja 13) +(def-art-elt racer-ag racer-racer-stance-ja 14) +(def-art-elt racer-ag racer-racer-jump-high-loop-ja 15) +(def-art-elt racer-ag racer-racer-jump-high-land-ja 16) +(def-art-elt racer-ag racer-racer-smack-ja 17) +(def-art-elt racer-ag racer-racer-get-off-ja 18) +(def-art-elt racer-ag racer-racer-get-on-ja 19) +(def-art-elt racer-ag racer-racer-death-explode-ja 20) (def-art-elt racer-ag racer-geo-jg 0) -(def-art-elt racer-ag racer-explode-idle-ja 24) (def-art-elt racer-ag racer-geo-mg 1) (def-art-elt racer-ag racer-shadow-mg 2) (def-art-elt racer-ag racer-explode-lod0-jg 22) (def-art-elt racer-ag racer-explode-lod0-mg 23) -;; ram-ag.gc +(def-art-elt racer-ag racer-explode-idle-ja 24) (def-art-elt ram-ag ram-lod0-jg 0) (def-art-elt ram-ag ram-lod0-mg 1) (def-art-elt ram-ag ram-lod1-mg 2) @@ -2018,7 +1706,6 @@ (def-art-elt ram-ag ram-cock-ja 4) (def-art-elt ram-ag ram-release-ja 5) (def-art-elt ram-ag ram-idle-ja 6) -;; ram-boss-ag.gc (def-art-elt ram-boss-ag ram-boss-lod0-jg 0) (def-art-elt ram-boss-ag ram-boss-lod0-mg 1) (def-art-elt ram-boss-ag ram-boss-lod1-mg 2) @@ -2044,11 +1731,9 @@ (def-art-elt ram-boss-ag ram-boss-up-defend-tracking-ja 22) (def-art-elt ram-boss-ag ram-boss-throw-no-shield-ja 23) (def-art-elt ram-boss-ag ram-boss-forward-defend-no-shield-ja 24) -;; redring-ag.gc (def-art-elt redring-ag redring-lod0-jg 0) (def-art-elt redring-ag redring-lod0-mg 1) (def-art-elt redring-ag redring-idle-ja 2) -;; redsage-ag.gc (def-art-elt redsage-ag redsage-lod0-jg 0) (def-art-elt redsage-ag redsage-lod0-mg 1) (def-art-elt redsage-ag redsage-lod1-mg 2) @@ -2056,11 +1741,9 @@ (def-art-elt redsage-ag redsage-redsage-idle-ja 4) (def-art-elt redsage-ag redsage-redsage-attack-start-ja 5) (def-art-elt redsage-ag redsage-redsage-attack-loop-ja 6) -;; reflector-middle-ag.gc (def-art-elt reflector-middle-ag reflector-middle-geo-jg 0) (def-art-elt reflector-middle-ag reflector-middle-geo-mg 1) (def-art-elt reflector-middle-ag reflector-middle-idle-ja 2) -;; reflector-mirror-ag.gc (def-art-elt reflector-mirror-ag reflector-mirror-lod0-jg 0) (def-art-elt reflector-mirror-ag reflector-mirror-lod0-mg 1) (def-art-elt reflector-mirror-ag reflector-mirror-lod1-mg 2) @@ -2068,15 +1751,12 @@ (def-art-elt reflector-mirror-ag reflector-mirror-break-lod0-jg 4) (def-art-elt reflector-mirror-ag reflector-mirror-break-lod0-mg 5) (def-art-elt reflector-mirror-ag reflector-mirror-break-break-ja 6) -;; revcycle-ag.gc (def-art-elt revcycle-ag revcycle-geo-jg 0) (def-art-elt revcycle-ag revcycle-geo-mg 1) (def-art-elt revcycle-ag revcycle-idle-ja 2) -;; revcycleprop-ag.gc (def-art-elt revcycleprop-ag revcycleprop-lod0-jg 0) (def-art-elt revcycleprop-ag revcycleprop-lod0-mg 1) (def-art-elt revcycleprop-ag revcycleprop-idle-ja 2) -;; robber-ag.gc (def-art-elt robber-ag robber-lod0-jg 0) (def-art-elt robber-ag robber-lod0-mg 1) (def-art-elt robber-ag robber-lod1-mg 2) @@ -2089,7 +1769,6 @@ (def-art-elt robber-ag robber-taunt-ja 9) (def-art-elt robber-ag robber-idle-hover-ja 10) (def-art-elt robber-ag robber-ambient-look-ja 11) -;; robotboss-ag.gc (def-art-elt robotboss-ag robotboss-basic-lod0-jg 0) (def-art-elt robotboss-ag robotboss-basic-lod0-mg 1) (def-art-elt robotboss-ag robotboss-idle-ja 2) @@ -2126,26 +1805,21 @@ (def-art-elt robotboss-ag robotboss-blue-last-hit-ja 33) (def-art-elt robotboss-ag robotboss-red-last-hit-ja 34) (def-art-elt robotboss-ag robotboss-yellow-last-hit-ja 35) -;; robotboss-blueeco-ag.gc (def-art-elt robotboss-blueeco-ag robotboss-blueeco-lod0-jg 0) (def-art-elt robotboss-blueeco-ag robotboss-blueeco-lod0-mg 1) (def-art-elt robotboss-blueeco-ag robotboss-blueeco-idle-ja 2) (def-art-elt robotboss-blueeco-ag robotboss-blueeco-blue-last-hit-ja 3) -;; robotboss-cinematic-ag.gc (def-art-elt robotboss-cinematic-ag robotboss-cinematic-lod0-jg 0) (def-art-elt robotboss-cinematic-ag robotboss-cinematic-lod0-mg 1) (def-art-elt robotboss-cinematic-ag robotboss-cinematic-idle-ja 2) -;; robotboss-redeco-ag.gc (def-art-elt robotboss-redeco-ag robotboss-redeco-lod0-jg 0) (def-art-elt robotboss-redeco-ag robotboss-redeco-lod0-mg 1) (def-art-elt robotboss-redeco-ag robotboss-redeco-idle-ja 2) (def-art-elt robotboss-redeco-ag robotboss-redeco-red-last-hit-ja 3) -;; robotboss-yelloweco-ag.gc (def-art-elt robotboss-yelloweco-ag robotboss-yelloweco-lod0-jg 0) (def-art-elt robotboss-yelloweco-ag robotboss-yelloweco-lod0-mg 1) (def-art-elt robotboss-yelloweco-ag robotboss-yelloweco-idle-ja 2) (def-art-elt robotboss-yelloweco-ag robotboss-yelloweco-yellow-last-hit-ja 3) -;; rolling-start-ag.gc (def-art-elt rolling-start-ag rolling-start-whole-lod0-jg 0) (def-art-elt rolling-start-ag rolling-start-whole-lod0-mg 1) (def-art-elt rolling-start-ag rolling-start-broken-lod0-jg 2) @@ -2154,42 +1828,34 @@ (def-art-elt rolling-start-ag rolling-start-break-whole-ja 5) (def-art-elt rolling-start-ag rolling-start-break-broken-ja 6) (def-art-elt rolling-start-ag rolling-start-broken-ja 7) -;; rollingcam-ag.gc (def-art-elt rollingcam-ag rollingcam-lod0-jg 0) (def-art-elt rollingcam-ag rollingcam-lod0-mg 1) (def-art-elt rollingcam-ag rollingcam-anim-ja 2) -;; ropebridge-32-ag.gc (def-art-elt ropebridge-32-ag ropebridge-32-lod0-jg 0) (def-art-elt ropebridge-32-ag ropebridge-32-lod0-mg 1) (def-art-elt ropebridge-32-ag ropebridge-32-lod1-mg 2) (def-art-elt ropebridge-32-ag ropebridge-32-idle-ja 3) -;; ropebridge-36-ag.gc (def-art-elt ropebridge-36-ag ropebridge-36-lod0-jg 0) (def-art-elt ropebridge-36-ag ropebridge-36-lod0-mg 1) (def-art-elt ropebridge-36-ag ropebridge-36-lod1-mg 2) (def-art-elt ropebridge-36-ag ropebridge-36-idle-ja 3) -;; ropebridge-52-ag.gc (def-art-elt ropebridge-52-ag ropebridge-52-lod0-jg 0) (def-art-elt ropebridge-52-ag ropebridge-52-lod0-mg 1) (def-art-elt ropebridge-52-ag ropebridge-52-lod1-mg 2) (def-art-elt ropebridge-52-ag ropebridge-52-idle-ja 3) -;; ropebridge-70-ag.gc (def-art-elt ropebridge-70-ag ropebridge-70-lod0-jg 0) (def-art-elt ropebridge-70-ag ropebridge-70-lod0-mg 1) (def-art-elt ropebridge-70-ag ropebridge-70-lod1-mg 2) (def-art-elt ropebridge-70-ag ropebridge-70-idle-ja 3) -;; rounddoor-ag.gc (def-art-elt rounddoor-ag rounddoor-lod0-jg 0) (def-art-elt rounddoor-ag rounddoor-lod0-mg 1) (def-art-elt rounddoor-ag rounddoor-lod1-mg 2) (def-art-elt rounddoor-ag rounddoor-idle-ja 3) -;; sack-ag.gc (def-art-elt sack-ag sack-lod0-jg 0) (def-art-elt sack-ag sack-lod0-mg 1) (def-art-elt sack-ag sack-idle-ja 2) (def-art-elt sack-ag sack-hit-ja 3) (def-art-elt sack-ag sack-fuse-ja 4) -;; sage-ag.gc (def-art-elt sage-ag sage-lod0-jg 0) (def-art-elt sage-ag sage-lod0-mg 1) (def-art-elt sage-ag sage-shadow-mg 2) @@ -2198,25 +1864,21 @@ (def-art-elt sage-ag sage-idle-ecorocks-peer-ja 5) (def-art-elt sage-ag sage-idle-levitate-ja 6) (def-art-elt sage-ag sage-idle-levitate-backward-ja 7) -;; sage-bluehut-ag.gc (def-art-elt sage-bluehut-ag sage-bluehut-lod0-jg 0) (def-art-elt sage-bluehut-ag sage-bluehut-lod0-mg 1) (def-art-elt sage-bluehut-ag sage-bluehut-shadow-mg 2) (def-art-elt sage-bluehut-ag sage-bluehut-idle-ja 3) (def-art-elt sage-bluehut-ag sage-bluehut-idle-stand-ja 4) (def-art-elt sage-bluehut-ag sage-bluehut-idle-prec-arm-ja 5) -;; sage-village3-ag.gc (def-art-elt sage-village3-ag sage-village3-lod0-jg 0) (def-art-elt sage-village3-ag sage-village3-lod0-mg 1) (def-art-elt sage-village3-ag sage-village3-shadow-mg 2) (def-art-elt sage-village3-ag sage-village3-idle-ja 3) -;; sagesail-ag.gc (def-art-elt sagesail-ag sagesail-lod0-jg 0) (def-art-elt sagesail-ag sagesail-lod0-mg 1) (def-art-elt sagesail-ag sagesail-lod1-mg 2) (def-art-elt sagesail-ag sagesail-lod2-mg 3) (def-art-elt sagesail-ag sagesail-idle-ja 4) -;; scarecrow-a-ag.gc (def-art-elt scarecrow-a-ag scarecrow-a-lod0-jg 0) (def-art-elt scarecrow-a-ag scarecrow-a-lod0-mg 1) (def-art-elt scarecrow-a-ag scarecrow-a-lod1-mg 2) @@ -2226,7 +1888,6 @@ (def-art-elt scarecrow-a-ag scarecrow-a-hit-left-ja 6) (def-art-elt scarecrow-a-ag scarecrow-a-hit-right-ja 7) (def-art-elt scarecrow-a-ag scarecrow-a-hit-front-ja 8) -;; scarecrow-b-ag.gc (def-art-elt scarecrow-b-ag scarecrow-b-lod0-jg 0) (def-art-elt scarecrow-b-ag scarecrow-b-lod0-mg 1) (def-art-elt scarecrow-b-ag scarecrow-b-lod1-mg 2) @@ -2236,7 +1897,6 @@ (def-art-elt scarecrow-b-ag scarecrow-b-hit-left-ja 6) (def-art-elt scarecrow-b-ag scarecrow-b-hit-right-ja 7) (def-art-elt scarecrow-b-ag scarecrow-b-hit-front-ja 8) -;; sculptor-ag.gc (def-art-elt sculptor-ag sculptor-lod0-jg 0) (def-art-elt sculptor-ag sculptor-lod0-mg 1) (def-art-elt sculptor-ag sculptor-shadow-mg 2) @@ -2253,11 +1913,9 @@ (def-art-elt sculptor-ag sculptor-to-huge-ja 13) (def-art-elt sculptor-ag sculptor-huge-ja 14) (def-art-elt sculptor-ag sculptor-huge-to-looking-ja 15) -;; sculptor-muse-ag.gc (def-art-elt sculptor-muse-ag sculptor-muse-lod0-jg 0) (def-art-elt sculptor-muse-ag sculptor-muse-lod0-mg 1) (def-art-elt sculptor-muse-ag sculptor-muse-idle-ja 2) -;; seagull-ag.gc (def-art-elt seagull-ag seagull-lod0-jg 0) (def-art-elt seagull-ag seagull-lod0-mg 1) (def-art-elt seagull-ag seagull-idle-ja 2) @@ -2268,36 +1926,29 @@ (def-art-elt seagull-ag seagull-stop-ja 7) (def-art-elt seagull-ag seagull-walk-ja 8) (def-art-elt seagull-ag seagull-takeoff-ja 9) -;; seaweed-ag.gc (def-art-elt seaweed-ag seaweed-lod0-jg 0) (def-art-elt seaweed-ag seaweed-lod0-mg 1) (def-art-elt seaweed-ag seaweed-idle-ja 2) -;; sharkey-ag.gc (def-art-elt sharkey-ag sharkey-lod0-jg 0) (def-art-elt sharkey-ag sharkey-lod0-mg 1) (def-art-elt sharkey-ag sharkey-idle-ja 2) (def-art-elt sharkey-ag sharkey-chomp-ja 3) -;; shortcut-boulder-ag.gc (def-art-elt shortcut-boulder-ag shortcut-boulder-whole-lod0-jg 0) (def-art-elt shortcut-boulder-ag shortcut-boulder-whole-lod0-mg 1) (def-art-elt shortcut-boulder-ag shortcut-boulder-broken-lod0-jg 2) (def-art-elt shortcut-boulder-ag shortcut-boulder-broken-lod0-mg 3) (def-art-elt shortcut-boulder-ag shortcut-boulder-idle-ja 4) -;; shover-ag.gc (def-art-elt shover-ag shover-lod0-jg 0) (def-art-elt shover-ag shover-lod0-mg 1) (def-art-elt shover-ag shover-idle-ja 2) -;; side-to-side-plat-ag.gc (def-art-elt side-to-side-plat-ag side-to-side-plat-lod0-jg 0) (def-art-elt side-to-side-plat-ag side-to-side-plat-lod0-mg 1) (def-art-elt side-to-side-plat-ag side-to-side-plat-lod1-mg 2) (def-art-elt side-to-side-plat-ag side-to-side-plat-idle-ja 3) -;; sidedoor-ag.gc (def-art-elt sidedoor-ag sidedoor-geo-jg 0) (def-art-elt sidedoor-ag sidedoor-geo-mg 1) (def-art-elt sidedoor-ag sidedoor-lod1-mg 2) (def-art-elt sidedoor-ag sidedoor-idle-ja 3) -;; sidekick-ag.gc (def-art-elt sidekick-ag sidekick-lod0-jg 0) (def-art-elt sidekick-ag sidekick-lod0-mg 1) (def-art-elt sidekick-ag sidekick-shadow-mg 2) @@ -2342,11 +1993,8 @@ (def-art-elt sidekick-ag sidekick-attack-from-stance-run-alt-end-ja 40) (def-art-elt sidekick-ag sidekick-attack-from-jump-ja 41) (def-art-elt sidekick-ag sidekick-attack-from-jump-loop-ja 42) -(def-art-elt sidekick-ag sidekick-free-run-ja 171) (def-art-elt sidekick-ag sidekick-attack-from-jump-end-ja 43) -(def-art-elt sidekick-ag sidekick-free-jog-ja 172) (def-art-elt sidekick-ag sidekick-attack-punch-ja 44) -(def-art-elt sidekick-ag sidekick-free-walk-ja 173) (def-art-elt sidekick-ag sidekick-attack-punch-end-ja 45) (def-art-elt sidekick-ag sidekick-attack-punch-alt-end-ja 46) (def-art-elt sidekick-ag sidekick-attack-uppercut-ja 47) @@ -2381,20 +2029,78 @@ (def-art-elt sidekick-ag sidekick-swim-jump-ja 82) (def-art-elt sidekick-ag sidekick-trip-ja 95) (def-art-elt sidekick-ag sidekick-fuel-cell-victory-9-ja 122) -;; sidekick-human-ag.gc +(def-art-elt sidekick-ag sidekick-free-run-ja 171) +(def-art-elt sidekick-ag sidekick-free-jog-ja 172) +(def-art-elt sidekick-ag sidekick-free-walk-ja 173) +(def-art-elt sidekick-ag sidekick-main-plant-boss-kill-ja 169) +(def-art-elt sidekick-ag sidekick-main-plant-boss-kill-close-ja 170) +(def-art-elt sidekick-ag sidekick-fishing-ja 83) +(def-art-elt sidekick-ag sidekick-fishing-lose-ja 84) +(def-art-elt sidekick-ag sidekick-racer-idle-ja 96) +(def-art-elt sidekick-ag sidekick-racer-turn-ja 97) +(def-art-elt sidekick-ag sidekick-racer-turn2-ja 98) +(def-art-elt sidekick-ag sidekick-racer-dig-ja 99) +(def-art-elt sidekick-ag sidekick-racer-dig2-ja 100) +(def-art-elt sidekick-ag sidekick-racer-jump-ja 101) +(def-art-elt sidekick-ag sidekick-racer-jump-loop-ja 102) +(def-art-elt sidekick-ag sidekick-racer-jump-land-ja 103) +(def-art-elt sidekick-ag sidekick-racer-jump-small-ja 104) +(def-art-elt sidekick-ag sidekick-racer-jump-small-loop-ja 105) +(def-art-elt sidekick-ag sidekick-racer-jump-small-land-ja 106) +(def-art-elt sidekick-ag sidekick-racer-stance-ja 107) +(def-art-elt sidekick-ag sidekick-racer-jump-high-loop-ja 108) +(def-art-elt sidekick-ag sidekick-racer-jump-high-land-ja 109) +(def-art-elt sidekick-ag sidekick-racer-smack-ja 110) +(def-art-elt sidekick-ag sidekick-racer-get-off-ja 111) +(def-art-elt sidekick-ag sidekick-racer-get-on-ja 112) +(def-art-elt sidekick-ag sidekick-racer-death-explode-ja 113) +(def-art-elt sidekick-ag sidekick-flut-idle-ja 195) +(def-art-elt sidekick-ag sidekick-flut-walk-ja 196) +(def-art-elt sidekick-ag sidekick-flut-run-ja 197) +(def-art-elt sidekick-ag sidekick-flut-jump-ja 198) +(def-art-elt sidekick-ag sidekick-flut-jump-loop-ja 199) +(def-art-elt sidekick-ag sidekick-flut-jump-land-ja 200) +(def-art-elt sidekick-ag sidekick-flut-jump-forward-ja 201) +(def-art-elt sidekick-ag sidekick-flut-jump-forward-loop-ja 202) +(def-art-elt sidekick-ag sidekick-flut-jump-forward-land-ja 203) +(def-art-elt sidekick-ag sidekick-flut-double-jump-ja 204) +(def-art-elt sidekick-ag sidekick-flut-running-attack-ja 205) +(def-art-elt sidekick-ag sidekick-flut-running-attack-end-ja 206) +(def-art-elt sidekick-ag sidekick-flut-air-attack-ja 207) +(def-art-elt sidekick-ag sidekick-flut-air-attack-loop-ja 208) +(def-art-elt sidekick-ag sidekick-flut-air-attack-land-ja 209) +(def-art-elt sidekick-ag sidekick-flut-get-on-ja 210) +(def-art-elt sidekick-ag sidekick-flut-get-off-ja 211) +(def-art-elt sidekick-ag sidekick-flut-hit-back-ja 212) +(def-art-elt sidekick-ag sidekick-flut-smack-surface-ja 213) +(def-art-elt sidekick-ag sidekick-flut-smack-surface-end-ja 214) +(def-art-elt sidekick-ag sidekick-flut-deatha-ja 215) +(def-art-elt sidekick-ag sidekick-flut-squash-run-ja 216) +(def-art-elt sidekick-ag sidekick-tube-turn-ja 88) +(def-art-elt sidekick-ag sidekick-tube-jump-land-ja 89) +(def-art-elt sidekick-ag sidekick-tube-dummy2-ja 90) +(def-art-elt sidekick-ag sidekick-tube-dummy3-ja 91) +(def-art-elt sidekick-ag sidekick-tube-dummy4-ja 92) +(def-art-elt sidekick-ag sidekick-tube-dummy5-ja 93) +(def-art-elt sidekick-ag sidekick-tube-dummy6-ja 94) +(def-art-elt sidekick-ag sidekick-pole-cycle-ja 63) +(def-art-elt sidekick-ag sidekick-pole-cycle2-ja 64) +(def-art-elt sidekick-ag sidekick-pole-flip-up-ja 65) +(def-art-elt sidekick-ag sidekick-pole-flip-forward-ja 66) +(def-art-elt sidekick-ag sidekick-pole-jump-loop-ja 67) +(def-art-elt sidekick-ag sidekick-ice-skate-ja 85) +(def-art-elt sidekick-ag sidekick-ice-slide-ja 86) +(def-art-elt sidekick-ag sidekick-ice-stance-ja 87) (def-art-elt sidekick-human-ag sidekick-human-lod0-jg 0) (def-art-elt sidekick-human-ag sidekick-human-lod0-mg 1) (def-art-elt sidekick-human-ag sidekick-human-shadow-mg 2) (def-art-elt sidekick-human-ag sidekick-human-idle-ja 3) -;; silodoor-ag.gc (def-art-elt silodoor-ag silodoor-lod0-jg 0) (def-art-elt silodoor-ag silodoor-lod0-mg 1) (def-art-elt silodoor-ag silodoor-idle-ja 2) -;; silostep-ag.gc (def-art-elt silostep-ag silostep-lod0-jg 0) (def-art-elt silostep-ag silostep-lod0-mg 1) (def-art-elt silostep-ag silostep-idle-ja 2) -;; snow-ball-ag.gc (def-art-elt snow-ball-ag snow-ball-lod0-jg 0) (def-art-elt snow-ball-ag snow-ball-lod0-mg 1) (def-art-elt snow-ball-ag snow-ball-idle-ja 2) @@ -2402,19 +2108,16 @@ (def-art-elt snow-ball-ag snow-ball-shadow-lod0-mg 4) (def-art-elt snow-ball-ag snow-ball-shadow-shadow-mg 5) (def-art-elt snow-ball-ag snow-ball-shadow-idle-ja 6) -;; snow-bridge-36-ag.gc (def-art-elt snow-bridge-36-ag snow-bridge-36-lod0-jg 0) (def-art-elt snow-bridge-36-ag snow-bridge-36-lod0-mg 1) (def-art-elt snow-bridge-36-ag snow-bridge-36-lod1-mg 2) (def-art-elt snow-bridge-36-ag snow-bridge-36-idle-ja 3) -;; snow-bumper-ag.gc (def-art-elt snow-bumper-ag snow-bumper-lod0-jg 0) (def-art-elt snow-bumper-ag snow-bumper-lod0-mg 1) (def-art-elt snow-bumper-ag snow-bumper-lod1-mg 2) (def-art-elt snow-bumper-ag snow-bumper-idle-ja 3) (def-art-elt snow-bumper-ag snow-bumper-button-ja 4) (def-art-elt snow-bumper-ag snow-bumper-collapse-ja 5) -;; snow-bunny-ag.gc (def-art-elt snow-bunny-ag snow-bunny-lod0-jg 0) (def-art-elt snow-bunny-ag snow-bunny-lod0-mg 1) (def-art-elt snow-bunny-ag snow-bunny-lod1-mg 2) @@ -2427,40 +2130,32 @@ (def-art-elt snow-bunny-ag snow-bunny-sees-player-ja 9) (def-art-elt snow-bunny-ag snow-bunny-sees-player-land-ja 10) (def-art-elt snow-bunny-ag snow-bunny-die-ja 11) -;; snow-button-ag.gc (def-art-elt snow-button-ag snow-button-lod0-jg 0) (def-art-elt snow-button-ag snow-button-lod0-mg 1) (def-art-elt snow-button-ag snow-button-going-down-ja 2) (def-art-elt snow-button-ag snow-button-going-up-ja 3) -;; snow-eggtop-ag.gc (def-art-elt snow-eggtop-ag snow-eggtop-lod0-jg 0) (def-art-elt snow-eggtop-ag snow-eggtop-lod0-mg 1) (def-art-elt snow-eggtop-ag snow-eggtop-idle-ja 2) -;; snow-fort-gate-ag.gc (def-art-elt snow-fort-gate-ag snow-fort-gate-lod0-jg 0) (def-art-elt snow-fort-gate-ag snow-fort-gate-lod0-mg 1) (def-art-elt snow-fort-gate-ag snow-fort-gate-idle-ja 2) -;; snow-gears-ag.gc (def-art-elt snow-gears-ag snow-gears-lod0-jg 0) (def-art-elt snow-gears-ag snow-gears-lod0-mg 1) (def-art-elt snow-gears-ag snow-gears-idle-ja 2) (def-art-elt snow-gears-ag snow-gears-start-ja 3) (def-art-elt snow-gears-ag snow-gears-loop-ja 4) (def-art-elt snow-gears-ag snow-gears-stop-ja 5) -;; snow-log-ag.gc (def-art-elt snow-log-ag snow-log-lod0-jg 0) (def-art-elt snow-log-ag snow-log-lod0-mg 1) (def-art-elt snow-log-ag snow-log-activate-ja 2) (def-art-elt snow-log-ag snow-log-active-loop-ja 3) -;; snow-spatula-ag.gc (def-art-elt snow-spatula-ag snow-spatula-lod0-jg 0) (def-art-elt snow-spatula-ag snow-spatula-lod0-mg 1) (def-art-elt snow-spatula-ag snow-spatula-idle-ja 2) -;; snow-switch-ag.gc (def-art-elt snow-switch-ag snow-switch-lod0-jg 0) (def-art-elt snow-switch-ag snow-switch-lod0-mg 1) (def-art-elt snow-switch-ag snow-switch-idle-ja 2) -;; snowcam-ag.gc (def-art-elt snowcam-ag snowcam-lod0-jg 0) (def-art-elt snowcam-ag snowcam-lod0-mg 1) (def-art-elt snowcam-ag snowcam-gearstart-ja 2) @@ -2468,15 +2163,12 @@ (def-art-elt snowcam-ag snowcam-gearend-ja 4) (def-art-elt snowcam-ag snowcam-eggtop-activating-ja 5) (def-art-elt snowcam-ag snowcam-ecovent-activating-ja 6) -;; snowpusher-ag.gc (def-art-elt snowpusher-ag snowpusher-lod0-jg 0) (def-art-elt snowpusher-ag snowpusher-lod0-mg 1) (def-art-elt snowpusher-ag snowpusher-idle-ja 2) -;; speaker-ag.gc (def-art-elt speaker-ag speaker-lod0-jg 0) (def-art-elt speaker-ag speaker-lod0-mg 1) (def-art-elt speaker-ag speaker-idle-ja 2) -;; spider-egg-ag.gc (def-art-elt spider-egg-ag spider-egg-unbroken-lod0-jg 0) (def-art-elt spider-egg-ag spider-egg-unbroken-lod0-mg 1) (def-art-elt spider-egg-ag spider-egg-unbroken-lod1-mg 2) @@ -2491,34 +2183,27 @@ (def-art-elt spider-egg-ag spider-egg-bounce-ja 11) (def-art-elt spider-egg-ag spider-egg-die-ja 12) (def-art-elt spider-egg-ag spider-egg-twitch-ja 13) -;; spiderwebs-ag.gc (def-art-elt spiderwebs-ag spiderwebs-good-lod0-jg 0) (def-art-elt spiderwebs-ag spiderwebs-good-lod0-mg 1) (def-art-elt spiderwebs-ag spiderwebs-bounce-ja 2) -;; spike-ag.gc (def-art-elt spike-ag spike-lod0-jg 0) (def-art-elt spike-ag spike-lod0-mg 1) (def-art-elt spike-ag spike-lod1-mg 2) (def-art-elt spike-ag spike-idle-ja 3) -;; square-platform-ag.gc (def-art-elt square-platform-ag square-platform-lod0-jg 0) (def-art-elt square-platform-ag square-platform-lod0-mg 1) (def-art-elt square-platform-ag square-platform-lod1-mg 2) (def-art-elt square-platform-ag square-platform-idle-ja 3) -;; steam-cap-ag.gc (def-art-elt steam-cap-ag steam-cap-lod0-jg 0) (def-art-elt steam-cap-ag steam-cap-lod0-mg 1) (def-art-elt steam-cap-ag steam-cap-idle-ja 2) -;; sun-iris-door-ag.gc (def-art-elt sun-iris-door-ag sun-iris-door-lod0-jg 0) (def-art-elt sun-iris-door-ag sun-iris-door-lod0-mg 1) (def-art-elt sun-iris-door-ag sun-iris-door-lod1-mg 2) (def-art-elt sun-iris-door-ag sun-iris-door-idle-ja 3) -;; sunken-elevator-ag.gc (def-art-elt sunken-elevator-ag sunken-elevator-lod0-jg 0) (def-art-elt sunken-elevator-ag sunken-elevator-lod0-mg 1) (def-art-elt sunken-elevator-ag sunken-elevator-pressed-ja 2) -;; sunkencam-ag.gc (def-art-elt sunkencam-ag sunkencam-lod0-jg 0) (def-art-elt sunkencam-ag sunkencam-lod0-mg 1) (def-art-elt sunkencam-ag sunkencam-qbert-show-door-open-ja 2) @@ -2541,7 +2226,6 @@ (def-art-elt sunkencam-ag sunkencam-pipegame-left-ja 19) (def-art-elt sunkencam-ag sunkencam-pipegame-middle-ja 20) (def-art-elt sunkencam-ag sunkencam-pipegame-right-ja 21) -;; sunkenfisha-ag.gc (def-art-elt sunkenfisha-ag sunkenfisha-red-yellow-lod0-jg 0) (def-art-elt sunkenfisha-ag sunkenfisha-red-yellow-lod0-mg 1) (def-art-elt sunkenfisha-ag sunkenfisha-yellow-blue-lod0-jg 2) @@ -2549,7 +2233,6 @@ (def-art-elt sunkenfisha-ag sunkenfisha-yellow-eye-lod0-jg 4) (def-art-elt sunkenfisha-ag sunkenfisha-yellow-eye-lod0-mg 5) (def-art-elt sunkenfisha-ag sunkenfisha-idle-ja 6) -;; swamp-bat-ag.gc (def-art-elt swamp-bat-ag swamp-bat-lod0-jg 0) (def-art-elt swamp-bat-ag swamp-bat-lod0-mg 1) (def-art-elt swamp-bat-ag swamp-bat-lod1-mg 2) @@ -2560,12 +2243,10 @@ (def-art-elt swamp-bat-ag swamp-bat-strafe-ja 7) (def-art-elt swamp-bat-ag swamp-bat-die-ja 8) (def-art-elt swamp-bat-ag swamp-bat-strafe-to-idle-ja 9) -;; swamp-blimp-ag.gc (def-art-elt swamp-blimp-ag swamp-blimp-lod0-jg 0) (def-art-elt swamp-blimp-ag swamp-blimp-lod0-mg 1) (def-art-elt swamp-blimp-ag swamp-blimp-lod1-mg 2) (def-art-elt swamp-blimp-ag swamp-blimp-idle-ja 3) -;; swamp-rat-ag.gc (def-art-elt swamp-rat-ag swamp-rat-lod0-jg 0) (def-art-elt swamp-rat-ag swamp-rat-lod0-mg 1) (def-art-elt swamp-rat-ag swamp-rat-lod1-mg 2) @@ -2579,7 +2260,6 @@ (def-art-elt swamp-rat-ag swamp-rat-celebrate-ja 10) (def-art-elt swamp-rat-ag swamp-rat-die-ja 11) (def-art-elt swamp-rat-ag swamp-rat-eat-ja 12) -;; swamp-rat-nest-ag.gc (def-art-elt swamp-rat-nest-ag swamp-rat-nest-a-lod0-jg 0) (def-art-elt swamp-rat-nest-ag swamp-rat-nest-a-lod0-mg 1) (def-art-elt swamp-rat-nest-ag swamp-rat-nest-a-lod1-mg 2) @@ -2592,60 +2272,49 @@ (def-art-elt swamp-rat-nest-ag swamp-rat-nest-c-lod0-mg 9) (def-art-elt swamp-rat-nest-ag swamp-rat-nest-c-lod1-mg 10) (def-art-elt swamp-rat-nest-ag swamp-rat-nest-c-idle-ja 11) -;; swamp-rock-ag.gc (def-art-elt swamp-rock-ag swamp-rock-lod0-jg 0) (def-art-elt swamp-rock-ag swamp-rock-lod0-mg 1) (def-art-elt swamp-rock-ag swamp-rock-idle-ja 2) -;; swamp-rope-ag.gc (def-art-elt swamp-rope-ag swamp-rope-lod0-jg 0) (def-art-elt swamp-rope-ag swamp-rope-lod0-mg 1) (def-art-elt swamp-rope-ag swamp-rope-idle-ja 2) (def-art-elt swamp-rope-ag swamp-rope-slack-ja 3) (def-art-elt swamp-rope-ag swamp-rope-swing-ja 4) -;; swamp-spike-ag.gc (def-art-elt swamp-spike-ag swamp-spike-lod0-jg 0) (def-art-elt swamp-spike-ag swamp-spike-lod0-mg 1) (def-art-elt swamp-spike-ag swamp-spike-lod1-mg 2) (def-art-elt swamp-spike-ag swamp-spike-up-ja 3) (def-art-elt swamp-spike-ag swamp-spike-down-ja 4) (def-art-elt swamp-spike-ag swamp-spike-shake-ja 5) -;; swamp-tetherrock-ag.gc (def-art-elt swamp-tetherrock-ag swamp-tetherrock-lod0-jg 0) (def-art-elt swamp-tetherrock-ag swamp-tetherrock-lod0-mg 1) (def-art-elt swamp-tetherrock-ag swamp-tetherrock-idle-ja 2) -;; swamp-tetherrock-explode-ag.gc (def-art-elt swamp-tetherrock-explode-ag swamp-tetherrock-explode-lod0-jg 0) (def-art-elt swamp-tetherrock-explode-ag swamp-tetherrock-explode-lod0-mg 1) (def-art-elt swamp-tetherrock-explode-ag swamp-tetherrock-explode-idle-ja 2) (def-art-elt swamp-tetherrock-explode-ag swamp-tetherrock-explode-explode-ja 3) -;; swampcam-ag.gc (def-art-elt swampcam-ag swampcam-lod0-jg 0) (def-art-elt swampcam-ag swampcam-lod0-mg 1) (def-art-elt swampcam-ag swampcam-anim-ja 2) (def-art-elt swampcam-ag swampcam-swamp-ambush-ja 3) -;; tar-plat-ag.gc (def-art-elt tar-plat-ag tar-plat-lod0-jg 0) (def-art-elt tar-plat-ag tar-plat-lod0-mg 1) (def-art-elt tar-plat-ag tar-plat-lod1-mg 2) (def-art-elt tar-plat-ag tar-plat-idle-ja 3) -;; teetertotter-ag.gc (def-art-elt teetertotter-ag teetertotter-lod0-jg 0) (def-art-elt teetertotter-ag teetertotter-lod0-mg 1) (def-art-elt teetertotter-ag teetertotter-lod1-mg 2) (def-art-elt teetertotter-ag teetertotter-lod2-mg 3) (def-art-elt teetertotter-ag teetertotter-idle-ja 4) (def-art-elt teetertotter-ag teetertotter-landing-ja 5) -;; tntbarrel-ag.gc (def-art-elt tntbarrel-ag tntbarrel-lod0-jg 0) (def-art-elt tntbarrel-ag tntbarrel-lod0-mg 1) (def-art-elt tntbarrel-ag tntbarrel-idle-ja 2) -;; towertop-ag.gc (def-art-elt towertop-ag towertop-lod0-jg 0) (def-art-elt towertop-ag towertop-lod0-mg 1) (def-art-elt towertop-ag towertop-lod1-mg 2) (def-art-elt towertop-ag towertop-lod2-mg 3) (def-art-elt towertop-ag towertop-idle-ja 4) -;; trainingcam-ag.gc (def-art-elt trainingcam-ag trainingcam-lod0-jg 0) (def-art-elt trainingcam-ag trainingcam-lod0-mg 1) (def-art-elt trainingcam-ag trainingcam-orbcam-ja 2) @@ -2654,67 +2323,53 @@ (def-art-elt trainingcam-ag trainingcam-greenecocam-ja 5) (def-art-elt trainingcam-ag trainingcam-precursordoorcam-ja 6) (def-art-elt trainingcam-ag trainingcam-ecoventcam-ja 7) -;; vil3-bridge-36-ag.gc (def-art-elt vil3-bridge-36-ag vil3-bridge-36-lod0-jg 0) (def-art-elt vil3-bridge-36-ag vil3-bridge-36-lod0-mg 1) (def-art-elt vil3-bridge-36-ag vil3-bridge-36-idle-ja 2) -;; villa-starfish-ag.gc (def-art-elt villa-starfish-ag villa-starfish-lod0-jg 0) (def-art-elt villa-starfish-ag villa-starfish-lod0-mg 1) (def-art-elt villa-starfish-ag villa-starfish-idle-ja 2) -;; village-cam-ag.gc (def-art-elt village-cam-ag village-cam-lod0-jg 0) (def-art-elt village-cam-ag village-cam-lod0-mg 1) (def-art-elt village-cam-ag village-cam-firecanyon-cam-ja 2) (def-art-elt village-cam-ag village-cam-firecanyon-alt-cam-ja 3) (def-art-elt village-cam-ag village-cam-vi2-button-cam-ja 4) (def-art-elt village-cam-ag village-cam-vi3-button-cam-ja 5) -;; village1cam-ag.gc (def-art-elt village1cam-ag village1cam-lod0-jg 0) (def-art-elt village1cam-ag village1cam-lod0-mg 1) (def-art-elt village1cam-ag village1cam-anim-ja 2) -;; village2cam-ag.gc (def-art-elt village2cam-ag village2cam-lod0-jg 0) (def-art-elt village2cam-ag village2cam-lod0-mg 1) (def-art-elt village2cam-ag village2cam-elevator-at-top-going-down-ja 2) (def-art-elt village2cam-ag village2cam-elevator-at-bottom-going-up-ja 3) (def-art-elt village2cam-ag village2cam-elevator-at-top-going-up-ja 4) -;; wall-plat-ag.gc (def-art-elt wall-plat-ag wall-plat-lod0-jg 0) (def-art-elt wall-plat-ag wall-plat-lod0-mg 1) (def-art-elt wall-plat-ag wall-plat-idle-ja 2) -;; warp-gate-switch-ag.gc (def-art-elt warp-gate-switch-ag warp-gate-switch-lod0-jg 0) (def-art-elt warp-gate-switch-ag warp-gate-switch-lod0-mg 1) (def-art-elt warp-gate-switch-ag warp-gate-switch-down-ja 2) -;; warpgate-ag.gc (def-art-elt warpgate-ag warpgate-lod0-jg 0) (def-art-elt warpgate-ag warpgate-lod0-mg 1) -;; warrior-ag.gc (def-art-elt warrior-ag warrior-lod0-jg 0) (def-art-elt warrior-ag warrior-lod0-mg 1) (def-art-elt warrior-ag warrior-lod1-mg 2) (def-art-elt warrior-ag warrior-lod2-mg 3) (def-art-elt warrior-ag warrior-shadow-mg 4) (def-art-elt warrior-ag warrior-idle-ja 5) -;; water-anim-darkcave-ag.gc (def-art-elt water-anim-darkcave-ag water-anim-darkcave-water-with-crystal-lod0-jg 0) (def-art-elt water-anim-darkcave-ag water-anim-darkcave-water-with-crystal-lod0-mg 1) (def-art-elt water-anim-darkcave-ag water-anim-darkcave-idle-ja 2) -;; water-anim-finalboss-ag.gc (def-art-elt water-anim-finalboss-ag water-anim-finalboss-dark-eco-pool-lod0-jg 0) (def-art-elt water-anim-finalboss-ag water-anim-finalboss-dark-eco-pool-lod0-mg 1) (def-art-elt water-anim-finalboss-ag water-anim-finalboss-idle-ja 2) -;; water-anim-jungle-ag.gc (def-art-elt water-anim-jungle-ag water-anim-jungle-river-lod0-jg 0) (def-art-elt water-anim-jungle-ag water-anim-jungle-river-lod0-mg 1) (def-art-elt water-anim-jungle-ag water-anim-jungle-river-lod1-mg 2) (def-art-elt water-anim-jungle-ag water-anim-jungle-idle-ja 3) -;; water-anim-lavatube-ag.gc (def-art-elt water-anim-lavatube-ag water-anim-lavatube-energy-lava-lod0-jg 0) (def-art-elt water-anim-lavatube-ag water-anim-lavatube-energy-lava-lod0-mg 1) (def-art-elt water-anim-lavatube-ag water-anim-lavatube-idle-ja 2) -;; water-anim-maincave-ag.gc (def-art-elt water-anim-maincave-ag water-anim-maincave-center-pool-lod0-jg 0) (def-art-elt water-anim-maincave-ag water-anim-maincave-center-pool-lod0-mg 1) (def-art-elt water-anim-maincave-ag water-anim-maincave-lower-right-pool-lod0-jg 2) @@ -2726,11 +2381,9 @@ (def-art-elt water-anim-maincave-ag water-anim-maincave-mid-left-pool-lod0-jg 8) (def-art-elt water-anim-maincave-ag water-anim-maincave-mid-left-pool-lod0-mg 9) (def-art-elt water-anim-maincave-ag water-anim-maincave-idle-ja 10) -;; water-anim-maincave-water-ag.gc (def-art-elt water-anim-maincave-water-ag water-anim-maincave-water-with-crystal-lod0-jg 0) (def-art-elt water-anim-maincave-water-ag water-anim-maincave-water-with-crystal-lod0-mg 1) (def-art-elt water-anim-maincave-water-ag water-anim-maincave-water-idle-ja 2) -;; water-anim-misty-ag.gc (def-art-elt water-anim-misty-ag water-anim-misty-mud-by-arena-lod0-jg 0) (def-art-elt water-anim-misty-ag water-anim-misty-mud-by-arena-lod0-mg 1) (def-art-elt water-anim-misty-ag water-anim-misty-mud-above-skeleton-lod0-jg 2) @@ -2756,7 +2409,6 @@ (def-art-elt water-anim-misty-ag water-anim-misty-dark-eco-pool-lod0-jg 22) (def-art-elt water-anim-misty-ag water-anim-misty-dark-eco-pool-lod0-mg 23) (def-art-elt water-anim-misty-ag water-anim-misty-idle-ja 24) -;; water-anim-ogre-ag.gc (def-art-elt water-anim-ogre-ag water-anim-ogre-lava-lod0-jg 0) (def-art-elt water-anim-ogre-ag water-anim-ogre-lava-lod0-mg 1) (def-art-elt water-anim-ogre-ag water-anim-ogre-idle-ja 2) @@ -2765,18 +2417,15 @@ (def-art-elt water-anim-ogre-ag water-anim-ogre-submerge2-ja 5) (def-art-elt water-anim-ogre-ag water-anim-ogre-emerge2-ja 6) (def-art-elt water-anim-ogre-ag water-anim-ogre-boulder-ja 7) -;; water-anim-robocave-ag.gc (def-art-elt water-anim-robocave-ag water-anim-robocave-main-pool-lod0-jg 0) (def-art-elt water-anim-robocave-ag water-anim-robocave-main-pool-lod0-mg 1) (def-art-elt water-anim-robocave-ag water-anim-robocave-main-pool-lod1-mg 2) (def-art-elt water-anim-robocave-ag water-anim-robocave-idle-ja 3) -;; water-anim-rolling-ag.gc (def-art-elt water-anim-rolling-ag water-anim-rolling-water-back-lod0-jg 0) (def-art-elt water-anim-rolling-ag water-anim-rolling-water-back-lod0-mg 1) (def-art-elt water-anim-rolling-ag water-anim-rolling-water-front-lod0-jg 2) (def-art-elt water-anim-rolling-ag water-anim-rolling-water-front-lod0-mg 3) (def-art-elt water-anim-rolling-ag water-anim-rolling-idle-ja 4) -;; water-anim-sunken-ag.gc (def-art-elt water-anim-sunken-ag water-anim-sunken-big-room-lod0-jg 0) (def-art-elt water-anim-sunken-ag water-anim-sunken-big-room-lod0-mg 1) (def-art-elt water-anim-sunken-ag water-anim-sunken-first-room-from-entrance-lod0-jg 2) @@ -2802,7 +2451,6 @@ (def-art-elt water-anim-sunken-ag water-anim-sunken-big-room-upper-water-lod0-jg 22) (def-art-elt water-anim-sunken-ag water-anim-sunken-big-room-upper-water-lod0-mg 23) (def-art-elt water-anim-sunken-ag water-anim-sunken-idle-ja 24) -;; water-anim-sunken-dark-eco-ag.gc (def-art-elt water-anim-sunken-dark-eco-ag water-anim-sunken-dark-eco-qbert-lod0-jg 0) (def-art-elt water-anim-sunken-dark-eco-ag water-anim-sunken-dark-eco-qbert-lod0-mg 1) (def-art-elt water-anim-sunken-dark-eco-ag water-anim-sunken-dark-eco-platform-room-lod0-jg 2) @@ -2810,11 +2458,9 @@ (def-art-elt water-anim-sunken-dark-eco-ag water-anim-sunken-dark-eco-helix-room-lod0-jg 4) (def-art-elt water-anim-sunken-dark-eco-ag water-anim-sunken-dark-eco-helix-room-lod0-mg 5) (def-art-elt water-anim-sunken-dark-eco-ag water-anim-sunken-dark-eco-idle-ja 6) -;; water-anim-training-ag.gc (def-art-elt water-anim-training-ag water-anim-training-lake-lod0-jg 0) (def-art-elt water-anim-training-ag water-anim-training-lake-lod0-mg 1) (def-art-elt water-anim-training-ag water-anim-training-idle-ja 2) -;; water-anim-village1-ag.gc (def-art-elt water-anim-village1-ag water-anim-village1-rice-paddy-lod0-jg 0) (def-art-elt water-anim-village1-ag water-anim-village1-rice-paddy-lod0-mg 1) (def-art-elt water-anim-village1-ag water-anim-village1-rice-paddy-mid-lod0-jg 2) @@ -2824,57 +2470,46 @@ (def-art-elt water-anim-village1-ag water-anim-village1-fountain-lod0-jg 6) (def-art-elt water-anim-village1-ag water-anim-village1-fountain-lod0-mg 7) (def-art-elt water-anim-village1-ag water-anim-village1-idle-ja 8) -;; water-anim-village2-ag.gc (def-art-elt water-anim-village2-ag water-anim-village2-bucket-lod0-jg 0) (def-art-elt water-anim-village2-ag water-anim-village2-bucket-lod0-mg 1) (def-art-elt water-anim-village2-ag water-anim-village2-idle-ja 2) -;; water-anim-village3-ag.gc (def-art-elt water-anim-village3-ag water-anim-village3-lava-lod0-jg 0) (def-art-elt water-anim-village3-ag water-anim-village3-lava-lod0-mg 1) (def-art-elt water-anim-village3-ag water-anim-village3-lava-lod1-mg 2) (def-art-elt water-anim-village3-ag water-anim-village3-idle-ja 3) -;; wedge-plat-ag.gc (def-art-elt wedge-plat-ag wedge-plat-lod0-jg 0) (def-art-elt wedge-plat-ag wedge-plat-lod0-mg 1) (def-art-elt wedge-plat-ag wedge-plat-idle-ja 2) (def-art-elt wedge-plat-ag wedge-plat-tip-ja 3) -;; wedge-plat-outer-ag.gc (def-art-elt wedge-plat-outer-ag wedge-plat-outer-lod0-jg 0) (def-art-elt wedge-plat-outer-ag wedge-plat-outer-lod0-mg 1) (def-art-elt wedge-plat-outer-ag wedge-plat-outer-idle-ja 2) (def-art-elt wedge-plat-outer-ag wedge-plat-outer-tip-ja 3) -;; wheel-ag.gc (def-art-elt wheel-ag wheel-geo-jg 0) (def-art-elt wheel-ag wheel-geo-mg 1) (def-art-elt wheel-ag wheel-idle-ja 2) -;; whirlpool-ag.gc (def-art-elt whirlpool-ag whirlpool-lod0-jg 0) (def-art-elt whirlpool-ag whirlpool-lod0-mg 1) (def-art-elt whirlpool-ag whirlpool-idle-ja 2) -;; windmill-one-ag.gc (def-art-elt windmill-one-ag windmill-one-lod0-jg 0) (def-art-elt windmill-one-ag windmill-one-lod0-mg 1) (def-art-elt windmill-one-ag windmill-one-lod1-mg 2) (def-art-elt windmill-one-ag windmill-one-lod2-mg 3) (def-art-elt windmill-one-ag windmill-one-idle-ja 4) -;; windmill-sail-ag.gc (def-art-elt windmill-sail-ag windmill-sail-lod0-jg 0) (def-art-elt windmill-sail-ag windmill-sail-lod0-mg 1) (def-art-elt windmill-sail-ag windmill-sail-lod1-mg 2) (def-art-elt windmill-sail-ag windmill-sail-lod2-mg 3) (def-art-elt windmill-sail-ag windmill-sail-idle-ja 4) -;; windspinner-ag.gc (def-art-elt windspinner-ag windspinner-lod0-jg 0) (def-art-elt windspinner-ag windspinner-lod0-mg 1) (def-art-elt windspinner-ag windspinner-lod1-mg 2) (def-art-elt windspinner-ag windspinner-idle-ja 3) -;; windturbine-ag.gc (def-art-elt windturbine-ag windturbine-lod0-jg 0) (def-art-elt windturbine-ag windturbine-lod0-mg 1) (def-art-elt windturbine-ag windturbine-lod1-mg 2) (def-art-elt windturbine-ag windturbine-lod2-mg 3) (def-art-elt windturbine-ag windturbine-idle-ja 4) -;; yakow-ag.gc (def-art-elt yakow-ag yakow-lod0-jg 0) (def-art-elt yakow-ag yakow-lod0-mg 1) (def-art-elt yakow-ag yakow-lod1-mg 2) @@ -2887,7 +2522,6 @@ (def-art-elt yakow-ag yakow-walk-right-ja 9) (def-art-elt yakow-ag yakow-walk-left-ja 10) (def-art-elt yakow-ag yakow-kicked-in-place-ja 11) -;; yellowsage-ag.gc (def-art-elt yellowsage-ag yellowsage-lod0-jg 0) (def-art-elt yellowsage-ag yellowsage-lod0-mg 1) (def-art-elt yellowsage-ag yellowsage-lod1-mg 2) @@ -2895,7 +2529,6 @@ (def-art-elt yellowsage-ag yellowsage-yellowsage-idle-ja 4) (def-art-elt yellowsage-ag yellowsage-yellowsage-attack-start-ja 5) (def-art-elt yellowsage-ag yellowsage-yellowsage-attack-loop-ja 6) -;; yeti-ag.gc (def-art-elt yeti-ag yeti-lod0-jg 0) (def-art-elt yeti-ag yeti-lod0-mg 1) (def-art-elt yeti-ag yeti-idle-ja 2) @@ -2909,3 +2542,5 @@ (def-art-elt yeti-ag yeti-jump-ja 10) (def-art-elt yeti-ag yeti-jump-land-ja 11) (def-art-elt yeti-ag yeti-turn-ja 12) + + diff --git a/goal_src/jak1/engine/debug/viewer.gc b/goal_src/jak1/engine/debug/viewer.gc index 75640c1734e..2fd6d267585 100644 --- a/goal_src/jak1/engine/debug/viewer.gc +++ b/goal_src/jak1/engine/debug/viewer.gc @@ -48,7 +48,7 @@ ) ) ) - :post (the-as (function none :behavior viewer) ja-post) + :post ja-post ) (define viewer-string (new 'global 'string 64 (the-as string #f))) diff --git a/goal_src/jak1/engine/game/powerups.gc b/goal_src/jak1/engine/game/powerups.gc index fdbe6742c4b..93f7edd3bdb 100644 --- a/goal_src/jak1/engine/game/powerups.gc +++ b/goal_src/jak1/engine/game/powerups.gc @@ -553,7 +553,7 @@ ) ;; og:preserve-this PAL patch here (let ((f0-8 (lerp-scale 80.0 100.0 (-> self control unknown-float01) 0.0 81920.0))) - (if (not (ja-group? (-> self draw art-group data 104))) + (if (not (ja-group? eichar-ice-stance-ja)) (set! f0-8 (* 0.8 f0-8)) ) (seek! (-> self control unknown-float141) f0-8 (* 100.0 (-> *display* seconds-per-frame))) diff --git a/goal_src/jak1/engine/target/sidekick.gc b/goal_src/jak1/engine/target/sidekick.gc index 7c88676e0af..c700d7d938d 100644 --- a/goal_src/jak1/engine/target/sidekick.gc +++ b/goal_src/jak1/engine/target/sidekick.gc @@ -118,7 +118,7 @@ ) ) ) - :code (the-as (function none :behavior sidekick) looping-code) + :code looping-code :post (behavior () (let ((v1-0 'process-drawable-art-error) (a0-0 (-> self parent-override)) diff --git a/goal_src/jak1/engine/target/target.gc b/goal_src/jak1/engine/target/target.gc index 9c9ce647111..5f1edc34894 100644 --- a/goal_src/jak1/engine/target/target.gc +++ b/goal_src/jak1/engine/target/target.gc @@ -723,7 +723,7 @@ ((and (ja-group? eichar-walk-ja) (= (-> self skel root-channel 0) (-> self skel channel))) (set! f28-0 (ja-aframe-num 0)) ) - ((ja-group? (-> self draw art-group data 102)) + ((ja-group? eichar-ice-skate-ja) (set! f28-0 (ja-aframe-num 0)) (ja-channel-push! 7 (seconds 0.1)) ) diff --git a/goal_src/jak1/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc index 4119a0c2698..0802616f830 100644 --- a/goal_src/jak1/engine/target/target2.gc +++ b/goal_src/jak1/engine/target/target2.gc @@ -964,7 +964,7 @@ ) ) (cond - ((ja-group? (-> self draw art-group data 83)) + ((ja-group? eichar-pole-jump-loop-ja) (while (not (-> self control unknown-int21)) (ja :num! (seek!)) (suspend) @@ -979,7 +979,7 @@ (ja-channel-push! 1 (seconds 0.15)) ) ) - (ja-no-eval :group! (-> self draw art-group data 80) :num! (seek!) :frame-num 0.0) + (ja-no-eval :group! eichar-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -991,7 +991,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 80) :num! (seek!) :frame-num 0.0) + (ja-no-eval :group! eichar-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1005,7 +1005,7 @@ :event target-standard-event-handler :exit (-> target-pole-cycle exit) :code (behavior ((arg0 object) (arg1 object) (arg2 float)) - (ja-no-eval :group! (-> self draw art-group data 81) + (ja-no-eval :group! eichar-pole-flip-up-ja :num! (seek!) :frame-num (ja-aframe (+ 1.0 (fmin 17.0 (ja-aframe-num 0))) 0) ) @@ -1030,7 +1030,7 @@ :code (behavior ((arg0 float) (arg1 float)) (sound-play "jump") (send-event *camera* 'damp-up) - (ja :group! (-> self draw art-group data 83) :num! min) + (ja :group! eichar-pole-jump-loop-ja :num! min) (let ((f0-1 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) @@ -1055,7 +1055,7 @@ :event target-standard-event-handler :exit (-> target-pole-cycle exit) :code (behavior ((arg0 float) (arg1 float) (arg2 float)) - (ja-no-eval :group! (-> self draw art-group data 82) + (ja-no-eval :group! eichar-pole-flip-forward-ja :num! (seek! (ja-aframe (the-as float 16.0) 0)) :frame-num (ja-aframe (+ 1.0 (ja-aframe-num 0)) 0) ) diff --git a/goal_src/jak1/kernel/gkernel.gc b/goal_src/jak1/kernel/gkernel.gc index 26199321656..eb57a085524 100644 --- a/goal_src/jak1/kernel/gkernel.gc +++ b/goal_src/jak1/kernel/gkernel.gc @@ -2439,7 +2439,7 @@ :enter #f :event #f))) -(set! (-> dead-state code) (the (function none :behavior process) nothing)) +(set! (-> dead-state code) (the (function object :behavior process) nothing)) ;; this is not yet defined. diff --git a/goal_src/jak1/levels/beach/beach-obs.gc b/goal_src/jak1/levels/beach/beach-obs.gc index 251c16bb1e6..c72eb2525a8 100644 --- a/goal_src/jak1/levels/beach/beach-obs.gc +++ b/goal_src/jak1/levels/beach/beach-obs.gc @@ -55,7 +55,7 @@ ) ) ) - :post (the-as (function none :behavior windmill-one) rider-post) + :post rider-post ) (defmethod init-from-entity! windmill-one ((obj windmill-one) (arg0 entity-actor)) @@ -307,7 +307,7 @@ (move-grottopole self 1.0) (go grottopole-idle) ) - :post (the-as (function none :behavior grottopole) transform-post) + :post transform-post ) (defstate grottopole-moving-down (grottopole) @@ -320,7 +320,7 @@ (move-grottopole self -1.0) (go grottopole-idle) ) - :post (the-as (function none :behavior grottopole) transform-post) + :post transform-post ) (defmethod init-from-entity! grottopole ((obj grottopole) (arg0 entity-actor)) @@ -545,10 +545,7 @@ ) (defstate ecoventrock-break (ecoventrock) - :event (the-as - (function process int symbol event-message-block object :behavior ecoventrock) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :enter (behavior ((arg0 symbol)) (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -803,7 +800,7 @@ ) (deactivate self) ) - :post (the-as (function none :behavior flying-rock) ja-post) + :post ja-post ) (defbehavior flying-rock-init-by-other flying-rock ((arg0 vector) (arg1 vector) (arg2 float) (arg3 entity-actor)) @@ -1146,7 +1143,7 @@ ) ) ) - :post (the-as (function none :behavior flutflutegg) ja-post) + :post ja-post ) (defstate flutflutegg-physics-fall (flutflutegg) @@ -1210,7 +1207,7 @@ (go flutflutegg-break #f) ) ) - :post (the-as (function none :behavior flutflutegg) ja-post) + :post ja-post ) (defstate flutflutegg-break (flutflutegg) @@ -1264,7 +1261,7 @@ (suspend) ) ) - :post (the-as (function none :behavior flutflutegg) ja-post) + :post ja-post ) (defmethod init-from-entity! flutflutegg ((obj flutflutegg) (arg0 entity-actor)) @@ -1381,7 +1378,7 @@ ) ) ) - :post (the-as (function none :behavior harvester) ja-post) + :post ja-post ) (defmethod init-from-entity! harvester ((obj harvester) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/beach/beach-rocks.gc b/goal_src/jak1/levels/beach/beach-rocks.gc index 11780aa2e42..8f25dd65ecb 100644 --- a/goal_src/jak1/levels/beach/beach-rocks.gc +++ b/goal_src/jak1/levels/beach/beach-rocks.gc @@ -394,7 +394,7 @@ (set! (-> self draw bounds w) 20480.0) (go-virtual fallen) ) - :post (the-as (function none :behavior beach-rock) transform-post) + :post transform-post ) (defstate fallen (beach-rock) @@ -419,7 +419,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior beach-rock) ja-post) + :post ja-post ) (defmethod init-from-entity! beach-rock ((obj beach-rock) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/beach/lurkercrab.gc b/goal_src/jak1/levels/beach/lurkercrab.gc index eab17cf0b0a..40e4d4e759a 100644 --- a/goal_src/jak1/levels/beach/lurkercrab.gc +++ b/goal_src/jak1/levels/beach/lurkercrab.gc @@ -194,10 +194,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-idle (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (set! (-> self draw force-lod) -1) ) @@ -258,10 +255,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-patrol (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (lurkercrab-invulnerable) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf6)) @@ -331,10 +325,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-notice (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-chase) ) @@ -342,10 +333,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-chase (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (lurkercrab-invulnerable) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf6)) @@ -414,10 +402,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-stop-chase (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -425,10 +410,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-stare (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -436,10 +418,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-victory (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (ja-channel-push! 1 (seconds 0.075)) @@ -453,10 +432,7 @@ nav-enemy-default-event-handler ) (defstate lurkercrab-pushed (lurkercrab) - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (set! (-> self orient) #t) ) diff --git a/goal_src/jak1/levels/beach/lurkerpuppy.gc b/goal_src/jak1/levels/beach/lurkerpuppy.gc index b846fc81642..7c1694fc812 100644 --- a/goal_src/jak1/levels/beach/lurkerpuppy.gc +++ b/goal_src/jak1/levels/beach/lurkerpuppy.gc @@ -26,10 +26,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-notice (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.17)) @@ -45,10 +42,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-chase (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (cond ((ja-group? lurkerpuppy-jump-land-ja) @@ -83,10 +77,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-stare (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 1456355.5) (set! (-> self turn-time) (seconds 0.1)) @@ -127,10 +118,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-give-up (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 218453.33) (set! (-> self turn-time) (seconds 0.5)) @@ -159,10 +147,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-attack (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (sound-play "head-butt") (go-virtual nav-enemy-victory) @@ -171,10 +156,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-victory (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-travel)) ) @@ -196,7 +178,7 @@ nav-enemy-default-event-handler ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior lurkerpuppy) nav-enemy-face-player-post) + :post nav-enemy-face-player-post ) (define *lurkerpuppy-nav-enemy-info* (new 'static 'nav-enemy-info diff --git a/goal_src/jak1/levels/beach/lurkerworm.gc b/goal_src/jak1/levels/beach/lurkerworm.gc index eda7c96b866..d400b74862b 100644 --- a/goal_src/jak1/levels/beach/lurkerworm.gc +++ b/goal_src/jak1/levels/beach/lurkerworm.gc @@ -445,10 +445,7 @@ lurkerworm-default-post-behavior ) (defstate lurkerworm-die (lurkerworm) - :event (the-as - (function process int symbol event-message-block object :behavior lurkerworm) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (let ((v1-3 (-> self root-override root-prim))) diff --git a/goal_src/jak1/levels/beach/pelican.gc b/goal_src/jak1/levels/beach/pelican.gc index 663afbb0a61..0ccc3a55f86 100644 --- a/goal_src/jak1/levels/beach/pelican.gc +++ b/goal_src/jak1/levels/beach/pelican.gc @@ -809,7 +809,7 @@ (ja-channel-set! 0) (anim-loop) ) - :post (the-as (function none :behavior pelican) ja-post) + :post ja-post ) (defmethod init-from-entity! pelican ((obj pelican) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/citadel/citadel-obs.gc b/goal_src/jak1/levels/citadel/citadel-obs.gc index 283ed81c75a..0f80652bec2 100644 --- a/goal_src/jak1/levels/citadel/citadel-obs.gc +++ b/goal_src/jak1/levels/citadel/citadel-obs.gc @@ -94,7 +94,7 @@ ) ) ) - :post (the-as (function none :behavior citb-arm-section) ja-post) + :post ja-post ) (defmethod init-root! citb-arm-section ((obj citb-arm-section)) @@ -144,7 +144,7 @@ (defstate idle (citb-arm) :virtual #t - :trans (the-as (function none :behavior citb-arm) rider-trans) + :trans rider-trans :post (behavior () (if (logtest? (-> self draw status) (draw-status hidden)) (clear-collide-with-as (-> self root-override)) @@ -358,7 +358,7 @@ ) ) ) - :trans (the-as (function none :behavior citb-disc) rider-trans) + :trans rider-trans :code (behavior () (loop (update! (-> self sound)) @@ -372,7 +372,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-disc) rider-post) + :post rider-post ) (defmethod init! citb-disc ((obj citb-disc)) @@ -823,7 +823,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-robotboss) ja-post) + :post ja-post ) (defstate citb-robotboss-die (citb-robotboss) @@ -932,7 +932,7 @@ ) (go citb-coil-broken) ) - :post (the-as (function none :behavior citb-coil) ja-post) + :post ja-post ) (defstate citb-coil-broken (citb-coil) @@ -947,7 +947,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-coil) ja-post) + :post ja-post ) (defmethod init-from-entity! citb-coil ((obj citb-coil) (arg0 entity-actor)) @@ -1009,7 +1009,7 @@ ) ) ) - :post (the-as (function none :behavior citb-hose) ja-post) + :post ja-post ) (defstate citb-hose-spawn (citb-hose) @@ -1023,7 +1023,7 @@ ) (go citb-hose-idle) ) - :post (the-as (function none :behavior citb-hose) ja-post) + :post ja-post ) (defstate citb-hose-die (citb-hose) @@ -1038,7 +1038,7 @@ ) (anim-loop) ) - :post (the-as (function none :behavior citb-hose) ja-post) + :post ja-post ) (defmethod init-from-entity! citb-hose ((obj citb-hose) (arg0 entity-actor)) @@ -1243,7 +1243,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-generator) ja-post) + :post ja-post ) (defstate citb-generator-break (citb-generator) @@ -1298,7 +1298,7 @@ ; ) (go citb-generator-broken) ) - :post (the-as (function none :behavior citb-generator) ja-post) + :post ja-post ) (defstate citb-generator-broken (citb-generator) diff --git a/goal_src/jak1/levels/citadel/citadel-sages.gc b/goal_src/jak1/levels/citadel/citadel-sages.gc index 363315b0511..afa88204f51 100644 --- a/goal_src/jak1/levels/citadel/citadel-sages.gc +++ b/goal_src/jak1/levels/citadel/citadel-sages.gc @@ -111,7 +111,7 @@ ) ) ) - :trans (the-as (function none :behavior citb-sagecage) rider-trans) + :trans rider-trans :code (behavior () (loop (cond diff --git a/goal_src/jak1/levels/citadel/citb-drop-plat.gc b/goal_src/jak1/levels/citadel/citb-drop-plat.gc index 84affc29491..2b063334568 100644 --- a/goal_src/jak1/levels/citadel/citb-drop-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-drop-plat.gc @@ -86,7 +86,7 @@ (suspend) ) ) - :post (the-as (function none :behavior drop-plat) ja-post) + :post ja-post ) (defbehavior drop-plat-set-fade drop-plat () diff --git a/goal_src/jak1/levels/citadel/citb-plat.gc b/goal_src/jak1/levels/citadel/citb-plat.gc index 86d9455c1b6..31e5b868088 100644 --- a/goal_src/jak1/levels/citadel/citb-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-plat.gc @@ -61,8 +61,8 @@ (go-virtual citb-base-plat-active) ) ) - :code (the-as (function none :behavior citb-base-plat) anim-loop) - :post (the-as (function none :behavior citb-base-plat) ja-post) + :code anim-loop + :post ja-post ) (defstate citb-base-plat-active (citb-base-plat) @@ -76,8 +76,8 @@ ) (rider-trans) ) - :code (the-as (function none :behavior citb-base-plat) anim-loop) - :post (the-as (function none :behavior citb-base-plat) rider-post) + :code anim-loop + :post rider-post ) (defmethod citb-base-plat-method-21 citb-base-plat ((obj citb-base-plat)) @@ -283,7 +283,7 @@ ) ) ) - :trans (the-as (function none :behavior citb-stair-plat) #f) + :trans #f :code (behavior () (logior! (-> self draw status) (draw-status hidden)) (while (not (-> self rise)) @@ -314,12 +314,12 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-stair-plat) #f) + :post #f ) (defstate citb-base-plat-active (citb-stair-plat) :virtual #t - :trans (the-as (function none :behavior citb-stair-plat) #f) + :trans #f :code (behavior () (set! (-> self root-override trans y) (-> self rise-height)) (suspend) @@ -327,7 +327,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (anim-loop) ) - :post (the-as (function none :behavior citb-stair-plat) ja-post) + :post ja-post ) (defmethod citb-base-plat-method-22 citb-stair-plat ((obj citb-stair-plat)) @@ -458,15 +458,12 @@ :code (behavior () (anim-loop) ) - :post (the-as (function none :behavior citb-chain-plat) ja-post) + :post ja-post ) (defstate rigid-body-platform-float (citb-chain-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior citb-chain-plat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -503,11 +500,11 @@ :code (behavior () (anim-loop) ) - :post (the-as (function none :behavior citb-chain-plat) rigid-body-platform-post) + :post rigid-body-platform-post ) (defstate citb-chain-plat-settle (citb-chain-plat) - :trans (the-as (function none :behavior citb-chain-plat) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'quaternion)) @@ -535,7 +532,7 @@ (suspend) (go-virtual rigid-body-platform-idle) ) - :post (the-as (function none :behavior citb-chain-plat) rider-post) + :post rider-post ) (defmethod rigid-body-platform-method-30 citb-chain-plat ((obj citb-chain-plat)) @@ -608,7 +605,7 @@ (defstate citb-base-plat-active (citb-rotatebox) :virtual #t - :trans (the-as (function none :behavior citb-rotatebox) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) @@ -823,7 +820,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-firehose) ja-post) + :post ja-post ) (defstate citb-firehose-active (citb-firehose) @@ -848,7 +845,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-firehose) ja-post) + :post ja-post ) (defbehavior citb-firehose-blast-particles citb-firehose () @@ -904,7 +901,7 @@ ) (go citb-firehose-active) ) - :post (the-as (function none :behavior citb-firehose) transform-post) + :post transform-post ) (defmethod init-from-entity! citb-firehose ((obj citb-firehose) (arg0 entity-actor)) @@ -994,7 +991,7 @@ ) (defstate citb-exit-plat-rise (citb-exit-plat) - :trans (the-as (function none :behavior citb-exit-plat) rider-trans) + :trans rider-trans :code (behavior () (logclear! (-> self draw status) (draw-status hidden)) (restore-collide-with-as (-> self root-override)) @@ -1010,7 +1007,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-exit-plat) rider-post) + :post rider-post ) (defbehavior citb-exit-plat-move-player citb-exit-plat ((arg0 vector)) @@ -1046,7 +1043,7 @@ (citb-exit-plat-move-player gp-0) ) ) - :post (the-as (function none :behavior citb-exit-plat) transform-post) + :post transform-post ) (defstate plat-button-move-upward (citb-exit-plat) @@ -1062,7 +1059,7 @@ (citb-exit-plat-move-player gp-0) ) ) - :post (the-as (function none :behavior citb-exit-plat) transform-post) + :post transform-post ) (defmethod can-activate? citb-exit-plat ((obj citb-exit-plat)) diff --git a/goal_src/jak1/levels/common/battlecontroller.gc b/goal_src/jak1/levels/common/battlecontroller.gc index 2047dbce551..742c451b094 100644 --- a/goal_src/jak1/levels/common/battlecontroller.gc +++ b/goal_src/jak1/levels/common/battlecontroller.gc @@ -409,7 +409,7 @@ battlecontroller-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior battlecontroller) #f) + :post #f ) (defstate battlecontroller-play-intro-camera (battlecontroller) @@ -477,7 +477,7 @@ battlecontroller-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior battlecontroller) #f) + :post #f ) (defbehavior battlecontroller-special-contents? battlecontroller () @@ -512,10 +512,7 @@ battlecontroller-default-event-handler (defstate battlecontroller-die (battlecontroller) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior battlecontroller) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (sound-play "money-pickup" :pitch -1.5 :position #f) (battlecontroller-battle-end) @@ -579,7 +576,7 @@ battlecontroller-default-event-handler ) (process-entity-status! self (entity-perm-status dead) #t) ) - :post (the-as (function none :behavior battlecontroller) #f) + :post #f ) (defmethod relocate battlecontroller ((obj battlecontroller) (arg0 int)) diff --git a/goal_src/jak1/levels/common/launcherdoor.gc b/goal_src/jak1/levels/common/launcherdoor.gc index f6006f0317e..1360a152150 100644 --- a/goal_src/jak1/levels/common/launcherdoor.gc +++ b/goal_src/jak1/levels/common/launcherdoor.gc @@ -95,7 +95,7 @@ ) ) ) - :post (the-as (function none :behavior launcherdoor) ja-post) + :post ja-post ) (defstate launcherdoor-open (launcherdoor) @@ -130,7 +130,7 @@ (suspend) ) ) - :post (the-as (function none :behavior launcherdoor) ja-post) + :post ja-post ) (defmethod init-from-entity! launcherdoor ((obj launcherdoor) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc index 183fae87397..0fd6f5d1983 100644 --- a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc +++ b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc @@ -391,7 +391,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior green-eco-lurker) transform-post) + :post transform-post ) (defstate green-eco-lurker-wait-to-appear (green-eco-lurker) @@ -525,14 +525,11 @@ (suspend) ) ) - :post (the-as (function none :behavior green-eco-lurker) transform-post) + :post transform-post ) (defstate green-eco-lurker-appear-land (green-eco-lurker) - :event (the-as - (function process int symbol event-message-block object :behavior green-eco-lurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (activate! *camera-smush-control* 409.6 37 150 1.0 0.99) (sound-play "blob-land" :pitch (nav-enemy-rnd-float-range -1.0 1.0)) @@ -559,7 +556,7 @@ (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior green-eco-lurker) transform-post) + :post transform-post ) (defstate nav-enemy-patrol (green-eco-lurker) diff --git a/goal_src/jak1/levels/finalboss/light-eco.gc b/goal_src/jak1/levels/finalboss/light-eco.gc index 13fe04148f5..195262c2444 100644 --- a/goal_src/jak1/levels/finalboss/light-eco.gc +++ b/goal_src/jak1/levels/finalboss/light-eco.gc @@ -401,7 +401,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-child) transform-post) + :post transform-post ) (defstate light-eco-child-hit-ground (light-eco-child) @@ -447,7 +447,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-child) transform-post) + :post transform-post ) (defstate light-eco-child-idle (light-eco-child) @@ -467,7 +467,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-child) transform-post) + :post transform-post ) (defstate light-eco-child-die (light-eco-child) @@ -649,7 +649,7 @@ ) (go light-eco-mother-active) ) - :post (the-as (function none :behavior light-eco-mother) ja-post) + :post ja-post ) (defstate light-eco-mother-active (light-eco-mother) @@ -665,7 +665,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-mother) ja-post) + :post ja-post ) (defstate light-eco-mother-discipate (light-eco-mother) @@ -686,7 +686,7 @@ (suspend) ) ) - :post (the-as (function none :behavior light-eco-mother) ja-post) + :post ja-post ) (defmethod deactivate light-eco-mother ((obj light-eco-mother)) diff --git a/goal_src/jak1/levels/finalboss/robotboss-misc.gc b/goal_src/jak1/levels/finalboss/robotboss-misc.gc index 8e3d83f9ccc..4d90920dded 100644 --- a/goal_src/jak1/levels/finalboss/robotboss-misc.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-misc.gc @@ -247,7 +247,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ecoclaw) ja-post) + :post ja-post ) (defstate ecoclaw-idle (ecoclaw) @@ -260,7 +260,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ecoclaw) ja-post) + :post ja-post ) (defmethod init-from-entity! ecoclaw ((obj ecoclaw) (arg0 entity-actor)) @@ -307,7 +307,7 @@ ) ) ) - :trans (the-as (function none :behavior silodoor) rider-trans) + :trans rider-trans :code (behavior () (loop (when (not (movie?)) diff --git a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc index 560ea9c56c3..1a87b8fdbda 100644 --- a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc @@ -282,7 +282,7 @@ ) (deactivate self) ) - :post (the-as (function none :behavior darkecobomb) ja-post) + :post ja-post ) (defbehavior darkecobomb-handler darkecobomb ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) @@ -365,7 +365,7 @@ ) ) ) - :post (the-as (function none :behavior darkecobomb) transform-post) + :post transform-post ) (defstate darkecobomb-land (darkecobomb) @@ -394,7 +394,7 @@ ) ) ) - :post (the-as (function none :behavior darkecobomb) transform-post) + :post transform-post ) (defstate darkecobomb-idle (darkecobomb) @@ -424,7 +424,7 @@ ) ) ) - :post (the-as (function none :behavior darkecobomb) transform-post) + :post transform-post ) (defbehavior darkecobomb-init-by-other darkecobomb ((arg0 vector) (arg1 vector) (arg2 float) (arg3 time-frame) (arg4 float)) @@ -500,7 +500,7 @@ ) ) ) - :post (the-as (function none :behavior greenshot) transform-post) + :post transform-post ) (defbehavior greenshot-init-by-other greenshot ((arg0 vector) (arg1 vector) (arg2 float) (arg3 time-frame)) @@ -666,7 +666,7 @@ (suspend) ) ) - :post (the-as (function none :behavior redshot) transform-post) + :post transform-post ) (defbehavior redshot-handler redshot ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) @@ -694,7 +694,7 @@ (suspend) ) ) - :post (the-as (function none :behavior redshot) transform-post) + :post transform-post ) (defstate redshot-idle (redshot) @@ -718,7 +718,7 @@ (suspend) ) ) - :post (the-as (function none :behavior redshot) transform-post) + :post transform-post ) (defbehavior redshot-init-by-other redshot ((arg0 vector) (arg1 vector) (arg2 float) (arg3 time-frame) (arg4 time-frame) (arg5 int)) @@ -802,7 +802,7 @@ (suspend) ) ) - :post (the-as (function none :behavior yellowshot) transform-post) + :post transform-post ) (defbehavior yellowshot-init-by-other yellowshot ((arg0 vector) (arg1 vector) (arg2 float) (arg3 time-frame)) diff --git a/goal_src/jak1/levels/finalboss/robotboss.gc b/goal_src/jak1/levels/finalboss/robotboss.gc index 261e26b755b..a6817c3f7ac 100644 --- a/goal_src/jak1/levels/finalboss/robotboss.gc +++ b/goal_src/jak1/levels/finalboss/robotboss.gc @@ -582,7 +582,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-daxter-sacrifice-movie (robotboss) @@ -838,7 +838,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defbehavior robotboss-yellowshot robotboss () @@ -1200,7 +1200,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-red-dark-bomb-wait (robotboss) @@ -1252,7 +1252,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-red-dark-bomb (robotboss) @@ -1291,7 +1291,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (deftype redshot-launch-info (structure) @@ -1711,7 +1711,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-red (robotboss) @@ -1757,7 +1757,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-green-dark-bomb-wait (robotboss) @@ -1809,7 +1809,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-green-dark-bomb (robotboss) @@ -1849,7 +1849,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defbehavior robotboss-greenshot robotboss ((arg0 vector) (arg1 float) (arg2 int) (arg3 symbol)) @@ -2104,7 +2104,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-green (robotboss) @@ -2151,7 +2151,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-blue-dark-bomb-wait (robotboss) @@ -2211,7 +2211,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defstate robotboss-blue-dark-bomb (robotboss) @@ -2250,7 +2250,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defbehavior robotboss-blue-beam robotboss ((arg0 int) (arg1 symbol)) @@ -2629,7 +2629,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) (defmethod init-from-entity! robotboss ((obj robotboss) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc index 47c218994f7..fdc81468d69 100644 --- a/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc +++ b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc @@ -131,7 +131,7 @@ ) ) ) - :post (the-as (function none :behavior balloon) ja-post) + :post ja-post ) (defmethod init-from-entity! balloon ((obj balloon) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/flut_common/flutflut.gc b/goal_src/jak1/levels/flut_common/flutflut.gc index 0f08c8f86e8..1f9278111f6 100644 --- a/goal_src/jak1/levels/flut_common/flutflut.gc +++ b/goal_src/jak1/levels/flut_common/flutflut.gc @@ -219,7 +219,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior flutflut) ja-post) + :post ja-post ) (defstate pickup (flutflut) diff --git a/goal_src/jak1/levels/jungle/bouncer.gc b/goal_src/jak1/levels/jungle/bouncer.gc index 484321fac66..c95a0187e87 100644 --- a/goal_src/jak1/levels/jungle/bouncer.gc +++ b/goal_src/jak1/levels/jungle/bouncer.gc @@ -100,7 +100,7 @@ ) ) ) - :post (the-as (function none :behavior springbox) transform-post) + :post transform-post ) (defstate bouncer-fire (springbox) @@ -113,7 +113,7 @@ ) (go bouncer-wait) ) - :post (the-as (function none :behavior springbox) transform-post) + :post transform-post ) (defmethod init-from-entity! springbox ((obj springbox) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/jungle/fisher.gc b/goal_src/jak1/levels/jungle/fisher.gc index 4cac383a773..433dd306522 100644 --- a/goal_src/jak1/levels/jungle/fisher.gc +++ b/goal_src/jak1/levels/jungle/fisher.gc @@ -901,7 +901,7 @@ ) ) ) - :post (the-as (function none :behavior fisher-fish) ja-post) + :post ja-post ) (defstate fisher-fish-caught (fisher-fish) @@ -1369,8 +1369,8 @@ ) (spool-push *art-control* "fisher-reject" 0 self -99.0) ) - :code (the-as (function none :behavior fisher) process-taskable-anim-loop) - :post (the-as (function none :behavior fisher) ja-post) + :code process-taskable-anim-loop + :post ja-post ) (defbehavior fisher-spawn-ambient fisher () diff --git a/goal_src/jak1/levels/jungle/hopper.gc b/goal_src/jak1/levels/jungle/hopper.gc index dd8f42e617c..7d13d6b8ba6 100644 --- a/goal_src/jak1/levels/jungle/hopper.gc +++ b/goal_src/jak1/levels/jungle/hopper.gc @@ -109,10 +109,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-idle (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (loop @@ -134,10 +131,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-patrol (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :trans (behavior () (if (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) ((-> (method-of-type nav-enemy nav-enemy-patrol) trans)) @@ -186,15 +180,12 @@ nav-enemy-default-event-handler (hopper-do-jump) ) ) - :post (the-as (function none :behavior hopper) nav-enemy-jump-post) + :post nav-enemy-jump-post ) (defstate nav-enemy-notice (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-chase) ) @@ -202,10 +193,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-chase (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :trans (behavior () (if (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) @@ -249,15 +237,12 @@ nav-enemy-default-event-handler (hopper-do-jump) ) ) - :post (the-as (function none :behavior hopper) nav-enemy-jump-post) + :post nav-enemy-jump-post ) (defstate nav-enemy-stop-chase (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-stare) ) diff --git a/goal_src/jak1/levels/jungle/jungle-mirrors.gc b/goal_src/jak1/levels/jungle/jungle-mirrors.gc index ebf94b275c7..61a31372f06 100644 --- a/goal_src/jak1/levels/jungle/jungle-mirrors.gc +++ b/goal_src/jak1/levels/jungle/jungle-mirrors.gc @@ -1237,7 +1237,7 @@ (suspend) ) ) - :post (the-as (function none :behavior periscope) ja-post) + :post ja-post ) (defun target-close-to-point? ((arg0 vector) (arg1 float)) @@ -1811,7 +1811,7 @@ ) ) ) - :post (the-as (function none :behavior reflector-mirror) ja-post) + :post ja-post ) (defstate reflector-mirror-broken (reflector-mirror) diff --git a/goal_src/jak1/levels/jungle/jungle-obs.gc b/goal_src/jak1/levels/jungle/jungle-obs.gc index 20414aa2ea9..60339c45b55 100644 --- a/goal_src/jak1/levels/jungle/jungle-obs.gc +++ b/goal_src/jak1/levels/jungle/jungle-obs.gc @@ -127,7 +127,7 @@ ) ) ) - :post (the-as (function none :behavior towertop) ja-post) + :post ja-post ) (defmethod init-from-entity! towertop ((obj towertop) (arg0 entity-actor)) @@ -173,7 +173,7 @@ ) ) ) - :trans (the-as (function none :behavior lurkerm-tall-sail) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max (* 0.5 (-> self speed))) :frame-num 0.0) @@ -188,7 +188,7 @@ ) ) ) - :post (the-as (function none :behavior lurkerm-tall-sail) rider-post) + :post rider-post ) (defmethod init-from-entity! lurkerm-tall-sail ((obj lurkerm-tall-sail) (arg0 entity-actor)) @@ -263,7 +263,7 @@ ) ) ) - :trans (the-as (function none :behavior lurkerm-short-sail) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max (* 0.5 (-> self speed))) :frame-num 0.0) @@ -278,7 +278,7 @@ ) ) ) - :post (the-as (function none :behavior lurkerm-short-sail) rider-post) + :post rider-post ) (defmethod init-from-entity! lurkerm-short-sail ((obj lurkerm-short-sail) (arg0 entity-actor)) @@ -373,7 +373,7 @@ ) ) ) - :trans (the-as (function none :behavior lurkerm-piston) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max (-> self speed)) :frame-num 0.0) @@ -388,7 +388,7 @@ ) ) ) - :post (the-as (function none :behavior lurkerm-piston) rider-post) + :post rider-post ) (defmethod init-from-entity! lurkerm-piston ((obj lurkerm-piston) (arg0 entity-actor)) @@ -643,14 +643,14 @@ (suspend) ) ) - :post (the-as (function none :behavior precurbridge) ja-post) + :post ja-post ) (defstate precurbridge-activate (precurbridge) :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior precurbridge) rider-trans) + :trans rider-trans :code (behavior () (process-entity-status! self (entity-perm-status complete) #t) (sound-play "blue-eco-on" :position (the-as symbol (-> self root-override trans))) @@ -664,7 +664,7 @@ ) (go precurbridge-active #f) ) - :post (the-as (function none :behavior precurbridge) rider-post) + :post rider-post ) (defstate precurbridge-active (precurbridge) @@ -682,7 +682,7 @@ ) ) ) - :trans (the-as (function none :behavior precurbridge) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (set! (-> self draw bounds w) 81920.0) (when arg0 @@ -715,7 +715,7 @@ (suspend) ) ) - :post (the-as (function none :behavior precurbridge) rider-post) + :post rider-post ) (defmethod init-from-entity! precurbridge ((obj precurbridge) (arg0 entity-actor)) @@ -988,7 +988,7 @@ (suspend) ) ) - :post (the-as (function none :behavior maindoor) ja-post) + :post ja-post ) (defmethod init-from-entity! maindoor ((obj maindoor) (arg0 entity-actor)) @@ -1094,7 +1094,7 @@ (defskelgroup *jngpusher-sg* jngpusher 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 10)) (defstate jngpusher-idle (jngpusher) - :trans (the-as (function none :behavior jngpusher) rider-trans) + :trans rider-trans :code (behavior () (loop (ja :num-func num-func-identity @@ -1114,7 +1114,7 @@ (suspend) ) ) - :post (the-as (function none :behavior jngpusher) rider-post) + :post rider-post ) (defmethod init-from-entity! jngpusher ((obj jngpusher) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/jungle/junglefish.gc b/goal_src/jak1/levels/jungle/junglefish.gc index 6581f1bb457..30aac41a497 100644 --- a/goal_src/jak1/levels/jungle/junglefish.gc +++ b/goal_src/jak1/levels/jungle/junglefish.gc @@ -32,10 +32,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-patrol (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (set! (-> self target-speed) (-> self nav-info walk-travel-speed)) ) @@ -94,10 +91,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-notice (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-chase) ) @@ -105,10 +99,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-chase (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) (if (and *target* (>= 8192.0 (vector-vector-distance (-> self collide-info trans) (-> *target* control trans)))) @@ -119,10 +110,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-stop-chase (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -130,10 +118,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-stare (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -141,10 +126,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-give-up (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -152,10 +134,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-attack (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! junglefish-chomp-ja :num! (seek!) :frame-num 0.0) @@ -165,15 +144,12 @@ nav-enemy-default-event-handler ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior junglefish) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate nav-enemy-victory (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (ja-no-eval :group! junglefish-swim-ja :num! (seek! max 2.0) :frame-num 0.0) diff --git a/goal_src/jak1/levels/jungle/junglesnake.gc b/goal_src/jak1/levels/jungle/junglesnake.gc index 71017809dfb..60552cd7854 100644 --- a/goal_src/jak1/levels/jungle/junglesnake.gc +++ b/goal_src/jak1/levels/jungle/junglesnake.gc @@ -382,7 +382,7 @@ junglesnake-default-event-handler ) (go junglesnake-tracking) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) (defstate junglesnake-tracking (junglesnake) @@ -443,7 +443,7 @@ junglesnake-default-event-handler ) ) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) (defstate junglesnake-attack (junglesnake) @@ -509,7 +509,7 @@ junglesnake-default-event-handler ) (go junglesnake-tracking) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) (defstate junglesnake-give-up (junglesnake) @@ -551,14 +551,11 @@ junglesnake-default-event-handler (set-vector! (-> self root-override scale) 1.0 1.0 1.0 1.0) (go junglesnake-sleeping) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) (defstate junglesnake-die (junglesnake) - :event (the-as - (function process int symbol event-message-block object :behavior junglesnake) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (clear-collide-with-as (-> self root-override)) @@ -570,7 +567,7 @@ junglesnake-default-event-handler ) (cleanup-for-death self) ) - :post (the-as (function none :behavior junglesnake) ja-post) + :post ja-post ) (defmethod junglesnake-method-23 junglesnake ((obj junglesnake)) diff --git a/goal_src/jak1/levels/jungleb/jungleb-obs.gc b/goal_src/jak1/levels/jungleb/jungleb-obs.gc index 56830658bda..5bd7ca9ef99 100644 --- a/goal_src/jak1/levels/jungleb/jungleb-obs.gc +++ b/goal_src/jak1/levels/jungleb/jungleb-obs.gc @@ -202,7 +202,7 @@ (update-transforms! (-> self root-override)) (anim-loop) ) - :post (the-as (function none :behavior eggtop) ja-post) + :post ja-post ) (defstate eggtop-close (eggtop) @@ -286,7 +286,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior eggtop) rider-post) + :post rider-post ) (defmethod init-from-entity! eggtop ((obj eggtop) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/jungleb/plant-boss.gc b/goal_src/jak1/levels/jungleb/plant-boss.gc index e7567284f23..bbfe83a661c 100644 --- a/goal_src/jak1/levels/jungleb/plant-boss.gc +++ b/goal_src/jak1/levels/jungleb/plant-boss.gc @@ -254,7 +254,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-arm-hit (plant-boss-arm) @@ -275,7 +275,7 @@ ) (go plant-boss-arm-idle) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-arm-die (plant-boss-arm) @@ -342,7 +342,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-back-arms-idle (plant-boss-arm) @@ -368,7 +368,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-back-arms-hit (plant-boss-arm) @@ -406,7 +406,7 @@ ) (go plant-boss-back-arms-idle) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-back-arms-die (plant-boss-arm) @@ -431,7 +431,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-vine-idle (plant-boss-arm) @@ -456,7 +456,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-vine-hit (plant-boss-arm) @@ -477,7 +477,7 @@ ) (go plant-boss-vine-idle) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-vine-die (plant-boss-arm) @@ -500,7 +500,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-root-idle (plant-boss-arm) @@ -522,7 +522,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defstate plant-boss-root-die (plant-boss-arm) @@ -536,7 +536,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) (defbehavior plant-boss-arm-init plant-boss-arm ((arg0 vector) (arg1 float) (arg2 int)) @@ -687,7 +687,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-leaf) ja-post) + :post ja-post ) (defstate plant-boss-leaf-open (plant-boss-leaf) @@ -701,7 +701,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.1)) @@ -743,7 +743,7 @@ ) (go plant-boss-leaf-open-idle #f) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) (defstate plant-boss-leaf-open-idle (plant-boss-leaf) @@ -766,7 +766,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (local-vars (v1-19 symbol)) (set! (-> self state-object) arg0) @@ -790,7 +790,7 @@ ) (go plant-boss-leaf-close) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) (defstate plant-boss-leaf-bounce (plant-boss-leaf) @@ -808,7 +808,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (case (-> self side) @@ -831,7 +831,7 @@ ) (go plant-boss-leaf-open-idle (-> self state-object)) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) (defstate plant-boss-leaf-close (plant-boss-leaf) @@ -842,7 +842,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior () (case (-> self side) ((1) @@ -864,7 +864,7 @@ ) (go plant-boss-leaf-idle #f) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) (defstate plant-boss-leaf-die (plant-boss-leaf) @@ -874,7 +874,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-leaf) ja-post) + :post ja-post ) (defbehavior plant-boss-leaf-init plant-boss-leaf ((arg0 vector) (arg1 float) (arg2 int)) @@ -948,7 +948,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss) ja-post) + :post ja-post ) (defstate plant-boss-intro (plant-boss) @@ -1037,7 +1037,7 @@ (set! (-> self snap-count) 0) (go plant-boss-reset 0) ) - :post (the-as (function none :behavior plant-boss) ja-post) + :post ja-post ) (defstate plant-boss-idle (plant-boss) @@ -1404,9 +1404,9 @@ (send-event *camera* 'change-state cam-lookat 0) (logior! (-> self skel status) (janim-status inited)) (ja-channel-push! 2 (seconds 0.1)) - (ja :group! (-> self draw art-group data 18) :num! (identity (ja-aframe f30-1 0))) + (ja :group! plant-boss-main-plant-boss-kill-ja :num! (identity (ja-aframe f30-1 0))) (ja :chan 1 - :group! (-> self draw art-group data 19) + :group! plant-boss-main-plant-boss-kill-close-ja :num! (identity (ja-aframe f30-1 0)) :frame-interp (-> self interp) ) @@ -1683,7 +1683,7 @@ (defstate plant-boss-dead-bounce (plant-boss) :event plant-boss-generic-event-handler - :trans (the-as (function none :behavior plant-boss) rider-trans) + :trans rider-trans :code (behavior ((arg0 float)) (let ((v1-2 (-> self entity extra perm))) (if (and (< 0.3 arg0) (and (not (handle->process (-> self money))) (< (-> v1-2 user-int8 1) 5))) @@ -1709,7 +1709,7 @@ ) (go plant-boss-dead-idle) ) - :post (the-as (function none :behavior plant-boss) rider-post) + :post rider-post ) (defmethod init-from-entity! plant-boss ((obj plant-boss) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/jungleb/plat-flip.gc b/goal_src/jak1/levels/jungleb/plat-flip.gc index 9a8993760be..b0ceb805a30 100644 --- a/goal_src/jak1/levels/jungleb/plat-flip.gc +++ b/goal_src/jak1/levels/jungleb/plat-flip.gc @@ -46,7 +46,7 @@ ) ) ) - :trans (the-as (function none :behavior plat-flip) rider-trans) + :trans rider-trans :code (behavior () (local-vars (f30-0 float) (f30-1 float)) (let ((gp-0 #f)) @@ -98,7 +98,7 @@ ) ) ) - :post (the-as (function none :behavior plat-flip) rider-post) + :post rider-post ) (defmethod init-from-entity! plat-flip ((obj plat-flip) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/lavatube/lavatube-energy.gc b/goal_src/jak1/levels/lavatube/lavatube-energy.gc index 28c04298472..b2a2103fb50 100644 --- a/goal_src/jak1/levels/lavatube/lavatube-energy.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-energy.gc @@ -421,7 +421,7 @@ (go energydoor-closed-till-task) ) ) - :post (the-as (function none :behavior energydoor) transform-post) + :post transform-post ) (defstate energydoor-opened (energydoor) @@ -475,7 +475,7 @@ ) (go energydoor-opened) ) - :post (the-as (function none :behavior energydoor) transform-post) + :post transform-post ) (defstate energydoor-closed-till-task (energydoor) @@ -637,7 +637,7 @@ ) ) ) - :post (the-as (function none :behavior energybase) ja-post) + :post ja-post ) (defstate energybase-idle (energybase) @@ -660,7 +660,7 @@ ) ) ) - :post (the-as (function none :behavior energybase) ja-post) + :post ja-post ) (defmethod init-from-entity! energybase ((obj energybase) (arg0 entity-actor)) @@ -804,7 +804,7 @@ ) ) ) - :post (the-as (function none :behavior energyball) rider-post) + :post rider-post ) (defun energyball-init ((arg0 energyball)) @@ -900,7 +900,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) (defstate energyarm-no-ball (energyarm) @@ -948,7 +948,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) (defstate energyarm-fall (energyarm) @@ -976,7 +976,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) (defstate energyarm-idle (energyarm) @@ -1041,7 +1041,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) (defun energyarm-init ((arg0 energyarm)) @@ -1194,7 +1194,7 @@ ) ) ) - :post (the-as (function none :behavior energyhub) ja-post) + :post ja-post ) (defstate energyhub-stop (energyhub) @@ -1271,7 +1271,7 @@ ) ) ) - :post (the-as (function none :behavior energyhub) ja-post) + :post ja-post ) (defstate energyhub-idle (energyhub) @@ -1343,7 +1343,7 @@ ) ) ) - :post (the-as (function none :behavior energyhub) ja-post) + :post ja-post ) (defmethod init-from-entity! energyhub ((obj energyhub) (arg0 entity-actor)) @@ -1411,7 +1411,7 @@ ) ) ) - :post (the-as (function none :behavior energylava) ja-post) + :post ja-post ) (defmethod init-from-entity! energylava ((obj energylava) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/lavatube/lavatube-obs.gc b/goal_src/jak1/levels/lavatube/lavatube-obs.gc index 2fa09a492a1..64d6521205c 100644 --- a/goal_src/jak1/levels/lavatube/lavatube-obs.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-obs.gc @@ -35,7 +35,7 @@ ) ) ) - :post (the-as (function none :behavior lavabase) ja-post) + :post ja-post ) (defmethod init-from-entity! lavabase ((obj lavabase) (arg0 entity-actor)) @@ -74,7 +74,7 @@ ) ) ) - :post (the-as (function none :behavior lavafall) ja-post) + :post ja-post ) (defmethod init-from-entity! lavafall ((obj lavafall) (arg0 entity-actor)) @@ -113,7 +113,7 @@ ) ) ) - :post (the-as (function none :behavior lavashortcut) ja-post) + :post ja-post ) (defmethod init-from-entity! lavashortcut ((obj lavashortcut) (arg0 entity-actor)) @@ -598,7 +598,7 @@ (suspend) ) ) - :post (the-as (function none :behavior darkecobarrel-mover) pusher-post) + :post pusher-post ) (defbehavior darkecobarrel-mover-init-by-other darkecobarrel-mover ((arg0 res-lump) (arg1 float) (arg2 time-frame) (arg3 time-frame)) @@ -795,7 +795,7 @@ ) ) ) - :post (the-as (function none :behavior lavafallsewera) ja-post) + :post ja-post ) (defmethod init-from-entity! lavafallsewera ((obj lavafallsewera) (arg0 entity-actor)) @@ -833,7 +833,7 @@ ) ) ) - :post (the-as (function none :behavior lavafallsewerb) ja-post) + :post ja-post ) (defmethod init-from-entity! lavafallsewerb ((obj lavafallsewerb) (arg0 entity-actor)) @@ -1046,7 +1046,7 @@ ) ) ) - :post (the-as (function none :behavior chainmine) ja-post) + :post ja-post ) (defmethod init-from-entity! chainmine ((obj chainmine) (arg0 entity-actor)) @@ -1216,7 +1216,7 @@ ) ) ) - :post (the-as (function none :behavior lavaballoon) transform-post) + :post transform-post ) (defmethod init-from-entity! lavaballoon ((obj lavaballoon) (arg0 entity-actor)) @@ -1322,7 +1322,7 @@ ) ) ) - :post (the-as (function none :behavior lavayellowtarp) ja-post) + :post ja-post ) (defmethod init-from-entity! lavayellowtarp ((obj lavayellowtarp) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/maincave/baby-spider.gc b/goal_src/jak1/levels/maincave/baby-spider.gc index 64deb0b4614..0f9318cfb86 100644 --- a/goal_src/jak1/levels/maincave/baby-spider.gc +++ b/goal_src/jak1/levels/maincave/baby-spider.gc @@ -313,7 +313,7 @@ baby-spider-default-event-handler ) (go baby-spider-resume) ) - :post (the-as (function none :behavior baby-spider) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate baby-spider-resume (baby-spider) @@ -603,10 +603,7 @@ baby-spider-default-event-handler (defstate nav-enemy-die (baby-spider) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior baby-spider) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :enter (behavior () (let ((v1-0 (-> self event-death))) (if v1-0 diff --git a/goal_src/jak1/levels/maincave/dark-crystal.gc b/goal_src/jak1/levels/maincave/dark-crystal.gc index a8bf9b4f5ce..3ac568db2b5 100644 --- a/goal_src/jak1/levels/maincave/dark-crystal.gc +++ b/goal_src/jak1/levels/maincave/dark-crystal.gc @@ -520,10 +520,7 @@ ) (defstate dark-crystal-spawn-fuel-cell (dark-crystal) - :event (the-as - (function process int symbol event-message-block object :behavior dark-crystal) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (clear-collide-with-as (-> self root-override)) diff --git a/goal_src/jak1/levels/maincave/driller-lurker.gc b/goal_src/jak1/levels/maincave/driller-lurker.gc index 45b235bbc26..9b826fc6d93 100644 --- a/goal_src/jak1/levels/maincave/driller-lurker.gc +++ b/goal_src/jak1/levels/maincave/driller-lurker.gc @@ -634,7 +634,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) (defstate driller-lurker-idle-drilling (driller-lurker) @@ -685,7 +685,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) (defstate driller-lurker-patrol (driller-lurker) @@ -726,7 +726,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) (defstate driller-lurker-patrol-pause (driller-lurker) @@ -782,7 +782,7 @@ ) (go driller-lurker-patrol) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) (defstate driller-lurker-chase (driller-lurker) @@ -845,7 +845,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) (defstate driller-lurker-attack (driller-lurker) @@ -887,7 +887,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) (defstate driller-lurker-jammed-standing (driller-lurker) @@ -920,14 +920,11 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) (defstate driller-lurker-die (driller-lurker) - :event (the-as - (function process int symbol event-message-block object :behavior driller-lurker) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (shut-down! (-> self neck)) (logclear! (-> self mask) (process-mask actor-pause)) @@ -944,7 +941,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior driller-lurker) ja-post) + :post ja-post ) (defmethod relocate driller-lurker ((obj driller-lurker) (arg0 int)) diff --git a/goal_src/jak1/levels/maincave/gnawer.gc b/goal_src/jak1/levels/maincave/gnawer.gc index a43d5f0f963..72cbf34d277 100644 --- a/goal_src/jak1/levels/maincave/gnawer.gc +++ b/goal_src/jak1/levels/maincave/gnawer.gc @@ -344,7 +344,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior gnawer-falling-segment) ja-post) + :post ja-post ) (defbehavior gnawer-falling-segment-init-by-other gnawer-falling-segment ((arg0 gnawer) (arg1 vector) (arg2 vector)) @@ -908,7 +908,7 @@ ) ) ) - :post (the-as (function none :behavior gnawer) transform-post) + :post transform-post ) (defstate gnawer-retreat-into-post (gnawer) @@ -926,7 +926,7 @@ (quaternion-identity! (-> self root-override quat)) (go gnawer-wait-to-run) ) - :post (the-as (function none :behavior gnawer) transform-post) + :post transform-post ) (defstate gnawer-wait-to-run (gnawer) @@ -1039,7 +1039,7 @@ (ja :group! gnawer-run-ja :num! min) ) ) - :post (the-as (function none :behavior gnawer) transform-post) + :post transform-post ) (defstate gnawer-die (gnawer) @@ -1080,7 +1080,7 @@ ) (go gnawer-dying-give-pickups) ) - :post (the-as (function none :behavior gnawer) ja-post) + :post ja-post ) (defstate gnawer-dying-give-pickups (gnawer) diff --git a/goal_src/jak1/levels/maincave/maincave-obs.gc b/goal_src/jak1/levels/maincave/maincave-obs.gc index f9d23340408..216a78d0da7 100644 --- a/goal_src/jak1/levels/maincave/maincave-obs.gc +++ b/goal_src/jak1/levels/maincave/maincave-obs.gc @@ -152,7 +152,7 @@ ) ) ) - :post (the-as (function none :behavior cavecrusher) ja-post) + :post ja-post ) (defmethod init-from-entity! cavecrusher ((obj cavecrusher) (arg0 entity-actor)) @@ -299,7 +299,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior cavetrapdoor) pusher-post) + :post pusher-post ) (defmethod init-from-entity! cavetrapdoor ((obj cavetrapdoor) (arg0 entity-actor)) @@ -681,7 +681,7 @@ (suspend) ) ) - :post (the-as (function none :behavior cavespatula) rider-post) + :post rider-post ) (defmethod init-from-entity! cavespatula ((obj cavespatula) (arg0 entity-actor)) @@ -791,7 +791,7 @@ (suspend) ) ) - :post (the-as (function none :behavior cavespatulatwo) rider-post) + :post rider-post ) (defmethod init-from-entity! cavespatulatwo ((obj cavespatulatwo) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/maincave/mother-spider-egg.gc b/goal_src/jak1/levels/maincave/mother-spider-egg.gc index cbbccdb3fc1..0f4774824c0 100644 --- a/goal_src/jak1/levels/maincave/mother-spider-egg.gc +++ b/goal_src/jak1/levels/maincave/mother-spider-egg.gc @@ -253,7 +253,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider-egg) transform-post) + :post transform-post ) (defstate mother-spider-egg-on-ground (mother-spider-egg) @@ -321,7 +321,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider-egg) transform-post) + :post transform-post ) (defstate mother-spider-egg-hatch (mother-spider-egg) @@ -367,7 +367,7 @@ 0 (go mother-spider-egg-die-exit) ) - :post (the-as (function none :behavior mother-spider-egg) transform-post) + :post transform-post ) (defstate mother-spider-egg-die (mother-spider-egg) @@ -398,7 +398,7 @@ ) (go mother-spider-egg-die-exit) ) - :post (the-as (function none :behavior mother-spider-egg) ja-post) + :post ja-post ) (defstate mother-spider-egg-die-while-falling (mother-spider-egg) @@ -437,7 +437,7 @@ ) (go mother-spider-egg-die-exit) ) - :post (the-as (function none :behavior mother-spider-egg) ja-post) + :post ja-post ) (defstate mother-spider-egg-die-exit (mother-spider-egg) diff --git a/goal_src/jak1/levels/maincave/mother-spider.gc b/goal_src/jak1/levels/maincave/mother-spider.gc index e20b890302a..e4b621e7e42 100644 --- a/goal_src/jak1/levels/maincave/mother-spider.gc +++ b/goal_src/jak1/levels/maincave/mother-spider.gc @@ -158,7 +158,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider-leg) ja-post) + :post ja-post ) (defstate wait-for-children (mother-spider) @@ -168,7 +168,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mother-spider) ja-post) + :post ja-post ) (defbehavior mother-spider-leg-init-by-other mother-spider-leg ((arg0 mother-spider) (arg1 vector) (arg2 vector) (arg3 vector)) @@ -952,7 +952,7 @@ (ja :group! mother-spider-lowering-ja :num! min) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defstate mother-spider-stop-traveling (mother-spider) @@ -989,7 +989,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defstate mother-spider-tracking (mother-spider) @@ -1084,7 +1084,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defstate mother-spider-hit-while-tracking (mother-spider) @@ -1118,7 +1118,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defstate mother-spider-spit (mother-spider) @@ -1192,7 +1192,7 @@ (go mother-spider-traveling (the-as uint 2)) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defstate mother-spider-birthing (mother-spider) @@ -1251,7 +1251,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defstate mother-spider-birth-baby (mother-spider) @@ -1296,7 +1296,7 @@ ) (go mother-spider-birthing) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defmethod mother-spider-method-20 mother-spider ((obj mother-spider) (arg0 vector) (arg1 vector)) @@ -1411,7 +1411,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) (defstate mother-spider-die-from-uppercut (mother-spider) @@ -1463,7 +1463,7 @@ ) (go mother-spider-die-wait-for-children) ) - :post (the-as (function none :behavior mother-spider) ja-post) + :post ja-post ) (defstate mother-spider-die (mother-spider) @@ -1487,7 +1487,7 @@ ) (go mother-spider-die-wait-for-children) ) - :post (the-as (function none :behavior mother-spider) ja-post) + :post ja-post ) (defstate mother-spider-die-wait-for-children (mother-spider) diff --git a/goal_src/jak1/levels/maincave/spiderwebs.gc b/goal_src/jak1/levels/maincave/spiderwebs.gc index b4b131f3bab..1f8f3314547 100644 --- a/goal_src/jak1/levels/maincave/spiderwebs.gc +++ b/goal_src/jak1/levels/maincave/spiderwebs.gc @@ -118,7 +118,7 @@ ) (go spiderwebs-idle) ) - :post (the-as (function none :behavior spiderwebs) transform-post) + :post transform-post ) (defmethod init-from-entity! spiderwebs ((obj spiderwebs) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/misty/babak-with-cannon.gc b/goal_src/jak1/levels/misty/babak-with-cannon.gc index 68ce1e37572..3b458638a22 100644 --- a/goal_src/jak1/levels/misty/babak-with-cannon.gc +++ b/goal_src/jak1/levels/misty/babak-with-cannon.gc @@ -29,10 +29,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-idle (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (and (and *target* (>= (-> self enemy-info idle-distance) (vector-vector-distance (-> self collide-info trans) (-> *target* control trans)) @@ -53,15 +50,12 @@ nav-enemy-default-event-handler ) (anim-loop) ) - :post (the-as (function none :behavior babak-with-cannon) #f) + :post #f ) (defstate nav-enemy-patrol (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.1)) (let ((f30-0 (- (-> (target-pos 0) y) (-> self collide-info trans y)))) @@ -92,10 +86,7 @@ nav-enemy-default-event-handler ) (defstate babak-run-to-cannon (babak) - :event (the-as - (function process int symbol event-message-block object :behavior babak) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self nav destination-pos quad) (-> self entity extra trans quad)) @@ -172,10 +163,7 @@ nav-enemy-default-event-handler ) (defstate babak-with-cannon-jump-onto-cannon (babak-with-cannon) - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :exit (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate enable-travel)) ) @@ -240,14 +228,11 @@ nav-enemy-default-event-handler ) (go babak-with-cannon-shooting) ) - :post (the-as (function none :behavior babak-with-cannon) nav-enemy-jump-post) + :post nav-enemy-jump-post ) (defstate babak-with-cannon-jump-off-cannon (babak-with-cannon) - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :exit (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate enable-travel)) ) @@ -272,14 +257,11 @@ nav-enemy-default-event-handler ) (go-virtual nav-enemy-jump-land) ) - :post (the-as (function none :behavior babak-with-cannon) nav-enemy-jump-post) + :post nav-enemy-jump-post ) (defstate babak-with-cannon-shooting (babak-with-cannon) - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (let ((v1-2 (entity-actor-lookup (-> self entity) 'alt-actor 0))) @@ -318,10 +300,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-die (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (and *target* (= (-> *target* current-level name) 'beach)) (spool-push *art-control* "beachcam-cannon" 0 self -1.0) @@ -339,10 +318,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-fuel-cell (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (ja-channel-set! 0) (clear-collide-with-as (-> self collide-info)) diff --git a/goal_src/jak1/levels/misty/balloonlurker.gc b/goal_src/jak1/levels/misty/balloonlurker.gc index dc4a8ee1ce8..665cd82d007 100644 --- a/goal_src/jak1/levels/misty/balloonlurker.gc +++ b/goal_src/jak1/levels/misty/balloonlurker.gc @@ -742,7 +742,7 @@ ) (defstate balloonlurker-die (balloonlurker) - :event (the-as (function process int symbol event-message-block object :behavior balloonlurker) #f) + :event #f :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self vulnerable) #f) @@ -849,10 +849,7 @@ ) (defstate balloonlurker-pilot-die (balloonlurker-pilot) - :event (the-as - (function process int symbol event-message-block object :behavior balloonlurker-pilot) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (process-spawn part-tracker diff --git a/goal_src/jak1/levels/misty/bonelurker.gc b/goal_src/jak1/levels/misty/bonelurker.gc index 95f6cf93823..a9abfea70e7 100644 --- a/goal_src/jak1/levels/misty/bonelurker.gc +++ b/goal_src/jak1/levels/misty/bonelurker.gc @@ -154,10 +154,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-idle (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (bonelurker-set-large-bounds-sphere) ) @@ -169,10 +166,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-patrol (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.2)) ((the-as (function none :behavior bonelurker) (-> (method-of-type nav-enemy nav-enemy-patrol) code))) @@ -181,19 +175,13 @@ nav-enemy-default-event-handler (defstate nav-enemy-notice (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (-> (method-of-type nav-enemy nav-enemy-notice) code) ) (defstate nav-enemy-chase (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) (if (and (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags navenmf6))) @@ -270,19 +258,13 @@ nav-enemy-default-event-handler (defstate nav-enemy-stop-chase (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (-> (method-of-type nav-enemy nav-enemy-stop-chase) code) ) (defstate nav-enemy-stare (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 524288.0) (set! (-> self turn-time) (seconds 0.2)) @@ -330,10 +312,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-give-up (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 524288.0) (set! (-> self turn-time) (seconds 0.1)) @@ -382,10 +361,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-victory (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (-> (method-of-type nav-enemy nav-enemy-victory) code) ) diff --git a/goal_src/jak1/levels/misty/misty-conveyor.gc b/goal_src/jak1/levels/misty/misty-conveyor.gc index e2737377b41..caa1f8be3a3 100644 --- a/goal_src/jak1/levels/misty/misty-conveyor.gc +++ b/goal_src/jak1/levels/misty/misty-conveyor.gc @@ -187,7 +187,7 @@ (suspend) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) (defstate keg-paddle-to-path (keg) @@ -221,7 +221,7 @@ ) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) (defstate keg-on-path (keg) @@ -336,7 +336,7 @@ ) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) (defstate keg-in-chute (keg) @@ -375,16 +375,16 @@ ) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) (defstate keg-die (keg) - :event (the-as (function process int symbol event-message-block object :behavior keg) #f) + :event #f :code (behavior () (sound-stop (-> self sound-id)) (cleanup-for-death self) ) - :post (the-as (function none :behavior keg) transform-post) + :post transform-post ) (defbehavior keg-init-by-other keg ((arg0 keg) (arg1 int)) @@ -457,7 +457,7 @@ (suspend) ) ) - :post (the-as (function none :behavior keg-conveyor) ja-post) + :post ja-post ) (defstate keg-conveyor-paddle-idle (keg-conveyor-paddle) @@ -522,7 +522,7 @@ ) ) ) - :post (the-as (function none :behavior keg-conveyor-paddle) transform-post) + :post transform-post ) (defbehavior keg-conveyor-paddle-init-by-other keg-conveyor-paddle ((arg0 keg-conveyor-paddle)) diff --git a/goal_src/jak1/levels/misty/misty-obs.gc b/goal_src/jak1/levels/misty/misty-obs.gc index 3d9a8048760..b53a52833bd 100644 --- a/goal_src/jak1/levels/misty/misty-obs.gc +++ b/goal_src/jak1/levels/misty/misty-obs.gc @@ -1044,7 +1044,7 @@ (suspend) ) ) - :post (the-as (function none :behavior boatpaddle) ja-post) + :post ja-post ) (defmethod init-from-entity! boatpaddle ((obj boatpaddle) (arg0 entity-actor)) @@ -1102,7 +1102,7 @@ (suspend) ) ) - :post (the-as (function none :behavior windturbine) ja-post) + :post ja-post ) (defmethod init-from-entity! windturbine ((obj windturbine) (arg0 entity-actor)) @@ -1195,12 +1195,12 @@ (suspend) ) ) - :post (the-as (function none :behavior mis-bone-bridge) transform-post) + :post transform-post ) (defstate mis-bone-bridge-bump (mis-bone-bridge) :event mis-bone-bridge-event-handler - :trans (the-as (function none :behavior mis-bone-bridge) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) @@ -1209,12 +1209,12 @@ ) (go mis-bone-bridge-idle) ) - :post (the-as (function none :behavior mis-bone-bridge) rider-post) + :post rider-post ) (defstate mis-bone-bridge-hit (mis-bone-bridge) :event mis-bone-bridge-event-handler - :trans (the-as (function none :behavior mis-bone-bridge) rider-trans) + :trans rider-trans :code (behavior () (+! (-> self hit-points) -1) (if (zero? (-> self hit-points)) @@ -1227,11 +1227,11 @@ ) (go mis-bone-bridge-idle) ) - :post (the-as (function none :behavior mis-bone-bridge) rider-post) + :post rider-post ) (defstate mis-bone-bridge-fall (mis-bone-bridge) - :trans (the-as (function none :behavior mis-bone-bridge) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status complete) #t) (when (not arg0) @@ -1259,7 +1259,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mis-bone-bridge) rider-post) + :post rider-post ) (defmethod init-from-entity! mis-bone-bridge ((obj mis-bone-bridge) (arg0 entity-actor)) @@ -1364,8 +1364,8 @@ ) ) ) - :code (the-as (function none :behavior breakaway) anim-loop) - :post (the-as (function none :behavior breakaway) transform-post) + :code anim-loop + :post transform-post ) (defun actor-wait-for-period ((arg0 time-frame)) @@ -1400,7 +1400,7 @@ ) ) ) - :post (the-as (function none :behavior breakaway) rider-post) + :post rider-post ) (defstate breakaway-fall (breakaway) @@ -1420,7 +1420,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior breakaway) rider-post) + :post rider-post ) (defmethod init! breakaway ((obj breakaway) (arg0 res-lump) (arg1 int)) @@ -1597,15 +1597,12 @@ (suspend) ) ) - :post (the-as (function none :behavior bone-platform) ja-post) + :post ja-post ) (defstate rigid-body-platform-float (bone-platform) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bone-platform) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :trans (behavior () (-> self entity extra trans y) (cond @@ -1633,7 +1630,7 @@ (suspend) ) ) - :post (the-as (function none :behavior bone-platform) rigid-body-platform-post) + :post rigid-body-platform-post ) (defmethod rigid-body-platform-method-30 bone-platform ((obj bone-platform)) @@ -1835,14 +1832,11 @@ ) ) ) - :code (the-as (function none :behavior boat-fuelcell) anim-loop) + :code anim-loop ) (defstate boat-fuelcell-spawn (boat-fuelcell) - :event (the-as - (function process int symbol event-message-block object :behavior boat-fuelcell) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (process-drawable-birth-fuel-cell (the-as entity #f) (the-as vector #f) #f) (when (and *target* (-> self play-cutscene?)) diff --git a/goal_src/jak1/levels/misty/misty-teetertotter.gc b/goal_src/jak1/levels/misty/misty-teetertotter.gc index 9d85ff58321..569ecc5c6a8 100644 --- a/goal_src/jak1/levels/misty/misty-teetertotter.gc +++ b/goal_src/jak1/levels/misty/misty-teetertotter.gc @@ -67,7 +67,7 @@ (suspend) ) ) - :post (the-as (function none :behavior teetertotter) transform-post) + :post transform-post ) (defstate teetertotter-launch (teetertotter) @@ -120,7 +120,7 @@ ) (go teetertotter-idle) ) - :post (the-as (function none :behavior teetertotter) rider-post) + :post rider-post ) (defstate teetertotter-bend (teetertotter) @@ -132,7 +132,7 @@ ) (go teetertotter-idle) ) - :post (the-as (function none :behavior teetertotter) rider-post) + :post rider-post ) (defmethod init-from-entity! teetertotter ((obj teetertotter) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/misty/misty-warehouse.gc b/goal_src/jak1/levels/misty/misty-warehouse.gc index d9fd6cc57ce..207d279639c 100644 --- a/goal_src/jak1/levels/misty/misty-warehouse.gc +++ b/goal_src/jak1/levels/misty/misty-warehouse.gc @@ -48,7 +48,7 @@ (suspend) ) ) - :post (the-as (function none :behavior silostep) ja-post) + :post ja-post ) (defbehavior misty-camera-view silostep () @@ -98,7 +98,7 @@ (send-to-all-after (-> self link) 'trigger-rise) (go silostep-rise #f) ) - :post (the-as (function none :behavior silostep) ja-post) + :post ja-post ) (defstate silostep-rise (silostep) @@ -120,7 +120,7 @@ (suspend) ) ) - :post (the-as (function none :behavior silostep) #f) + :post #f ) (defmethod init-from-entity! silostep ((obj silostep) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/misty/mistycannon.gc b/goal_src/jak1/levels/misty/mistycannon.gc index cfeb58c0bc8..a32ffa006c1 100644 --- a/goal_src/jak1/levels/misty/mistycannon.gc +++ b/goal_src/jak1/levels/misty/mistycannon.gc @@ -820,7 +820,7 @@ ) (ja-channel-set! 0) ) - :post (the-as (function none :behavior mistycannon-missile) ja-post) + :post ja-post ) (defstate mistycannon-missile-explode (mistycannon-missile) @@ -911,7 +911,7 @@ (kill-and-free-particles (-> self part2)) (deactivate self) ) - :post (the-as (function none :behavior mistycannon-missile) ja-post) + :post ja-post ) (defun mistycannon-collision-reaction ((arg0 collide-shape-moving) (arg1 collide-shape-intersect) (arg2 vector) (arg3 vector)) @@ -1244,7 +1244,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) (deftype quadratic-solution (structure) @@ -1434,7 +1434,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) (defstate mistycannon-waiting-for-player (mistycannon) @@ -1505,7 +1505,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) (defstate cam-mistycannon (camera-slave) @@ -1624,7 +1624,7 @@ ) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) (defstate mistycannon-waiting-for-player-to-fuck-off (mistycannon) @@ -1647,7 +1647,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) - :trans (the-as (function none :behavior mistycannon) rider-trans) + :trans rider-trans :code (behavior () (loop (suspend) @@ -1657,7 +1657,7 @@ ) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) (defmethod init-from-entity! mistycannon ((obj mistycannon) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/misty/muse.gc b/goal_src/jak1/levels/misty/muse.gc index fbe116d5dc6..e99b9759993 100644 --- a/goal_src/jak1/levels/misty/muse.gc +++ b/goal_src/jak1/levels/misty/muse.gc @@ -176,10 +176,7 @@ nav-enemy-default-event-handler (defstate muse-idle (muse) - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (seek! (-> self sprint-distance) 61440.0 (* 8192.0 (-> *display* seconds-per-frame))) (if (and *target* (>= 102400.0 (vector-vector-distance (-> self collide-info trans) (-> *target* control trans)))) @@ -210,15 +207,12 @@ nav-enemy-default-event-handler ) ) ) - :post (the-as (function none :behavior muse) ja-post) + :post ja-post ) (defstate nav-enemy-chase (muse) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -285,10 +279,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-jump (muse) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () ((-> (method-of-type nav-enemy nav-enemy-jump) enter)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags standing-jump)) @@ -298,10 +289,7 @@ nav-enemy-default-event-handler (defstate nav-enemy-jump-land (muse) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-no-eval :num! (seek!)) (ja-channel-push! 1 (seconds 0.075)) @@ -316,7 +304,7 @@ nav-enemy-default-event-handler ) (defstate muse-caught (muse) - :event (the-as (function process int symbol event-message-block object :behavior muse) #f) + :event #f :trans (behavior () (spool-push *art-control* (-> self anim name) 0 self -1.0) ) diff --git a/goal_src/jak1/levels/misty/quicksandlurker.gc b/goal_src/jak1/levels/misty/quicksandlurker.gc index 9fef9058241..37f8b8572ce 100644 --- a/goal_src/jak1/levels/misty/quicksandlurker.gc +++ b/goal_src/jak1/levels/misty/quicksandlurker.gc @@ -560,7 +560,7 @@ ) (defstate quicksandlurker-idle (quicksandlurker) - :event (the-as (function process int symbol event-message-block object :behavior quicksandlurker) #f) + :event #f :enter (behavior () (logior! (-> self draw status) (draw-status hidden)) ) @@ -579,7 +579,7 @@ (suspend) ) ) - :post (the-as (function none :behavior quicksandlurker) ja-post) + :post ja-post ) (defstate quicksandlurker-wait (quicksandlurker) @@ -850,10 +850,7 @@ ) (defstate quicksandlurker-die (quicksandlurker) - :event (the-as - (function process int symbol event-message-block object :behavior quicksandlurker) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (ja-channel-push! 1 (seconds 0.2)) diff --git a/goal_src/jak1/levels/ogre/flying-lurker.gc b/goal_src/jak1/levels/ogre/flying-lurker.gc index db151eed999..4274ea44572 100644 --- a/goal_src/jak1/levels/ogre/flying-lurker.gc +++ b/goal_src/jak1/levels/ogre/flying-lurker.gc @@ -155,7 +155,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plunger-lurker) ja-post) + :post ja-post ) (defstate plunger-lurker-flee (plunger-lurker) @@ -210,7 +210,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plunger-lurker) ja-post) + :post ja-post ) (defstate plunger-lurker-idle (plunger-lurker) @@ -238,7 +238,7 @@ ) ) ) - :post (the-as (function none :behavior plunger-lurker) ja-post) + :post ja-post ) (defstate plunger-lurker-die (plunger-lurker) @@ -737,7 +737,7 @@ ) ) ) - :post (the-as (function none :behavior flying-lurker) ja-post) + :post ja-post ) (defbehavior flying-lurker-handler flying-lurker ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) @@ -958,7 +958,7 @@ ) ) ) - :post (the-as (function none :behavior flying-lurker) ja-post) + :post ja-post ) (defstate flying-lurker-clone (flying-lurker) @@ -1181,7 +1181,7 @@ ) ) ) - :post (the-as (function none :behavior flying-lurker) ja-post) + :post ja-post ) (defmethod init-from-entity! flying-lurker ((obj flying-lurker) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/ogre/ogre-obs.gc b/goal_src/jak1/levels/ogre/ogre-obs.gc index 8229e73c10e..4de1c6266f5 100644 --- a/goal_src/jak1/levels/ogre/ogre-obs.gc +++ b/goal_src/jak1/levels/ogre/ogre-obs.gc @@ -486,15 +486,12 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-plat) ja-post) + :post ja-post ) (defstate rigid-body-platform-float (ogre-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior ogre-plat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :trans (behavior () (cond ((or (not *target*) (< (-> self info idle-distance) @@ -519,7 +516,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-plat) rigid-body-platform-post) + :post rigid-body-platform-post ) (defmethod rigid-body-platform-method-30 ogre-plat ((obj ogre-plat)) @@ -896,7 +893,7 @@ ) (go ogre-bridge-activated) ) - :post (the-as (function none :behavior ogre-bridge) rider-post) + :post rider-post ) (defstate ogre-bridge-activated (ogre-bridge) @@ -922,7 +919,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-bridge) ja-post) + :post ja-post ) (defstate ogre-bridge-break (ogre-bridge) @@ -959,7 +956,7 @@ ) (go ogre-bridge-idle) ) - :post (the-as (function none :behavior ogre-bridge) rider-post) + :post rider-post ) (define *ogre-bridge-joint-array* (new 'static 'boxed-array :type uint8 #x4 #x9 #xc #x11 #x7 #xa #xf #x12)) @@ -1264,7 +1261,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-lava) #f) + :post #f ) (defstate water-vol-startup (ogre-lava) @@ -1428,7 +1425,7 @@ (cleanup-for-death self) (deactivate self) ) - :post (the-as (function none :behavior shortcut-boulder) ja-post) + :post ja-post ) (defstate shortcut-boulder-idle (shortcut-boulder) diff --git a/goal_src/jak1/levels/ogre/ogreboss.gc b/goal_src/jak1/levels/ogre/ogreboss.gc index e17c90a854e..9c1ad166e0f 100644 --- a/goal_src/jak1/levels/ogre/ogreboss.gc +++ b/goal_src/jak1/levels/ogre/ogreboss.gc @@ -134,7 +134,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ogreboss-missile) transform-post) + :post transform-post ) (defstate ogreboss-missile-seek (ogreboss-missile) @@ -350,7 +350,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ogreboss-missile) ja-post) + :post ja-post ) (deftype ogreboss-missile-init-data (structure) @@ -558,7 +558,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) (defbehavior ogreboss-super-boulder-impact-effect ogreboss-super-boulder () @@ -620,7 +620,7 @@ ) (go ogreboss-super-boulder-land) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) (defstate ogreboss-super-boulder-hit (ogreboss-super-boulder) @@ -630,7 +630,7 @@ (ogreboss-super-boulder-play-hit-anim) (go ogreboss-super-boulder-land) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) (defstate ogreboss-super-boulder-die (ogreboss-super-boulder) @@ -645,7 +645,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) (defstate ogreboss-super-boulder-land (ogreboss-super-boulder) @@ -1120,7 +1120,7 @@ (ogreboss-reset-camera) (ogreboss-idle-loop) ) - :post (the-as (function none :behavior ogreboss) ja-post) + :post ja-post ) (defstate ogreboss-intro (ogreboss) @@ -1161,7 +1161,7 @@ (set-setting! 'music 'ogreboss 0.0 0) (go ogreboss-wait-for-player) ) - :post (the-as (function none :behavior ogreboss) ja-post) + :post ja-post ) (defstate ogreboss-wait-for-player (ogreboss) @@ -1178,7 +1178,7 @@ :code (behavior () (ogreboss-idle-loop) ) - :post (the-as (function none :behavior ogreboss) ja-post) + :post ja-post ) (defun ogreboss-debug-adjust-difficulty () @@ -1839,7 +1839,7 @@ (set! (-> self bridge-assembled) #f) (go ogreboss-stage1) ) - :post (the-as (function none :behavior ogreboss) transform-post) + :post transform-post ) (defstate ogreboss-stage3-hit (ogreboss) @@ -1862,7 +1862,7 @@ ) (go ogreboss-stage1) ) - :post (the-as (function none :behavior ogreboss) transform-post) + :post transform-post ) (defbehavior ogreboss-trigger-steps ogreboss () @@ -1908,10 +1908,7 @@ ) (defstate ogreboss-dead (ogreboss) - :event (the-as - (function process int symbol event-message-block object :behavior ogreboss) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (remove-setting! 'music) (ogreboss-reset-camera) diff --git a/goal_src/jak1/levels/racer_common/racer.gc b/goal_src/jak1/levels/racer_common/racer.gc index ec5e678f761..e3b885f6f03 100644 --- a/goal_src/jak1/levels/racer_common/racer.gc +++ b/goal_src/jak1/levels/racer_common/racer.gc @@ -48,7 +48,7 @@ (the-as racer ((method-of-type process-drawable relocate) obj arg0)) ) -(defskelgroup *racer-sg* racer racer-geo-jg 3 +(defskelgroup *racer-sg* racer racer-geo-jg racer-racer-idle-ja ((racer-geo-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.5) :shadow racer-shadow-mg @@ -124,7 +124,7 @@ (case (current-status gp-0) (((task-status need-reward-speech)) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! racer-racer-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (ja-post) @@ -209,7 +209,7 @@ :exit (-> (method-of-type racer wait-for-start) exit) :code (behavior () (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! racer-racer-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) 0.0 @@ -253,7 +253,7 @@ ) ) ) - :post (the-as (function none :behavior racer) ja-post) + :post ja-post ) (defstate pickup (racer) @@ -262,7 +262,7 @@ (case message (('draw) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! racer-racer-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (transform-post) diff --git a/goal_src/jak1/levels/robocave/spider-egg.gc b/goal_src/jak1/levels/robocave/spider-egg.gc index 56666146eae..13fb7efc22a 100644 --- a/goal_src/jak1/levels/robocave/spider-egg.gc +++ b/goal_src/jak1/levels/robocave/spider-egg.gc @@ -108,7 +108,7 @@ ) ) ) - :post (the-as (function none :behavior spider-egg) ja-post) + :post ja-post ) (defstate spider-egg-hatch (spider-egg) @@ -148,7 +148,7 @@ (suspend) ) ) - :post (the-as (function none :behavior spider-egg) ja-post) + :post ja-post ) (defstate spider-egg-die (spider-egg) @@ -206,7 +206,7 @@ (suspend) ) ) - :post (the-as (function none :behavior spider-egg) ja-post) + :post ja-post ) (defmethod init-from-entity! spider-egg ((obj spider-egg) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc index 65817dd554f..ffa89874e0e 100644 --- a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc +++ b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc @@ -493,7 +493,7 @@ ) ) ) - :post (the-as (function none :behavior fleeing-nav-enemy) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (define *lightning-mole-hole* (new 'static 'vector :x -241664.0 :y 106496.0 :z -6393856.0)) @@ -596,7 +596,7 @@ (set! (-> self speed-adjust) 1.0) ) :code lightning-mole-run-code - :post (the-as (function none :behavior lightning-mole) ja-post) + :post ja-post ) (defstate lightning-mole-debug-run (lightning-mole) @@ -791,13 +791,13 @@ ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior lightning-mole) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate nav-enemy-stop-chase (lightning-mole) :virtual #t :code lightning-mole-run-code - :post (the-as (function none :behavior lightning-mole) fleeing-nav-enemy-chase-post) + :post fleeing-nav-enemy-chase-post ) (defstate nav-enemy-chase (lightning-mole) @@ -864,7 +864,7 @@ ((-> (method-of-type fleeing-nav-enemy nav-enemy-chase) trans)) ) :code lightning-mole-run-code - :post (the-as (function none :behavior lightning-mole) fleeing-nav-enemy-chase-post) + :post fleeing-nav-enemy-chase-post ) (defmethod attack-handler lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) @@ -1198,7 +1198,7 @@ (suspend) ) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) (defstate peeper-hide (peeper) @@ -1214,7 +1214,7 @@ (logior! (-> self draw status) (draw-status hidden)) (go peeper-wait) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) (defstate peeper-down (peeper) @@ -1260,7 +1260,7 @@ ) (go peeper-up) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) (defstate peeper-up (peeper) @@ -1292,7 +1292,7 @@ (go peeper-down) ) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) (defmethod init-from-entity! peeper ((obj peeper) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc index 9b7750a9a1c..a63a1cc01a2 100644 --- a/goal_src/jak1/levels/rolling/rolling-obs.gc +++ b/goal_src/jak1/levels/rolling/rolling-obs.gc @@ -106,7 +106,7 @@ ) (defstate pusher-idle (pusher) - :trans (the-as (function none :behavior pusher) rider-trans) + :trans rider-trans :code (behavior () (loop (let ((f0-0 -1.0)) @@ -124,7 +124,7 @@ (suspend) ) ) - :post (the-as (function none :behavior pusher) rider-post) + :post rider-post ) (defmethod init-from-entity! pusher ((obj pusher) (arg0 entity-actor)) @@ -143,7 +143,7 @@ ) (defstate gorge-pusher-idle (gorge-pusher) - :trans (the-as (function none :behavior gorge-pusher) rider-trans) + :trans rider-trans :code (behavior () (loop (if (task-closed? (game-task rolling-race) (task-status need-introduction)) @@ -153,7 +153,7 @@ (suspend) ) ) - :post (the-as (function none :behavior gorge-pusher) rider-post) + :post rider-post ) (defmethod init-from-entity! gorge-pusher ((obj gorge-pusher) (arg0 entity-actor)) @@ -273,7 +273,7 @@ ) (go dark-plant-idle) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) (defstate dark-plant-gone (dark-plant) @@ -307,7 +307,7 @@ ) ) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) (defstate dark-plant-death (dark-plant) @@ -322,7 +322,7 @@ ) (go dark-plant-gone) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) (defstate dark-plant-idle (dark-plant) @@ -376,7 +376,7 @@ ) ) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) (defstate dark-plant-startup (dark-plant) @@ -397,7 +397,7 @@ ) (go dark-plant-idle) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) (defpartgroup group-dark-plant @@ -505,7 +505,7 @@ ) ) ) - :post (the-as (function none :behavior happy-plant) ja-post) + :post ja-post ) (defstate happy-plant-opening (happy-plant) @@ -575,7 +575,7 @@ (restore-collide-with-as (-> self root-override)) (go happy-plant-opened) ) - :post (the-as (function none :behavior happy-plant) transform-post) + :post transform-post ) (defstate happy-plant-init (happy-plant) @@ -606,7 +606,7 @@ ) ) ) - :post (the-as (function none :behavior happy-plant) ja-post) + :post ja-post ) (defmethod init-from-entity! happy-plant ((obj happy-plant) (arg0 entity-actor)) @@ -795,7 +795,7 @@ ) ) ) - :post (the-as (function none :behavior rolling-start) ja-post) + :post ja-post ) (defstate rolling-start-whole (rolling-start) @@ -820,7 +820,7 @@ ) ) ) - :post (the-as (function none :behavior rolling-start) ja-post) + :post ja-post ) (defbehavior rolling-start-init-by-other rolling-start ((arg0 vector) (arg1 float)) @@ -944,7 +944,7 @@ ) (defstate gorge-abort-idle (gorge-abort) - :trans (the-as (function none :behavior gorge-abort) gorge-trans) + :trans gorge-trans :code (behavior () (loop (suspend) @@ -964,7 +964,7 @@ ) (defstate gorge-finish-idle (gorge-finish) - :trans (the-as (function none :behavior gorge-finish) gorge-trans) + :trans gorge-trans :code (behavior () (loop (suspend) @@ -1251,7 +1251,7 @@ (send-event (handle->process (-> self start-banner)) 'unbreak) (remove-setting! 'sound-flava) ) - :trans (the-as (function none :behavior gorge-start) gorge-trans) + :trans gorge-trans :code (behavior () (set! (-> self state-time) (-> *display* game-frame-counter)) (loop @@ -1268,7 +1268,7 @@ ) (defstate gorge-start-ready (gorge-start) - :trans (the-as (function none :behavior gorge-start) gorge-trans) + :trans gorge-trans :code (behavior () (loop (suspend) diff --git a/goal_src/jak1/levels/rolling/rolling-race-ring.gc b/goal_src/jak1/levels/rolling/rolling-race-ring.gc index 38372b5181e..10f1796d4d6 100644 --- a/goal_src/jak1/levels/rolling/rolling-race-ring.gc +++ b/goal_src/jak1/levels/rolling/rolling-race-ring.gc @@ -899,7 +899,7 @@ ) ) ) - :post (the-as (function none :behavior race-ring) ja-post) + :post ja-post ) (defstate race-ring-wait (race-ring) diff --git a/goal_src/jak1/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc index 74aa2154eb6..27770bc8d77 100644 --- a/goal_src/jak1/levels/rolling/rolling-robber.gc +++ b/goal_src/jak1/levels/rolling/rolling-robber.gc @@ -9,7 +9,7 @@ ;; DECOMP BEGINS (defstate fuel-cell-spline-slider (fuel-cell) - :trans (the-as (function none :behavior fuel-cell) hide-hud-quick) + :trans hide-hud-quick :code (behavior ((arg0 handle) (arg1 float) (arg2 float)) (logclear! (-> self mask) (process-mask actor-pause)) (ja :group! (-> self draw art-group data 2)) @@ -313,7 +313,7 @@ ) ) ) - :post (the-as (function none :behavior robber) ja-post) + :post ja-post ) (defstate robber-dead (robber) @@ -324,10 +324,7 @@ ) (defstate robber-die (robber) - :event (the-as - (function process int symbol event-message-block object :behavior robber) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (let ((gp-0 #t)) (when (robber-task-complete?) @@ -389,7 +386,7 @@ ) (go robber-dead) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) (defstate robber-got-away (robber) @@ -424,7 +421,7 @@ (suspend) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) (defstate robber-tired (robber) @@ -478,7 +475,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) (defstate robber-flee (robber) @@ -546,7 +543,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) (defstate robber-idle (robber) @@ -573,7 +570,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) (defstate robber-initial-notice (robber) @@ -615,7 +612,7 @@ (go robber-flee) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) (defstate robber-initial (robber) @@ -641,7 +638,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) (defmethod init-from-entity! robber ((obj robber) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/snow/ice-cube.gc b/goal_src/jak1/levels/snow/ice-cube.gc index 61394b825a9..3318ec0ae77 100644 --- a/goal_src/jak1/levels/snow/ice-cube.gc +++ b/goal_src/jak1/levels/snow/ice-cube.gc @@ -806,7 +806,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-falling-post) + :post nav-enemy-falling-post ) (defstate ice-cube-appear-land (ice-cube) @@ -829,7 +829,7 @@ (go-virtual nav-enemy-idle) ) ) - :post (the-as (function none :behavior ice-cube) ja-post) + :post ja-post ) (defstate nav-enemy-idle (ice-cube) @@ -870,16 +870,16 @@ (defstate nav-enemy-notice (ice-cube) :virtual #t - :enter (the-as (function none :behavior ice-cube) #f) - :exit (the-as (function none :behavior ice-cube) #f) - :trans (the-as (function none :behavior ice-cube) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (nav-enemy-method-57 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (logclear! (-> self mask) (process-mask actor-pause)) (go ice-cube-face-player) ) - :post (the-as (function none :behavior ice-cube) #f) + :post #f ) (defstate ice-cube-face-player (ice-cube) @@ -969,7 +969,7 @@ ) (go ice-cube-become-mean) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ice-cube-become-mean (ice-cube) @@ -994,7 +994,7 @@ ) (go ice-cube-mean-turn-to-charge) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defmethod nav-enemy-method-54 ice-cube ((obj ice-cube) (arg0 vector)) @@ -1102,7 +1102,7 @@ ) (go ice-cube-mean-charge) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ice-cube-mean-charge (ice-cube) @@ -1259,7 +1259,7 @@ (ja :chan 1 :num! (chan 0) :frame-interp (-> self anim-blend)) ) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ice-cube-mean-charge-done (ice-cube) @@ -1290,7 +1290,7 @@ ) (go ice-cube-tired) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ice-cube-tired (ice-cube) @@ -1332,7 +1332,7 @@ ) ) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ice-cube-shatter (ice-cube) diff --git a/goal_src/jak1/levels/snow/snow-ball.gc b/goal_src/jak1/levels/snow/snow-ball.gc index 9f2732cf33a..8ae5cd4d70a 100644 --- a/goal_src/jak1/levels/snow/snow-ball.gc +++ b/goal_src/jak1/levels/snow/snow-ball.gc @@ -127,7 +127,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-ball-shadow) ja-post) + :post ja-post ) (defbehavior snow-ball-shadow-init-by-other snow-ball-shadow () @@ -395,7 +395,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-ball-roller) transform-post) + :post transform-post ) (defbehavior snow-ball-roller-init-by-other snow-ball-roller ((arg0 entity-actor) (arg1 snow-ball) (arg2 float) (arg3 int) (arg4 (inline-array snow-ball-junction))) diff --git a/goal_src/jak1/levels/snow/snow-bumper.gc b/goal_src/jak1/levels/snow/snow-bumper.gc index 73531b5f72d..999f271666c 100644 --- a/goal_src/jak1/levels/snow/snow-bumper.gc +++ b/goal_src/jak1/levels/snow/snow-bumper.gc @@ -218,7 +218,7 @@ (stop! (-> self sound)) (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior snow-bumper) rider-trans) + :trans rider-trans :code (behavior () (local-vars (sv-16 symbol)) (logclear! (-> self mask) (process-mask actor-pause)) @@ -249,7 +249,7 @@ ) (go snow-bumper-inactive-idle) ) - :post (the-as (function none :behavior snow-bumper) rider-post) + :post rider-post ) (defstate snow-bumper-spawn-fuel-cell (snow-bumper) diff --git a/goal_src/jak1/levels/snow/snow-bunny.gc b/goal_src/jak1/levels/snow/snow-bunny.gc index ca267f0a9cc..952478d1c99 100644 --- a/goal_src/jak1/levels/snow/snow-bunny.gc +++ b/goal_src/jak1/levels/snow/snow-bunny.gc @@ -315,7 +315,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior snow-bunny) transform-post) + :post transform-post ) (defstate nav-enemy-idle (snow-bunny) @@ -344,8 +344,8 @@ (defstate nav-enemy-patrol (snow-bunny) :virtual #t - :enter (the-as (function none :behavior snow-bunny) #f) - :trans (the-as (function none :behavior snow-bunny) #f) + :enter #f + :trans #f :code (behavior () (go-virtual snow-bunny-nav-resume) ) @@ -444,7 +444,7 @@ ) ) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defmethod snow-bunny-method-51 snow-bunny ((obj snow-bunny) (arg0 vector) (arg1 vector)) @@ -607,7 +607,7 @@ (go-virtual snow-bunny-patrol-hop) ) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-jump-post) + :post nav-enemy-jump-post ) (defstate nav-enemy-notice (snow-bunny) @@ -623,7 +623,7 @@ (snow-bunny-method-76 self #t) (set-vector! (-> self collide-info transv) 0.0 (nav-enemy-rnd-float-range 102400.0 131072.0) 0.0 1.0) ) - :exit (the-as (function none :behavior snow-bunny) #f) + :exit #f :trans (behavior () (nav-enemy-method-58 self) ) @@ -670,18 +670,18 @@ ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate nav-enemy-chase (snow-bunny) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior snow-bunny) #f) - :exit (the-as (function none :behavior snow-bunny) #f) - :trans (the-as (function none :behavior snow-bunny) #f) + :event #f + :exit #f + :trans #f :code (behavior () (go-virtual snow-bunny-chase-hop) ) - :post (the-as (function none :behavior snow-bunny) #f) + :post #f ) (defmethod snow-bunny-method-52 snow-bunny ((obj snow-bunny)) @@ -797,7 +797,7 @@ ) (go-virtual snow-bunny-chase-hop) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-jump-post) + :post nav-enemy-jump-post ) (defstate snow-bunny-defend (snow-bunny) @@ -996,7 +996,7 @@ ) (go-virtual snow-bunny-retreat-hop) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-jump-post) + :post nav-enemy-jump-post ) (defstate snow-bunny-lunge (snow-bunny) @@ -1035,7 +1035,7 @@ ) ) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate snow-bunny-attack (snow-bunny) @@ -1076,5 +1076,5 @@ ) (go-virtual snow-bunny-retreat-hop) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc index 1110cff802e..1049246a16e 100644 --- a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc +++ b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc @@ -314,7 +314,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior snow-button) rider-post) + :post rider-post ) (defstate snow-button-deactivate (snow-button) @@ -331,7 +331,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-button) rider-trans) + :trans rider-trans :code (behavior () (send-to-all-after (-> self link) 'untrigger) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -345,7 +345,7 @@ ) (go snow-button-up-idle) ) - :post (the-as (function none :behavior snow-button) rider-post) + :post rider-post ) (defmethod init-from-entity! snow-button ((obj snow-button) (arg0 entity-actor)) @@ -617,8 +617,8 @@ ) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) rider-post) + :code anim-loop + :post rider-post ) (defstate plat-idle (flutflut-plat) @@ -745,8 +745,8 @@ ) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) rider-post) + :code anim-loop + :post rider-post ) (defstate elevator-idle-at-cave (flutflut-plat) @@ -775,8 +775,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) (defstate elevator-travel-to-fort (flutflut-plat) @@ -798,8 +798,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) (defstate elevator-idle-at-fort (flutflut-plat) @@ -828,8 +828,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) (defstate elevator-travel-to-cave (flutflut-plat) @@ -851,8 +851,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) (deftype flutflut-plat-small (flutflut-plat) diff --git a/goal_src/jak1/levels/snow/snow-obs.gc b/goal_src/jak1/levels/snow/snow-obs.gc index acdc903e69b..d779f8d4e63 100644 --- a/goal_src/jak1/levels/snow/snow-obs.gc +++ b/goal_src/jak1/levels/snow/snow-obs.gc @@ -337,7 +337,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-eggtop) rider-trans) + :trans rider-trans :code (behavior () (process-spawn part-tracker @@ -404,7 +404,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-eggtop) rider-post) + :post rider-post ) (defstate snow-eggtop-idle-down (snow-eggtop) @@ -533,7 +533,7 @@ ) ) ) - :post (the-as (function none :behavior snowpusher) pusher-post) + :post pusher-post ) (defmethod init-from-entity! snowpusher ((obj snowpusher) (arg0 entity-actor)) @@ -629,7 +629,7 @@ ) ) ) - :trans (the-as (function none :behavior snow-spatula) plat-trans) + :trans plat-trans :code (behavior () (let ((f28-0 0.0) (gp-0 1) @@ -665,7 +665,7 @@ ) ) ) - :post (the-as (function none :behavior snow-spatula) plat-post) + :post plat-post ) (defmethod init-from-entity! snow-spatula ((obj snow-spatula) (arg0 entity-actor)) @@ -966,7 +966,7 @@ ) ) ) - :post (the-as (function none :behavior snow-fort-gate) transform-post) + :post transform-post ) (defstate snow-fort-gate-idle-open (snow-fort-gate) @@ -1199,7 +1199,7 @@ ) (go snow-gears-halt) ) - :post (the-as (function none :behavior snow-gears) ja-post) + :post ja-post ) (defstate snow-gears-halt (snow-gears) @@ -1225,7 +1225,7 @@ ) (go snow-gears-stopped) ) - :post (the-as (function none :behavior snow-gears) ja-post) + :post ja-post ) (defstate snow-gears-stopped (snow-gears) @@ -1317,7 +1317,7 @@ (process-entity-status! self (entity-perm-status bit-3) #f) (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior snow-switch) rider-trans) + :trans rider-trans :code (behavior () (local-vars (v1-1 symbol)) (until v1-1 @@ -1376,7 +1376,7 @@ ) ) ) - :post (the-as (function none :behavior snow-switch) rider-post) + :post rider-post ) (defstate snow-switch-idle-down (snow-switch) @@ -1551,7 +1551,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-log) rider-trans) + :trans rider-trans :code (behavior () (activate! *camera-smush-control* 819.2 37 150 1.0 0.99) (ja-channel-push! 1 0) @@ -1569,11 +1569,11 @@ ) (go snow-log-active) ) - :post (the-as (function none :behavior snow-log) rider-post) + :post rider-post ) (defstate snow-log-active (snow-log) - :trans (the-as (function none :behavior snow-log) rider-trans) + :trans rider-trans :code (behavior () (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) @@ -1605,7 +1605,7 @@ ) ) ) - :post (the-as (function none :behavior snow-log) rider-post) + :post rider-post ) (defmethod init-from-entity! snow-log ((obj snow-log) (arg0 entity-actor)) @@ -1705,7 +1705,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-log-button) rider-trans) + :trans rider-trans :code (behavior () (sound-play "prec-button1") (loop @@ -1740,7 +1740,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-log-button) rider-post) + :post rider-post ) (defstate snow-log-button-idle-down (snow-log-button) diff --git a/goal_src/jak1/levels/snow/snow-ram-boss.gc b/goal_src/jak1/levels/snow/snow-ram-boss.gc index c4f81b0b94c..3dbcf06e4cc 100644 --- a/goal_src/jak1/levels/snow/snow-ram-boss.gc +++ b/goal_src/jak1/levels/snow/snow-ram-boss.gc @@ -1244,7 +1244,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior ram-boss) transform-post) + :post transform-post ) (defstate ram-boss-idle (ram-boss) @@ -1357,7 +1357,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ram-boss-jump-down-hit-ground (ram-boss) @@ -1373,7 +1373,7 @@ (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go ram-boss-nav-start) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ram-boss-already-down (ram-boss) @@ -1499,7 +1499,7 @@ (defstate nav-enemy-attack (ram-boss) :virtual #t :event ram-boss-on-ground-event-handler - :trans (the-as (function none :behavior ram-boss) #f) + :trans #f :code (behavior () (go ram-boss-tracking) ) @@ -1655,7 +1655,7 @@ ) ) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ram-boss-forward-defend-block (ram-boss) @@ -1676,7 +1676,7 @@ ) (go ram-boss-tracking) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ram-boss-up-defend-block (ram-boss) @@ -1697,14 +1697,14 @@ ) (go ram-boss-tracking) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate nav-enemy-victory (ram-boss) :virtual #t :event ram-boss-on-ground-event-handler - :enter (the-as (function none :behavior ram-boss) #f) - :exit (the-as (function none :behavior ram-boss) #f) + :enter #f + :exit #f :trans (behavior () (when *target* (let ((f0-0 (vector-vector-distance (target-pos 0) (-> self collide-info trans)))) @@ -1729,7 +1729,7 @@ ) (go-virtual nav-enemy-attack) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate nav-enemy-stare (ram-boss) @@ -1776,7 +1776,7 @@ ) (go ram-boss-tracking) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ram-boss-lose-shield (ram-boss) diff --git a/goal_src/jak1/levels/snow/snow-ram.gc b/goal_src/jak1/levels/snow/snow-ram.gc index a5b7432c598..0b92d81e6d3 100644 --- a/goal_src/jak1/levels/snow/snow-ram.gc +++ b/goal_src/jak1/levels/snow/snow-ram.gc @@ -246,7 +246,7 @@ ) ) ) - :post (the-as (function none :behavior ram) rider-post) + :post rider-post ) (defstate ram-fun-idle (ram) diff --git a/goal_src/jak1/levels/snow/yeti.gc b/goal_src/jak1/levels/snow/yeti.gc index 747204148c4..9a0dcd39958 100644 --- a/goal_src/jak1/levels/snow/yeti.gc +++ b/goal_src/jak1/levels/snow/yeti.gc @@ -253,7 +253,7 @@ (suspend) ) ) - :post (the-as (function none :behavior yeti-slave) nav-enemy-falling-post) + :post nav-enemy-falling-post ) (defstate yeti-slave-appear-land (yeti-slave) @@ -270,7 +270,7 @@ (go-virtual nav-enemy-idle) ) ) - :post (the-as (function none :behavior yeti-slave) ja-post) + :post ja-post ) (defstate yeti-slave-show-anims (yeti-slave) @@ -280,7 +280,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior yeti-slave) transform-post) + :post transform-post ) (defstate nav-enemy-patrol (yeti-slave) diff --git a/goal_src/jak1/levels/sunken/bully.gc b/goal_src/jak1/levels/sunken/bully.gc index fcc635266aa..30c470e364f 100644 --- a/goal_src/jak1/levels/sunken/bully.gc +++ b/goal_src/jak1/levels/sunken/bully.gc @@ -225,7 +225,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior bully-broken-cage) ja-post) + :post ja-post ) (defbehavior bully-broken-cage-init-by-other bully-broken-cage ((arg0 entity-actor)) @@ -727,7 +727,7 @@ (suspend) ) ) - :post (the-as (function none :behavior bully) transform-post) + :post transform-post ) (defmethod relocate bully ((obj bully) (arg0 int)) diff --git a/goal_src/jak1/levels/sunken/double-lurker.gc b/goal_src/jak1/levels/sunken/double-lurker.gc index 55298f965db..13e3cd2c945 100644 --- a/goal_src/jak1/levels/sunken/double-lurker.gc +++ b/goal_src/jak1/levels/sunken/double-lurker.gc @@ -284,7 +284,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior double-lurker-top) ja-post) + :post ja-post ) (defstate double-lurker-top-knocked-down (double-lurker-top) @@ -330,7 +330,7 @@ (nav-control-method-27 (-> self nav)) (go double-lurker-top-resume) ) - :post (the-as (function none :behavior double-lurker-top) transform-post) + :post transform-post ) (defstate double-lurker-top-resume (double-lurker-top) @@ -583,7 +583,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior double-lurker) transform-post) + :post transform-post ) (defstate double-lurker-resume (double-lurker) @@ -752,7 +752,7 @@ ) (go double-lurker-resume) ) - :post (the-as (function none :behavior double-lurker) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defmethod nav-enemy-method-52 double-lurker ((obj double-lurker) (arg0 vector)) @@ -818,7 +818,7 @@ ) (go double-lurker-resume) ) - :post (the-as (function none :behavior double-lurker) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate double-lurker-knocked-back (double-lurker) @@ -894,7 +894,7 @@ ) (go double-lurker-resume) ) - :post (the-as (function none :behavior double-lurker) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate double-lurker-waiting-to-die (double-lurker) diff --git a/goal_src/jak1/levels/sunken/floating-launcher.gc b/goal_src/jak1/levels/sunken/floating-launcher.gc index eeb55c0b214..b7f9ac0f2e4 100644 --- a/goal_src/jak1/levels/sunken/floating-launcher.gc +++ b/goal_src/jak1/levels/sunken/floating-launcher.gc @@ -29,7 +29,7 @@ ) (defstate floating-launcher-idle (floating-launcher) - :event (the-as (function process int symbol event-message-block object :behavior floating-launcher) plat-event) + :event plat-event :trans (behavior () (plat-trans) (when (< (vector-xz-length (vector-! (new 'stack-no-clear 'vector) (target-pos 0) (-> self root-override trans))) @@ -51,12 +51,12 @@ (suspend) ) ) - :post (the-as (function none :behavior floating-launcher) plat-post) + :post plat-post ) (defstate floating-launcher-lowering (floating-launcher) - :event (the-as (function process int symbol event-message-block object :behavior floating-launcher) plat-event) - :trans (the-as (function none :behavior floating-launcher) plat-trans) + :event plat-event + :trans plat-trans :code (behavior () (let ((a0-1 (entity-actor-lookup (-> self entity) 'alt-actor 0))) (if a0-1 @@ -77,14 +77,14 @@ (update-transforms! (-> self launcher 0 root-override)) (go floating-launcher-ready) ) - :post (the-as (function none :behavior floating-launcher) plat-post) + :post plat-post ) (defstate floating-launcher-ready (floating-launcher) - :event (the-as (function process int symbol event-message-block object :behavior floating-launcher) plat-event) - :trans (the-as (function none :behavior floating-launcher) plat-trans) - :code (the-as (function none :behavior floating-launcher) plat-code) - :post (the-as (function none :behavior floating-launcher) plat-post) + :event plat-event + :trans plat-trans + :code plat-code + :post plat-post ) (defmethod init-from-entity! floating-launcher ((obj floating-launcher) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/sunken/helix-water.gc b/goal_src/jak1/levels/sunken/helix-water.gc index d91f9172977..7874d2f722b 100644 --- a/goal_src/jak1/levels/sunken/helix-water.gc +++ b/goal_src/jak1/levels/sunken/helix-water.gc @@ -162,7 +162,7 @@ (transform-post) (go helix-slide-door-idle-closed) ) - :post (the-as (function none :behavior helix-slide-door) transform-post) + :post transform-post ) (defstate helix-slide-door-idle-closed (helix-slide-door) @@ -266,7 +266,7 @@ ) (defstate helix-button-activate (helix-button) - :trans (the-as (function none :behavior helix-button) rider-trans) + :trans rider-trans :code (behavior () (local-vars (v1-7 symbol)) (let ((a0-1 (handle->process (-> self fcell-handle)))) @@ -410,11 +410,11 @@ ) (go helix-button-idle-down) ) - :post (the-as (function none :behavior helix-button) rider-post) + :post rider-post ) (defstate helix-button-quick-activate (helix-button) - :trans (the-as (function none :behavior helix-button) rider-trans) + :trans rider-trans :code (behavior () (let ((a1-0 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-0 from) self) @@ -489,7 +489,7 @@ ) (go helix-button-idle-down) ) - :post (the-as (function none :behavior helix-button) rider-post) + :post rider-post ) (defstate helix-button-idle-down (helix-button) @@ -612,7 +612,7 @@ (suspend) ) ) - :post (the-as (function none :behavior helix-water) ja-post) + :post ja-post ) (defstate helix-water-activated (helix-water) @@ -662,7 +662,7 @@ (suspend) ) ) - :post (the-as (function none :behavior helix-water) ja-post) + :post ja-post ) (defmethod relocate helix-water ((obj helix-water) (arg0 int)) diff --git a/goal_src/jak1/levels/sunken/orbit-plat.gc b/goal_src/jak1/levels/sunken/orbit-plat.gc index b5f1e9658b4..e38679b318d 100644 --- a/goal_src/jak1/levels/sunken/orbit-plat.gc +++ b/goal_src/jak1/levels/sunken/orbit-plat.gc @@ -225,7 +225,7 @@ (suspend) ) ) - :post (the-as (function none :behavior orbit-plat-bottom) ja-post) + :post ja-post ) (defmethod relocate orbit-plat-bottom ((obj orbit-plat-bottom) (arg0 int)) @@ -294,7 +294,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 0)) (ja-no-eval :num! (seek! 0.0)) @@ -347,7 +347,7 @@ ) ) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) (defmethod orbit-plat-method-28 orbit-plat ((obj orbit-plat)) @@ -381,7 +381,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 0)) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -412,12 +412,12 @@ ) (go orbit-plat-idle) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) (defstate orbit-plat-riding (orbit-plat) - :event (the-as (function process int symbol event-message-block object :behavior orbit-plat) plat-event) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :event plat-event + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 1)) (ja-no-eval :num! (seek!)) @@ -446,7 +446,7 @@ ) ) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) (defun get-rotate-point! ((arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float) (arg5 float)) @@ -495,7 +495,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 2)) (set! (-> self is-reset?) #f) @@ -540,7 +540,7 @@ ) (b! #t cfg-3 :delay (nop!)) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) ;; WARN: disable def twice: 132. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. @@ -701,7 +701,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 3)) (logclear! (-> self nav flags) (nav-control-flags navcf19)) @@ -734,7 +734,7 @@ (set! (-> self is-reset?) #t) (go orbit-plat-idle) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) (defstate orbit-plat-wait-for-other (orbit-plat) @@ -756,7 +756,7 @@ ) ) ) - :post (the-as (function none :behavior orbit-plat) ja-post) + :post ja-post ) (defmethod init-from-entity! orbit-plat ((obj orbit-plat) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/sunken/puffer.gc b/goal_src/jak1/levels/sunken/puffer.gc index 126de16a8cd..d270382a66c 100644 --- a/goal_src/jak1/levels/sunken/puffer.gc +++ b/goal_src/jak1/levels/sunken/puffer.gc @@ -661,7 +661,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior puffer) ja-post) + :post ja-post ) (defmethod puffer-method-21 puffer ((obj puffer)) diff --git a/goal_src/jak1/levels/sunken/qbert-plat.gc b/goal_src/jak1/levels/sunken/qbert-plat.gc index c1894d8c8f8..f6e64d3565a 100644 --- a/goal_src/jak1/levels/sunken/qbert-plat.gc +++ b/goal_src/jak1/levels/sunken/qbert-plat.gc @@ -128,7 +128,7 @@ (suspend) ) ) - :post (the-as (function none :behavior qbert-plat) ja-post) + :post ja-post ) (defstate qbert-plat-on-die (qbert-plat) @@ -224,7 +224,7 @@ 0 ) ) - :post (the-as (function none :behavior qbert-plat) ja-post) + :post ja-post ) (defstate rigid-body-platform-idle (qbert-plat) @@ -235,7 +235,7 @@ (suspend) ) ) - :post (the-as (function none :behavior qbert-plat) ja-post) + :post ja-post ) (defstate rigid-body-platform-float (qbert-plat) diff --git a/goal_src/jak1/levels/sunken/shover.gc b/goal_src/jak1/levels/sunken/shover.gc index 49bb4d578c5..5ea61edb14e 100644 --- a/goal_src/jak1/levels/sunken/shover.gc +++ b/goal_src/jak1/levels/sunken/shover.gc @@ -72,7 +72,7 @@ ) ) ) - :code (the-as (function none :behavior shover) anim-loop) + :code anim-loop ) (defmethod init-from-entity! shover ((obj shover) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/sunken/square-platform.gc b/goal_src/jak1/levels/sunken/square-platform.gc index 8ec196b0640..ffb03c3118a 100644 --- a/goal_src/jak1/levels/sunken/square-platform.gc +++ b/goal_src/jak1/levels/sunken/square-platform.gc @@ -314,7 +314,7 @@ (suspend) ) ) - :post (the-as (function none :behavior square-platform) plat-post) + :post plat-post ) (defstate square-platform-raised (square-platform) @@ -328,7 +328,7 @@ ) ) ) - :trans (the-as (function none :behavior square-platform) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self pos-u) 1.0) (loop @@ -336,7 +336,7 @@ (suspend) ) ) - :post (the-as (function none :behavior square-platform) plat-post) + :post plat-post ) (defstate square-platform-lowering (square-platform) @@ -377,7 +377,7 @@ (suspend) ) ) - :post (the-as (function none :behavior square-platform) plat-post) + :post plat-post ) (defmethod deactivate square-platform ((obj square-platform)) diff --git a/goal_src/jak1/levels/sunken/steam-cap.gc b/goal_src/jak1/levels/sunken/steam-cap.gc index 7580e7e8f45..d0340feda8b 100644 --- a/goal_src/jak1/levels/sunken/steam-cap.gc +++ b/goal_src/jak1/levels/sunken/steam-cap.gc @@ -632,7 +632,7 @@ ) (defstate steam-cap-idle (steam-cap) - :trans (the-as (function none :behavior steam-cap) rider-trans) + :trans rider-trans :code (behavior () (loop (steam-cap-method-20 self) @@ -640,7 +640,7 @@ (suspend) ) ) - :post (the-as (function none :behavior steam-cap) rider-post) + :post rider-post ) (defmethod relocate steam-cap ((obj steam-cap) (arg0 int)) diff --git a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc index 98ed639c13a..c18c81af721 100644 --- a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc +++ b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc @@ -204,7 +204,7 @@ (suspend) ) ) - :post (the-as (function none :behavior blue-eco-charger-orb) ja-post) + :post ja-post ) (defstate blue-eco-charger-orb-active (blue-eco-charger-orb) @@ -287,7 +287,7 @@ ) ) ) - :post (the-as (function none :behavior blue-eco-charger-orb) ja-post) + :post ja-post ) (defbehavior blue-eco-charger-orb-init-by-other blue-eco-charger-orb ((arg0 entity-actor) (arg1 blue-eco-charger-orb)) @@ -371,7 +371,7 @@ (suspend) ) ) - :post (the-as (function none :behavior blue-eco-charger) ja-post) + :post ja-post ) (defstate blue-eco-charger-open (blue-eco-charger) @@ -416,7 +416,7 @@ (suspend) ) ) - :post (the-as (function none :behavior blue-eco-charger) ja-post) + :post ja-post ) (defstate blue-eco-charger-stuck-open (blue-eco-charger) @@ -453,7 +453,7 @@ (blue-eco-charger-method-21 self #f) (go blue-eco-charger-idle) ) - :post (the-as (function none :behavior blue-eco-charger) ja-post) + :post ja-post ) (defmethod init-from-entity! blue-eco-charger ((obj blue-eco-charger) (arg0 entity-actor)) @@ -667,7 +667,7 @@ (suspend) ) ) - :post (the-as (function none :behavior exit-chamber) ja-post) + :post ja-post ) (defstate exit-chamber-charger-puzzle-beaten (exit-chamber) diff --git a/goal_src/jak1/levels/sunken/sunken-fish.gc b/goal_src/jak1/levels/sunken/sunken-fish.gc index 9d1c29c6c99..1d26f9ca23d 100644 --- a/goal_src/jak1/levels/sunken/sunken-fish.gc +++ b/goal_src/jak1/levels/sunken/sunken-fish.gc @@ -210,7 +210,7 @@ ) ) ) - :post (the-as (function none :behavior sunkenfisha) ja-post) + :post ja-post ) (defmethod sunkenfisha-method-26 sunkenfisha ((obj sunkenfisha)) diff --git a/goal_src/jak1/levels/sunken/sunken-obs.gc b/goal_src/jak1/levels/sunken/sunken-obs.gc index 7aa4248b30c..e671dbe2925 100644 --- a/goal_src/jak1/levels/sunken/sunken-obs.gc +++ b/goal_src/jak1/levels/sunken/sunken-obs.gc @@ -333,7 +333,7 @@ ) ) ) - :post (the-as (function none :behavior seaweed) ja-post) + :post ja-post ) (defmethod init-from-entity! seaweed ((obj seaweed) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/sunken/sunken-water.gc b/goal_src/jak1/levels/sunken/sunken-water.gc index 5de826c8524..9026490b3b5 100644 --- a/goal_src/jak1/levels/sunken/sunken-water.gc +++ b/goal_src/jak1/levels/sunken/sunken-water.gc @@ -175,7 +175,7 @@ ) ) ) - :post (the-as (function none :behavior sunken-water) ja-post) + :post ja-post ) (defmethod water-vol-method-25 sunken-water ((obj sunken-water)) diff --git a/goal_src/jak1/levels/sunken/target-tube.gc b/goal_src/jak1/levels/sunken/target-tube.gc index 643954a2b50..89ee05e2cf2 100644 --- a/goal_src/jak1/levels/sunken/target-tube.gc +++ b/goal_src/jak1/levels/sunken/target-tube.gc @@ -931,7 +931,7 @@ (go-virtual slide-control-ride) ) ) - :code (the-as (function none :behavior slide-control) anim-loop) + :code anim-loop ) (defstate slide-control-ride (slide-control) @@ -985,7 +985,7 @@ ) ) ) - :code (the-as (function none :behavior slide-control) anim-loop) + :code anim-loop ) (defmethod init-from-entity! slide-control ((obj slide-control) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/sunken/wall-plat.gc b/goal_src/jak1/levels/sunken/wall-plat.gc index 9ec64da9f41..34b1c8e6908 100644 --- a/goal_src/jak1/levels/sunken/wall-plat.gc +++ b/goal_src/jak1/levels/sunken/wall-plat.gc @@ -68,7 +68,7 @@ :enter (behavior () (sound-play "wall-plat") ) - :trans (the-as (function none :behavior wall-plat) rider-trans) + :trans rider-trans :code (behavior () (restore-collide-with-as (-> self root-override)) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -84,7 +84,7 @@ ) ) ) - :post (the-as (function none :behavior wall-plat) rider-post) + :post rider-post ) (defstate wall-plat-extended (wall-plat) @@ -118,7 +118,7 @@ :enter (behavior () (sound-play "wall-plat") ) - :trans (the-as (function none :behavior wall-plat) rider-trans) + :trans rider-trans :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (loop @@ -133,7 +133,7 @@ ) ) ) - :post (the-as (function none :behavior wall-plat) rider-post) + :post rider-post ) (defstate wall-plat-sync-idle (wall-plat) @@ -151,7 +151,7 @@ :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior wall-plat) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 #f)) (loop @@ -182,7 +182,7 @@ ) ) ) - :post (the-as (function none :behavior wall-plat) rider-post) + :post rider-post ) (defmethod init-from-entity! wall-plat ((obj wall-plat) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/sunken/wedge-plats.gc b/goal_src/jak1/levels/sunken/wedge-plats.gc index 364925c11d0..ce1d7d49b2a 100644 --- a/goal_src/jak1/levels/sunken/wedge-plats.gc +++ b/goal_src/jak1/levels/sunken/wedge-plats.gc @@ -123,7 +123,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat) plat-trans) + :trans plat-trans :code (behavior () (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) (loop @@ -133,7 +133,7 @@ (suspend) ) ) - :post (the-as (function none :behavior wedge-plat) plat-post) + :post plat-post ) (defstate wedge-plat-tip (wedge-plat) @@ -148,7 +148,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat) plat-trans) + :trans plat-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (ja-aframe 60.0 0)) @@ -185,7 +185,7 @@ ) (go wedge-plat-idle) ) - :post (the-as (function none :behavior wedge-plat) plat-post) + :post plat-post ) (defmethod init-from-entity! wedge-plat ((obj wedge-plat) (arg0 entity-actor)) @@ -283,7 +283,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat-outer) plat-trans) + :trans plat-trans :code (behavior () (loop (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) @@ -293,7 +293,7 @@ (suspend) ) ) - :post (the-as (function none :behavior wedge-plat-outer) plat-post) + :post plat-post ) (defstate wedge-plat-outer-tip (wedge-plat-outer) @@ -307,7 +307,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat-outer) plat-trans) + :trans plat-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (ja-aframe 60.0 0)) @@ -344,7 +344,7 @@ ) (go wedge-plat-outer-idle) ) - :post (the-as (function none :behavior wedge-plat-outer) plat-post) + :post plat-post ) (defmethod init-from-entity! wedge-plat-outer ((obj wedge-plat-outer) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/sunken/whirlpool.gc b/goal_src/jak1/levels/sunken/whirlpool.gc index e80f4bd00ef..540041f39dd 100644 --- a/goal_src/jak1/levels/sunken/whirlpool.gc +++ b/goal_src/jak1/levels/sunken/whirlpool.gc @@ -340,8 +340,8 @@ ) ) ) - :code (the-as (function none :behavior whirlpool) anim-loop) - :post (the-as (function none :behavior whirlpool) ja-post) + :code anim-loop + :post ja-post ) (defmethod deactivate whirlpool ((obj whirlpool)) diff --git a/goal_src/jak1/levels/swamp/billy.gc b/goal_src/jak1/levels/swamp/billy.gc index b2c30bfdb1a..737abba7cfd 100644 --- a/goal_src/jak1/levels/swamp/billy.gc +++ b/goal_src/jak1/levels/swamp/billy.gc @@ -81,7 +81,7 @@ (suspend) ) ) - :post (the-as (function none :behavior billy-snack) ja-post) + :post ja-post ) (defstate billy-snack-idle (billy-snack) @@ -101,7 +101,7 @@ ) ) ) - :post (the-as (function none :behavior billy-snack) ja-post) + :post ja-post ) (defbehavior billy-snack-init-by-other billy-snack ((arg0 vector)) @@ -139,7 +139,7 @@ :enter (behavior () (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior billy-rat) nav-enemy-common-post) + :post nav-enemy-common-post ) (defstate nav-enemy-die (billy-rat) @@ -175,14 +175,11 @@ (logclear! (-> self nav flags) (nav-control-flags navcf19)) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior billy-rat) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate billy-rat-salivate (billy-rat) - :event (the-as - (function process int symbol event-message-block object :behavior billy-rat) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (dotimes (gp-0 1) @@ -204,7 +201,7 @@ (go-virtual nav-enemy-chase) ) ) - :post (the-as (function none :behavior billy-rat) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate nav-enemy-victory (billy-rat) @@ -552,7 +549,7 @@ ) (spool-push *art-control* "billy-reject" 0 self -99.0) ) - :code (the-as (function none :behavior billy) process-taskable-anim-loop) + :code process-taskable-anim-loop :post (behavior () (ja-post) ) diff --git a/goal_src/jak1/levels/swamp/kermit.gc b/goal_src/jak1/levels/swamp/kermit.gc index c1be4bb993b..8c14f71eb21 100644 --- a/goal_src/jak1/levels/swamp/kermit.gc +++ b/goal_src/jak1/levels/swamp/kermit.gc @@ -890,10 +890,7 @@ nav-enemy-default-event-handler ) (defstate kermit-idle (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self notice-time) 0) 0 @@ -914,14 +911,11 @@ nav-enemy-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior kermit) ja-post) + :post ja-post ) (defstate kermit-patrol (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode flex-blend)) @@ -959,10 +953,7 @@ nav-enemy-default-event-handler ) (defstate kermit-notice (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set-mode! (-> self neck) (joint-mod-handler-mode look-at)) ) @@ -979,10 +970,7 @@ nav-enemy-default-event-handler ) (defstate kermit-give-up (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set-mode! (-> self neck) (joint-mod-handler-mode flex-blend)) ) @@ -993,10 +981,7 @@ nav-enemy-default-event-handler ) (defstate kermit-chase-new-position (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self miss-count) 0) @@ -1050,10 +1035,7 @@ nav-enemy-default-event-handler ) (defstate kermit-chase (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode look-at)) @@ -1109,10 +1091,7 @@ nav-enemy-default-event-handler ) (defstate kermit-attack (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.17)) (set! (-> self tongue-control forward-scale-control) 0.0) @@ -1163,10 +1142,7 @@ nav-enemy-default-event-handler ) (defstate kermit-tongue-stuck (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self miss-count) 0) (set! (-> self tongue-control forward-scale-control) 1.0) @@ -1233,10 +1209,7 @@ nav-enemy-default-event-handler ) (defstate kermit-retract-tongue (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self charged-up) #f) diff --git a/goal_src/jak1/levels/swamp/swamp-bat.gc b/goal_src/jak1/levels/swamp/swamp-bat.gc index b725cdeafe9..445a3feb2dc 100644 --- a/goal_src/jak1/levels/swamp/swamp-bat.gc +++ b/goal_src/jak1/levels/swamp/swamp-bat.gc @@ -253,7 +253,7 @@ swamp-bat-slave-event-handler ) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-post) + :post swamp-bat-slave-post ) (defstate swamp-bat-slave-launch (swamp-bat-slave) @@ -283,7 +283,7 @@ swamp-bat-slave-event-handler ) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-post) + :post swamp-bat-slave-post ) (defstate swamp-bat-slave-swoop (swamp-bat-slave) @@ -310,7 +310,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-path-post) + :post swamp-bat-slave-path-post ) (defstate swamp-bat-slave-strafe (swamp-bat-slave) @@ -327,7 +327,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-path-post) + :post swamp-bat-slave-path-post ) (defstate swamp-bat-slave-return (swamp-bat-slave) @@ -357,14 +357,11 @@ swamp-bat-slave-event-handler ) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-path-post) + :post swamp-bat-slave-path-post ) (defstate swamp-bat-slave-die (swamp-bat-slave) - :event (the-as - (function process int symbol event-message-block object :behavior swamp-bat-slave) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior ((arg0 handle)) (ja-channel-push! 1 (seconds 0.07)) (let ((gp-0 (new-stack-vector0))) @@ -384,7 +381,7 @@ swamp-bat-slave-event-handler ) (cleanup-for-death self) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-post) + :post swamp-bat-slave-post ) (defbehavior swamp-bat-slave-init-by-other swamp-bat-slave ((arg0 swamp-bat-slave) (arg1 int)) @@ -536,7 +533,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat) #f) + :post #f ) (defbehavior swamp-bat-launch-slave swamp-bat () @@ -571,7 +568,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat) #f) + :post #f ) (defmethod init-from-entity! swamp-bat ((obj swamp-bat) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index 57206cd0158..6e5289015a0 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -303,7 +303,7 @@ ) (go swamp-spike-gate-down) ) - :post (the-as (function none :behavior swampgate) swamp-spike-post) + :post swamp-spike-post ) (defstate swamp-spike-gate-down (swampgate) @@ -311,7 +311,7 @@ (process-entity-status! self (entity-perm-status complete) #t) (cleanup-for-death self) ) - :post (the-as (function none :behavior swampgate) swamp-spike-post) + :post swamp-spike-post ) (defmethod init! swamp-spike ((obj swamp-spike)) @@ -417,7 +417,7 @@ ) ) ) - :trans (the-as (function none :behavior balance-plat) rider-trans) + :trans rider-trans :code (behavior () (loop ;; og:preserve-this modified for high fps @@ -465,7 +465,7 @@ (suspend) ) ) - :post (the-as (function none :behavior balance-plat) rider-post) + :post rider-post ) (defmethod init-from-entity! balance-plat ((obj balance-plat) (arg0 entity-actor)) @@ -618,7 +618,7 @@ (cleanup-for-death self) (deactivate self) ) - :post (the-as (function none :behavior swamp-rock) ja-post) + :post ja-post ) (defstate swamp-rock-idle (swamp-rock) @@ -764,15 +764,12 @@ (suspend) ) ) - :post (the-as (function none :behavior tar-plat) ja-post) + :post ja-post ) (defstate rigid-body-platform-float (tar-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior tar-plat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :trans (behavior () (cond ((or (not *target*) (< (-> self info idle-distance) @@ -799,7 +796,7 @@ (suspend) ) ) - :post (the-as (function none :behavior tar-plat) rigid-body-platform-post) + :post rigid-body-platform-post ) (defmethod rigid-body-platform-method-30 tar-plat ((obj tar-plat)) diff --git a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc index 04251614b61..67c20a8cdf1 100644 --- a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc @@ -715,7 +715,7 @@ (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest-dummy) transform-post) + :post transform-post ) (defstate swamp-rat-nest-dummy-hit (swamp-rat-nest-dummy) @@ -737,7 +737,7 @@ ) (go swamp-rat-nest-dummy-idle) ) - :post (the-as (function none :behavior swamp-rat-nest-dummy) transform-post) + :post transform-post ) (defstate swamp-rat-nest-dummy-shake (swamp-rat-nest-dummy) @@ -750,11 +750,11 @@ ) (go swamp-rat-nest-dummy-idle) ) - :post (the-as (function none :behavior swamp-rat-nest-dummy) transform-post) + :post transform-post ) (defstate swamp-rat-nest-dummy-die (swamp-rat-nest-dummy) - :event (the-as (function process int symbol event-message-block object :behavior swamp-rat-nest-dummy) #f) + :event #f :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self parent-process 0 dummy) (the-as (pointer swamp-rat-nest-dummy) #f)) @@ -919,7 +919,7 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) (defstate swamp-rat-nest-active (swamp-rat-nest) @@ -952,7 +952,7 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) (defstate swamp-rat-nest-gestate (swamp-rat-nest) @@ -975,11 +975,11 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) (defstate swamp-rat-nest-victory (swamp-rat-nest) - :event (the-as (function process int symbol event-message-block object :behavior swamp-rat-nest) #f) + :event #f :code (behavior () (let ((gp-0 (the-as (pointer process-tree) (-> self child-process)))) (while gp-0 @@ -998,7 +998,7 @@ swamp-rat-nest-default-event-handler ) (go swamp-rat-nest-active) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) (defstate swamp-rat-nest-die (swamp-rat-nest) @@ -1011,7 +1011,7 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) (defmethod init-from-entity! swamp-rat-nest ((obj swamp-rat-nest) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/swamp/swamp-rat.gc b/goal_src/jak1/levels/swamp/swamp-rat.gc index 1c7793a3eb9..030c388c53c 100644 --- a/goal_src/jak1/levels/swamp/swamp-rat.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat.gc @@ -354,7 +354,7 @@ swamp-rat-default-event-handler (go-virtual nav-enemy-idle) ) ) - :post (the-as (function none :behavior swamp-rat) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (define *swamp-rat-nav-enemy-info* (new 'static 'nav-enemy-info diff --git a/goal_src/jak1/levels/title/title-obs.gc b/goal_src/jak1/levels/title/title-obs.gc index 7acf56ee139..dab366b0c22 100644 --- a/goal_src/jak1/levels/title/title-obs.gc +++ b/goal_src/jak1/levels/title/title-obs.gc @@ -795,8 +795,8 @@ (set-setting! 'allow-progress #f 0.0 0) ) :exit (-> target-title exit) - :trans (the-as (function none :behavior target) hide-hud-quick) - :code (the-as (function none :behavior target) anim-loop) + :trans hide-hud-quick + :code anim-loop :post target-no-move-post ) @@ -861,6 +861,6 @@ ) ) ) - :code (the-as (function none :behavior target) anim-loop) + :code anim-loop :post target-no-move-post ) diff --git a/goal_src/jak1/levels/training/training-obs.gc b/goal_src/jak1/levels/training/training-obs.gc index c5b1a65696c..cbc7f315965 100644 --- a/goal_src/jak1/levels/training/training-obs.gc +++ b/goal_src/jak1/levels/training/training-obs.gc @@ -689,7 +689,7 @@ ) ) ) - :post (the-as (function none :behavior scarecrow-a) ja-post) + :post ja-post ) (defstate hit (scarecrow-a) @@ -764,7 +764,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior scarecrow-a) ja-post) + :post ja-post ) (defmethod init-from-entity! scarecrow-a ((obj scarecrow-a) (arg0 entity-actor)) @@ -825,7 +825,7 @@ ) ) ) - :post (the-as (function none :behavior scarecrow-b) ja-post) + :post ja-post ) (defstate hit (scarecrow-b) @@ -903,7 +903,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior scarecrow-b) ja-post) + :post ja-post ) (defmethod init-from-entity! scarecrow-b ((obj scarecrow-b) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/village1/fishermans-boat.gc b/goal_src/jak1/levels/village1/fishermans-boat.gc index 50a07158636..0148fdcbadb 100644 --- a/goal_src/jak1/levels/village1/fishermans-boat.gc +++ b/goal_src/jak1/levels/village1/fishermans-boat.gc @@ -883,10 +883,7 @@ ) (defstate fishermans-boat-docked-village (fishermans-boat) - :event (the-as - (function process int symbol event-message-block object :behavior fishermans-boat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -993,10 +990,7 @@ ) (defstate fishermans-boat-docked-misty (fishermans-boat) - :event (the-as - (function process int symbol event-message-block object :behavior fishermans-boat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) diff --git a/goal_src/jak1/levels/village1/village-obs.gc b/goal_src/jak1/levels/village1/village-obs.gc index 4fb0383e9af..e701bb41d6f 100644 --- a/goal_src/jak1/levels/village1/village-obs.gc +++ b/goal_src/jak1/levels/village1/village-obs.gc @@ -288,8 +288,8 @@ (logclear! (-> self draw status) (draw-status do-not-check-distance)) ) ) - :code (the-as (function none :behavior windmill-sail) anim-loop) - :post (the-as (function none :behavior windmill-sail) ja-post) + :code anim-loop + :post ja-post ) (defmethod init-from-entity! windmill-sail ((obj windmill-sail) (arg0 entity-actor)) @@ -345,8 +345,8 @@ (quaternion*! (-> self root-override quat) (-> self root-override quat) (-> self orig-quat)) (quaternion-normalize! (-> self root-override quat)) ) - :code (the-as (function none :behavior sagesail) anim-loop) - :post (the-as (function none :behavior sagesail) ja-post) + :code anim-loop + :post ja-post ) (defmethod init-from-entity! sagesail ((obj sagesail) (arg0 entity-actor)) @@ -434,8 +434,8 @@ (quaternion*! (-> self root quat) (-> self root quat) (-> self orig-quat)) (quaternion-normalize! (-> self root quat)) ) - :code (the-as (function none :behavior windspinner) anim-loop) - :post (the-as (function none :behavior windspinner) ja-post) + :code anim-loop + :post ja-post ) (defmethod init-from-entity! windspinner ((obj windspinner) (arg0 entity-actor)) @@ -481,7 +481,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mayorgears) ja-post) + :post ja-post ) (defmethod init-from-entity! mayorgears ((obj mayorgears) (arg0 entity-actor)) @@ -566,8 +566,8 @@ (draw-eco-beam (-> self reflector-trans) (-> self next-reflector-trans)) ) ) - :code (the-as (function none :behavior reflector-middle) anim-loop) - :post (the-as (function none :behavior reflector-middle) ja-post) + :code anim-loop + :post ja-post ) (defmethod init-from-entity! reflector-middle ((obj reflector-middle) (arg0 entity-actor)) @@ -602,7 +602,7 @@ (defstate reflector-end-idle (reflector-end) - :code (the-as (function none :behavior reflector-end) anim-loop) + :code anim-loop ) (defmethod init-from-entity! reflector-end ((obj reflector-end) (arg0 entity-actor)) @@ -662,7 +662,7 @@ (suspend) ) ) - :post (the-as (function none :behavior starfish) ja-post) + :post ja-post ) (defstate starfish-patrol (starfish) @@ -691,7 +691,7 @@ ) ) ) - :post (the-as (function none :behavior starfish) nav-enemy-patrol-post) + :post nav-enemy-patrol-post ) (define *starfish-nav-enemy-info* (new 'static 'nav-enemy-info @@ -822,7 +822,7 @@ (suspend) ) ) - :post (the-as (function none :behavior villa-starfish) #f) + :post #f ) (defmethod init-from-entity! villa-starfish ((obj villa-starfish) (arg0 entity-actor)) @@ -856,7 +856,7 @@ (suspend) ) ) - :post (the-as (function none :behavior village-fish) #f) + :post #f ) (defmethod init-from-entity! village-fish ((obj village-fish) (arg0 entity-actor)) @@ -945,7 +945,7 @@ (suspend) ) ) - :post (the-as (function none :behavior hutlamp) ja-post) + :post ja-post ) (defmethod init-from-entity! hutlamp ((obj hutlamp) (arg0 entity-actor)) @@ -978,8 +978,8 @@ (defstate idle (revcycleprop) :virtual #t - :code (the-as (function none :behavior revcycleprop) anim-loop) - :post (the-as (function none :behavior revcycleprop) ja-post) + :code anim-loop + :post ja-post ) (defmethod init-from-entity! revcycleprop ((obj revcycleprop) (arg0 entity-actor)) @@ -1010,8 +1010,8 @@ (defstate idle (revcycle) :virtual #t - :code (the-as (function none :behavior revcycle) anim-loop) - :post (the-as (function none :behavior revcycle) ja-post) + :code anim-loop + :post ja-post ) (defmethod init-from-entity! revcycle ((obj revcycle) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/village1/yakow.gc b/goal_src/jak1/levels/village1/yakow.gc index f766f9275e6..d7c14c3262e 100644 --- a/goal_src/jak1/levels/village1/yakow.gc +++ b/goal_src/jak1/levels/village1/yakow.gc @@ -492,7 +492,7 @@ yakow-default-event-handler ) ) ) - :post (the-as (function none :behavior yakow) ja-post) + :post ja-post ) (defstate yakow-notice (yakow) @@ -544,7 +544,7 @@ yakow-default-event-handler (* (-> *YAKOW-bank* acceleration) (-> *display* seconds-per-frame)) ) ) - :code (the-as (function vector none :behavior yakow) yakow-blend-walk-run) + :code (the-as (function vector object) yakow-blend-walk-run) :post (behavior () (nav-control-method-19 (-> self nav) @@ -606,7 +606,7 @@ yakow-default-event-handler ) (defstate yakow-graze-kicked (yakow) - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :code (behavior () (ja-no-eval :group! yakow-kicked-in-place-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) @@ -664,7 +664,7 @@ yakow-default-event-handler ) (defstate yakow-kicked (yakow) - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (if (-> self grazing) @@ -732,7 +732,7 @@ yakow-default-event-handler ) (defstate yakow-die (yakow) - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :code (behavior () (let ((v1-1 (-> self root-override root-prim))) (set! (-> v1-1 collide-with) (collide-kind)) diff --git a/goal_src/jak1/levels/village2/swamp-blimp.gc b/goal_src/jak1/levels/village2/swamp-blimp.gc index 34df0f18919..600c12e5c7c 100644 --- a/goal_src/jak1/levels/village2/swamp-blimp.gc +++ b/goal_src/jak1/levels/village2/swamp-blimp.gc @@ -797,7 +797,7 @@ ) (go swamp-tetherrock-hide) ) - :post (the-as (function none :behavior swamp-tetherrock) ja-post) + :post ja-post ) (defstate swamp-tetherrock-idle (swamp-tetherrock) @@ -867,7 +867,7 @@ (suspend) ) ) - :post (the-as (function none :behavior swamp-tetherrock) transform-post) + :post transform-post ) (defmethod init-from-entity! swamp-tetherrock ((obj swamp-tetherrock) (arg0 entity-actor)) @@ -960,7 +960,7 @@ (suspend) ) ) - :post (the-as (function none :behavior precursor-arm) transform-post) + :post transform-post ) (defun precursor-arm-slip ((arg0 float)) @@ -1073,7 +1073,7 @@ (suspend) ) ) - :post (the-as (function none :behavior precursor-arm) transform-post) + :post transform-post ) (defmethod init-from-entity! precursor-arm ((obj precursor-arm) (arg0 entity-actor)) @@ -1407,7 +1407,7 @@ (set! (-> self draw force-lod) 0) 0 ) - :trans (the-as (function none :behavior swamp-blimp) blimp-trans) + :trans blimp-trans :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (let ((gp-0 (new 'stack-no-clear 'quaternion))) @@ -1432,7 +1432,7 @@ ) ) ) - :post (the-as (function none :behavior swamp-blimp) transform-post) + :post transform-post ) (defbehavior swamp-blimp-setup swamp-blimp () @@ -1528,7 +1528,7 @@ ) ) ) - :trans (the-as (function none :behavior swamp-blimp) blimp-trans) + :trans blimp-trans :code (behavior () (ja :group! swamp-blimp-idle-ja) (loop @@ -1564,7 +1564,7 @@ (suspend) ) ) - :post (the-as (function none :behavior swamp-blimp) transform-post) + :post transform-post ) (defmethod init-from-entity! swamp-blimp ((obj swamp-blimp) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/village2/village2-obs.gc b/goal_src/jak1/levels/village2/village2-obs.gc index 77a1e99c8ec..c75d61fe591 100644 --- a/goal_src/jak1/levels/village2/village2-obs.gc +++ b/goal_src/jak1/levels/village2/village2-obs.gc @@ -659,7 +659,7 @@ ) ) ) - :post (the-as (function none :behavior fireboulder) transform-post) + :post transform-post ) (defstate fireboulder-be-clone (fireboulder) @@ -677,7 +677,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (logclear! (-> self skel status) (janim-status spool)) ) - :trans (the-as (function none :behavior fireboulder) fireboulder-hover-stuff) + :trans fireboulder-hover-stuff :code (behavior ((arg0 handle)) (clone-anim arg0 3 #t "") (format 0 "ERROR: fireboulder-be-clone ended~%") @@ -735,7 +735,7 @@ ) ) ) - :post (the-as (function none :behavior fireboulder) ja-post) + :post ja-post ) (defmethod init-from-entity! fireboulder ((obj fireboulder) (arg0 entity-actor)) @@ -827,7 +827,7 @@ ) ) ) - :post (the-as (function none :behavior ceilingflag) ja-post) + :post ja-post ) (defmethod init-from-entity! ceilingflag ((obj ceilingflag) (arg0 entity-actor)) @@ -927,7 +927,7 @@ ) (go exit-chamber-dummy-wait-to-appear) ) - :post (the-as (function none :behavior exit-chamber-dummy) ja-post) + :post ja-post ) (defmethod init-from-entity! exit-chamber-dummy ((obj exit-chamber-dummy) (arg0 entity-actor)) @@ -1412,7 +1412,7 @@ ) (go ogreboss-village2-idle) ) - :post (the-as (function none :behavior ogreboss-village2) ja-post) + :post ja-post ) (defstate ogreboss-village2-idle (ogreboss-village2) @@ -1487,7 +1487,7 @@ ) ) ) - :post (the-as (function none :behavior ogreboss-village2) ja-post) + :post ja-post ) (defmethod init-from-entity! ogreboss-village2 ((obj ogreboss-village2) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/village3/minecart.gc b/goal_src/jak1/levels/village3/minecart.gc index 14cdf6783fd..0b0f3601b80 100644 --- a/goal_src/jak1/levels/village3/minecart.gc +++ b/goal_src/jak1/levels/village3/minecart.gc @@ -47,7 +47,7 @@ ) ) ) - :trans (the-as (function none :behavior minecartsteel) rider-trans) + :trans rider-trans :code (behavior () (ja-channel-set! 1) (ja :group! (-> self anim)) @@ -62,7 +62,7 @@ (suspend) ) ) - :post (the-as (function none :behavior minecartsteel) rider-post) + :post rider-post ) (defbehavior minecartsteel-initialize-by-other minecartsteel ((arg0 entity-actor) (arg1 float)) diff --git a/goal_src/jak1/levels/village3/miners.gc b/goal_src/jak1/levels/village3/miners.gc index f23a59d3a35..d459001a9d5 100644 --- a/goal_src/jak1/levels/village3/miners.gc +++ b/goal_src/jak1/levels/village3/miners.gc @@ -9,7 +9,8 @@ ;; DECOMP BEGINS -(defbehavior miners-anim-loop minershort () +;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 47] +(defbehavior miners-anim-loop process-taskable () (when (!= (ja-group) (get-art-elem self)) (ja-channel-push! 1 (seconds 0.2)) (ja :group! (get-art-elem self)) @@ -21,8 +22,7 @@ (process-taskable-method-43 self) ) ) - (the-as none 0) - (none) + 0 ) (deftype minertall (process-taskable) @@ -106,7 +106,7 @@ (set! (-> self will-talk) #f) ((-> (method-of-type process-taskable idle) trans)) ) - :code (the-as (function none :behavior minertall) miners-anim-loop) + :code miners-anim-loop ) (defmethod init-from-entity! minertall ((obj minertall) (arg0 entity-actor)) @@ -606,7 +606,7 @@ ) ) ) - :post (the-as (function none :behavior cavegem) ja-post) + :post ja-post ) (defmethod init-from-entity! cavegem ((obj cavegem) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/village3/village3-obs.gc b/goal_src/jak1/levels/village3/village3-obs.gc index ddd5c5be5ff..05e1d8c3b33 100644 --- a/goal_src/jak1/levels/village3/village3-obs.gc +++ b/goal_src/jak1/levels/village3/village3-obs.gc @@ -489,7 +489,7 @@ ) ) ) - :post (the-as (function none :behavior gondolacables) ja-post) + :post ja-post ) (defmethod init-from-entity! gondolacables ((obj gondolacables) (arg0 entity-actor)) diff --git a/goal_src/jak1/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc index 3ee8cdb44d4..b851534954e 100644 --- a/goal_src/jak1/levels/village_common/villagep-obs.gc +++ b/goal_src/jak1/levels/village_common/villagep-obs.gc @@ -391,7 +391,7 @@ (defstate hidden (warp-gate) :virtual #t - :code (the-as (function none :behavior warp-gate) anim-loop) + :code anim-loop ) (defbehavior warp-gate-init-by-other warp-gate ((arg0 vector)) diff --git a/goal_src/jak2/engine/ai/enemy.gc b/goal_src/jak2/engine/ai/enemy.gc index b6f00b08a0c..db365916a6e 100644 --- a/goal_src/jak2/engine/ai/enemy.gc +++ b/goal_src/jak2/engine/ai/enemy.gc @@ -1147,6 +1147,7 @@ (none) ) +;; WARN: Return type mismatch object vs none. (defbehavior enemy-init-by-other enemy ((arg0 process-drawable) (arg1 enemy-init-by-other-params)) (let ((a1-1 (-> arg1 entity))) (if a1-1 @@ -2237,7 +2238,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag victory)) (logior! (-> self root nav-flags) (nav-flags has-root-sphere)) ) - :code (the-as (function none :behavior enemy) sleep-code) + :code sleep-code ) (defstate dormant-aware (enemy) @@ -2255,7 +2256,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior enemy) sleep-code) + :code sleep-code :post (behavior () (if (and (nonzero? (-> self draw)) (logtest? (-> self draw status) (draw-control-status on-screen))) (set! (-> self last-draw-time) (current-time)) @@ -2361,14 +2362,7 @@ This commonly includes things such as: (gp-0 (new 'stack-no-clear 'vector)) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2464,10 +2458,7 @@ This commonly includes things such as: (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2490,14 +2481,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2887,14 +2871,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -3499,14 +3476,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -3573,10 +3543,7 @@ This commonly includes things such as: ) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -3607,7 +3574,7 @@ This commonly includes things such as: (defstate die-fast (enemy) :virtual #t - :code (the-as (function none :behavior enemy) nothing) + :code nothing ) (defstate view-anims (enemy) @@ -3625,10 +3592,7 @@ This commonly includes things such as: (let ((s4-0 (-> gp-0 data s5-0))) (when (and s4-0 (= (-> s4-0 type) art-joint-anim)) (ja-channel-set! 1) - (ja-no-eval :group! s4-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3640,7 +3604,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior enemy) transform-post) + :post transform-post ) (defbehavior ja-group-index? enemy ((arg0 int)) diff --git a/goal_src/jak2/engine/ambient/ambient.gc b/goal_src/jak2/engine/ambient/ambient.gc index bc503ecb2eb..72ac17881a2 100644 --- a/goal_src/jak2/engine/ambient/ambient.gc +++ b/goal_src/jak2/engine/ambient/ambient.gc @@ -526,5 +526,5 @@ (defstate exit (talker) :virtual #t - :code (the-as (function none :behavior talker) nothing) + :code nothing ) diff --git a/goal_src/jak2/engine/anim/fma-sphere.gc b/goal_src/jak2/engine/anim/fma-sphere.gc index 66aba5f3f51..9462128944b 100644 --- a/goal_src/jak2/engine/anim/fma-sphere.gc +++ b/goal_src/jak2/engine/anim/fma-sphere.gc @@ -142,7 +142,7 @@ ) ) ) - :code (the-as (function none :behavior fma-sphere) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/engine/anim/joint-exploder.gc b/goal_src/jak2/engine/anim/joint-exploder.gc index eadbd5e2198..49f8706b5f1 100644 --- a/goal_src/jak2/engine/anim/joint-exploder.gc +++ b/goal_src/jak2/engine/anim/joint-exploder.gc @@ -592,7 +592,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior joint-exploder) ja-post) + :post ja-post ) (defmethod init-joint-list joint-exploder ((obj joint-exploder)) diff --git a/goal_src/jak2/engine/common_objs/base-plat.gc b/goal_src/jak2/engine/common_objs/base-plat.gc index f8acfdccfd3..11fc8972481 100644 --- a/goal_src/jak2/engine/common_objs/base-plat.gc +++ b/goal_src/jak2/engine/common_objs/base-plat.gc @@ -264,7 +264,7 @@ eco-door-event-handler ) (go-virtual door-open) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) (defstate door-open (eco-door) @@ -331,7 +331,7 @@ eco-door-event-handler ) (go-virtual door-closed) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) (defmethod lock-according-to-task! eco-door ((obj eco-door)) diff --git a/goal_src/jak2/engine/common_objs/basebutton.gc b/goal_src/jak2/engine/common_objs/basebutton.gc index 10347e12d9c..ce46557a779 100644 --- a/goal_src/jak2/engine/common_objs/basebutton.gc +++ b/goal_src/jak2/engine/common_objs/basebutton.gc @@ -123,7 +123,7 @@ (rider-trans) ) ) - :code (the-as (function none :behavior basebutton) sleep-code) + :code sleep-code :post (behavior () (when (logtest? (-> self button-status) (button-status button-status-2)) (logclear! (-> self button-status) (button-status button-status-2)) @@ -149,7 +149,7 @@ :enter (behavior () (press! self #t) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! max (-> self anim-speed))) (until (ja-done? 0) @@ -235,7 +235,7 @@ :enter (behavior () (press! self #f) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! 0.0 (-> self anim-speed))) (until (ja-done? 0) diff --git a/goal_src/jak2/engine/common_objs/blocking-plane.gc b/goal_src/jak2/engine/common_objs/blocking-plane.gc index c2d835a1518..534c27a1628 100644 --- a/goal_src/jak2/engine/common_objs/blocking-plane.gc +++ b/goal_src/jak2/engine/common_objs/blocking-plane.gc @@ -83,7 +83,7 @@ ) ) ) - :code (the-as (function none :behavior blocking-plane) sleep-code) + :code sleep-code ) (defmethod init! blocking-plane ((obj blocking-plane) (vec-pair (inline-array vector)) (height float)) diff --git a/goal_src/jak2/engine/common_objs/collectables.gc b/goal_src/jak2/engine/common_objs/collectables.gc index cad06e53f59..6280b51e826 100644 --- a/goal_src/jak2/engine/common_objs/collectables.gc +++ b/goal_src/jak2/engine/common_objs/collectables.gc @@ -804,7 +804,7 @@ (go-virtual wait) ) ) - :code (the-as (function none :behavior collectable) sleep-code) + :code sleep-code ) (defstate jump (collectable) @@ -1724,8 +1724,8 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior gem) #f) - :code (the-as (function none :behavior gem) sleep-code) + :trans #f + :code sleep-code :post (behavior () (let ((gp-0 #t)) (vector-v++! (-> self root transv) (compute-acc-due-to-gravity (-> self root) (new-stack-vector0) 0.0)) diff --git a/goal_src/jak2/engine/common_objs/conveyor.gc b/goal_src/jak2/engine/common_objs/conveyor.gc index e52249236d2..6dbfff7e29e 100644 --- a/goal_src/jak2/engine/common_objs/conveyor.gc +++ b/goal_src/jak2/engine/common_objs/conveyor.gc @@ -369,7 +369,7 @@ and return it as well. Otherwise, set it to `0`" (defstate idle (conveyor) :virtual #t - :code (the-as (function none :behavior conveyor) sleep-code) + :code sleep-code :post (behavior () (conveyor-method-27 self) (if (nonzero? (-> self sound)) @@ -455,10 +455,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/engine/common_objs/crates.gc b/goal_src/jak2/engine/common_objs/crates.gc index e06b2188ca4..731a9cf337a 100644 --- a/goal_src/jak2/engine/common_objs/crates.gc +++ b/goal_src/jak2/engine/common_objs/crates.gc @@ -631,7 +631,7 @@ ) #f ) - :post (the-as (function none :behavior crate) ja-post) + :post ja-post ) (defstate carry (crate) @@ -647,7 +647,7 @@ ) ) ) - :code (the-as (function none :behavior crate) sleep-code) + :code sleep-code :post (behavior () (ja-post) (carry-info-method-9 (-> self carry)) @@ -700,7 +700,7 @@ ) ) ) - :code (the-as (function none :behavior crate) sleep-code) + :code sleep-code :post (behavior () (vector-v++! (-> self root transv) diff --git a/goal_src/jak2/engine/common_objs/elevator.gc b/goal_src/jak2/engine/common_objs/elevator.gc index 670c5720f32..3c30cefd7d8 100644 --- a/goal_src/jak2/engine/common_objs/elevator.gc +++ b/goal_src/jak2/engine/common_objs/elevator.gc @@ -516,9 +516,9 @@ do so. ) ) ) - :trans (the-as (function none :behavior elevator) plat-trans) - :code (the-as (function none :behavior elevator) sleep-code) - :post (the-as (function none :behavior elevator) plat-post) + :trans plat-trans + :code sleep-code + :post plat-post ) (defstate waiting (elevator) @@ -563,7 +563,7 @@ do so. (go-virtual running) ) ) - :code (the-as (function none :behavior elevator) sleep-code) + :code sleep-code :post (behavior () (logclear! (-> self elevator-status) (elevator-status waiting-to-descend)) (debug-draw (-> self path)) @@ -727,8 +727,8 @@ do so. ) (plat-trans) ) - :code (the-as (function none :behavior elevator) sleep-code) - :post (the-as (function none :behavior elevator) plat-post) + :code sleep-code + :post plat-post ) (defmethod calc-dist-between-points! elevator ((obj elevator) (path-point-x int) (path-point-y int)) diff --git a/goal_src/jak2/engine/common_objs/generic-obs.gc b/goal_src/jak2/engine/common_objs/generic-obs.gc index 9fa48d56bcd..cd952013cb3 100644 --- a/goal_src/jak2/engine/common_objs/generic-obs.gc +++ b/goal_src/jak2/engine/common_objs/generic-obs.gc @@ -333,7 +333,7 @@ This commonly includes things such as: (defstate die (process-hidden) :virtual #t - :code (the-as (function none :behavior process-hidden) nothing) + :code nothing ) ;; WARN: Return type mismatch object vs none. @@ -1741,7 +1741,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior med-res-level) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2366,7 +2366,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior launcher) sleep-code) + :code sleep-code ) (defstate active (launcher) @@ -2428,7 +2428,7 @@ This commonly includes things such as: (defstate deactivated (launcher) :virtual #t - :code (the-as (function none :behavior launcher) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/engine/common_objs/plat.gc b/goal_src/jak2/engine/common_objs/plat.gc index cceeb6e6af9..edbf986c635 100644 --- a/goal_src/jak2/engine/common_objs/plat.gc +++ b/goal_src/jak2/engine/common_objs/plat.gc @@ -90,7 +90,7 @@ otherwise, [[plat::34]] (defstate plat-idle (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :trans (behavior () (execute-effects self) ) @@ -118,7 +118,7 @@ otherwise, [[plat::34]] (defstate plat-path-active (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :exit (behavior () (sound-stop (-> self sound-id)) ) @@ -132,10 +132,7 @@ otherwise, [[plat::34]] ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -143,7 +140,7 @@ otherwise, [[plat::34]] ) #f ) - :post (the-as (function none :behavior plat) plat-post) + :post plat-post ) ;; WARN: Return type mismatch object vs none. @@ -273,7 +270,7 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior drop-plat) plat-trans) + :trans plat-trans :code (behavior () (add-process *gui-control* self (gui-channel art-load) (gui-action queue) (-> self anim name) -99.0 0) (until #f @@ -289,7 +286,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drop-plat) plat-post) + :post plat-post ) (defstate fall (drop-plat) @@ -312,7 +309,7 @@ This commonly includes things such as: :exit (behavior () (ja-abort-spooled-anim (-> self anim) (the-as art-joint-anim #f) -1) ) - :trans (the-as (function none :behavior drop-plat) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status subtask-complete) #t) (let ((v1-1 (-> self root root-prim))) @@ -334,5 +331,5 @@ This commonly includes things such as: (suspend) 0 ) - :post (the-as (function none :behavior drop-plat) rider-post) + :post rider-post ) diff --git a/goal_src/jak2/engine/common_objs/projectile.gc b/goal_src/jak2/engine/common_objs/projectile.gc index 1afa9a95de0..22d3fc53c97 100644 --- a/goal_src/jak2/engine/common_objs/projectile.gc +++ b/goal_src/jak2/engine/common_objs/projectile.gc @@ -502,7 +502,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p (none) ) -(defbehavior projectile-bounce-falling-post projectile-bounce ((arg0 projectile-bounce)) +(defbehavior projectile-bounce-falling-post projectile-bounce () (let ((gp-0 (-> self root)) (s4-0 (new 'stack-no-clear 'collide-query)) (s5-0 (new 'stack-no-clear 'vector)) @@ -527,18 +527,15 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p (defstate sitting (projectile-bounce) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior projectile-bounce) - projectile-event-handler - ) + :event projectile-event-handler :trans (behavior () (noop self) (if (>= (- (current-time) (-> self spawn-time)) (-> self timeout)) (go-virtual impact) ) ) - :code (the-as (function none :behavior projectile-bounce) sleep-code) - :post (the-as (function none :behavior projectile-bounce) projectile-bounce-falling-post) + :code sleep-code + :post projectile-bounce-falling-post ) (defmethod noop projectile-bounce ((obj projectile-bounce)) diff --git a/goal_src/jak2/engine/data/art-elts.gc b/goal_src/jak2/engine/data/art-elts.gc index 3fb7a717980..59c0a4d6d86 100644 --- a/goal_src/jak2/engine/data/art-elts.gc +++ b/goal_src/jak2/engine/data/art-elts.gc @@ -149,170 +149,95 @@ (def-art-elt barge-ag barge-lod0-jg 0) (def-art-elt barge-ag barge-lod0-mg 1) (def-art-elt barge-ag barge-idle-ja 2) +(def-art-elt baron-ag baron-grab-success-ja 3) +(def-art-elt baron-ag baron-fly-ja 4) +(def-art-elt baron-ag baron-return-ja 5) +(def-art-elt baron-ag baron-landing-ja 6) +(def-art-elt baron-ag baron-drill-ja 7) +(def-art-elt baron-ag baron-drill-right-high-ja 8) +(def-art-elt baron-ag baron-drill-right-mid-ja 9) +(def-art-elt baron-ag baron-drill-right-low-ja 10) +(def-art-elt baron-ag baron-drill-left-high-ja 11) +(def-art-elt baron-ag baron-drill-left-mid-ja 12) +(def-art-elt baron-ag baron-drill-left-low-ja 13) +(def-art-elt baron-ag baron-fire-start-ja 14) +(def-art-elt baron-ag baron-fire-loop-ja 15) +(def-art-elt baron-ag baron-fire-end-ja 16) +(def-art-elt baron-ag baron-grab-stone-ja 17) +(def-art-elt baron-ag baron-launch-left-ja 18) +(def-art-elt baron-ag baron-grab-fail-ja 19) +(def-art-elt baron-ag baron-grab-punch-ja 20) +(def-art-elt baron-ag baron-launch-right-ja 21) +(def-art-elt baron-ag baron-hit-pod-left-ja 22) +(def-art-elt baron-ag baron-hit-pod-right-ja 23) +(def-art-elt baron-ag baron-hit-front-ja 24) +(def-art-elt baron-ag baron-hit-gun-left-ja 25) +(def-art-elt baron-ag baron-hit-gun-right-ja 26) +(def-art-elt baron-ag baron-grab-pull-loop-ja 27) +(def-art-elt baron-ag baron-grab-yank-loop-ja 28) +(def-art-elt baron-ag baron-grab-tug-loop-ja 29) +(def-art-elt baron-ag baron-grab-footing-loop-ja 30) +(def-art-elt baron-ag baron-grab-launch-left-ja 31) +(def-art-elt baron-ag baron-grab-launch-right-ja 32) +(def-art-elt baron-ag baron-flight-launch-left-ja 33) +(def-art-elt baron-ag baron-flight-launch-right-ja 34) +(def-art-elt baron-ag baron-flight-hit-right-ja 35) +(def-art-elt baron-ag baron-flight-hit-left-ja 36) +(def-art-elt baron-ag baron-flight-hit-final-ja 37) (def-art-elt baron-ag baron-lod0-jg 0) (def-art-elt baron-ag baron-lod0-mg 1) (def-art-elt baron-ag baron-idle-ja 2) -(def-art-elt baron-consite+0-ag baron-highres-idle-dead-ja 0) +(def-art-elt baron-ag baron-squid-idle-ja 38) +(def-art-elt baron-ag baron-shields-up-ja 39) +(def-art-elt baron-ag baron-shields-idle-ja 40) +(def-art-elt baron-ag baron-shields-down-ja 41) +(def-art-elt baron-ag baron-pods-down-ja 42) +(def-art-elt baron-ag baron-hatch-fore-open-ja 43) +(def-art-elt baron-ag baron-hatch-fore-launch-ja 44) +(def-art-elt baron-ag baron-hatch-fore-close-ja 45) +(def-art-elt baron-ag baron-hatch-aft-open-ja 46) +(def-art-elt baron-ag baron-hatch-aft-launch-ja 47) +(def-art-elt baron-ag baron-hatch-aft-close-ja 48) +(def-art-elt baron-ag baron-breathe-between-grenades-ja 49) +(def-art-elt baron-ag baron-pods-up-ja 50) +(def-art-elt baron-ag baron-fire-guns-start-ja 51) +(def-art-elt baron-ag baron-fire-guns-loop-ja 52) +(def-art-elt baron-ag baron-fire-guns-end-ja 53) +(def-art-elt baron-ag baron-fire-guns-release-ja 54) +(def-art-elt baron-ag baron-fire-guns-breathe-ja 55) +(def-art-elt baron-ag baron-fly-left-start-ja 56) +(def-art-elt baron-ag baron-fly-left-idle-ja 57) +(def-art-elt baron-ag baron-fly-left-end-ja 58) +(def-art-elt baron-ag baron-fly-right-start-ja 59) +(def-art-elt baron-ag baron-fly-right-idle-ja 60) +(def-art-elt baron-ag baron-fly-right-end-ja 61) +(def-art-elt baron-ag baron-fly-foreward-start-ja 62) +(def-art-elt baron-ag baron-fly-foreward-idle-ja 63) +(def-art-elt baron-ag baron-fly-foreward-end-ja 64) +(def-art-elt baron-ag baron-fly-backward-start-ja 65) +(def-art-elt baron-ag baron-fly-backward-idle-ja 66) +(def-art-elt baron-ag baron-fly-backward-end-ja 67) +(def-art-elt baron-ag baron-recharge-landing-ja 68) +(def-art-elt baron-ag baron-recharge-liftoff-ja 69) +(def-art-elt baron-ag baron-recharge-ja 70) +(def-art-elt baron-ag baron-damaged-ja 71) +(def-art-elt baron-ag baron-dummy17-ja 72) +(def-art-elt baron-ag baron-dummy18-ja 73) +(def-art-elt baron-ag baron-dummy19-ja 74) +(def-art-elt baron-ag baron-dummy20-ja 75) (def-art-elt baron-highres-ag baron-highres-lod0-jg 0) (def-art-elt baron-highres-ag baron-highres-lod0-mg 1) (def-art-elt baron-highres-ag baron-highres-shadow-mg 2) (def-art-elt baron-highres-ag baron-highres-idle-ja 3) +(def-art-elt baron-highres-ag baron-highres-idle-dead-ja 4) +(def-art-elt baron-pod-ag baron-pod-grab-success-ja 4) (def-art-elt baron-pod-ag baron-pod-lod0-jg 0) (def-art-elt baron-pod-ag baron-pod-lod0-mg 1) (def-art-elt baron-pod-ag baron-pod-shadow-mg 2) (def-art-elt baron-pod-ag baron-pod-idle-ja 3) -(def-art-elt baron-squid+0-ag baron-squid-idle-ja 0) -(def-art-elt baron-squid+0-ag baron-shields-up-ja 1) -(def-art-elt baron-squid+0-ag baron-shields-idle-ja 2) -(def-art-elt baron-squid+0-ag baron-shields-down-ja 3) -(def-art-elt baron-squid+0-ag baron-pods-down-ja 4) -(def-art-elt baron-squid+0-ag baron-hatch-fore-open-ja 5) -(def-art-elt baron-squid+0-ag baron-hatch-fore-launch-ja 6) -(def-art-elt baron-squid+0-ag baron-hatch-fore-close-ja 7) -(def-art-elt baron-squid+0-ag baron-hatch-aft-open-ja 8) -(def-art-elt baron-squid+0-ag baron-hatch-aft-launch-ja 9) -(def-art-elt baron-squid+0-ag baron-hatch-aft-close-ja 10) -(def-art-elt baron-squid+0-ag baron-breathe-between-grenades-ja 11) -(def-art-elt baron-squid+0-ag baron-pods-up-ja 12) -(def-art-elt baron-squid+0-ag baron-fire-guns-start-ja 13) -(def-art-elt baron-squid+0-ag baron-fire-guns-loop-ja 14) -(def-art-elt baron-squid+0-ag baron-fire-guns-end-ja 15) -(def-art-elt baron-squid+0-ag baron-fire-guns-release-ja 16) -(def-art-elt baron-squid+0-ag baron-fire-guns-breathe-ja 17) -(def-art-elt baron-squid+0-ag baron-fly-left-start-ja 18) -(def-art-elt baron-squid+0-ag baron-fly-left-idle-ja 19) -(def-art-elt baron-squid+0-ag baron-fly-left-end-ja 20) -(def-art-elt baron-squid+0-ag baron-fly-right-start-ja 21) -(def-art-elt baron-squid+0-ag baron-fly-right-idle-ja 22) -(def-art-elt baron-squid+0-ag baron-fly-right-end-ja 23) -(def-art-elt baron-squid+0-ag baron-fly-foreward-start-ja 24) -(def-art-elt baron-squid+0-ag baron-fly-foreward-idle-ja 25) -(def-art-elt baron-squid+0-ag baron-fly-foreward-end-ja 26) -(def-art-elt baron-squid+0-ag baron-fly-backward-start-ja 27) -(def-art-elt baron-squid+0-ag baron-fly-backward-idle-ja 28) -(def-art-elt baron-squid+0-ag baron-fly-backward-end-ja 29) -(def-art-elt baron-squid+0-ag baron-recharge-landing-ja 30) -(def-art-elt baron-squid+0-ag baron-recharge-liftoff-ja 31) -(def-art-elt baron-squid+0-ag baron-recharge-ja 32) -(def-art-elt baron-squid+0-ag baron-damaged-ja 33) -(def-art-elt baron-squid+0-ag baron-dummy17-ja 34) -(def-art-elt baron-squid+0-ag baron-dummy18-ja 35) -(def-art-elt baron-squid+0-ag baron-dummy19-ja 36) -(def-art-elt baron-squid+0-ag baron-dummy20-ja 37) -(def-art-elt baron-squid+0-ag squid-squid-idle-ja 38) -(def-art-elt baron-squid+0-ag squid-shields-up-ja 39) -(def-art-elt baron-squid+0-ag squid-shields-idle-ja 40) -(def-art-elt baron-squid+0-ag squid-shields-down-ja 41) -(def-art-elt baron-squid+0-ag squid-pods-down-ja 42) -(def-art-elt baron-squid+0-ag squid-hatch-fore-open-ja 43) -(def-art-elt baron-squid+0-ag squid-hatch-fore-launch-ja 44) -(def-art-elt baron-squid+0-ag squid-hatch-fore-close-ja 45) -(def-art-elt baron-squid+0-ag squid-hatch-aft-open-ja 46) -(def-art-elt baron-squid+0-ag squid-hatch-aft-launch-ja 47) -(def-art-elt baron-squid+0-ag squid-hatch-aft-close-ja 48) -(def-art-elt baron-squid+0-ag squid-breathe-between-grenades-ja 49) -(def-art-elt baron-squid+0-ag squid-pods-up-ja 50) -(def-art-elt baron-squid+0-ag squid-fire-guns-start-ja 51) -(def-art-elt baron-squid+0-ag squid-fire-guns-loop-ja 52) -(def-art-elt baron-squid+0-ag squid-fire-guns-end-ja 53) -(def-art-elt baron-squid+0-ag squid-fire-guns-release-ja 54) -(def-art-elt baron-squid+0-ag squid-fire-guns-breathe-ja 55) -(def-art-elt baron-squid+0-ag squid-fly-left-start-ja 56) -(def-art-elt baron-squid+0-ag squid-fly-left-idle-ja 57) -(def-art-elt baron-squid+0-ag squid-fly-left-end-ja 58) -(def-art-elt baron-squid+0-ag squid-fly-right-start-ja 59) -(def-art-elt baron-squid+0-ag squid-fly-right-idle-ja 60) -(def-art-elt baron-squid+0-ag squid-fly-right-end-ja 61) -(def-art-elt baron-squid+0-ag squid-fly-foreward-start-ja 62) -(def-art-elt baron-squid+0-ag squid-fly-foreward-idle-ja 63) -(def-art-elt baron-squid+0-ag squid-fly-foreward-end-ja 64) -(def-art-elt baron-squid+0-ag squid-fly-backward-start-ja 65) -(def-art-elt baron-squid+0-ag squid-fly-backward-idle-ja 66) -(def-art-elt baron-squid+0-ag squid-fly-backward-end-ja 67) -(def-art-elt baron-squid+0-ag squid-recharge-landing-ja 68) -(def-art-elt baron-squid+0-ag squid-recharge-liftoff-ja 69) -(def-art-elt baron-squid+0-ag squid-recharge-ja 70) -(def-art-elt baron-squid+0-ag squid-damaged-ja 71) -(def-art-elt baron-squid+0-ag squid-dummy17-ja 72) -(def-art-elt baron-squid+0-ag squid-dummy18-ja 73) -(def-art-elt baron-squid+0-ag squid-dummy19-ja 74) -(def-art-elt baron-squid+0-ag squid-dummy20-ja 75) -(def-art-elt baron-squid+0-ag squid-driver-squid-idle-ja 76) (def-art-elt baron-statue-ag baron-statue-lod0-jg 0) (def-art-elt baron-statue-ag baron-statue-lod0-mg 1) (def-art-elt baron-statue-ag baron-statue-idle-ja 2) -(def-art-elt baron-widow+0-ag baron-grab-success-ja 0) -(def-art-elt baron-widow+0-ag baron-fly-ja 1) -(def-art-elt baron-widow+0-ag baron-return-ja 2) -(def-art-elt baron-widow+0-ag baron-landing-ja 3) -(def-art-elt baron-widow+0-ag baron-drill-ja 4) -(def-art-elt baron-widow+0-ag baron-drill-right-high-ja 5) -(def-art-elt baron-widow+0-ag baron-drill-right-mid-ja 6) -(def-art-elt baron-widow+0-ag baron-drill-right-low-ja 7) -(def-art-elt baron-widow+0-ag baron-drill-left-high-ja 8) -(def-art-elt baron-widow+0-ag baron-drill-left-mid-ja 9) -(def-art-elt baron-widow+0-ag baron-drill-left-low-ja 10) -(def-art-elt baron-widow+0-ag baron-fire-start-ja 11) -(def-art-elt baron-widow+0-ag baron-fire-loop-ja 12) -(def-art-elt baron-widow+0-ag baron-fire-end-ja 13) -(def-art-elt baron-widow+0-ag baron-grab-stone-ja 14) -(def-art-elt baron-widow+0-ag baron-launch-left-ja 15) -(def-art-elt baron-widow+0-ag baron-grab-fail-ja 16) -(def-art-elt baron-widow+0-ag baron-grab-punch-ja 17) -(def-art-elt baron-widow+0-ag baron-launch-right-ja 18) -(def-art-elt baron-widow+0-ag baron-hit-pod-left-ja 19) -(def-art-elt baron-widow+0-ag baron-hit-pod-right-ja 20) -(def-art-elt baron-widow+0-ag baron-hit-front-ja 21) -(def-art-elt baron-widow+0-ag baron-hit-gun-left-ja 22) -(def-art-elt baron-widow+0-ag baron-hit-gun-right-ja 23) -(def-art-elt baron-widow+0-ag baron-grab-pull-loop-ja 24) -(def-art-elt baron-widow+0-ag baron-grab-yank-loop-ja 25) -(def-art-elt baron-widow+0-ag baron-grab-tug-loop-ja 26) -(def-art-elt baron-widow+0-ag baron-grab-footing-loop-ja 27) -(def-art-elt baron-widow+0-ag baron-grab-launch-left-ja 28) -(def-art-elt baron-widow+0-ag baron-grab-launch-right-ja 29) -(def-art-elt baron-widow+0-ag baron-flight-launch-left-ja 30) -(def-art-elt baron-widow+0-ag baron-flight-launch-right-ja 31) -(def-art-elt baron-widow+0-ag baron-flight-hit-right-ja 32) -(def-art-elt baron-widow+0-ag baron-flight-hit-left-ja 33) -(def-art-elt baron-widow+0-ag baron-flight-hit-final-ja 34) -(def-art-elt baron-widow+0-ag baron-pod-grab-success-ja 35) -(def-art-elt baron-widow+0-ag heart-mar-grab-success-ja 36) -(def-art-elt baron-widow+0-ag widow-grab-success-ja 37) -(def-art-elt baron-widow+0-ag widow-fly-ja 38) -(def-art-elt baron-widow+0-ag widow-return-ja 39) -(def-art-elt baron-widow+0-ag widow-landing-ja 40) -(def-art-elt baron-widow+0-ag widow-drill-ja 41) -(def-art-elt baron-widow+0-ag widow-drill-right-high-ja 42) -(def-art-elt baron-widow+0-ag widow-drill-right-mid-ja 43) -(def-art-elt baron-widow+0-ag widow-drill-right-low-ja 44) -(def-art-elt baron-widow+0-ag widow-drill-left-high-ja 45) -(def-art-elt baron-widow+0-ag widow-drill-left-mid-ja 46) -(def-art-elt baron-widow+0-ag widow-drill-left-low-ja 47) -(def-art-elt baron-widow+0-ag widow-fire-start-ja 48) -(def-art-elt baron-widow+0-ag widow-fire-loop-ja 49) -(def-art-elt baron-widow+0-ag widow-fire-end-ja 50) -(def-art-elt baron-widow+0-ag widow-grab-stone-ja 51) -(def-art-elt baron-widow+0-ag widow-launch-left-ja 52) -(def-art-elt baron-widow+0-ag widow-grab-fail-ja 53) -(def-art-elt baron-widow+0-ag widow-grab-punch-ja 54) -(def-art-elt baron-widow+0-ag widow-launch-right-ja 55) -(def-art-elt baron-widow+0-ag widow-hit-pod-left-ja 56) -(def-art-elt baron-widow+0-ag widow-hit-pod-right-ja 57) -(def-art-elt baron-widow+0-ag widow-hit-front-ja 58) -(def-art-elt baron-widow+0-ag widow-hit-gun-left-ja 59) -(def-art-elt baron-widow+0-ag widow-hit-gun-right-ja 60) -(def-art-elt baron-widow+0-ag widow-grab-pull-loop-ja 61) -(def-art-elt baron-widow+0-ag widow-grab-yank-loop-ja 62) -(def-art-elt baron-widow+0-ag widow-grab-tug-loop-ja 63) -(def-art-elt baron-widow+0-ag widow-grab-footing-loop-ja 64) -(def-art-elt baron-widow+0-ag widow-grab-launch-left-ja 65) -(def-art-elt baron-widow+0-ag widow-grab-launch-right-ja 66) -(def-art-elt baron-widow+0-ag widow-flight-launch-left-ja 67) -(def-art-elt baron-widow+0-ag widow-flight-launch-right-ja 68) -(def-art-elt baron-widow+0-ag widow-flight-hit-right-ja 69) -(def-art-elt baron-widow+0-ag widow-flight-hit-left-ja 70) -(def-art-elt baron-widow+0-ag widow-flight-hit-final-ja 71) (def-art-elt barons-ship-lores-ag barons-ship-lores-lod0-jg 0) (def-art-elt barons-ship-lores-ag barons-ship-lores-lod0-mg 1) (def-art-elt barons-ship-lores-ag barons-ship-lores-idle-ja 2) @@ -320,6 +245,28 @@ (def-art-elt beam-ag beam-lod0-mg 1) (def-art-elt beam-ag beam-idle-ja 2) (def-art-elt beam-ag beam-slide-center-ja 3) +(def-art-elt big-bopper-ag big-bopper-mole-idle-ja 3) +(def-art-elt big-bopper-ag big-bopper-mole-whack0-ja 4) +(def-art-elt big-bopper-ag big-bopper-mole-whack1-ja 5) +(def-art-elt big-bopper-ag big-bopper-mole-whack2-ja 6) +(def-art-elt big-bopper-ag big-bopper-mole-whack3-ja 7) +(def-art-elt big-bopper-ag big-bopper-mole-whack4-ja 8) +(def-art-elt big-bopper-ag big-bopper-mole-whack5-ja 9) +(def-art-elt big-bopper-ag big-bopper-mole-whack6-ja 10) +(def-art-elt big-bopper-ag big-bopper-mole-whack7-ja 11) +(def-art-elt big-bopper-ag big-bopper-mole-idle-crazy-ja 12) +(def-art-elt big-bopper-ag big-bopper-mole-idle-tired-ja 13) +(def-art-elt big-bopper-ag big-bopper-mole-idle-angry-ja 14) +(def-art-elt big-bopper-ag big-bopper-mole-shock-ja 15) +(def-art-elt big-bopper-ag big-bopper-mole-idle-shock-ja 16) +(def-art-elt big-bopper-ag big-bopper-mole-idle-shock-end-ja 17) +(def-art-elt big-bopper-ag big-bopper-mole-dummy6-ja 18) +(def-art-elt big-bopper-ag big-bopper-mole-dummy7-ja 19) +(def-art-elt big-bopper-ag big-bopper-mole-dummy8-ja 20) +(def-art-elt big-bopper-ag big-bopper-mole-dummy9-ja 21) +(def-art-elt big-bopper-ag big-bopper-mole-dummy10-ja 22) +(def-art-elt big-bopper-ag big-bopper-mole-dummy11-ja 23) +(def-art-elt big-bopper-ag big-bopper-mole-dummy12-ja 24) (def-art-elt big-bopper-ag big-bopper-lod0-jg 0) (def-art-elt big-bopper-ag big-bopper-lod0-mg 1) (def-art-elt big-bopper-ag big-bopper-idle-ja 2) @@ -835,6 +782,7 @@ (def-art-elt crocadog-highres-ag crocadog-highres-shadow-mg 2) (def-art-elt crocadog-highres-ag crocadog-highres-idle-ja 3) (def-art-elt crocadog-highres-ag crocadog-highres-idle-stand-ja 4) +(def-art-elt crocadog-highres-ag crocadog-highres-idle-vinroom-ja 5) (def-art-elt cty-fruit-stand-ag cty-fruit-stand-lod0-jg 0) (def-art-elt cty-fruit-stand-ag cty-fruit-stand-lod0-mg 1) (def-art-elt cty-fruit-stand-ag cty-fruit-stand-idle-ja 2) @@ -904,32 +852,46 @@ (def-art-elt darkjak-highres-ag darkjak-highres-lod0-mg 1) (def-art-elt darkjak-highres-ag darkjak-highres-idle-ja 2) (def-art-elt daxter-ag daxter-hit-from-back-ja 64) +(def-art-elt daxter-ag daxter-darkjak-attack-combo3-ja 399) (def-art-elt daxter-ag daxter-lod0-jg 0) (def-art-elt daxter-ag daxter-hit-up-ja 65) (def-art-elt daxter-ag daxter-lod0-mg 1) +(def-art-elt daxter-ag daxter-pidax-car-crash-left-ja 457) (def-art-elt daxter-ag daxter-deatha-ja 66) +(def-art-elt daxter-ag daxter-darkjak-attack-spin-end-ja 393) (def-art-elt daxter-ag daxter-lod1-mg 2) (def-art-elt daxter-ag daxter-death-painful-land-ja 67) (def-art-elt daxter-ag daxter-shadow-mg 3) +(def-art-elt daxter-ag daxter-indax-dummy9-ja 451) (def-art-elt daxter-ag daxter-smack-surface-ja 68) +(def-art-elt daxter-ag daxter-darkjak-jump-ja 387) (def-art-elt daxter-ag daxter-run-to-stance-ja 4) (def-art-elt daxter-ag daxter-run-to-stance-loop-ja 5) +(def-art-elt daxter-ag daxter-darkjak-attack-combo2-ja 397) (def-art-elt daxter-ag daxter-stance-loop-ja 6) (def-art-elt daxter-ag daxter-run-to-stance-fast-ja 7) +(def-art-elt daxter-ag daxter-darkjak-attack-combo3c-end-ja 407) (def-art-elt daxter-ag daxter-run-ja 8) (def-art-elt daxter-ag daxter-run-up-ja 9) +(def-art-elt daxter-ag daxter-darkjak-get-off-ja 401) (def-art-elt daxter-ag daxter-run-down-ja 10) (def-art-elt daxter-ag daxter-walk-ja 11) +(def-art-elt daxter-ag daxter-darkjak-attack-combo1-ja 395) (def-art-elt daxter-ag daxter-walk-up-ja 12) (def-art-elt daxter-ag daxter-walk-down-ja 13) +(def-art-elt daxter-ag daxter-darkjak-get-on-fast-ja 405) (def-art-elt daxter-ag daxter-run-squash-ja 14) (def-art-elt daxter-ag daxter-run-squash-weak-ja 15) +(def-art-elt daxter-ag daxter-indax-stance-ja 415) (def-art-elt daxter-ag daxter-stance-to-duck-ja 16) (def-art-elt daxter-ag daxter-duck-stance-ja 17) +(def-art-elt daxter-ag daxter-darkjak-bomb-ja 409) (def-art-elt daxter-ag daxter-duck-walk-ja 18) (def-art-elt daxter-ag daxter-turn-around-ja 19) +(def-art-elt daxter-ag daxter-darkjak-attack-combo1b-end-ja 403) (def-art-elt daxter-ag daxter-jump-ja 20) (def-art-elt daxter-ag daxter-jump-land-ja 21) +(def-art-elt daxter-ag daxter-darkjak-attack-ice-loop2-ja 413) (def-art-elt daxter-ag daxter-painful-land-ja 22) (def-art-elt daxter-ag daxter-painful-land-end-ja 23) (def-art-elt daxter-ag daxter-jump-loop-ja 24) @@ -940,31 +902,44 @@ (def-art-elt daxter-ag daxter-edge-grab-stance0-ja 30) (def-art-elt daxter-ag daxter-edge-grab-stance1-ja 31) (def-art-elt daxter-ag daxter-falling-to-edge-grab-ja 33) +(def-art-elt daxter-ag daxter-indax-jump-loop-ja 419) (def-art-elt daxter-ag daxter-edge-grab-to-jump-ja 36) (def-art-elt daxter-ag daxter-edge-grab-off-ja 37) +(def-art-elt daxter-ag daxter-indax-run-to-stance-ja 429) (def-art-elt daxter-ag daxter-attack-from-stance-ja 38) (def-art-elt daxter-ag daxter-attack-from-stance-end-ja 39) +(def-art-elt daxter-ag daxter-indax-jump-forward-hands-loop-ja 439) (def-art-elt daxter-ag daxter-attack-from-stance-alt-end-ja 40) (def-art-elt daxter-ag daxter-attack-from-stance-run-end-ja 41) +(def-art-elt daxter-ag daxter-indax-death-squashed-ja 433) (def-art-elt daxter-ag daxter-attack-from-stance-run-alt-end-ja 42) (def-art-elt daxter-ag daxter-attack-from-jump-ja 43) +(def-art-elt daxter-ag daxter-indax-run-squash-ja 427) (def-art-elt daxter-ag daxter-attack-from-jump-loop-ja 44) (def-art-elt daxter-ag daxter-attack-from-jump-end-ja 45) +(def-art-elt daxter-ag daxter-indax-running-attack-ja 437) (def-art-elt daxter-ag daxter-attack-punch-ja 46) (def-art-elt daxter-ag daxter-attack-punch-end-ja 47) +(def-art-elt daxter-ag daxter-indax-dummy5-ja 447) (def-art-elt daxter-ag daxter-attack-punch-alt-end-ja 48) (def-art-elt daxter-ag daxter-attack-uppercut-ja 49) +(def-art-elt daxter-ag daxter-indax-run-squash-hands-ja 441) (def-art-elt daxter-ag daxter-flop-down-ja 50) (def-art-elt daxter-ag daxter-flop-down-loop-ja 51) +(def-art-elt daxter-ag daxter-indax-death-kill-ja 435) (def-art-elt daxter-ag daxter-flop-down-land-ja 52) (def-art-elt daxter-ag daxter-moving-flop-down-ja 53) +(def-art-elt daxter-ag daxter-indax-dummy3-ja 445) (def-art-elt daxter-ag daxter-moving-flop-down-loop-ja 54) (def-art-elt daxter-ag daxter-flop-jump-ja 56) (def-art-elt daxter-ag daxter-duck-roll-ja 57) +(def-art-elt daxter-ag daxter-darkjak-walk-ja 385) (def-art-elt daxter-ag daxter-duck-roll-end-ja 58) (def-art-elt daxter-ag daxter-roll-flip-ja 59) +(def-art-elt daxter-ag daxter-indax-trip-ja 443) (def-art-elt daxter-ag daxter-roll-flip-land-ja 60) (def-art-elt daxter-ag daxter-trip-ja 61) +(def-art-elt daxter-ag daxter-darkjak-stance-ja 389) (def-art-elt daxter-ag daxter-hit-elec-ja 62) (def-art-elt daxter-ag daxter-hit-from-front-ja 63) (def-art-elt daxter-ag daxter-smack-surface-end-ja 69) @@ -980,54 +955,278 @@ (def-art-elt daxter-ag daxter-wall-hide-head-right-ja 83) (def-art-elt daxter-ag daxter-wall-hide-body-ja 84) (def-art-elt daxter-ag daxter-fuel-cell-victory-9-ja 127) +(def-art-elt daxter-ag daxter-gun-stance-ja 197) +(def-art-elt daxter-ag daxter-gun-stance-yellow-low-ja 198) +(def-art-elt daxter-ag daxter-gun-yellow-fire-low-ja 199) +(def-art-elt daxter-ag daxter-gun-yellow-highlow-ja 200) +(def-art-elt daxter-ag daxter-mech-jump-thrust-ja 322) +(def-art-elt daxter-ag daxter-gun-attack-from-stance-ja 201) +(def-art-elt daxter-ag daxter-gun-attack-from-stance-end-ja 202) +(def-art-elt daxter-ag daxter-mech-carry-walk-ja 332) +(def-art-elt daxter-ag daxter-gun-attack-from-stance-blue-ja 203) +(def-art-elt daxter-ag daxter-gun-attack-from-stance-blue-end-ja 204) +(def-art-elt daxter-ag daxter-mech-punch-l-ja 326) +(def-art-elt daxter-ag daxter-gun-blue-to-yellow-ja 205) +(def-art-elt daxter-ag daxter-gun-stance-dark-ja 206) +(def-art-elt daxter-ag daxter-mech-turn90-ja 320) +(def-art-elt daxter-ag daxter-gun-stance-yellow-ja 207) +(def-art-elt daxter-ag daxter-gun-stance-blue-ja 208) +(def-art-elt daxter-ag daxter-mech-carry-pickup-high-ja 330) +(def-art-elt daxter-ag daxter-gun-red-fire-ja 209) +(def-art-elt daxter-ag daxter-gun-blue-fire-ja 210) +(def-art-elt daxter-ag daxter-mech-drag-pickup-ja 340) +(def-art-elt daxter-ag daxter-gun-blue-fire-single-ja 211) +(def-art-elt daxter-ag daxter-gun-dark-fire-ja 212) +(def-art-elt daxter-ag daxter-mech-carry-jump-loop-ja 334) +(def-art-elt daxter-ag daxter-gun-yellow-fire-ja 213) +(def-art-elt daxter-ag daxter-gun-walk-side-ja 214) +(def-art-elt daxter-ag daxter-mech-punch-b-ja 328) +(def-art-elt daxter-ag daxter-gun-run-blue-ja 215) +(def-art-elt daxter-ag daxter-gun-red-takeout-ja 216) +(def-art-elt daxter-ag daxter-mech-push-ja 338) +(def-art-elt daxter-ag daxter-gun-dark-takeout-ja 217) +(def-art-elt daxter-ag daxter-gun-yellow-takeout-ja 218) +(def-art-elt daxter-ag daxter-gun-blue-takeout-ja 219) +(def-art-elt daxter-ag daxter-gun-attack-upperbutt-ja 220) +(def-art-elt daxter-ag daxter-mech-get-off-ja 342) +(def-art-elt daxter-ag daxter-gun-side-to-front-hop-ja 221) +(def-art-elt daxter-ag daxter-gun-transformation-twirl-ja 222) +(def-art-elt daxter-ag daxter-mech-carry-throw-ja 336) +(def-art-elt daxter-ag daxter-gun-front-to-side-hop-ja 223) +(def-art-elt daxter-ag daxter-gun-front-to-blue-hop-ja 224) +(def-art-elt daxter-ag daxter-pilot-bike-turn-front-ja 282) +(def-art-elt daxter-ag daxter-gun-blue-to-front-hop-ja 225) +(def-art-elt daxter-ag daxter-gun-attack-butt-ja 226) +(def-art-elt daxter-ag daxter-gun-attack-butt-end-ja 227) +(def-art-elt daxter-ag daxter-gun-attack-butt-blue-ja 228) +(def-art-elt daxter-ag daxter-pilot-car-up-down-ja 286) +(def-art-elt daxter-ag daxter-gun-attack-butt-blue-end-ja 229) +(def-art-elt daxter-ag daxter-gun-jump-land-ja 230) +(def-art-elt daxter-ag daxter-pilot-gun-blue-fire-single-ja 280) +(def-art-elt daxter-ag daxter-gun-jump-land-side-ja 231) +(def-art-elt daxter-ag daxter-gun-attack-upperbutt-blue-ja 232) +(def-art-elt daxter-ag daxter-turret-get-on-ja 354) +(def-art-elt daxter-ag daxter-gun-edge-grab-off-ja 233) +(def-art-elt daxter-ag daxter-gun-edge-grab-to-jump-ja 234) +(def-art-elt daxter-ag daxter-gun-duck-roll-ja 235) +(def-art-elt daxter-ag daxter-gun-duck-roll-end-ja 236) +(def-art-elt daxter-ag daxter-gun-roll-flip-ja 237) +(def-art-elt daxter-ag daxter-gun-roll-flip-land-ja 238) +(def-art-elt daxter-ag daxter-turret-stance-ja 352) +(def-art-elt daxter-ag daxter-gun-flop-down-ja 239) +(def-art-elt daxter-ag daxter-gun-flop-down-loop-ja 240) +(def-art-elt daxter-ag daxter-gun-flop-down-land-ja 241) +(def-art-elt daxter-ag daxter-gun-hit-from-front-ja 242) +(def-art-elt daxter-ag daxter-gun-hit-from-back-ja 243) +(def-art-elt daxter-ag daxter-gun-red-fire-to-sideways-ja 244) +(def-art-elt daxter-ag daxter-gun-red-fire-from-sideways-ja 245) +(def-art-elt daxter-ag daxter-gun-dark-fire-twirl-ja 246) +(def-art-elt daxter-ag daxter-gun-stance-red-sideways-ja 247) +(def-art-elt daxter-ag daxter-gun-red-from-sideways-ja 248) +(def-art-elt daxter-ag daxter-gun-yellow-fire-twirl-ja 249) +(def-art-elt daxter-ag daxter-gun-hit-elec-ja 250) +(def-art-elt daxter-ag daxter-gun-front-walk-ja 251) +(def-art-elt daxter-ag daxter-gun-front-run-ja 252) +(def-art-elt daxter-ag daxter-gun-front-jump-ja 253) +(def-art-elt daxter-ag daxter-gun-front-jump-land-ja 254) +(def-art-elt daxter-ag daxter-gun-duck-walk-ja 255) +(def-art-elt daxter-ag daxter-gun-walk-blue-ja 256) +(def-art-elt daxter-ag daxter-gun-side-jump-ja 257) +(def-art-elt daxter-ag daxter-gun-side-jump-land-ja 258) +(def-art-elt daxter-ag daxter-gun-red-fire-fast-ja 262) +(def-art-elt daxter-ag daxter-gun-attack-from-stance-end-alt1-ja 269) +(def-art-elt daxter-ag daxter-board-duck-turn-ja 149) +(def-art-elt daxter-ag daxter-gun-attack-butt-end-alt1-ja 270) +(def-art-elt daxter-ag daxter-board-stance-ja 148) +(def-art-elt daxter-ag daxter-board-turn-ja 150) +(def-art-elt daxter-ag daxter-board-jump-kick-ja 151) +(def-art-elt daxter-ag daxter-board-jump-ja 152) +(def-art-elt daxter-ag daxter-pilot-bike-get-on-ja 274) +(def-art-elt daxter-ag daxter-board-jump-loop-ja 153) +(def-art-elt daxter-ag daxter-pilot-bike-smack-front-ja 284) +(def-art-elt daxter-ag daxter-board-hit-ja 155) +(def-art-elt daxter-ag daxter-board-flip-forward-ja 156) +(def-art-elt daxter-ag daxter-board-turn-left-ja 158) +(def-art-elt daxter-ag daxter-pilot-car-get-off-ja 272) +(def-art-elt daxter-ag daxter-board-turn-right-ja 159) +(def-art-elt daxter-ag daxter-board-turn-up-ja 160) +(def-art-elt daxter-ag daxter-board-turn-down-ja 161) +(def-art-elt daxter-ag daxter-board-hit-forward-ja 162) +(def-art-elt daxter-ag daxter-pilot-gun-dark-idle-ja 292) +(def-art-elt daxter-ag daxter-board-ride-turn-back-ja 163) +(def-art-elt daxter-ag daxter-board-ride-turn-front-ja 164) +(def-art-elt daxter-ag daxter-board-ride-turn-right-ja 165) +(def-art-elt daxter-ag daxter-board-ride-turn-left-ja 166) +(def-art-elt daxter-ag daxter-board-get-on-ja 167) +(def-art-elt daxter-ag daxter-board-get-off-ja 168) +(def-art-elt daxter-ag daxter-pilot-eject-loop-ja 290) +(def-art-elt daxter-ag daxter-board-grenade-ja 169) +(def-art-elt daxter-ag daxter-board-nosegrab-ja 170) +(def-art-elt daxter-ag daxter-pilot-gun-red-blue-ja 300) +(def-art-elt daxter-ag daxter-board-method-ja 171) +(def-art-elt daxter-ag daxter-board-kickflip-a-ja 172) +(def-art-elt daxter-ag daxter-pilot-gun-blue-idle-ja 294) +(def-art-elt daxter-ag daxter-board-spin-ja 173) +(def-art-elt daxter-ag daxter-board-air-turn-ja 174) +(def-art-elt daxter-ag daxter-pilot-bike-smack-shock-ja 288) +(def-art-elt daxter-ag daxter-board-flip-backward-ja 175) +(def-art-elt daxter-ag daxter-board-flip-forward-loop-ja 178) +(def-art-elt daxter-ag daxter-pilot-car-smack-right-ja 308) +(def-art-elt daxter-ag daxter-board-flip-backward-loop-ja 179) +(def-art-elt daxter-ag daxter-board-method-loop-ja 180) +(def-art-elt daxter-ag daxter-pilot-gun-yellow-takeout-ja 302) +(def-art-elt daxter-ag daxter-board-method-end-ja 181) +(def-art-elt daxter-ag daxter-board-nosegrab-loop-ja 182) +(def-art-elt daxter-ag daxter-pilot-gun-yellow-fire-ja 296) +(def-art-elt daxter-ag daxter-board-nosegrab-end-ja 183) +(def-art-elt daxter-ag daxter-board-noseflip-ja 184) +(def-art-elt daxter-ag daxter-pilot-bike-smack-right-ja 306) +(def-art-elt daxter-ag daxter-board-jump-kickoff-ja 185) +(def-art-elt daxter-ag daxter-board-hit-elec-ja 186) +(def-art-elt daxter-ag daxter-board-get-on-land-ja 187) +(def-art-elt daxter-ag daxter-board-get-off-pre-ja 188) +(def-art-elt daxter-ag daxter-board-kickflip-b-ja 189) +(def-art-elt daxter-ag daxter-board-kickflip-c-ja 190) +(def-art-elt daxter-ag daxter-pilot-gun-dark-takeout-ja 304) +(def-art-elt daxter-ag daxter-board-hit-get-off-ja 191) +(def-art-elt daxter-ag daxter-mech-jump-land-ja 324) +(def-art-elt daxter-ag daxter-board-spin-cw-ja 195) +(def-art-elt daxter-ag daxter-board-spin-ccw-ja 196) +(def-art-elt daxter-ag daxter-darkjak-attack-ice-ja 384) +(def-art-elt daxter-ag daxter-darkjak-run-ja 386) +(def-art-elt daxter-ag daxter-darkjak-jump-land-ja 388) +(def-art-elt daxter-ag daxter-darkjak-attack-spin-ja 392) +(def-art-elt daxter-ag daxter-darkjak-bomb-pre-ja 394) +(def-art-elt daxter-ag daxter-darkjak-attack-combo1-end-ja 396) +(def-art-elt daxter-ag daxter-darkjak-attack-combo2-end-ja 398) +(def-art-elt daxter-ag daxter-darkjak-attack-combo3-end-ja 400) +(def-art-elt daxter-ag daxter-darkjak-attack-combo1b-ja 402) +(def-art-elt daxter-ag daxter-darkjak-bomb-end-ja 404) +(def-art-elt daxter-ag daxter-darkjak-attack-combo3c-ja 406) +(def-art-elt daxter-ag daxter-darkjak-get-off-end-ja 408) +(def-art-elt daxter-ag daxter-darkjak-bomb-loop-ja 410) +(def-art-elt daxter-ag daxter-darkjak-bomb-land-ja 411) +(def-art-elt daxter-ag daxter-darkjak-attack-ice-loop-ja 412) +(def-art-elt daxter-ag daxter-darkjak-attack-ice-end-ja 414) +(def-art-elt daxter-ag daxter-death-swim-ja 85) +(def-art-elt daxter-ag daxter-death-swim-loop-ja 86) +(def-art-elt daxter-ag daxter-death-swim-end-ja 87) +(def-art-elt daxter-ag daxter-wade-shallow-walk-ja 90) +(def-art-elt daxter-ag daxter-wade-deep-walk-ja 91) +(def-art-elt daxter-ag daxter-swim-stance-ja 92) +(def-art-elt daxter-ag daxter-swim-walk-ja 93) +(def-art-elt daxter-ag daxter-swim-walk-to-down-ja 94) +(def-art-elt daxter-ag daxter-swim-down-ja 95) +(def-art-elt daxter-ag daxter-swim-down-to-up-ja 96) +(def-art-elt daxter-ag daxter-swim-up-ja 97) +(def-art-elt daxter-ag daxter-swim-up-to-stance-ja 98) +(def-art-elt daxter-ag daxter-swim-jump-ja 99) +(def-art-elt daxter-ag daxter-pidax-car-turn-front-ja 452) +(def-art-elt daxter-ag daxter-pidax-car-turn-back-ja 453) +(def-art-elt daxter-ag daxter-pidax-car-up-down-ja 454) +(def-art-elt daxter-ag daxter-pidax-car-crash-front-ja 455) +(def-art-elt daxter-ag daxter-pidax-car-crash-back-ja 456) +(def-art-elt daxter-ag daxter-pidax-car-crash-right-ja 458) +(def-art-elt daxter-ag daxter-board-attack-pegasus-ja 192) +(def-art-elt daxter-ag daxter-tube-turn-ja 108) +(def-art-elt daxter-ag daxter-tube-jump-land-ja 109) +(def-art-elt daxter-ag daxter-pole-cycle-ja 100) +(def-art-elt daxter-ag daxter-pole-cycle2-ja 101) +(def-art-elt daxter-ag daxter-pole-flip-up-ja 102) +(def-art-elt daxter-ag daxter-pole-flip-forward-ja 103) +(def-art-elt daxter-ag daxter-pole-jump-loop-ja 104) +(def-art-elt daxter-ag daxter-turret-get-off-ja 353) +(def-art-elt daxter-ag daxter-indax-walk-ja 416) +(def-art-elt daxter-ag daxter-indax-run-ja 417) +(def-art-elt daxter-ag daxter-indax-jump-ja 418) +(def-art-elt daxter-ag daxter-indax-jump-land-ja 420) +(def-art-elt daxter-ag daxter-indax-attack-spin-ja 421) +(def-art-elt daxter-ag daxter-indax-attack-spin-end-ja 422) +(def-art-elt daxter-ag daxter-indax-run-look-back-ja 423) +(def-art-elt daxter-ag daxter-indax-jump-forward-ja 424) +(def-art-elt daxter-ag daxter-indax-jump-forward-loop-ja 425) +(def-art-elt daxter-ag daxter-indax-jump-forward-land-ja 426) +(def-art-elt daxter-ag daxter-indax-attack-spin-air-ja 428) +(def-art-elt daxter-ag daxter-indax-hit-front-ja 430) +(def-art-elt daxter-ag daxter-indax-hit-back-ja 431) +(def-art-elt daxter-ag daxter-indax-hit-roll-ja 432) +(def-art-elt daxter-ag daxter-indax-death-fall-ja 434) +(def-art-elt daxter-ag daxter-indax-death-eaten-ja 436) +(def-art-elt daxter-ag daxter-indax-jump-forward-hands-ja 438) +(def-art-elt daxter-ag daxter-indax-jump-forward-hands-land-ja 440) +(def-art-elt daxter-ag daxter-indax-running-attack-end-ja 442) +(def-art-elt daxter-ag daxter-indax-trip-land-ja 444) +(def-art-elt daxter-ag daxter-indax-dummy4-ja 446) +(def-art-elt daxter-ag daxter-indax-dummy6-ja 448) +(def-art-elt daxter-ag daxter-indax-dummy7-ja 449) +(def-art-elt daxter-ag daxter-indax-dummy8-ja 450) +(def-art-elt daxter-ag daxter-mech-stance-ja 317) +(def-art-elt daxter-ag daxter-mech-run-ja 318) +(def-art-elt daxter-ag daxter-mech-walk-ja 319) +(def-art-elt daxter-ag daxter-mech-jump-ja 321) +(def-art-elt daxter-ag daxter-mech-jump-loop-ja 323) +(def-art-elt daxter-ag daxter-mech-turn20-ja 325) +(def-art-elt daxter-ag daxter-mech-punch-r-ja 327) +(def-art-elt daxter-ag daxter-mech-carry-pickup-low-ja 329) +(def-art-elt daxter-ag daxter-mech-carry-stance-ja 331) +(def-art-elt daxter-ag daxter-mech-carry-jump-ja 333) +(def-art-elt daxter-ag daxter-mech-carry-jump-land-ja 335) +(def-art-elt daxter-ag daxter-mech-carry-turn45-ja 337) +(def-art-elt daxter-ag daxter-mech-pull-ja 339) +(def-art-elt daxter-ag daxter-mech-hit-front-ja 341) +(def-art-elt daxter-ag daxter-mech-get-on-ja 343) +(def-art-elt daxter-ag daxter-mech-death-a-ja 344) +(def-art-elt daxter-ag daxter-mech-death-b-ja 345) +(def-art-elt daxter-ag daxter-mech-punch-u-ja 346) +(def-art-elt daxter-ag daxter-pilot-gun-red-takeout-ja 271) +(def-art-elt daxter-ag daxter-pilot-car-get-on-ja 273) +(def-art-elt daxter-ag daxter-pilot-car-turn-front-ja 275) +(def-art-elt daxter-ag daxter-pilot-car-turn-back-ja 276) +(def-art-elt daxter-ag daxter-pilot-car-smack-front-ja 277) +(def-art-elt daxter-ag daxter-pilot-car-smack-back-ja 278) +(def-art-elt daxter-ag daxter-pilot-gun-blue-fire-ja 279) +(def-art-elt daxter-ag daxter-pilot-car-smack-shock-ja 281) +(def-art-elt daxter-ag daxter-pilot-bike-turn-back-ja 283) +(def-art-elt daxter-ag daxter-pilot-bike-smack-back-ja 285) +(def-art-elt daxter-ag daxter-pilot-bike-up-down-ja 287) +(def-art-elt daxter-ag daxter-pilot-bike-get-off-ja 289) +(def-art-elt daxter-ag daxter-pilot-gun-red-idle-ja 291) +(def-art-elt daxter-ag daxter-pilot-gun-yellow-idle-ja 293) +(def-art-elt daxter-ag daxter-pilot-gun-red-fire-ja 295) +(def-art-elt daxter-ag daxter-pilot-gun-dark-fire-ja 297) +(def-art-elt daxter-ag daxter-pilot-gun-red-dark-ja 298) +(def-art-elt daxter-ag daxter-pilot-gun-red-yellow-ja 299) +(def-art-elt daxter-ag daxter-pilot-gun-yellow-blue-ja 301) +(def-art-elt daxter-ag daxter-pilot-gun-blue-takeout-ja 303) +(def-art-elt daxter-ag daxter-pilot-bike-smack-left-ja 305) +(def-art-elt daxter-ag daxter-pilot-car-smack-left-ja 307) +(def-art-elt daxter-ag daxter-darkjak-get-on-ja 383) (def-art-elt daxter-highres-ag daxter-highres-lod0-jg 0) (def-art-elt daxter-highres-ag daxter-highres-lod0-mg 1) (def-art-elt daxter-highres-ag daxter-highres-shadow-mg 2) (def-art-elt daxter-highres-ag daxter-highres-idle-ja 3) -(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-ja 0) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack0-ja 1) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack1-ja 2) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack2-ja 3) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack3-ja 4) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack4-ja 5) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack5-ja 6) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack6-ja 7) -(def-art-elt daxter-mole+0-ag big-bopper-mole-whack7-ja 8) -(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-crazy-ja 9) -(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-tired-ja 10) -(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-angry-ja 11) -(def-art-elt daxter-mole+0-ag big-bopper-mole-shock-ja 12) -(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-shock-ja 13) -(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-shock-end-ja 14) -(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy6-ja 15) -(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy7-ja 16) -(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy8-ja 17) -(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy9-ja 18) -(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy10-ja 19) -(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy11-ja 20) -(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy12-ja 21) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-ja 22) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack0-ja 23) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack1-ja 24) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack2-ja 25) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack3-ja 26) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack4-ja 27) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack5-ja 28) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack6-ja 29) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack7-ja 30) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-crazy-ja 31) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-tired-ja 32) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-angry-ja 33) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-shock-ja 34) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-shock-ja 35) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-shock-end-ja 36) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy6-ja 37) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy7-ja 38) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy8-ja 39) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy9-ja 40) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy10-ja 41) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy11-ja 42) -(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy12-ja 43) +(def-art-elt daxter-highres-ag daxter-highres-mole-idle-ja 4) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack0-ja 5) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack1-ja 6) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack2-ja 7) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack3-ja 8) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack4-ja 9) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack5-ja 10) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack6-ja 11) +(def-art-elt daxter-highres-ag daxter-highres-mole-whack7-ja 12) +(def-art-elt daxter-highres-ag daxter-highres-mole-idle-crazy-ja 13) +(def-art-elt daxter-highres-ag daxter-highres-mole-idle-tired-ja 14) +(def-art-elt daxter-highres-ag daxter-highres-mole-idle-angry-ja 15) +(def-art-elt daxter-highres-ag daxter-highres-mole-shock-ja 16) +(def-art-elt daxter-highres-ag daxter-highres-mole-idle-shock-ja 17) +(def-art-elt daxter-highres-ag daxter-highres-mole-idle-shock-end-ja 18) +(def-art-elt daxter-highres-ag daxter-highres-mole-dummy6-ja 19) +(def-art-elt daxter-highres-ag daxter-highres-mole-dummy7-ja 20) +(def-art-elt daxter-highres-ag daxter-highres-mole-dummy8-ja 21) +(def-art-elt daxter-highres-ag daxter-highres-mole-dummy9-ja 22) +(def-art-elt daxter-highres-ag daxter-highres-mole-dummy10-ja 23) +(def-art-elt daxter-highres-ag daxter-highres-mole-dummy11-ja 24) +(def-art-elt daxter-highres-ag daxter-highres-mole-dummy12-ja 25) (def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-lod0-jg 0) (def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-lod0-mg 1) (def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-idle-ja 2) @@ -1425,8 +1624,8 @@ (def-art-elt fort-entry-gate-ag fort-entry-gate-lod0-jg 0) (def-art-elt fort-entry-gate-ag fort-entry-gate-lod0-mg 1) (def-art-elt fort-entry-gate-ag fort-entry-gate-idle-ja 2) -(def-art-elt fort-fence-ag fort-fence-a-lod0-jg 0) (def-art-elt fort-fence-ag fort-fence-b-end-ja 8) +(def-art-elt fort-fence-ag fort-fence-a-lod0-jg 0) (def-art-elt fort-fence-ag fort-fence-a-lod0-mg 1) (def-art-elt fort-fence-ag fort-fence-a-idle-ja 2) (def-art-elt fort-fence-ag fort-fence-a-end-ja 3) @@ -1629,6 +1828,14 @@ (def-art-elt grunt-ag grunt-jump-in-air-ja 46) (def-art-elt grunt-ag grunt-jump-land-ja 47) (def-art-elt grunt-ag grunt-sew-scare-grunt-end-ja 57) +(def-art-elt grunt-ag grunt-mech-lunge-ja 48) +(def-art-elt grunt-ag grunt-mech-grab-ja 49) +(def-art-elt grunt-ag grunt-mech-idle0-ja 50) +(def-art-elt grunt-ag grunt-mech-head-butt-ja 51) +(def-art-elt grunt-ag grunt-mech-punch-left-ja 52) +(def-art-elt grunt-ag grunt-mech-double-pound-ja 53) +(def-art-elt grunt-ag grunt-mech-dismount-ja 54) +(def-art-elt grunt-ag grunt-mech-dismount-land-ja 55) (def-art-elt grunt-egg-a-ag grunt-egg-a-lod0-jg 0) (def-art-elt grunt-egg-a-ag grunt-egg-a-lod0-mg 1) (def-art-elt grunt-egg-a-ag grunt-egg-a-lod1-mg 2) @@ -1651,14 +1858,6 @@ (def-art-elt grunt-egg-d-ag grunt-egg-d-idle2-ja 4) (def-art-elt grunt-fma-ag grunt-fma-lod0-jg 0) (def-art-elt grunt-fma-ag grunt-fma-lod0-mg 1) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-lunge-ja 0) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-grab-ja 1) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-idle0-ja 2) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-head-butt-ja 3) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-punch-left-ja 4) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-double-pound-ja 5) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-dismount-ja 6) -(def-art-elt grunt-mech-anims+0-ag grunt-mech-dismount-land-ja 7) (def-art-elt gun-ag gun-ammo-yellow-lod0-jg 0) (def-art-elt gun-ag gun-ammo-yellow-lod0-mg 1) (def-art-elt gun-ag gun-ammo-red-lod0-jg 2) @@ -1679,6 +1878,20 @@ (def-art-elt gun-ag gun-red-cone-lod0-jg 40) (def-art-elt gun-ag gun-red-cone-lod0-mg 41) (def-art-elt gun-ag gun-red-cone-idle-ja 42) +(def-art-elt gun-ag gun-gun-yellow-fire-low-ja 17) +(def-art-elt gun-ag gun-gun-red-fire-ja 18) +(def-art-elt gun-ag gun-gun-blue-fire-ja 19) +(def-art-elt gun-ag gun-gun-blue-fire-single-ja 20) +(def-art-elt gun-ag gun-gun-dark-fire-ja 21) +(def-art-elt gun-ag gun-gun-yellow-fire-ja 22) +(def-art-elt gun-ag gun-gun-red-dark-ja 23) +(def-art-elt gun-ag gun-gun-red-yellow-ja 24) +(def-art-elt gun-ag gun-gun-red-blue-ja 25) +(def-art-elt gun-ag gun-gun-dark-yellow-ja 26) +(def-art-elt gun-ag gun-gun-yellow-blue-ja 27) +(def-art-elt gun-ag gun-gun-yellow-red-ja 28) +(def-art-elt gun-ag gun-gun-blue-dark-ja 29) +(def-art-elt gun-ag gun-gun-blue-red-ja 30) (def-art-elt gun-barrel-ag gun-barrel-lod0-jg 0) (def-art-elt gun-barrel-ag gun-barrel-lod0-mg 1) (def-art-elt gun-barrel-ag gun-barrel-idle-ja 2) @@ -1750,6 +1963,7 @@ (def-art-elt gun-upgrade-a-ag gun-upgrade-a-lod0-jg 0) (def-art-elt gun-upgrade-a-ag gun-upgrade-a-lod0-mg 1) (def-art-elt gun-upgrade-a-ag gun-upgrade-a-idle-ja 2) +(def-art-elt heart-mar-ag heart-mar-grab-success-ja 3) (def-art-elt heart-mar-ag heart-mar-lod0-jg 0) (def-art-elt heart-mar-ag heart-mar-lod0-mg 1) (def-art-elt heart-mar-ag heart-mar-idle-ja 2) @@ -1936,293 +2150,9 @@ (def-art-elt intro-flamer-ag intro-flamer-lod2-mg 3) (def-art-elt intro-flamer-ag intro-flamer-shadow-mg 4) (def-art-elt intro-flamer-ag intro-flamer-fly-straight-ja 5) -(def-art-elt jak-board+0-ag daxter-board-stance-ja 0) -(def-art-elt jak-board+0-ag daxter-board-duck-turn-ja 1) -(def-art-elt jak-board+0-ag daxter-board-turn-ja 2) -(def-art-elt jak-board+0-ag daxter-board-jump-kick-ja 3) -(def-art-elt jak-board+0-ag daxter-board-jump-ja 4) -(def-art-elt jak-board+0-ag daxter-board-jump-loop-ja 5) -(def-art-elt jak-board+0-ag daxter-board-hit-ja 6) -(def-art-elt jak-board+0-ag daxter-board-flip-forward-ja 7) -(def-art-elt jak-board+0-ag daxter-board-turn-left-ja 8) -(def-art-elt jak-board+0-ag daxter-board-turn-right-ja 9) -(def-art-elt jak-board+0-ag daxter-board-turn-up-ja 10) -(def-art-elt jak-board+0-ag daxter-board-turn-down-ja 11) -(def-art-elt jak-board+0-ag daxter-board-hit-forward-ja 12) -(def-art-elt jak-board+0-ag daxter-board-ride-turn-back-ja 13) -(def-art-elt jak-board+0-ag daxter-board-ride-turn-front-ja 14) -(def-art-elt jak-board+0-ag daxter-board-ride-turn-right-ja 15) -(def-art-elt jak-board+0-ag daxter-board-ride-turn-left-ja 16) -(def-art-elt jak-board+0-ag daxter-board-get-on-ja 17) -(def-art-elt jak-board+0-ag daxter-board-get-off-ja 18) -(def-art-elt jak-board+0-ag daxter-board-grenade-ja 19) -(def-art-elt jak-board+0-ag daxter-board-nosegrab-ja 20) -(def-art-elt jak-board+0-ag daxter-board-method-ja 21) -(def-art-elt jak-board+0-ag daxter-board-kickflip-a-ja 22) -(def-art-elt jak-board+0-ag daxter-board-spin-ja 23) -(def-art-elt jak-board+0-ag daxter-board-air-turn-ja 24) -(def-art-elt jak-board+0-ag daxter-board-flip-backward-ja 25) -(def-art-elt jak-board+0-ag daxter-board-flip-forward-loop-ja 26) -(def-art-elt jak-board+0-ag daxter-board-flip-backward-loop-ja 27) -(def-art-elt jak-board+0-ag daxter-board-method-loop-ja 28) -(def-art-elt jak-board+0-ag daxter-board-method-end-ja 29) -(def-art-elt jak-board+0-ag daxter-board-nosegrab-loop-ja 30) -(def-art-elt jak-board+0-ag daxter-board-nosegrab-end-ja 31) -(def-art-elt jak-board+0-ag daxter-board-noseflip-ja 32) -(def-art-elt jak-board+0-ag daxter-board-jump-kickoff-ja 33) -(def-art-elt jak-board+0-ag daxter-board-hit-elec-ja 34) -(def-art-elt jak-board+0-ag daxter-board-get-on-land-ja 35) -(def-art-elt jak-board+0-ag daxter-board-get-off-pre-ja 36) -(def-art-elt jak-board+0-ag daxter-board-kickflip-b-ja 37) -(def-art-elt jak-board+0-ag daxter-board-kickflip-c-ja 38) -(def-art-elt jak-board+0-ag daxter-board-hit-get-off-ja 39) -(def-art-elt jak-board+0-ag daxter-board-spin-cw-ja 40) -(def-art-elt jak-board+0-ag daxter-board-spin-ccw-ja 41) -(def-art-elt jak-board+0-ag jakb-board-stance-ja 42) -(def-art-elt jak-board+0-ag jakb-board-duck-turn-ja 43) -(def-art-elt jak-board+0-ag jakb-board-turn-ja 44) -(def-art-elt jak-board+0-ag jakb-board-jump-kick-ja 45) -(def-art-elt jak-board+0-ag jakb-board-jump-ja 46) -(def-art-elt jak-board+0-ag jakb-board-jump-loop-ja 47) -(def-art-elt jak-board+0-ag jakb-board-hit-ja 48) -(def-art-elt jak-board+0-ag jakb-board-flip-forward-ja 49) -(def-art-elt jak-board+0-ag jakb-board-turn-left-ja 50) -(def-art-elt jak-board+0-ag jakb-board-turn-right-ja 51) -(def-art-elt jak-board+0-ag jakb-board-turn-up-ja 52) -(def-art-elt jak-board+0-ag jakb-board-turn-down-ja 53) -(def-art-elt jak-board+0-ag jakb-board-hit-forward-ja 54) -(def-art-elt jak-board+0-ag jakb-board-ride-turn-back-ja 55) -(def-art-elt jak-board+0-ag jakb-board-ride-turn-front-ja 56) -(def-art-elt jak-board+0-ag jakb-board-ride-turn-right-ja 57) -(def-art-elt jak-board+0-ag jakb-board-ride-turn-left-ja 58) -(def-art-elt jak-board+0-ag jakb-board-get-on-ja 59) -(def-art-elt jak-board+0-ag jakb-board-get-off-ja 60) -(def-art-elt jak-board+0-ag jakb-board-grenade-ja 61) -(def-art-elt jak-board+0-ag jakb-board-nosegrab-ja 62) -(def-art-elt jak-board+0-ag jakb-board-method-ja 63) -(def-art-elt jak-board+0-ag jakb-board-kickflip-a-ja 64) -(def-art-elt jak-board+0-ag jakb-board-spin-ja 65) -(def-art-elt jak-board+0-ag jakb-board-air-turn-ja 66) -(def-art-elt jak-board+0-ag jakb-board-flip-backward-ja 67) -(def-art-elt jak-board+0-ag jakb-board-flip-forward-loop-ja 68) -(def-art-elt jak-board+0-ag jakb-board-flip-backward-loop-ja 69) -(def-art-elt jak-board+0-ag jakb-board-method-loop-ja 70) -(def-art-elt jak-board+0-ag jakb-board-method-end-ja 71) -(def-art-elt jak-board+0-ag jakb-board-nosegrab-loop-ja 72) -(def-art-elt jak-board+0-ag jakb-board-nosegrab-end-ja 73) -(def-art-elt jak-board+0-ag jakb-board-noseflip-ja 74) -(def-art-elt jak-board+0-ag jakb-board-jump-kickoff-ja 75) -(def-art-elt jak-board+0-ag jakb-board-hit-elec-ja 76) -(def-art-elt jak-board+0-ag jakb-board-get-on-land-ja 77) -(def-art-elt jak-board+0-ag jakb-board-get-off-pre-ja 78) -(def-art-elt jak-board+0-ag jakb-board-kickflip-b-ja 79) -(def-art-elt jak-board+0-ag jakb-board-kickflip-c-ja 80) -(def-art-elt jak-board+0-ag jakb-board-hit-get-off-ja 81) (def-art-elt jak-clothes-ag jak-clothes-lod0-jg 0) (def-art-elt jak-clothes-ag jak-clothes-lod0-mg 1) (def-art-elt jak-clothes-ag jak-clothes-idle-ja 2) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-ice-ja 0) -(def-art-elt jak-dark+0-ag daxter-darkjak-walk-ja 1) -(def-art-elt jak-dark+0-ag daxter-darkjak-run-ja 2) -(def-art-elt jak-dark+0-ag daxter-darkjak-jump-ja 3) -(def-art-elt jak-dark+0-ag daxter-darkjak-jump-land-ja 4) -(def-art-elt jak-dark+0-ag daxter-darkjak-stance-ja 5) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-spin-ja 6) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-spin-end-ja 7) -(def-art-elt jak-dark+0-ag daxter-darkjak-bomb-pre-ja 8) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo1-ja 9) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo1-end-ja 10) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo2-ja 11) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo2-end-ja 12) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo3-ja 13) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo3-end-ja 14) -(def-art-elt jak-dark+0-ag daxter-darkjak-get-off-ja 15) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo1b-ja 16) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo1b-end-ja 17) -(def-art-elt jak-dark+0-ag daxter-darkjak-bomb-end-ja 18) -(def-art-elt jak-dark+0-ag daxter-darkjak-get-on-fast-ja 19) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo3c-ja 20) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-combo3c-end-ja 21) -(def-art-elt jak-dark+0-ag daxter-darkjak-get-off-end-ja 22) -(def-art-elt jak-dark+0-ag daxter-darkjak-bomb-ja 23) -(def-art-elt jak-dark+0-ag daxter-darkjak-bomb-loop-ja 24) -(def-art-elt jak-dark+0-ag daxter-darkjak-bomb-land-ja 25) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-ice-loop-ja 26) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-ice-loop2-ja 27) -(def-art-elt jak-dark+0-ag daxter-darkjak-attack-ice-end-ja 28) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-ice-ja 29) -(def-art-elt jak-dark+0-ag jakb-darkjak-walk-ja 30) -(def-art-elt jak-dark+0-ag jakb-darkjak-run-ja 31) -(def-art-elt jak-dark+0-ag jakb-darkjak-jump-ja 32) -(def-art-elt jak-dark+0-ag jakb-darkjak-jump-land-ja 33) -(def-art-elt jak-dark+0-ag jakb-darkjak-stance-ja 34) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-spin-ja 35) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-spin-end-ja 36) -(def-art-elt jak-dark+0-ag jakb-darkjak-bomb-pre-ja 37) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo1-ja 38) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo1-end-ja 39) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo2-ja 40) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo2-end-ja 41) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo3-ja 42) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo3-end-ja 43) -(def-art-elt jak-dark+0-ag jakb-darkjak-get-off-ja 44) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo1b-ja 45) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo1b-end-ja 46) -(def-art-elt jak-dark+0-ag jakb-darkjak-bomb-end-ja 47) -(def-art-elt jak-dark+0-ag jakb-darkjak-get-on-fast-ja 48) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo3c-ja 49) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-combo3c-end-ja 50) -(def-art-elt jak-dark+0-ag jakb-darkjak-get-off-end-ja 51) -(def-art-elt jak-dark+0-ag jakb-darkjak-bomb-ja 52) -(def-art-elt jak-dark+0-ag jakb-darkjak-bomb-loop-ja 53) -(def-art-elt jak-dark+0-ag jakb-darkjak-bomb-land-ja 54) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-ice-loop-ja 55) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-ice-loop2-ja 56) -(def-art-elt jak-dark+0-ag jakb-darkjak-attack-ice-end-ja 57) -(def-art-elt jak-dark-on+0-ag daxter-darkjak-get-on-ja 0) -(def-art-elt jak-dark-on+0-ag jakb-darkjak-get-on-ja 1) -(def-art-elt jak-gun+0-ag daxter-gun-stance-ja 0) -(def-art-elt jak-gun+0-ag daxter-gun-stance-yellow-low-ja 1) -(def-art-elt jak-gun+0-ag daxter-gun-yellow-fire-low-ja 2) -(def-art-elt jak-gun+0-ag daxter-gun-yellow-highlow-ja 3) -(def-art-elt jak-gun+0-ag daxter-gun-attack-from-stance-ja 4) -(def-art-elt jak-gun+0-ag daxter-gun-attack-from-stance-end-ja 5) -(def-art-elt jak-gun+0-ag daxter-gun-attack-from-stance-blue-ja 6) -(def-art-elt jak-gun+0-ag daxter-gun-attack-from-stance-blue-end-ja 7) -(def-art-elt jak-gun+0-ag daxter-gun-blue-to-yellow-ja 8) -(def-art-elt jak-gun+0-ag daxter-gun-stance-dark-ja 9) -(def-art-elt jak-gun+0-ag daxter-gun-stance-yellow-ja 10) -(def-art-elt jak-gun+0-ag daxter-gun-stance-blue-ja 11) -(def-art-elt jak-gun+0-ag daxter-gun-red-fire-ja 12) -(def-art-elt jak-gun+0-ag daxter-gun-blue-fire-ja 13) -(def-art-elt jak-gun+0-ag daxter-gun-blue-fire-single-ja 14) -(def-art-elt jak-gun+0-ag daxter-gun-dark-fire-ja 15) -(def-art-elt jak-gun+0-ag daxter-gun-yellow-fire-ja 16) -(def-art-elt jak-gun+0-ag daxter-gun-walk-side-ja 17) -(def-art-elt jak-gun+0-ag daxter-gun-run-blue-ja 18) -(def-art-elt jak-gun+0-ag daxter-gun-red-takeout-ja 19) -(def-art-elt jak-gun+0-ag daxter-gun-dark-takeout-ja 20) -(def-art-elt jak-gun+0-ag daxter-gun-yellow-takeout-ja 21) -(def-art-elt jak-gun+0-ag daxter-gun-blue-takeout-ja 22) -(def-art-elt jak-gun+0-ag daxter-gun-attack-upperbutt-ja 23) -(def-art-elt jak-gun+0-ag daxter-gun-side-to-front-hop-ja 24) -(def-art-elt jak-gun+0-ag daxter-gun-transformation-twirl-ja 25) -(def-art-elt jak-gun+0-ag daxter-gun-front-to-side-hop-ja 26) -(def-art-elt jak-gun+0-ag daxter-gun-front-to-blue-hop-ja 27) -(def-art-elt jak-gun+0-ag daxter-gun-blue-to-front-hop-ja 28) -(def-art-elt jak-gun+0-ag daxter-gun-attack-butt-ja 29) -(def-art-elt jak-gun+0-ag daxter-gun-attack-butt-end-ja 30) -(def-art-elt jak-gun+0-ag daxter-gun-attack-butt-blue-ja 31) -(def-art-elt jak-gun+0-ag daxter-gun-attack-butt-blue-end-ja 32) -(def-art-elt jak-gun+0-ag daxter-gun-jump-land-ja 33) -(def-art-elt jak-gun+0-ag daxter-gun-jump-land-side-ja 34) -(def-art-elt jak-gun+0-ag daxter-gun-attack-upperbutt-blue-ja 35) -(def-art-elt jak-gun+0-ag daxter-gun-edge-grab-off-ja 36) -(def-art-elt jak-gun+0-ag daxter-gun-edge-grab-to-jump-ja 37) -(def-art-elt jak-gun+0-ag daxter-gun-duck-roll-ja 38) -(def-art-elt jak-gun+0-ag daxter-gun-duck-roll-end-ja 39) -(def-art-elt jak-gun+0-ag daxter-gun-roll-flip-ja 40) -(def-art-elt jak-gun+0-ag daxter-gun-roll-flip-land-ja 41) -(def-art-elt jak-gun+0-ag daxter-gun-flop-down-ja 42) -(def-art-elt jak-gun+0-ag daxter-gun-flop-down-loop-ja 43) -(def-art-elt jak-gun+0-ag daxter-gun-flop-down-land-ja 44) -(def-art-elt jak-gun+0-ag daxter-gun-hit-from-front-ja 45) -(def-art-elt jak-gun+0-ag daxter-gun-hit-from-back-ja 46) -(def-art-elt jak-gun+0-ag daxter-gun-red-fire-to-sideways-ja 47) -(def-art-elt jak-gun+0-ag daxter-gun-red-fire-from-sideways-ja 48) -(def-art-elt jak-gun+0-ag daxter-gun-dark-fire-twirl-ja 49) -(def-art-elt jak-gun+0-ag daxter-gun-stance-red-sideways-ja 50) -(def-art-elt jak-gun+0-ag daxter-gun-red-from-sideways-ja 51) -(def-art-elt jak-gun+0-ag daxter-gun-yellow-fire-twirl-ja 52) -(def-art-elt jak-gun+0-ag daxter-gun-hit-elec-ja 53) -(def-art-elt jak-gun+0-ag daxter-gun-front-walk-ja 54) -(def-art-elt jak-gun+0-ag daxter-gun-front-run-ja 55) -(def-art-elt jak-gun+0-ag daxter-gun-front-jump-ja 56) -(def-art-elt jak-gun+0-ag daxter-gun-front-jump-land-ja 57) -(def-art-elt jak-gun+0-ag daxter-gun-duck-walk-ja 58) -(def-art-elt jak-gun+0-ag daxter-gun-walk-blue-ja 59) -(def-art-elt jak-gun+0-ag daxter-gun-side-jump-ja 60) -(def-art-elt jak-gun+0-ag daxter-gun-side-jump-land-ja 61) -(def-art-elt jak-gun+0-ag daxter-gun-red-fire-fast-ja 62) -(def-art-elt jak-gun+0-ag daxter-gun-attack-from-stance-end-alt1-ja 63) -(def-art-elt jak-gun+0-ag daxter-gun-attack-butt-end-alt1-ja 64) -(def-art-elt jak-gun+0-ag gun-gun-yellow-fire-low-ja 65) -(def-art-elt jak-gun+0-ag gun-gun-red-fire-ja 66) -(def-art-elt jak-gun+0-ag gun-gun-blue-fire-ja 67) -(def-art-elt jak-gun+0-ag gun-gun-blue-fire-single-ja 68) -(def-art-elt jak-gun+0-ag gun-gun-dark-fire-ja 69) -(def-art-elt jak-gun+0-ag gun-gun-yellow-fire-ja 70) -(def-art-elt jak-gun+0-ag gun-gun-red-dark-ja 71) -(def-art-elt jak-gun+0-ag gun-gun-red-yellow-ja 72) -(def-art-elt jak-gun+0-ag gun-gun-red-blue-ja 73) -(def-art-elt jak-gun+0-ag gun-gun-dark-yellow-ja 74) -(def-art-elt jak-gun+0-ag gun-gun-yellow-blue-ja 75) -(def-art-elt jak-gun+0-ag gun-gun-yellow-red-ja 76) -(def-art-elt jak-gun+0-ag gun-gun-blue-dark-ja 77) -(def-art-elt jak-gun+0-ag gun-gun-blue-red-ja 78) -(def-art-elt jak-gun+0-ag jakb-gun-stance-ja 79) -(def-art-elt jak-gun+0-ag jakb-gun-stance-yellow-low-ja 80) -(def-art-elt jak-gun+0-ag jakb-gun-yellow-fire-low-ja 81) -(def-art-elt jak-gun+0-ag jakb-gun-yellow-highlow-ja 82) -(def-art-elt jak-gun+0-ag jakb-gun-attack-from-stance-ja 83) -(def-art-elt jak-gun+0-ag jakb-gun-attack-from-stance-end-ja 84) -(def-art-elt jak-gun+0-ag jakb-gun-attack-from-stance-blue-ja 85) -(def-art-elt jak-gun+0-ag jakb-gun-attack-from-stance-blue-end-ja 86) -(def-art-elt jak-gun+0-ag jakb-gun-blue-to-yellow-ja 87) -(def-art-elt jak-gun+0-ag jakb-gun-stance-dark-ja 88) -(def-art-elt jak-gun+0-ag jakb-gun-stance-yellow-ja 89) -(def-art-elt jak-gun+0-ag jakb-gun-stance-blue-ja 90) -(def-art-elt jak-gun+0-ag jakb-gun-red-fire-ja 91) -(def-art-elt jak-gun+0-ag jakb-gun-blue-fire-ja 92) -(def-art-elt jak-gun+0-ag jakb-gun-blue-fire-single-ja 93) -(def-art-elt jak-gun+0-ag jakb-gun-dark-fire-ja 94) -(def-art-elt jak-gun+0-ag jakb-gun-yellow-fire-ja 95) -(def-art-elt jak-gun+0-ag jakb-gun-walk-side-ja 96) -(def-art-elt jak-gun+0-ag jakb-gun-run-blue-ja 97) -(def-art-elt jak-gun+0-ag jakb-gun-red-takeout-ja 98) -(def-art-elt jak-gun+0-ag jakb-gun-dark-takeout-ja 99) -(def-art-elt jak-gun+0-ag jakb-gun-yellow-takeout-ja 100) -(def-art-elt jak-gun+0-ag jakb-gun-blue-takeout-ja 101) -(def-art-elt jak-gun+0-ag jakb-gun-attack-upperbutt-ja 102) -(def-art-elt jak-gun+0-ag jakb-gun-side-to-front-hop-ja 103) -(def-art-elt jak-gun+0-ag jakb-gun-transformation-twirl-ja 104) -(def-art-elt jak-gun+0-ag jakb-gun-front-to-side-hop-ja 105) -(def-art-elt jak-gun+0-ag jakb-gun-front-to-blue-hop-ja 106) -(def-art-elt jak-gun+0-ag jakb-gun-blue-to-front-hop-ja 107) -(def-art-elt jak-gun+0-ag jakb-gun-attack-butt-ja 108) -(def-art-elt jak-gun+0-ag jakb-gun-attack-butt-end-ja 109) -(def-art-elt jak-gun+0-ag jakb-gun-attack-butt-blue-ja 110) -(def-art-elt jak-gun+0-ag jakb-gun-attack-butt-blue-end-ja 111) -(def-art-elt jak-gun+0-ag jakb-gun-jump-land-ja 112) -(def-art-elt jak-gun+0-ag jakb-gun-jump-land-side-ja 113) -(def-art-elt jak-gun+0-ag jakb-gun-attack-upperbutt-blue-ja 114) -(def-art-elt jak-gun+0-ag jakb-gun-edge-grab-off-ja 115) -(def-art-elt jak-gun+0-ag jakb-gun-edge-grab-to-jump-ja 116) -(def-art-elt jak-gun+0-ag jakb-gun-duck-roll-ja 117) -(def-art-elt jak-gun+0-ag jakb-gun-duck-roll-end-ja 118) -(def-art-elt jak-gun+0-ag jakb-gun-roll-flip-ja 119) -(def-art-elt jak-gun+0-ag jakb-gun-roll-flip-land-ja 120) -(def-art-elt jak-gun+0-ag jakb-gun-flop-down-ja 121) -(def-art-elt jak-gun+0-ag jakb-gun-flop-down-loop-ja 122) -(def-art-elt jak-gun+0-ag jakb-gun-flop-down-land-ja 123) -(def-art-elt jak-gun+0-ag jakb-gun-hit-from-front-ja 124) -(def-art-elt jak-gun+0-ag jakb-gun-hit-from-back-ja 125) -(def-art-elt jak-gun+0-ag jakb-gun-red-fire-to-sideways-ja 126) -(def-art-elt jak-gun+0-ag jakb-gun-red-fire-from-sideways-ja 127) -(def-art-elt jak-gun+0-ag jakb-gun-dark-fire-twirl-ja 128) -(def-art-elt jak-gun+0-ag jakb-gun-stance-red-sideways-ja 129) -(def-art-elt jak-gun+0-ag jakb-gun-red-from-sideways-ja 130) -(def-art-elt jak-gun+0-ag jakb-gun-yellow-fire-twirl-ja 131) -(def-art-elt jak-gun+0-ag jakb-gun-hit-elec-ja 132) -(def-art-elt jak-gun+0-ag jakb-gun-front-walk-ja 133) -(def-art-elt jak-gun+0-ag jakb-gun-front-run-ja 134) -(def-art-elt jak-gun+0-ag jakb-gun-front-jump-ja 135) -(def-art-elt jak-gun+0-ag jakb-gun-front-jump-land-ja 136) -(def-art-elt jak-gun+0-ag jakb-gun-duck-walk-ja 137) -(def-art-elt jak-gun+0-ag jakb-gun-walk-blue-ja 138) -(def-art-elt jak-gun+0-ag jakb-gun-side-jump-ja 139) -(def-art-elt jak-gun+0-ag jakb-gun-side-jump-land-ja 140) -(def-art-elt jak-gun+0-ag jakb-gun-red-fire-fast-ja 141) (def-art-elt jak-highres-ag jak-highres-lod0-jg 0) (def-art-elt jak-highres-ag jak-highres-lod0-mg 1) (def-art-elt jak-highres-ag jak-highres-shadow-mg 2) @@ -2231,277 +2161,21 @@ (def-art-elt jak-highres-prison-ag jak-highres-prison-lod0-mg 1) (def-art-elt jak-highres-prison-ag jak-highres-prison-shadow-mg 2) (def-art-elt jak-highres-prison-ag jak-highres-prison-idle-ja 3) -(def-art-elt jak-indax+0-ag daxter-indax-stance-ja 0) -(def-art-elt jak-indax+0-ag daxter-indax-walk-ja 1) -(def-art-elt jak-indax+0-ag daxter-indax-run-ja 2) -(def-art-elt jak-indax+0-ag daxter-indax-jump-ja 3) -(def-art-elt jak-indax+0-ag daxter-indax-jump-loop-ja 4) -(def-art-elt jak-indax+0-ag daxter-indax-jump-land-ja 5) -(def-art-elt jak-indax+0-ag daxter-indax-attack-spin-ja 6) -(def-art-elt jak-indax+0-ag daxter-indax-attack-spin-end-ja 7) -(def-art-elt jak-indax+0-ag daxter-indax-run-look-back-ja 8) -(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-ja 9) -(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-loop-ja 10) -(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-land-ja 11) -(def-art-elt jak-indax+0-ag daxter-indax-run-squash-ja 12) -(def-art-elt jak-indax+0-ag daxter-indax-attack-spin-air-ja 13) -(def-art-elt jak-indax+0-ag daxter-indax-run-to-stance-ja 14) -(def-art-elt jak-indax+0-ag daxter-indax-hit-front-ja 15) -(def-art-elt jak-indax+0-ag daxter-indax-hit-back-ja 16) -(def-art-elt jak-indax+0-ag daxter-indax-hit-roll-ja 17) -(def-art-elt jak-indax+0-ag daxter-indax-death-squashed-ja 18) -(def-art-elt jak-indax+0-ag daxter-indax-death-fall-ja 19) -(def-art-elt jak-indax+0-ag daxter-indax-death-kill-ja 20) -(def-art-elt jak-indax+0-ag daxter-indax-death-eaten-ja 21) -(def-art-elt jak-indax+0-ag daxter-indax-running-attack-ja 22) -(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-hands-ja 23) -(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-hands-loop-ja 24) -(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-hands-land-ja 25) -(def-art-elt jak-indax+0-ag daxter-indax-run-squash-hands-ja 26) -(def-art-elt jak-indax+0-ag daxter-indax-running-attack-end-ja 27) -(def-art-elt jak-indax+0-ag daxter-indax-trip-ja 28) -(def-art-elt jak-indax+0-ag daxter-indax-trip-land-ja 29) -(def-art-elt jak-indax+0-ag daxter-indax-dummy3-ja 30) -(def-art-elt jak-indax+0-ag daxter-indax-dummy4-ja 31) -(def-art-elt jak-indax+0-ag daxter-indax-dummy5-ja 32) -(def-art-elt jak-indax+0-ag daxter-indax-dummy6-ja 33) -(def-art-elt jak-indax+0-ag daxter-indax-dummy7-ja 34) -(def-art-elt jak-indax+0-ag daxter-indax-dummy8-ja 35) -(def-art-elt jak-indax+0-ag daxter-indax-dummy9-ja 36) (def-art-elt jak-logo-ag jak-logo-lod0-jg 0) (def-art-elt jak-logo-ag jak-logo-lod0-mg 1) (def-art-elt jak-logo-ag jak-logo-idle-ja 2) (def-art-elt jak-logo-ag jak-logo-end-ja 5) -(def-art-elt jak-mech+0-ag daxter-mech-stance-ja 0) -(def-art-elt jak-mech+0-ag daxter-mech-run-ja 1) -(def-art-elt jak-mech+0-ag daxter-mech-walk-ja 2) -(def-art-elt jak-mech+0-ag daxter-mech-turn90-ja 3) -(def-art-elt jak-mech+0-ag daxter-mech-jump-ja 4) -(def-art-elt jak-mech+0-ag daxter-mech-jump-thrust-ja 5) -(def-art-elt jak-mech+0-ag daxter-mech-jump-loop-ja 6) -(def-art-elt jak-mech+0-ag daxter-mech-jump-land-ja 7) -(def-art-elt jak-mech+0-ag daxter-mech-turn20-ja 8) -(def-art-elt jak-mech+0-ag daxter-mech-punch-l-ja 9) -(def-art-elt jak-mech+0-ag daxter-mech-punch-r-ja 10) -(def-art-elt jak-mech+0-ag daxter-mech-punch-b-ja 11) -(def-art-elt jak-mech+0-ag daxter-mech-carry-pickup-low-ja 12) -(def-art-elt jak-mech+0-ag daxter-mech-carry-pickup-high-ja 13) -(def-art-elt jak-mech+0-ag daxter-mech-carry-stance-ja 14) -(def-art-elt jak-mech+0-ag daxter-mech-carry-walk-ja 15) -(def-art-elt jak-mech+0-ag daxter-mech-carry-jump-ja 16) -(def-art-elt jak-mech+0-ag daxter-mech-carry-jump-loop-ja 17) -(def-art-elt jak-mech+0-ag daxter-mech-carry-jump-land-ja 18) -(def-art-elt jak-mech+0-ag daxter-mech-carry-throw-ja 19) -(def-art-elt jak-mech+0-ag daxter-mech-carry-turn45-ja 20) -(def-art-elt jak-mech+0-ag daxter-mech-push-ja 21) -(def-art-elt jak-mech+0-ag daxter-mech-pull-ja 22) -(def-art-elt jak-mech+0-ag daxter-mech-drag-pickup-ja 23) -(def-art-elt jak-mech+0-ag daxter-mech-hit-front-ja 24) -(def-art-elt jak-mech+0-ag daxter-mech-get-off-ja 25) -(def-art-elt jak-mech+0-ag daxter-mech-get-on-ja 26) -(def-art-elt jak-mech+0-ag daxter-mech-death-a-ja 27) -(def-art-elt jak-mech+0-ag daxter-mech-death-b-ja 28) -(def-art-elt jak-mech+0-ag daxter-mech-punch-u-ja 29) -(def-art-elt jak-mech+0-ag jakb-mech-stance-ja 30) -(def-art-elt jak-mech+0-ag jakb-mech-run-ja 31) -(def-art-elt jak-mech+0-ag jakb-mech-walk-ja 32) -(def-art-elt jak-mech+0-ag jakb-mech-turn90-ja 33) -(def-art-elt jak-mech+0-ag jakb-mech-jump-ja 34) -(def-art-elt jak-mech+0-ag jakb-mech-jump-thrust-ja 35) -(def-art-elt jak-mech+0-ag jakb-mech-jump-loop-ja 36) -(def-art-elt jak-mech+0-ag jakb-mech-jump-land-ja 37) -(def-art-elt jak-mech+0-ag jakb-mech-turn20-ja 38) -(def-art-elt jak-mech+0-ag jakb-mech-punch-l-ja 39) -(def-art-elt jak-mech+0-ag jakb-mech-punch-r-ja 40) -(def-art-elt jak-mech+0-ag jakb-mech-punch-b-ja 41) -(def-art-elt jak-mech+0-ag jakb-mech-carry-pickup-low-ja 42) -(def-art-elt jak-mech+0-ag jakb-mech-carry-pickup-high-ja 43) -(def-art-elt jak-mech+0-ag jakb-mech-carry-stance-ja 44) -(def-art-elt jak-mech+0-ag jakb-mech-carry-walk-ja 45) -(def-art-elt jak-mech+0-ag jakb-mech-carry-jump-ja 46) -(def-art-elt jak-mech+0-ag jakb-mech-carry-jump-loop-ja 47) -(def-art-elt jak-mech+0-ag jakb-mech-carry-jump-land-ja 48) -(def-art-elt jak-mech+0-ag jakb-mech-carry-throw-ja 49) -(def-art-elt jak-mech+0-ag jakb-mech-carry-turn45-ja 50) -(def-art-elt jak-mech+0-ag jakb-mech-push-ja 51) -(def-art-elt jak-mech+0-ag jakb-mech-pull-ja 52) -(def-art-elt jak-mech+0-ag jakb-mech-drag-pickup-ja 53) -(def-art-elt jak-mech+0-ag jakb-mech-hit-front-ja 54) -(def-art-elt jak-mech+0-ag jakb-mech-get-off-ja 55) -(def-art-elt jak-mech+0-ag jakb-mech-get-on-ja 56) -(def-art-elt jak-mech+0-ag jakb-mech-death-a-ja 57) -(def-art-elt jak-mech+0-ag jakb-mech-death-b-ja 58) -(def-art-elt jak-mech+0-ag jakb-mech-punch-u-ja 59) -(def-art-elt jak-mech+0-ag mech-mech-stance-ja 60) -(def-art-elt jak-mech+0-ag mech-mech-run-ja 61) -(def-art-elt jak-mech+0-ag mech-mech-walk-ja 62) -(def-art-elt jak-mech+0-ag mech-mech-turn90-ja 63) -(def-art-elt jak-mech+0-ag mech-mech-jump-ja 64) -(def-art-elt jak-mech+0-ag mech-mech-jump-thrust-ja 65) -(def-art-elt jak-mech+0-ag mech-mech-jump-loop-ja 66) -(def-art-elt jak-mech+0-ag mech-mech-jump-land-ja 67) -(def-art-elt jak-mech+0-ag mech-mech-turn20-ja 68) -(def-art-elt jak-mech+0-ag mech-mech-punch-l-ja 69) -(def-art-elt jak-mech+0-ag mech-mech-punch-r-ja 70) -(def-art-elt jak-mech+0-ag mech-mech-punch-b-ja 71) -(def-art-elt jak-mech+0-ag mech-mech-carry-pickup-low-ja 72) -(def-art-elt jak-mech+0-ag mech-mech-carry-pickup-high-ja 73) -(def-art-elt jak-mech+0-ag mech-mech-carry-stance-ja 74) -(def-art-elt jak-mech+0-ag mech-mech-carry-walk-ja 75) -(def-art-elt jak-mech+0-ag mech-mech-carry-jump-ja 76) -(def-art-elt jak-mech+0-ag mech-mech-carry-jump-loop-ja 77) -(def-art-elt jak-mech+0-ag mech-mech-carry-jump-land-ja 78) -(def-art-elt jak-mech+0-ag mech-mech-carry-throw-ja 79) -(def-art-elt jak-mech+0-ag mech-mech-carry-turn45-ja 80) -(def-art-elt jak-mech+0-ag mech-mech-push-ja 81) -(def-art-elt jak-mech+0-ag mech-mech-pull-ja 82) -(def-art-elt jak-mech+0-ag mech-mech-drag-pickup-ja 83) -(def-art-elt jak-mech+0-ag mech-mech-hit-front-ja 84) -(def-art-elt jak-mech+0-ag mech-mech-get-off-ja 85) -(def-art-elt jak-mech+0-ag mech-mech-get-on-ja 86) -(def-art-elt jak-mech+0-ag mech-mech-death-a-ja 87) -(def-art-elt jak-mech+0-ag mech-mech-death-b-ja 88) -(def-art-elt jak-mech+0-ag mech-mech-punch-u-ja 89) -(def-art-elt jak-pegasus+0-ag daxter-board-attack-pegasus-ja 0) -(def-art-elt jak-pegasus+0-ag jakb-board-attack-pegasus-ja 1) -(def-art-elt jak-pidax+0-ag daxter-pidax-car-turn-front-ja 0) -(def-art-elt jak-pidax+0-ag daxter-pidax-car-turn-back-ja 1) -(def-art-elt jak-pidax+0-ag daxter-pidax-car-up-down-ja 2) -(def-art-elt jak-pidax+0-ag daxter-pidax-car-crash-front-ja 3) -(def-art-elt jak-pidax+0-ag daxter-pidax-car-crash-back-ja 4) -(def-art-elt jak-pidax+0-ag daxter-pidax-car-crash-left-ja 5) -(def-art-elt jak-pidax+0-ag daxter-pidax-car-crash-right-ja 6) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-red-takeout-ja 0) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-get-off-ja 1) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-get-on-ja 2) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-get-on-ja 3) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-turn-front-ja 4) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-turn-back-ja 5) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-smack-front-ja 6) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-smack-back-ja 7) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-blue-fire-ja 8) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-blue-fire-single-ja 9) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-smack-shock-ja 10) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-turn-front-ja 11) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-turn-back-ja 12) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-smack-front-ja 13) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-smack-back-ja 14) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-up-down-ja 15) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-up-down-ja 16) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-smack-shock-ja 17) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-get-off-ja 18) -(def-art-elt jak-pilot+0-ag daxter-pilot-eject-loop-ja 19) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-red-idle-ja 20) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-dark-idle-ja 21) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-yellow-idle-ja 22) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-blue-idle-ja 23) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-red-fire-ja 24) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-yellow-fire-ja 25) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-dark-fire-ja 26) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-red-dark-ja 27) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-red-yellow-ja 28) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-red-blue-ja 29) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-yellow-blue-ja 30) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-yellow-takeout-ja 31) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-blue-takeout-ja 32) -(def-art-elt jak-pilot+0-ag daxter-pilot-gun-dark-takeout-ja 33) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-smack-left-ja 34) -(def-art-elt jak-pilot+0-ag daxter-pilot-bike-smack-right-ja 35) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-smack-left-ja 36) -(def-art-elt jak-pilot+0-ag daxter-pilot-car-smack-right-ja 37) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-red-takeout-ja 38) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-get-off-ja 39) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-get-on-ja 40) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-get-on-ja 41) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-turn-front-ja 42) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-turn-back-ja 43) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-smack-front-ja 44) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-smack-back-ja 45) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-blue-fire-ja 46) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-blue-fire-single-ja 47) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-smack-shock-ja 48) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-turn-front-ja 49) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-turn-back-ja 50) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-smack-front-ja 51) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-smack-back-ja 52) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-up-down-ja 53) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-up-down-ja 54) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-smack-shock-ja 55) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-get-off-ja 56) -(def-art-elt jak-pilot+0-ag jakb-pilot-eject-loop-ja 57) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-red-idle-ja 58) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-dark-idle-ja 59) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-yellow-idle-ja 60) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-blue-idle-ja 61) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-red-fire-ja 62) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-yellow-fire-ja 63) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-dark-fire-ja 64) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-red-dark-ja 65) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-red-yellow-ja 66) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-red-blue-ja 67) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-yellow-blue-ja 68) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-yellow-takeout-ja 69) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-blue-takeout-ja 70) -(def-art-elt jak-pilot+0-ag jakb-pilot-gun-dark-takeout-ja 71) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-smack-left-ja 72) -(def-art-elt jak-pilot+0-ag jakb-pilot-bike-smack-right-ja 73) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-smack-left-ja 74) -(def-art-elt jak-pilot+0-ag jakb-pilot-car-smack-right-ja 75) -(def-art-elt jak-pole+0-ag daxter-pole-cycle-ja 0) -(def-art-elt jak-pole+0-ag daxter-pole-cycle2-ja 1) -(def-art-elt jak-pole+0-ag daxter-pole-flip-up-ja 2) -(def-art-elt jak-pole+0-ag daxter-pole-flip-forward-ja 3) -(def-art-elt jak-pole+0-ag daxter-pole-jump-loop-ja 4) -(def-art-elt jak-pole+0-ag jakb-pole-cycle-ja 5) -(def-art-elt jak-pole+0-ag jakb-pole-flip-up-ja 6) -(def-art-elt jak-pole+0-ag jakb-pole-flip-forward-ja 7) -(def-art-elt jak-pole+0-ag jakb-pole-jump-loop-ja 8) (def-art-elt jak-stand-ag jak-stand-lod0-jg 0) (def-art-elt jak-stand-ag jak-stand-lod0-mg 1) (def-art-elt jak-stand-ag jak-stand-idle-ja 2) (def-art-elt jak-stand-ag jak-stand-end-ja 5) -(def-art-elt jak-swim+0-ag daxter-death-swim-ja 0) -(def-art-elt jak-swim+0-ag daxter-death-swim-loop-ja 1) -(def-art-elt jak-swim+0-ag daxter-death-swim-end-ja 2) -(def-art-elt jak-swim+0-ag daxter-wade-shallow-walk-ja 3) -(def-art-elt jak-swim+0-ag daxter-wade-deep-walk-ja 4) -(def-art-elt jak-swim+0-ag daxter-swim-stance-ja 5) -(def-art-elt jak-swim+0-ag daxter-swim-walk-ja 6) -(def-art-elt jak-swim+0-ag daxter-swim-walk-to-down-ja 7) -(def-art-elt jak-swim+0-ag daxter-swim-down-ja 8) -(def-art-elt jak-swim+0-ag daxter-swim-down-to-up-ja 9) -(def-art-elt jak-swim+0-ag daxter-swim-up-ja 10) -(def-art-elt jak-swim+0-ag daxter-swim-up-to-stance-ja 11) -(def-art-elt jak-swim+0-ag daxter-swim-jump-ja 12) -(def-art-elt jak-swim+0-ag jakb-death-swim-ja 13) -(def-art-elt jak-swim+0-ag jakb-death-swim-loop-ja 14) -(def-art-elt jak-swim+0-ag jakb-death-swim-end-ja 15) -(def-art-elt jak-swim+0-ag jakb-wade-shallow-walk-ja 16) -(def-art-elt jak-swim+0-ag jakb-wade-deep-walk-ja 17) -(def-art-elt jak-swim+0-ag jakb-swim-stance-ja 18) -(def-art-elt jak-swim+0-ag jakb-swim-walk-ja 19) -(def-art-elt jak-swim+0-ag jakb-swim-walk-to-down-ja 20) -(def-art-elt jak-swim+0-ag jakb-swim-down-ja 21) -(def-art-elt jak-swim+0-ag jakb-swim-down-to-up-ja 22) -(def-art-elt jak-swim+0-ag jakb-swim-up-ja 23) -(def-art-elt jak-swim+0-ag jakb-swim-up-to-stance-ja 24) -(def-art-elt jak-swim+0-ag jakb-swim-jump-ja 25) -(def-art-elt jak-tube+0-ag daxter-tube-turn-ja 0) -(def-art-elt jak-tube+0-ag daxter-tube-jump-land-ja 1) -(def-art-elt jak-tube+0-ag jakb-tube-turn-ja 2) -(def-art-elt jak-tube+0-ag jakb-tube-jump-land-ja 3) -(def-art-elt jak-turret+0-ag daxter-turret-stance-ja 0) -(def-art-elt jak-turret+0-ag daxter-turret-get-off-ja 1) -(def-art-elt jak-turret+0-ag daxter-turret-get-on-ja 2) -(def-art-elt jak-turret+0-ag jakb-turret-stance-ja 3) -(def-art-elt jak-turret+0-ag jakb-turret-get-off-ja 4) -(def-art-elt jak-turret+0-ag jakb-turret-get-on-ja 5) (def-art-elt jakb-ag jakb-hit-elec-ja 64) +(def-art-elt jakb-ag jakb-darkjak-attack-spin-ja 399) (def-art-elt jakb-ag jakb-lod0-jg 0) (def-art-elt jakb-ag jakb-hit-from-front-alt1-ja 65) (def-art-elt jakb-ag jakb-lod0-mg 1) (def-art-elt jakb-ag jakb-hit-from-front-ja 66) -(def-art-elt jakb-ag jakb-fuel-cell-victory-9-ja 130) +(def-art-elt jakb-ag jakb-darkjak-run-ja 393) (def-art-elt jakb-ag jakb-shadow-mg 2) (def-art-elt jakb-ag jakb-hit-from-back-ja 67) (def-art-elt jakb-ag jakb-run-to-stance-ja 3) @@ -2509,26 +2183,35 @@ (def-art-elt jakb-ag jakb-stance-loop-ja 5) (def-art-elt jakb-ag jakb-run-to-stance-fast-ja 6) (def-art-elt jakb-ag jakb-run-ja 7) +(def-art-elt jakb-ag jakb-darkjak-attack-combo3-end-ja 407) (def-art-elt jakb-ag jakb-run-up-ja 8) (def-art-elt jakb-ag jakb-run-down-ja 9) +(def-art-elt jakb-ag jakb-darkjak-bomb-pre-ja 401) (def-art-elt jakb-ag jakb-run-right-ja 10) (def-art-elt jakb-ag jakb-run-left-ja 11) +(def-art-elt jakb-ag jakb-darkjak-jump-land-ja 395) (def-art-elt jakb-ag jakb-walk-ja 12) (def-art-elt jakb-ag jakb-walk-up-ja 13) +(def-art-elt jakb-ag jakb-darkjak-attack-combo2-end-ja 405) (def-art-elt jakb-ag jakb-walk-down-ja 14) (def-art-elt jakb-ag jakb-walk-right-ja 15) +(def-art-elt jakb-ag jakb-darkjak-get-off-end-ja 415) (def-art-elt jakb-ag jakb-walk-left-ja 16) (def-art-elt jakb-ag jakb-run-squash-ja 17) +(def-art-elt jakb-ag jakb-darkjak-attack-combo1b-ja 409) (def-art-elt jakb-ag jakb-run-squash-weak-ja 18) (def-art-elt jakb-ag jakb-stance-to-duck-ja 19) +(def-art-elt jakb-ag jakb-darkjak-attack-combo1-end-ja 403) (def-art-elt jakb-ag jakb-duck-stance-ja 20) (def-art-elt jakb-ag jakb-duck-walk-ja 21) +(def-art-elt jakb-ag jakb-darkjak-attack-combo3c-ja 413) (def-art-elt jakb-ag jakb-turn-around-ja 22) (def-art-elt jakb-ag jakb-jump-ja 23) (def-art-elt jakb-ag jakb-jump-land-ja 24) (def-art-elt jakb-ag jakb-painful-land-ja 25) (def-art-elt jakb-ag jakb-painful-land-end-ja 26) (def-art-elt jakb-ag jakb-jump-loop-ja 27) +(def-art-elt jakb-ag jakb-darkjak-bomb-end-ja 411) (def-art-elt jakb-ag jakb-jump-short-land-ja 28) (def-art-elt jakb-ag jakb-jump-forward-ja 29) (def-art-elt jakb-ag jakb-duck-high-jump-ja 30) @@ -2554,6 +2237,7 @@ (def-art-elt jakb-ag jakb-flop-down-loop-ja 53) (def-art-elt jakb-ag jakb-flop-down-land-ja 54) (def-art-elt jakb-ag jakb-moving-flop-down-ja 55) +(def-art-elt jakb-ag jakb-darkjak-attack-ice-ja 391) (def-art-elt jakb-ag jakb-moving-flop-down-loop-ja 56) (def-art-elt jakb-ag jakb-flop-jump-ja 58) (def-art-elt jakb-ag jakb-duck-roll-ja 59) @@ -2577,6 +2261,219 @@ (def-art-elt jakb-ag jakb-wall-hide-head-left-ja 86) (def-art-elt jakb-ag jakb-wall-hide-head-right-ja 87) (def-art-elt jakb-ag jakb-wall-hide-body-ja 88) +(def-art-elt jakb-ag jakb-fuel-cell-victory-9-ja 130) +(def-art-elt jakb-ag jakb-gun-stance-ja 244) +(def-art-elt jakb-ag jakb-gun-stance-yellow-low-ja 245) +(def-art-elt jakb-ag jakb-gun-yellow-fire-low-ja 246) +(def-art-elt jakb-ag jakb-turret-get-off-ja 360) +(def-art-elt jakb-ag jakb-gun-yellow-highlow-ja 247) +(def-art-elt jakb-ag jakb-gun-attack-from-stance-ja 248) +(def-art-elt jakb-ag jakb-gun-attack-from-stance-end-ja 249) +(def-art-elt jakb-ag jakb-gun-attack-from-stance-blue-ja 250) +(def-art-elt jakb-ag jakb-gun-attack-from-stance-blue-end-ja 251) +(def-art-elt jakb-ag jakb-gun-blue-to-yellow-ja 252) +(def-art-elt jakb-ag jakb-gun-stance-dark-ja 253) +(def-art-elt jakb-ag jakb-gun-stance-yellow-ja 254) +(def-art-elt jakb-ag jakb-gun-stance-blue-ja 255) +(def-art-elt jakb-ag jakb-gun-red-fire-ja 256) +(def-art-elt jakb-ag jakb-gun-blue-fire-ja 257) +(def-art-elt jakb-ag jakb-gun-blue-fire-single-ja 258) +(def-art-elt jakb-ag jakb-gun-dark-fire-ja 259) +(def-art-elt jakb-ag jakb-gun-yellow-fire-ja 260) +(def-art-elt jakb-ag jakb-gun-walk-side-ja 261) +(def-art-elt jakb-ag jakb-gun-run-blue-ja 262) +(def-art-elt jakb-ag jakb-gun-red-takeout-ja 263) +(def-art-elt jakb-ag jakb-board-stance-ja 151) +(def-art-elt jakb-ag jakb-gun-dark-takeout-ja 264) +(def-art-elt jakb-ag jakb-gun-yellow-takeout-ja 265) +(def-art-elt jakb-ag jakb-gun-blue-takeout-ja 266) +(def-art-elt jakb-ag jakb-gun-attack-upperbutt-ja 267) +(def-art-elt jakb-ag jakb-gun-side-to-front-hop-ja 268) +(def-art-elt jakb-ag jakb-gun-transformation-twirl-ja 269) +(def-art-elt jakb-ag jakb-gun-front-to-side-hop-ja 270) +(def-art-elt jakb-ag jakb-gun-front-to-blue-hop-ja 271) +(def-art-elt jakb-ag jakb-board-flip-forward-ja 159) +(def-art-elt jakb-ag jakb-gun-blue-to-front-hop-ja 272) +(def-art-elt jakb-ag jakb-gun-attack-butt-ja 273) +(def-art-elt jakb-ag jakb-board-turn-ja 153) +(def-art-elt jakb-ag jakb-gun-attack-butt-end-ja 274) +(def-art-elt jakb-ag jakb-gun-attack-butt-blue-ja 275) +(def-art-elt jakb-ag jakb-gun-attack-butt-blue-end-ja 276) +(def-art-elt jakb-ag jakb-gun-jump-land-ja 277) +(def-art-elt jakb-ag jakb-gun-jump-land-side-ja 278) +(def-art-elt jakb-ag jakb-gun-attack-upperbutt-blue-ja 279) +(def-art-elt jakb-ag jakb-pilot-gun-dark-takeout-ja 231) +(def-art-elt jakb-ag jakb-gun-edge-grab-off-ja 280) +(def-art-elt jakb-ag jakb-gun-edge-grab-to-jump-ja 281) +(def-art-elt jakb-ag jakb-pilot-gun-red-dark-ja 225) +(def-art-elt jakb-ag jakb-gun-duck-roll-ja 282) +(def-art-elt jakb-ag jakb-gun-duck-roll-end-ja 283) +(def-art-elt jakb-ag jakb-board-jump-ja 155) +(def-art-elt jakb-ag jakb-gun-roll-flip-ja 284) +(def-art-elt jakb-ag jakb-gun-roll-flip-land-ja 285) +(def-art-elt jakb-ag jakb-pilot-gun-yellow-takeout-ja 229) +(def-art-elt jakb-ag jakb-gun-flop-down-ja 286) +(def-art-elt jakb-ag jakb-gun-flop-down-loop-ja 287) +(def-art-elt jakb-ag jakb-board-kickflip-a-ja 175) +(def-art-elt jakb-ag jakb-gun-flop-down-land-ja 288) +(def-art-elt jakb-ag jakb-gun-hit-from-front-ja 289) +(def-art-elt jakb-ag jakb-board-ride-turn-left-ja 169) +(def-art-elt jakb-ag jakb-gun-hit-from-back-ja 290) +(def-art-elt jakb-ag jakb-gun-red-fire-to-sideways-ja 291) +(def-art-elt jakb-ag jakb-board-turn-up-ja 163) +(def-art-elt jakb-ag jakb-gun-red-fire-from-sideways-ja 292) +(def-art-elt jakb-ag jakb-gun-dark-fire-twirl-ja 293) +(def-art-elt jakb-ag jakb-board-nosegrab-ja 173) +(def-art-elt jakb-ag jakb-gun-stance-red-sideways-ja 294) +(def-art-elt jakb-ag jakb-gun-red-from-sideways-ja 295) +(def-art-elt jakb-ag jakb-board-method-loop-ja 183) +(def-art-elt jakb-ag jakb-gun-yellow-fire-twirl-ja 296) +(def-art-elt jakb-ag jakb-gun-hit-elec-ja 297) +(def-art-elt jakb-ag jakb-board-air-turn-ja 177) +(def-art-elt jakb-ag jakb-gun-front-walk-ja 298) +(def-art-elt jakb-ag jakb-gun-front-run-ja 299) +(def-art-elt jakb-ag jakb-board-get-off-ja 171) +(def-art-elt jakb-ag jakb-gun-front-jump-ja 300) +(def-art-elt jakb-ag jakb-gun-front-jump-land-ja 301) +(def-art-elt jakb-ag jakb-board-flip-forward-loop-ja 181) +(def-art-elt jakb-ag jakb-gun-duck-walk-ja 302) +(def-art-elt jakb-ag jakb-gun-walk-blue-ja 303) +(def-art-elt jakb-ag jakb-board-get-off-pre-ja 191) +(def-art-elt jakb-ag jakb-gun-side-jump-ja 304) +(def-art-elt jakb-ag jakb-gun-side-jump-land-ja 305) +(def-art-elt jakb-ag jakb-gun-red-fire-fast-ja 309) +(def-art-elt jakb-ag jakb-board-duck-turn-ja 152) +(def-art-elt jakb-ag jakb-board-jump-kick-ja 154) +(def-art-elt jakb-ag jakb-board-jump-loop-ja 156) +(def-art-elt jakb-ag jakb-board-hit-ja 158) +(def-art-elt jakb-ag jakb-board-turn-left-ja 161) +(def-art-elt jakb-ag jakb-board-turn-right-ja 162) +(def-art-elt jakb-ag jakb-board-turn-down-ja 164) +(def-art-elt jakb-ag jakb-board-hit-forward-ja 165) +(def-art-elt jakb-ag jakb-board-ride-turn-back-ja 166) +(def-art-elt jakb-ag jakb-board-ride-turn-front-ja 167) +(def-art-elt jakb-ag jakb-board-ride-turn-right-ja 168) +(def-art-elt jakb-ag jakb-board-get-on-ja 170) +(def-art-elt jakb-ag jakb-board-grenade-ja 172) +(def-art-elt jakb-ag jakb-board-method-ja 174) +(def-art-elt jakb-ag jakb-board-spin-ja 176) +(def-art-elt jakb-ag jakb-board-flip-backward-ja 178) +(def-art-elt jakb-ag jakb-board-flip-backward-loop-ja 182) +(def-art-elt jakb-ag jakb-board-method-end-ja 184) +(def-art-elt jakb-ag jakb-board-nosegrab-loop-ja 185) +(def-art-elt jakb-ag jakb-board-nosegrab-end-ja 186) +(def-art-elt jakb-ag jakb-board-noseflip-ja 187) +(def-art-elt jakb-ag jakb-board-jump-kickoff-ja 188) +(def-art-elt jakb-ag jakb-board-hit-elec-ja 189) +(def-art-elt jakb-ag jakb-board-get-on-land-ja 190) +(def-art-elt jakb-ag jakb-board-kickflip-b-ja 192) +(def-art-elt jakb-ag jakb-board-kickflip-c-ja 193) +(def-art-elt jakb-ag jakb-board-hit-get-off-ja 194) +(def-art-elt jakb-ag jakb-darkjak-walk-ja 392) +(def-art-elt jakb-ag jakb-darkjak-jump-ja 394) +(def-art-elt jakb-ag jakb-darkjak-stance-ja 396) +(def-art-elt jakb-ag jakb-darkjak-attack-spin-end-ja 400) +(def-art-elt jakb-ag jakb-darkjak-attack-combo1-ja 402) +(def-art-elt jakb-ag jakb-darkjak-attack-combo2-ja 404) +(def-art-elt jakb-ag jakb-darkjak-attack-combo3-ja 406) +(def-art-elt jakb-ag jakb-darkjak-get-off-ja 408) +(def-art-elt jakb-ag jakb-darkjak-attack-combo1b-end-ja 410) +(def-art-elt jakb-ag jakb-darkjak-get-on-fast-ja 412) +(def-art-elt jakb-ag jakb-darkjak-attack-combo3c-end-ja 414) +(def-art-elt jakb-ag jakb-darkjak-bomb-ja 416) +(def-art-elt jakb-ag jakb-darkjak-bomb-loop-ja 417) +(def-art-elt jakb-ag jakb-darkjak-bomb-land-ja 418) +(def-art-elt jakb-ag jakb-darkjak-attack-ice-loop-ja 419) +(def-art-elt jakb-ag jakb-darkjak-attack-ice-loop2-ja 420) +(def-art-elt jakb-ag jakb-darkjak-attack-ice-end-ja 421) +(def-art-elt jakb-ag jakb-death-swim-ja 89) +(def-art-elt jakb-ag jakb-death-swim-loop-ja 90) +(def-art-elt jakb-ag jakb-death-swim-end-ja 91) +(def-art-elt jakb-ag jakb-wade-shallow-walk-ja 94) +(def-art-elt jakb-ag jakb-wade-deep-walk-ja 95) +(def-art-elt jakb-ag jakb-swim-stance-ja 96) +(def-art-elt jakb-ag jakb-swim-walk-ja 97) +(def-art-elt jakb-ag jakb-swim-walk-to-down-ja 98) +(def-art-elt jakb-ag jakb-swim-down-ja 99) +(def-art-elt jakb-ag jakb-swim-down-to-up-ja 100) +(def-art-elt jakb-ag jakb-swim-up-ja 101) +(def-art-elt jakb-ag jakb-swim-up-to-stance-ja 102) +(def-art-elt jakb-ag jakb-swim-jump-ja 103) +(def-art-elt jakb-ag jakb-mech-stance-ja 324) +(def-art-elt jakb-ag jakb-board-attack-pegasus-ja 195) +(def-art-elt jakb-ag jakb-tube-turn-ja 111) +(def-art-elt jakb-ag jakb-tube-jump-land-ja 112) +(def-art-elt jakb-ag jakb-pole-cycle-ja 104) +(def-art-elt jakb-ag jakb-pole-flip-up-ja 105) +(def-art-elt jakb-ag jakb-pole-flip-forward-ja 106) +(def-art-elt jakb-ag jakb-pole-jump-loop-ja 107) +(def-art-elt jakb-ag jakb-turret-stance-ja 359) +(def-art-elt jakb-ag jakb-turret-get-on-ja 361) +(def-art-elt jakb-ag jakb-mech-run-ja 325) +(def-art-elt jakb-ag jakb-pilot-car-smack-back-ja 205) +(def-art-elt jakb-ag jakb-mech-walk-ja 326) +(def-art-elt jakb-ag jakb-mech-turn90-ja 327) +(def-art-elt jakb-ag jakb-pilot-bike-smack-shock-ja 215) +(def-art-elt jakb-ag jakb-mech-jump-ja 328) +(def-art-elt jakb-ag jakb-mech-jump-thrust-ja 329) +(def-art-elt jakb-ag jakb-pilot-bike-turn-front-ja 209) +(def-art-elt jakb-ag jakb-mech-jump-loop-ja 330) +(def-art-elt jakb-ag jakb-mech-jump-land-ja 331) +(def-art-elt jakb-ag jakb-pilot-car-turn-back-ja 203) +(def-art-elt jakb-ag jakb-mech-turn20-ja 332) +(def-art-elt jakb-ag jakb-mech-punch-l-ja 333) +(def-art-elt jakb-ag jakb-pilot-car-up-down-ja 213) +(def-art-elt jakb-ag jakb-mech-punch-r-ja 334) +(def-art-elt jakb-ag jakb-mech-punch-b-ja 335) +(def-art-elt jakb-ag jakb-pilot-gun-yellow-fire-ja 223) +(def-art-elt jakb-ag jakb-mech-carry-pickup-low-ja 336) +(def-art-elt jakb-ag jakb-mech-carry-pickup-high-ja 337) +(def-art-elt jakb-ag jakb-pilot-eject-loop-ja 217) +(def-art-elt jakb-ag jakb-mech-carry-stance-ja 338) +(def-art-elt jakb-ag jakb-mech-carry-walk-ja 339) +(def-art-elt jakb-ag jakb-pilot-bike-smack-front-ja 211) +(def-art-elt jakb-ag jakb-mech-carry-jump-ja 340) +(def-art-elt jakb-ag jakb-mech-carry-jump-loop-ja 341) +(def-art-elt jakb-ag jakb-pilot-gun-blue-idle-ja 221) +(def-art-elt jakb-ag jakb-mech-carry-jump-land-ja 342) +(def-art-elt jakb-ag jakb-mech-carry-throw-ja 343) +(def-art-elt jakb-ag jakb-mech-carry-turn45-ja 344) +(def-art-elt jakb-ag jakb-mech-push-ja 345) +(def-art-elt jakb-ag jakb-mech-pull-ja 346) +(def-art-elt jakb-ag jakb-mech-drag-pickup-ja 347) +(def-art-elt jakb-ag jakb-pilot-gun-dark-idle-ja 219) +(def-art-elt jakb-ag jakb-mech-hit-front-ja 348) +(def-art-elt jakb-ag jakb-mech-get-off-ja 349) +(def-art-elt jakb-ag jakb-mech-get-on-ja 350) +(def-art-elt jakb-ag jakb-mech-death-a-ja 351) +(def-art-elt jakb-ag jakb-mech-death-b-ja 352) +(def-art-elt jakb-ag jakb-mech-punch-u-ja 353) +(def-art-elt jakb-ag jakb-pilot-gun-red-takeout-ja 198) +(def-art-elt jakb-ag jakb-pilot-car-get-off-ja 199) +(def-art-elt jakb-ag jakb-pilot-car-get-on-ja 200) +(def-art-elt jakb-ag jakb-pilot-bike-get-on-ja 201) +(def-art-elt jakb-ag jakb-pilot-car-turn-front-ja 202) +(def-art-elt jakb-ag jakb-pilot-car-smack-front-ja 204) +(def-art-elt jakb-ag jakb-pilot-gun-blue-fire-ja 206) +(def-art-elt jakb-ag jakb-pilot-gun-blue-fire-single-ja 207) +(def-art-elt jakb-ag jakb-pilot-car-smack-shock-ja 208) +(def-art-elt jakb-ag jakb-pilot-bike-turn-back-ja 210) +(def-art-elt jakb-ag jakb-pilot-bike-smack-back-ja 212) +(def-art-elt jakb-ag jakb-pilot-bike-up-down-ja 214) +(def-art-elt jakb-ag jakb-pilot-bike-get-off-ja 216) +(def-art-elt jakb-ag jakb-pilot-gun-red-idle-ja 218) +(def-art-elt jakb-ag jakb-pilot-gun-yellow-idle-ja 220) +(def-art-elt jakb-ag jakb-pilot-gun-red-fire-ja 222) +(def-art-elt jakb-ag jakb-pilot-gun-dark-fire-ja 224) +(def-art-elt jakb-ag jakb-pilot-gun-red-yellow-ja 226) +(def-art-elt jakb-ag jakb-pilot-gun-red-blue-ja 227) +(def-art-elt jakb-ag jakb-pilot-gun-yellow-blue-ja 228) +(def-art-elt jakb-ag jakb-pilot-gun-blue-takeout-ja 230) +(def-art-elt jakb-ag jakb-pilot-bike-smack-left-ja 232) +(def-art-elt jakb-ag jakb-pilot-bike-smack-right-ja 233) +(def-art-elt jakb-ag jakb-pilot-car-smack-left-ja 234) +(def-art-elt jakb-ag jakb-pilot-car-smack-right-ja 235) +(def-art-elt jakb-ag jakb-darkjak-get-on-ja 390) (def-art-elt jakone-highres-ag jakone-highres-lod0-jg 0) (def-art-elt jakone-highres-ag jakone-highres-lod0-mg 1) (def-art-elt jakone-highres-ag jakone-highres-idle-ja 2) @@ -2713,16 +2610,17 @@ (def-art-elt keira-ag keira-idle-transition-left-to-right-ja 8) (def-art-elt keira-ag keira-idle-wiping-brow-ja 9) (def-art-elt keira-ag keira-stad-sit-ja 10) -(def-art-elt keira-anim+0-ag keira-highres-idle-anim-ja 0) -(def-art-elt keira-garage+0-ag keira-highres-idle-garage-ja 0) (def-art-elt keira-highres-ag keira-highres-lod0-jg 0) (def-art-elt keira-highres-ag keira-highres-lod0-mg 1) (def-art-elt keira-highres-ag keira-highres-shadow-mg 2) (def-art-elt keira-highres-ag keira-highres-idle-ja 3) +(def-art-elt keira-highres-ag keira-highres-idle-anim-ja 4) +(def-art-elt keira-highres-ag keira-highres-idle-garage-ja 5) +(def-art-elt kid-ag kid-idle0-ja 3) +(def-art-elt kid-ag kid-idle-floating-ja 19) (def-art-elt kid-ag kid-lod0-jg 0) (def-art-elt kid-ag kid-lod0-mg 1) (def-art-elt kid-ag kid-shadow-mg 2) -(def-art-elt kid-ag kid-idle0-ja 3) (def-art-elt kid-ag kid-scared0-ja 4) (def-art-elt kid-ag kid-walk0-ja 5) (def-art-elt kid-ag kid-run0-ja 6) @@ -2755,15 +2653,12 @@ (def-art-elt kid-highres-ag kid-highres-lod0-mg 1) (def-art-elt kid-highres-ag kid-highres-shadow-mg 2) (def-art-elt kid-highres-ag kid-highres-idle-ja 3) -(def-art-elt kid-ltrnkrkd+0-ag kid-highres-idle-shuttle-ugrnd-ja 0) -(def-art-elt kid-ltrnkrkd+0-ag kor-highres-idle-shuttle-ugrnd-ja 1) -(def-art-elt kid-lyskdcd+0-ag kid-highres-idle-alley-ja 0) +(def-art-elt kid-highres-ag kid-highres-idle-shuttle-ugrnd-ja 6) +(def-art-elt kid-highres-ag kid-highres-idle-alley-ja 5) +(def-art-elt kid-highres-ag kid-highres-idle-tomb-ja 4) (def-art-elt kid-medallion-ag kid-medallion-lod0-jg 0) (def-art-elt kid-medallion-ag kid-medallion-lod0-mg 1) (def-art-elt kid-medallion-ag kid-medallion-idle-ja 2) -(def-art-elt kid-nestb+0-ag kid-idle-floating-ja 0) -(def-art-elt kid-tombd+0-ag crocadog-highres-idle-vinroom-ja 0) -(def-art-elt kid-tombd+0-ag kid-highres-idle-tomb-ja 1) (def-art-elt kiosk-banner-ag kiosk-banner-lod0-jg 0) (def-art-elt kiosk-banner-ag kiosk-banner-lod0-mg 1) (def-art-elt kiosk-banner-ag kiosk-banner-idle-ja 2) @@ -2800,8 +2695,9 @@ (def-art-elt kor-highres-ag kor-highres-shadow-mg 2) (def-art-elt kor-highres-ag kor-highres-idle-ja 3) (def-art-elt kor-highres-ag kor-highres-idle-stand-ja 4) -(def-art-elt kor-transform-ag kor-transform-lod0-jg 0) +(def-art-elt kor-highres-ag kor-highres-idle-shuttle-ugrnd-ja 5) (def-art-elt kor-transform-ag kor-transform-monsterparts-idle-ja 8) +(def-art-elt kor-transform-ag kor-transform-lod0-jg 0) (def-art-elt kor-transform-ag kor-transform-lod0-mg 1) (def-art-elt kor-transform-ag kor-transform-shadow-mg 2) (def-art-elt kor-transform-ag kor-transform-idle-ja 3) @@ -2951,6 +2847,36 @@ (def-art-elt mech-ag mech-explode-lod0-jg 39) (def-art-elt mech-ag mech-target-lod0-mg 43) (def-art-elt mech-ag mech-target-idle-ja 44) +(def-art-elt mech-ag mech-mech-stance-ja 4) +(def-art-elt mech-ag mech-mech-run-ja 5) +(def-art-elt mech-ag mech-mech-walk-ja 6) +(def-art-elt mech-ag mech-mech-turn90-ja 7) +(def-art-elt mech-ag mech-mech-jump-ja 8) +(def-art-elt mech-ag mech-mech-jump-thrust-ja 9) +(def-art-elt mech-ag mech-mech-jump-loop-ja 10) +(def-art-elt mech-ag mech-mech-jump-land-ja 11) +(def-art-elt mech-ag mech-mech-turn20-ja 12) +(def-art-elt mech-ag mech-mech-punch-l-ja 13) +(def-art-elt mech-ag mech-mech-punch-r-ja 14) +(def-art-elt mech-ag mech-mech-punch-b-ja 15) +(def-art-elt mech-ag mech-mech-carry-pickup-low-ja 16) +(def-art-elt mech-ag mech-mech-carry-pickup-high-ja 17) +(def-art-elt mech-ag mech-mech-carry-stance-ja 18) +(def-art-elt mech-ag mech-mech-carry-walk-ja 19) +(def-art-elt mech-ag mech-mech-carry-jump-ja 20) +(def-art-elt mech-ag mech-mech-carry-jump-loop-ja 21) +(def-art-elt mech-ag mech-mech-carry-jump-land-ja 22) +(def-art-elt mech-ag mech-mech-carry-throw-ja 23) +(def-art-elt mech-ag mech-mech-carry-turn45-ja 24) +(def-art-elt mech-ag mech-mech-push-ja 25) +(def-art-elt mech-ag mech-mech-pull-ja 26) +(def-art-elt mech-ag mech-mech-drag-pickup-ja 27) +(def-art-elt mech-ag mech-mech-hit-front-ja 28) +(def-art-elt mech-ag mech-mech-get-off-ja 29) +(def-art-elt mech-ag mech-mech-get-on-ja 30) +(def-art-elt mech-ag mech-mech-death-a-ja 31) +(def-art-elt mech-ag mech-mech-death-b-ja 32) +(def-art-elt mech-ag mech-mech-punch-u-ja 33) (def-art-elt mecha-daxter-ag mecha-daxter-lod0-jg 0) (def-art-elt mecha-daxter-ag mecha-daxter-lod0-mg 1) (def-art-elt mecha-daxter-ag mecha-daxter-idle-ja 2) @@ -3182,8 +3108,8 @@ (def-art-elt mincan-lens-ag mincan-lens-lod0-mg 1) (def-art-elt mincan-lens-ag mincan-lens-idle-ja 2) (def-art-elt mincan-lens-ag mincan-lens-idle-closed-ja 3) -(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lod0-jg 0) (def-art-elt mincan-lighthouse-ag mincan-lighthouse-lens-idle-erect-ja 8) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lod0-jg 0) (def-art-elt mincan-lighthouse-ag mincan-lighthouse-lod0-mg 1) (def-art-elt mincan-lighthouse-ag mincan-lighthouse-idle-ja 2) (def-art-elt mincan-lighthouse-ag mincan-lighthouse-idle-erect-ja 3) @@ -3350,14 +3276,13 @@ (def-art-elt onin-brain-ag onin-brain-lod0-jg 0) (def-art-elt onin-brain-ag onin-brain-lod0-mg 1) (def-art-elt onin-brain-ag onin-brain-idle-ja 2) -(def-art-elt onin-game+0-ag onin-highres-idle-game-ja 0) -(def-art-elt onin-game+0-ag pecker-highres-idle-game-ja 1) (def-art-elt onin-highres-ag onin-highres-lod0-jg 0) (def-art-elt onin-highres-ag onin-highres-lod0-mg 1) (def-art-elt onin-highres-ag onin-highres-shadow-mg 2) (def-art-elt onin-highres-ag onin-highres-idle-ja 3) (def-art-elt onin-highres-ag onin-highres-idle-sleep-ja 4) (def-art-elt onin-highres-ag onin-highres-idle-wakeup-ja 5) +(def-art-elt onin-highres-ag onin-highres-idle-game-ja 6) (def-art-elt oracle-door-ag oracle-door-lod0-jg 0) (def-art-elt oracle-door-ag oracle-door-lod0-mg 1) (def-art-elt oracle-door-ag oracle-door-idle-ja 2) @@ -3461,6 +3386,7 @@ (def-art-elt pecker-highres-ag pecker-highres-idle-ja 3) (def-art-elt pecker-highres-ag pecker-highres-idle-sleep-ja 4) (def-art-elt pecker-highres-ag pecker-highres-idle-wakeup-ja 5) +(def-art-elt pecker-highres-ag pecker-highres-idle-game-ja 6) (def-art-elt pegasus-ag pegasus-lod0-jg 0) (def-art-elt pegasus-ag pegasus-lod0-mg 1) (def-art-elt pegasus-ag pegasus-lod1-mg 2) @@ -3643,8 +3569,8 @@ (def-art-elt rhino-ag rhino-victory-hit-ja 23) (def-art-elt rhino-ag rhino-victory-hit2-ja 24) (def-art-elt rhino-wall-ag rhino-wall-1-lod0-jg 0) -(def-art-elt rhino-wall-ag rhino-wall-1-lod0-mg 1) (def-art-elt rhino-wall-ag rhino-wall-2-end-ja 9) +(def-art-elt rhino-wall-ag rhino-wall-1-lod0-mg 1) (def-art-elt rhino-wall-ag rhino-wall-1-idle-ja 2) (def-art-elt rhino-wall-ag rhino-wall-1-end-ja 4) (def-art-elt rhino-wall-ag rhino-wall-2-lod0-jg 5) @@ -3664,14 +3590,13 @@ (def-art-elt rift-rider-bar-ag rift-rider-bar-lod0-jg 0) (def-art-elt rift-rider-bar-ag rift-rider-bar-lod0-mg 1) (def-art-elt rift-rider-bar-ag rift-rider-bar-idle-ja 2) -(def-art-elt rift-rider-break-ag rift-rider-break-lod0-jg 0) (def-art-elt rift-rider-break-ag rift-rider-break-a-lod0-mg 8) +(def-art-elt rift-rider-break-ag rift-rider-break-lod0-jg 0) (def-art-elt rift-rider-break-ag rift-rider-break-lod0-mg 1) -(def-art-elt rift-rider-break-ag rift-rider-break-a-idle-ja 9) +(def-art-elt rift-rider-break-ag rift-rider-break-a-end-ja 10) (def-art-elt rift-rider-break-ag rift-rider-break-idle-ja 2) (def-art-elt rift-rider-break-ag rift-rider-break-end-ja 4) (def-art-elt rift-rider-break-ag rift-rider-break-a-lod0-jg 7) -(def-art-elt rift-rider-break-ag rift-rider-break-a-end-ja 11) (def-art-elt rift-rider-break-b-ag rift-rider-break-b-lod0-jg 0) (def-art-elt rift-rider-break-b-ag rift-rider-break-b-lod0-mg 1) (def-art-elt rift-rider-break-b-ag rift-rider-break-b-idle-ja 2) @@ -3792,10 +3717,10 @@ (def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-2-end-ja 28) (def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-3-idle-ja 30) (def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-3-end-ja 31) -(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-lod0-jg 0) (def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-3-idle-ja 8) -(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-lod0-mg 1) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-lod0-jg 0) (def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-3-end-ja 9) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-lod0-mg 1) (def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-1-idle-ja 2) (def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-1-end-ja 3) (def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-2-idle-ja 5) @@ -3830,20 +3755,20 @@ (def-art-elt samos-ag samos-shadow-mg 3) (def-art-elt samos-ag samos-idle-ja 4) (def-art-elt samos-ag samos-idle-bots-ja 5) -(def-art-elt samos-ag samos-stand0-ja 6) -(def-art-elt samos-ag samos-raise-ship-ja 7) -(def-art-elt samos-ag samos-walk0-ja 8) -(def-art-elt samos-ag samos-knocked-forward-ja 9) -(def-art-elt samos-ag samos-knocked-forward-land-ja 10) -(def-art-elt samos-ag samos-knocked-back-ja 11) -(def-art-elt samos-ag samos-knocked-back-land-ja 12) -(def-art-elt samos-ag samos-death0-ja 13) -(def-art-elt samos-ag samos-death0-end-ja 14) +(def-art-elt samos-ag samos-raise-ship-ja 6) +(def-art-elt samos-ag samos-walk0-ja 7) +(def-art-elt samos-ag samos-knocked-forward-ja 8) +(def-art-elt samos-ag samos-knocked-forward-land-ja 9) +(def-art-elt samos-ag samos-knocked-back-ja 10) +(def-art-elt samos-ag samos-knocked-back-land-ja 11) +(def-art-elt samos-ag samos-death0-ja 12) +(def-art-elt samos-ag samos-death0-end-ja 13) (def-art-elt samos-highres-ag samos-highres-lod0-jg 0) (def-art-elt samos-highres-ag samos-highres-lod0-mg 1) (def-art-elt samos-highres-ag samos-highres-shadow-mg 2) (def-art-elt samos-highres-ag samos-highres-idle-ja 3) -(def-art-elt samos-lsamergd+0-ag samos-highres-idle-garage-ja 0) +(def-art-elt samos-highres-ag samos-highres-idle-garage-ja 5) +(def-art-elt samos-highres-ag samos-highres-idle-bots-ja 4) (def-art-elt scenecamera-ag scenecamera-lod0-jg 0) (def-art-elt scenecamera-ag scenecamera-lod0-mg 1) (def-art-elt scenecamera-ag scenecamera-idle-ja 2) @@ -4079,13 +4004,50 @@ (def-art-elt spydroid-ag spydroid-exploding-lod0-jg 18) (def-art-elt spydroid-ag spydroid-exploding-lod0-mg 19) (def-art-elt spydroid-ag spydroid-exploding-idle-ja 20) -(def-art-elt squid-ag squid-lod0-jg 0) +(def-art-elt squid-ag squid-squid-idle-ja 3) +(def-art-elt squid-ag squid-shields-up-ja 4) +(def-art-elt squid-ag squid-shields-idle-ja 5) +(def-art-elt squid-ag squid-shields-down-ja 6) +(def-art-elt squid-ag squid-pods-down-ja 7) +(def-art-elt squid-ag squid-hatch-fore-open-ja 8) +(def-art-elt squid-ag squid-hatch-fore-launch-ja 9) +(def-art-elt squid-ag squid-hatch-fore-close-ja 10) +(def-art-elt squid-ag squid-hatch-aft-open-ja 11) +(def-art-elt squid-ag squid-hatch-aft-launch-ja 12) +(def-art-elt squid-ag squid-hatch-aft-close-ja 13) +(def-art-elt squid-ag squid-breathe-between-grenades-ja 14) +(def-art-elt squid-ag squid-pods-up-ja 15) +(def-art-elt squid-ag squid-fire-guns-start-ja 16) +(def-art-elt squid-ag squid-fire-guns-loop-ja 17) +(def-art-elt squid-ag squid-fire-guns-end-ja 18) +(def-art-elt squid-ag squid-fire-guns-release-ja 19) +(def-art-elt squid-ag squid-fire-guns-breathe-ja 20) +(def-art-elt squid-ag squid-fly-left-start-ja 21) +(def-art-elt squid-ag squid-fly-left-idle-ja 22) +(def-art-elt squid-ag squid-fly-left-end-ja 23) +(def-art-elt squid-ag squid-fly-right-start-ja 24) +(def-art-elt squid-ag squid-fly-right-idle-ja 25) +(def-art-elt squid-ag squid-fly-right-end-ja 26) +(def-art-elt squid-ag squid-fly-foreward-start-ja 27) +(def-art-elt squid-ag squid-fly-foreward-idle-ja 28) +(def-art-elt squid-ag squid-fly-foreward-end-ja 29) +(def-art-elt squid-ag squid-fly-backward-start-ja 30) +(def-art-elt squid-ag squid-fly-backward-idle-ja 31) +(def-art-elt squid-ag squid-fly-backward-end-ja 32) +(def-art-elt squid-ag squid-recharge-landing-ja 33) +(def-art-elt squid-ag squid-recharge-liftoff-ja 34) +(def-art-elt squid-ag squid-recharge-ja 35) +(def-art-elt squid-ag squid-damaged-ja 36) +(def-art-elt squid-ag squid-dummy17-ja 37) +(def-art-elt squid-ag squid-dummy18-ja 38) +(def-art-elt squid-ag squid-dummy19-ja 39) +(def-art-elt squid-ag squid-dummy20-ja 40) +(def-art-elt squid-ag squid-driver-squid-idle-ja 55) (def-art-elt squid-ag squid-firepool-dissipate-ja 64) +(def-art-elt squid-ag squid-lod0-jg 0) (def-art-elt squid-ag squid-lod0-mg 1) -(def-art-elt squid-ag squid-tentacle-shield-lod0-jg 65) -(def-art-elt squid-ag squid-tentacle-lod0-jg 42) (def-art-elt squid-ag squid-shadow-mg 2) -(def-art-elt squid-ag squid-tentacle-shield-lod0-mg 66) +(def-art-elt squid-ag squid-tentacle-lod0-jg 42) (def-art-elt squid-ag squid-tentacle-lod0-mg 43) (def-art-elt squid-ag squid-tentacle-shadow-mg 44) (def-art-elt squid-ag squid-tentacle-idle-ja 45) @@ -4106,6 +4068,8 @@ (def-art-elt squid-ag squid-firepool-lod0-mg 61) (def-art-elt squid-ag squid-firepool-idle-ja 62) (def-art-elt squid-ag squid-firepool-form-ja 63) +(def-art-elt squid-ag squid-tentacle-shield-lod0-jg 65) +(def-art-elt squid-ag squid-tentacle-shield-lod0-mg 66) (def-art-elt squid-ag squid-tentacle-shield-idle-ja 67) (def-art-elt squid-ag squid-squid-shield-lod0-jg 68) (def-art-elt squid-ag squid-squid-shield-lod0-mg 69) @@ -4200,13 +4164,13 @@ (def-art-elt tanker-roof-break-ag tanker-roof-break-lod0-jg 0) (def-art-elt tanker-roof-break-ag tanker-roof-break-lod0-mg 1) (def-art-elt tanker-roof-break-ag tanker-roof-break-idle-ja 2) +(def-art-elt tess-highres-ag tess-highres-idle-hiphog-ja 6) (def-art-elt tess-highres-ag tess-highres-lod0-jg 0) (def-art-elt tess-highres-ag tess-highres-lod0-mg 1) (def-art-elt tess-highres-ag tess-highres-shadow-mg 2) (def-art-elt tess-highres-ag tess-highres-idle-ja 3) -(def-art-elt tess-lhiphog+0-ag tess-highres-idle-hiphog-ja 0) -(def-art-elt tess-ltrntess+0-ag tess-highres-idle-alley-ja 0) -(def-art-elt tess-lwhack+0-ag tess-highres-idle-whack-ja 0) +(def-art-elt tess-highres-ag tess-highres-idle-alley-ja 4) +(def-art-elt tess-highres-ag tess-highres-idle-whack-ja 5) (def-art-elt throne-throne-ag throne-throne-lod0-jg 0) (def-art-elt throne-throne-ag throne-throne-lod0-mg 1) (def-art-elt throne-throne-ag throne-throne-idle-ja 2) @@ -4712,6 +4676,41 @@ (def-art-elt water-anim-under-ag water-anim-under-fillup-lod0-jg 4) (def-art-elt water-anim-under-ag water-anim-under-fillup-lod0-mg 5) (def-art-elt water-anim-under-ag water-anim-under-idle-ja 6) +(def-art-elt widow-ag widow-grab-success-ja 4) +(def-art-elt widow-ag widow-fly-ja 5) +(def-art-elt widow-ag widow-return-ja 6) +(def-art-elt widow-ag widow-landing-ja 7) +(def-art-elt widow-ag widow-drill-ja 8) +(def-art-elt widow-ag widow-drill-right-high-ja 9) +(def-art-elt widow-ag widow-drill-right-mid-ja 10) +(def-art-elt widow-ag widow-drill-right-low-ja 11) +(def-art-elt widow-ag widow-drill-left-high-ja 12) +(def-art-elt widow-ag widow-drill-left-mid-ja 13) +(def-art-elt widow-ag widow-drill-left-low-ja 14) +(def-art-elt widow-ag widow-fire-start-ja 15) +(def-art-elt widow-ag widow-fire-loop-ja 16) +(def-art-elt widow-ag widow-fire-end-ja 17) +(def-art-elt widow-ag widow-grab-stone-ja 18) +(def-art-elt widow-ag widow-launch-left-ja 19) +(def-art-elt widow-ag widow-grab-fail-ja 20) +(def-art-elt widow-ag widow-grab-punch-ja 21) +(def-art-elt widow-ag widow-launch-right-ja 22) +(def-art-elt widow-ag widow-hit-pod-left-ja 23) +(def-art-elt widow-ag widow-hit-pod-right-ja 24) +(def-art-elt widow-ag widow-hit-front-ja 25) +(def-art-elt widow-ag widow-hit-gun-left-ja 26) +(def-art-elt widow-ag widow-hit-gun-right-ja 27) +(def-art-elt widow-ag widow-grab-pull-loop-ja 28) +(def-art-elt widow-ag widow-grab-yank-loop-ja 29) +(def-art-elt widow-ag widow-grab-tug-loop-ja 30) +(def-art-elt widow-ag widow-grab-footing-loop-ja 31) +(def-art-elt widow-ag widow-grab-launch-left-ja 32) +(def-art-elt widow-ag widow-grab-launch-right-ja 33) +(def-art-elt widow-ag widow-flight-launch-left-ja 34) +(def-art-elt widow-ag widow-flight-launch-right-ja 35) +(def-art-elt widow-ag widow-flight-hit-right-ja 36) +(def-art-elt widow-ag widow-flight-hit-left-ja 37) +(def-art-elt widow-ag widow-flight-hit-final-ja 38) (def-art-elt widow-ag widow-lod0-jg 0) (def-art-elt widow-ag widow-lod0-mg 1) (def-art-elt widow-ag widow-shadow-mg 2) @@ -4745,7 +4744,7 @@ (def-art-elt yellow-barrel-ag yellow-barrel-lod0-jg 0) (def-art-elt yellow-barrel-ag yellow-barrel-lod0-mg 1) (def-art-elt yellow-barrel-ag yellow-barrel-idle-ja 2) -(def-art-elt youngsamos-forestb+0-ag youngsamos-highres-idle-meditate-ja 0) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-stand3-ja 6) (def-art-elt youngsamos-highres-ag youngsamos-highres-lod0-jg 0) (def-art-elt youngsamos-highres-ag youngsamos-highres-lod0-mg 1) (def-art-elt youngsamos-highres-ag youngsamos-highres-stand-to-meditate0-ja 10) @@ -4767,12 +4766,13 @@ (def-art-elt youngsamos-highres-ag youngsamos-highres-death0-end-ja 24) (def-art-elt youngsamos-highres-ag youngsamos-highres-walk0-ja 25) (def-art-elt youngsamos-highres-ag youngsamos-highres-walk1-ja 26) -(def-art-elt youngsamos-ltrnysam+0-ag youngsamos-highres-idle-stand3-ja 0) -(def-art-elt youngsamos-lysamsam+0-ag samos-highres-idle-bots-ja 0) -(def-art-elt youngsamos-lysamsam+0-ag youngsamos-highres-idle-stand2-ja 1) -(def-art-elt youngsamos-lyskdcd+0-ag youngsamos-highres-idle-alley-ja 0) -(def-art-elt youngsamos-onintent+0-ag youngsamos-highres-idle-onintent-ja 0) -(def-art-elt youngsamos-tombd+0-ag youngsamos-highres-idle-tomb-ja 0) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-meditate-ja 4) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-alley-ja 7) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-tomb-ja 8) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-onintent-ja 9) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-stand2-ja 5) (def-art-elt zipline-ag zipline-lod0-jg 0) (def-art-elt zipline-ag zipline-lod0-mg 1) (def-art-elt zipline-ag zipline-idle-ja 2) + + diff --git a/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc b/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc index fca3031c38c..0effc984f2a 100644 --- a/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc +++ b/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc @@ -1470,7 +1470,7 @@ ) ) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Move node" "" "") (nav-graph-editor-method-28 self) @@ -1491,7 +1491,7 @@ ) (nav-graph-editor-method-41 self) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Move plane" "Snap to node" "") (nav-graph-editor-method-28 self) @@ -1513,7 +1513,7 @@ (go-virtual adjust-plane) ) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (format *stdcon* "~0K") (let ((t9-1 format) @@ -1607,7 +1607,7 @@ ) ) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Dest node/pos" "" "Cancel") (nav-graph-editor-method-28 self) @@ -1644,7 +1644,7 @@ (set! (-> self edge-src) -1) (set! (-> self edge-dst) -1) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Create edge" "" "Delete edge") (nav-graph-editor-method-28 self) @@ -1660,7 +1660,7 @@ :exit (behavior () (set! (-> self edge-visibility) -1) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Add node" "Remove Node" "Exit") (nav-graph-editor-method-28 self) @@ -1694,7 +1694,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1718,7 +1718,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1745,7 +1745,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1772,7 +1772,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1839,7 +1839,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (cond ((>= (-> self selected-index) 0) @@ -1890,7 +1890,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Edge visibility" "" "Closest Node/Edge") (nav-graph-editor-method-28 self) @@ -1903,7 +1903,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-41 self) @@ -1994,7 +1994,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Move node" "Delete node/edge" "Create edge(s)") (nav-graph-editor-method-28 self) diff --git a/goal_src/jak2/engine/debug/viewer.gc b/goal_src/jak2/engine/debug/viewer.gc index 82b073c7c4e..040cdb19332 100644 --- a/goal_src/jak2/engine/debug/viewer.gc +++ b/goal_src/jak2/engine/debug/viewer.gc @@ -51,7 +51,7 @@ ) #f ) - :post (the-as (function none :behavior viewer) ja-post) + :post ja-post ) (define viewer-string (new 'global 'string 64 (the-as string #f))) diff --git a/goal_src/jak2/engine/game/game-save.gc b/goal_src/jak2/engine/game/game-save.gc index b3c9e6d67aa..1190b77a912 100644 --- a/goal_src/jak2/engine/game/game-save.gc +++ b/goal_src/jak2/engine/game/game-save.gc @@ -1809,7 +1809,7 @@ auto-save-post (format #t "got buffer #x~X~%" (-> self buffer base)) (go-virtual get-card) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate get-card (auto-save) @@ -1863,7 +1863,7 @@ auto-save-post ) ) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate format-card (auto-save) @@ -1907,7 +1907,7 @@ auto-save-post ) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate unformat-card (auto-save) @@ -1939,7 +1939,7 @@ auto-save-post (label cfg-10) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate create-file (auto-save) @@ -1996,7 +1996,7 @@ auto-save-post ) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate save (auto-save) @@ -2060,7 +2060,7 @@ auto-save-post (label cfg-18) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate restore (auto-save) @@ -2142,7 +2142,7 @@ auto-save-post (sleep-code) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate error (auto-save) @@ -2252,7 +2252,7 @@ auto-save-post ) ) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) (defstate done (auto-save) @@ -2283,7 +2283,7 @@ auto-save-post (send-event (handle->process (-> self notify)) 'notify 'done (mc-status-code ok) gp-0) ) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; WARN: Return type mismatch (pointer process) vs (pointer auto-save). diff --git a/goal_src/jak2/engine/game/idle-control.gc b/goal_src/jak2/engine/game/idle-control.gc index 234b29c230f..70a7dc521cf 100644 --- a/goal_src/jak2/engine/game/idle-control.gc +++ b/goal_src/jak2/engine/game/idle-control.gc @@ -76,18 +76,7 @@ (ja :group! (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim)) :num! min) (return #f) ) - (ja :group! (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim))) - frames - num-frames - ) - -1 - ) - ) - ) - ) + (ja :group! (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim)) :num! (seek!)) (cond ((ja-done? 0) (+! (-> obj counter) 1) @@ -131,6 +120,3 @@ 0 (none) ) - - - diff --git a/goal_src/jak2/engine/game/task/task-arrow.gc b/goal_src/jak2/engine/game/task/task-arrow.gc index ffec2de9194..f2b0335df09 100644 --- a/goal_src/jak2/engine/game/task/task-arrow.gc +++ b/goal_src/jak2/engine/game/task/task-arrow.gc @@ -234,7 +234,7 @@ or collectable items on the ground (jetboard / weapon upgrades / etc)" ) ) ) - :code (the-as (function none :behavior task-arrow) sleep-code) + :code sleep-code :post (behavior () (draw-arrow self) ) diff --git a/goal_src/jak2/engine/load/loader.gc b/goal_src/jak2/engine/load/loader.gc index e4f833699d0..a8442295fb6 100644 --- a/goal_src/jak2/engine/load/loader.gc +++ b/goal_src/jak2/engine/load/loader.gc @@ -995,7 +995,7 @@ (cond (s5-8 (ja-channel-set! 1) - (ja-no-eval :group! s5-8 :num! (seek! (the float (+ (-> s5-8 frames num-frames) -1))) :frame-num 0.0) + (ja-no-eval :group! s5-8 :num! (seek!) :frame-num 0.0) (when (zero? (-> gp-0 part)) (str-play-async (-> gp-0 anim name) (-> gp-0 sid)) (set! (-> *art-control* active-stream) (-> gp-0 anim name)) diff --git a/goal_src/jak2/engine/nav/nav-enemy.gc b/goal_src/jak2/engine/nav/nav-enemy.gc index 629f47131fa..a05642e9027 100644 --- a/goal_src/jak2/engine/nav/nav-enemy.gc +++ b/goal_src/jak2/engine/nav/nav-enemy.gc @@ -1555,7 +1555,7 @@ This commonly includes things such as: (defstate idle (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy idle) enter))) (if t9-0 @@ -1578,7 +1578,7 @@ This commonly includes things such as: (defstate dormant (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy dormant) enter))) (if t9-0 @@ -1600,13 +1600,13 @@ This commonly includes things such as: (defstate dormant-aware (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy dormant) enter) ) (defstate active (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy active) enter))) (if t9-0 @@ -1634,14 +1634,7 @@ This commonly includes things such as: (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1658,14 +1651,7 @@ This commonly includes things such as: 0 (nav-enemy-method-167 self) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1675,14 +1661,7 @@ This commonly includes things such as: ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1702,14 +1681,7 @@ This commonly includes things such as: (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.6)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1727,7 +1699,7 @@ This commonly includes things such as: (defstate notice (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy notice) enter))) (if t9-0 @@ -1769,14 +1741,7 @@ This commonly includes things such as: (gp-0 (new 'stack-no-clear 'vector)) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1795,7 +1760,7 @@ This commonly includes things such as: (defstate hostile (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy hostile) enter))) (if t9-0 @@ -1854,7 +1819,7 @@ This commonly includes things such as: (defstate stop-chase (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((a1-0 (new 'stack-no-clear 'vector))) @@ -1933,7 +1898,7 @@ This commonly includes things such as: (defstate stare (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy stare) enter))) (if t9-0 @@ -2052,10 +2017,7 @@ This commonly includes things such as: (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2069,7 +2031,7 @@ This commonly includes things such as: (defstate taunt (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy stare) enter)) (let ((gp-0 (handle->process (-> self focus handle)))) @@ -2115,14 +2077,7 @@ This commonly includes things such as: ) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info taunt-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info taunt-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2137,7 +2092,7 @@ This commonly includes things such as: (defstate pacing (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (look-at-target! self (enemy-flag lock-focus)) @@ -2245,10 +2200,7 @@ This commonly includes things such as: ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2272,7 +2224,7 @@ This commonly includes things such as: (defstate circling (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (look-at-target! self (enemy-flag lock-focus)) @@ -2355,10 +2307,7 @@ This commonly includes things such as: ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2409,7 +2358,7 @@ This commonly includes things such as: (defstate flee (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy flee) enter))) (if t9-0 @@ -2447,7 +2396,7 @@ This commonly includes things such as: (defstate victory (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy victory) enter))) (if t9-0 @@ -2471,7 +2420,7 @@ This commonly includes things such as: (defstate hit (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy hit) enter))) (if t9-0 @@ -2494,14 +2443,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2562,7 +2504,7 @@ This commonly includes things such as: (defstate die (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy die) enter))) (if t9-0 @@ -2585,7 +2527,7 @@ This commonly includes things such as: (defstate die-falling (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy die-falling) enter))) (if t9-0 @@ -2793,7 +2735,7 @@ This commonly includes things such as: (defstate directed (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag victory)) ((-> (method-of-type nav-enemy idle) enter)) @@ -2821,7 +2763,7 @@ This commonly includes things such as: (defstate debug-control (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :code (behavior () (let ((v1-0 *nav-enemy-debug-control-info*)) (set! (-> v1-0 steering) 0.0) @@ -2829,16 +2771,7 @@ This commonly includes things such as: ) (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/engine/physics/rigid-body-queue.gc b/goal_src/jak2/engine/physics/rigid-body-queue.gc index a83e1fa92d8..d7b31a5b60f 100644 --- a/goal_src/jak2/engine/physics/rigid-body-queue.gc +++ b/goal_src/jak2/engine/physics/rigid-body-queue.gc @@ -236,7 +236,7 @@ (set! (-> self queue count) 0) 0 ) - :code (the-as (function none :behavior rigid-body-queue-manager) sleep-code) + :code sleep-code :post (behavior () (local-vars (a0-3 int) (a0-5 int)) (let* ((v1-1 (-> *perf-stats* data 17)) diff --git a/goal_src/jak2/engine/physics/rigid-body.gc b/goal_src/jak2/engine/physics/rigid-body.gc index 253dba12b59..b4d01db07d0 100644 --- a/goal_src/jak2/engine/physics/rigid-body.gc +++ b/goal_src/jak2/engine/physics/rigid-body.gc @@ -1424,8 +1424,8 @@ This commonly includes things such as: (go-virtual active) ) ) - :code (the-as (function none :behavior rigid-body-object) sleep-code) - :post (the-as (function none :behavior rigid-body-object) ja-post) + :code sleep-code + :post ja-post ) (defstate active (rigid-body-object) @@ -1441,7 +1441,7 @@ This commonly includes things such as: (go-virtual idle) ) ) - :code (the-as (function none :behavior rigid-body-object) sleep-code) + :code sleep-code :post (behavior () (rigid-body-object-method-37 self) ) diff --git a/goal_src/jak2/engine/process-drawable/process-drawable-h.gc b/goal_src/jak2/engine/process-drawable/process-drawable-h.gc index 0f4b4fc6f3b..dd2b7ec4031 100644 --- a/goal_src/jak2/engine/process-drawable/process-drawable-h.gc +++ b/goal_src/jak2/engine/process-drawable/process-drawable-h.gc @@ -25,7 +25,7 @@ ;; NOTE - for base-plat (define-extern rider-post (function none :behavior process-drawable)) ;; NOTE - for fma-sphere -(define-extern sleep-code (function symbol :behavior process-drawable)) +(define-extern sleep-code (function symbol :behavior process)) (define-extern ja-post (function none :behavior process-drawable)) diff --git a/goal_src/jak2/engine/process-drawable/process-drawable.gc b/goal_src/jak2/engine/process-drawable/process-drawable.gc index 2c571d9f938..249316b6adc 100644 --- a/goal_src/jak2/engine/process-drawable/process-drawable.gc +++ b/goal_src/jak2/engine/process-drawable/process-drawable.gc @@ -590,7 +590,7 @@ ) (defstate empty-state (process) - :code (the-as (function none :behavior process) nothing) + :code nothing ) (defstate process-drawable-art-error (process-drawable) @@ -603,8 +603,6 @@ ) ) :code (behavior ((arg0 string)) - ;; og:preserve-this - (format 0 "ART ERROR: ~A for ~A~%" arg0 self) (if (-> self entity) (logior! (-> self entity extra perm status) (entity-perm-status error)) ) @@ -657,7 +655,7 @@ ) (defstate process-drawable-idle (process-drawable) - :code (the-as (function none :behavior process-drawable) sleep-code) + :code sleep-code :post ja-post ) @@ -1710,7 +1708,7 @@ ) ;; WARN: new jak 2 until loop case, check carefully -(defbehavior sleep-code process-drawable () +(defbehavior sleep-code process () (until #f (logior! (-> self mask) (process-mask sleep-code)) (suspend) diff --git a/goal_src/jak2/engine/process-drawable/process-taskable.gc b/goal_src/jak2/engine/process-drawable/process-taskable.gc index 1df061ba38d..a1f7457008d 100644 --- a/goal_src/jak2/engine/process-drawable/process-taskable.gc +++ b/goal_src/jak2/engine/process-drawable/process-taskable.gc @@ -113,7 +113,7 @@ Seen take in - `true-func` which takes no args TODO - seems fishy ) ) ) - :code (the-as (function none :behavior process-taskable) sleep-code) + :code sleep-code ) (defstate idle (process-taskable) diff --git a/goal_src/jak2/engine/process-drawable/simple-focus.gc b/goal_src/jak2/engine/process-drawable/simple-focus.gc index 287ed50db00..14d170b58cf 100644 --- a/goal_src/jak2/engine/process-drawable/simple-focus.gc +++ b/goal_src/jak2/engine/process-drawable/simple-focus.gc @@ -44,7 +44,7 @@ ) ) ) - :code (the-as (function none :behavior simple-focus) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/engine/process-drawable/simple-nav-sphere.gc b/goal_src/jak2/engine/process-drawable/simple-nav-sphere.gc index 415d0a1af60..70814b6641a 100644 --- a/goal_src/jak2/engine/process-drawable/simple-nav-sphere.gc +++ b/goal_src/jak2/engine/process-drawable/simple-nav-sphere.gc @@ -74,7 +74,7 @@ ) ) ) - :code (the-as (function none :behavior simple-nav-sphere) sleep-code) + :code sleep-code ) (defstate active (simple-nav-sphere) @@ -88,7 +88,7 @@ (move-to-point! (-> self root) gp-0) ) ) - :code (the-as (function none :behavior simple-nav-sphere) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/engine/target/board/board-states.gc b/goal_src/jak2/engine/target/board/board-states.gc index b81a5e79e6f..fa0d81d6c3c 100644 --- a/goal_src/jak2/engine/target/board/board-states.gc +++ b/goal_src/jak2/engine/target/board/board-states.gc @@ -665,13 +665,7 @@ (let ((v1-10 (ja-group))) (when (and v1-10 (= v1-10 (-> self draw art-group data 170))) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 190) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 190)) frames num-frames) -1)) - 1.8 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 190) :num! (seek! max 1.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.8)) @@ -1031,10 +1025,7 @@ (case arg2 (('hit) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 158) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 158)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 158) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1446,10 +1437,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 154) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 154)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 154) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1488,10 +1476,7 @@ :exit target-board-exit :trans target-board-jump-trans :code (behavior ((arg0 vector) (arg1 float)) - (ja-no-eval :group! (-> self draw art-group data 188) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 188)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 188) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (jump-hit-ground-stuck?) (< 31.0 (ja-aframe-num 0))) (go target-board-hit-ground) @@ -1619,10 +1604,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 181) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 181)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 181) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1639,10 +1621,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 182) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 182)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 182) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1657,10 +1636,7 @@ ) (cond (gp-0 - (ja-no-eval :group! (-> self draw art-group data 159) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 159)) frames num-frames) -1))) - :frame-num (ja-aframe 15.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 159) :num! (seek!) :frame-num (ja-aframe 15.0 0)) (until (ja-done? 0) (if (jump-hit-ground-stuck?) (go target-board-hit-ground) @@ -1670,10 +1646,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 178) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 178)) frames num-frames) -1))) - :frame-num (ja-aframe 10.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 178) :num! (seek!) :frame-num (ja-aframe 10.0 0)) (until (ja-done? 0) (if (jump-hit-ground-stuck?) (go target-board-hit-ground) @@ -1778,10 +1751,7 @@ (add-to-trick-list (-> self board) (board-tricks board-method) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-method")) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 174) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 174)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 174) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1800,10 +1770,7 @@ (add-to-trick-list (-> self board) (board-tricks board-nosegrab) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-nosegrab")) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 173) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 173)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 173) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1831,13 +1798,7 @@ (cond ((and v1-121 (= v1-121 (-> self draw art-group data 183))) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 184) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 184)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 184) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -1847,13 +1808,7 @@ (and v1-151 (= v1-151 (-> self draw art-group data 185))) ) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 186) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 186)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 186) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -1935,31 +1890,19 @@ (add-to-trick-list (-> self board) (board-tricks board-kickflip) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-kickflip")) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 175) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 175)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 175) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (send-event (ppointer->process (-> self sidekick)) 'matrix #f) - (ja-no-eval :group! (-> self draw art-group data 192) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 192)) frames num-frames) -1)) - 1.05 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 192) :num! (seek! max 1.05) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.05)) ) (send-event (ppointer->process (-> self sidekick)) 'matrix 'board) - (ja-no-eval :group! (-> self draw art-group data 193) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 193)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 193) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1969,13 +1912,7 @@ (add-to-trick-list (-> self board) (board-tricks board-board-spin) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-boardspin")) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 176) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 176)) frames num-frames) -1)) - 0.95 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 176) :num! (seek! max 0.95) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.95)) @@ -2039,13 +1976,7 @@ (and v1-18 (= v1-18 (-> self draw art-group data 183))) ) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 184) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 184)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 184) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -2055,13 +1986,7 @@ (and v1-48 (= v1-48 (-> self draw art-group data 185))) ) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 186) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 186)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 186) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -2614,13 +2539,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 170) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 170)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 170) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (when (logtest? (-> self control status) (collide-status on-surface)) (set! (-> self board turn-anim-duck-vel) 0.0) @@ -2670,10 +2589,7 @@ (set! (-> self neck flex-blend) 0.0) (set! (-> self control unknown-vector37 quad) (-> self control trans quad)) (set! (-> self control unknown-vector39 quad) (-> self control quat quad)) - (ja :group! s4-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja :group! s4-0 :num! (seek!) :frame-num 0.0) (until #f (let* ((s3-0 (handle->process arg0)) (s4-1 (if (type? s3-0 process-focusable) @@ -2845,13 +2761,7 @@ ) ((-> self control unknown-spool-anim00) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 191) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 191)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 191) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/goal_src/jak2/engine/target/board/board-util.gc b/goal_src/jak2/engine/target/board/board-util.gc index 436186ef988..a08b7603559 100644 --- a/goal_src/jak2/engine/target/board/board-util.gc +++ b/goal_src/jak2/engine/target/board/board-util.gc @@ -116,15 +116,10 @@ (ja-channel-push! 1 (seconds 0.1)) (cond (arg0 - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) ) (else - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -183,10 +178,7 @@ :code (behavior () (set! (-> self draw shadow) (-> self shadow-backup)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/engine/target/board/target-board.gc b/goal_src/jak2/engine/target/board/target-board.gc index 88edd4320c1..8951530c194 100644 --- a/goal_src/jak2/engine/target/board/target-board.gc +++ b/goal_src/jak2/engine/target/board/target-board.gc @@ -943,12 +943,12 @@ (defbehavior target-board-falling-anim-trans target () (let ((v1-2 (ja-group))) (cond - ((not (and v1-2 (= v1-2 (-> self draw art-group data 156)))) + ((not (and v1-2 (= v1-2 jakb-board-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.33)) - (ja :group! (-> self draw art-group data 156)) + (ja :group! jakb-board-jump-loop-ja) ) ((let ((v1-11 (ja-group))) - (and v1-11 (= v1-11 (-> self draw art-group data 156))) + (and v1-11 (= v1-11 jakb-board-jump-loop-ja)) ) (ja :num! (loop!)) ) diff --git a/goal_src/jak2/engine/target/gun/gun-dark-shot.gc b/goal_src/jak2/engine/target/gun/gun-dark-shot.gc index 0df9fecabeb..79b2154a138 100644 --- a/goal_src/jak2/engine/target/gun/gun-dark-shot.gc +++ b/goal_src/jak2/engine/target/gun/gun-dark-shot.gc @@ -545,7 +545,7 @@ ) ) ) - :code (the-as (function none :behavior gun-dark-shot) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/engine/target/gun/gun-util.gc b/goal_src/jak2/engine/target/gun/gun-util.gc index b69971c2c91..5be6cf73961 100644 --- a/goal_src/jak2/engine/target/gun/gun-util.gc +++ b/goal_src/jak2/engine/target/gun/gun-util.gc @@ -456,10 +456,7 @@ (ja-channel-set! 1) (set! (-> self read-scale) #f) (until #f - (ja-no-eval :group! (-> self draw art-group data 12) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -533,120 +530,84 @@ (set! (-> self gun-type) (the-as pickup-type a0-5)) (cond ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 2)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 3)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 4)) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-red)) (= a0-5 1)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-red)) (= a0-5 3)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-red)) (= a0-5 4)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 1)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 2)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 4)) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 1)) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 2)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 3)) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) diff --git a/goal_src/jak2/engine/target/mech/grunt-mech.gc b/goal_src/jak2/engine/target/mech/grunt-mech.gc index 27c0c68eab6..bc6595514c6 100644 --- a/goal_src/jak2/engine/target/mech/grunt-mech.gc +++ b/goal_src/jak2/engine/target/mech/grunt-mech.gc @@ -337,7 +337,7 @@ (defstate mech-lunge (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -365,13 +365,7 @@ (let ((gp-0 (new 'stack-no-clear 'matrix))) (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat)) (set! (-> gp-0 vector 1 quad) (-> self root trans quad)) - (ja-no-eval :group! (-> self draw art-group data 48) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 48)) frames num-frames) -1)) - 0.769 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 48) :num! (seek! max 0.769) :frame-num 0.0) (until (ja-done? 0) (let ((s5-0 *grunt-mech-info*)) (grunt-mech-info-method-10 s5-0) @@ -394,7 +388,7 @@ ) (go-virtual mech-hold) ) - :post (the-as (function none :behavior grunt-mech) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defbehavior grunt-mech-hold-post grunt-mech () @@ -542,7 +536,7 @@ (defstate mech-hold (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -565,10 +559,7 @@ ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 49) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 49)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 49) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -659,13 +650,7 @@ ) (when (= (get-rand-int self 4) 3) (ja-channel-push! 1 (seconds 0.13)) - (ja-no-eval :group! (-> self draw art-group data 50) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 50)) frames num-frames) -1)) - 0.090909 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 50) :num! (seek! max 0.090909) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.090909)) @@ -681,7 +666,7 @@ (defstate mech-dismount (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self root root-prim prim-core collide-as) (collide-spec)) @@ -723,10 +708,7 @@ (quaternion-look-at! (the-as quaternion (-> gp-0 vector 2)) (-> gp-0 vector 1) *up-vector*) (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat)) (set! (-> gp-0 vector 1 quad) (-> self root trans quad)) - (ja-no-eval :group! (-> self draw art-group data 54) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 54)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 54) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f30-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 33.0 41.0))) (quaternion-slerp! @@ -754,10 +736,7 @@ ) 0 (logclear! (-> self nav state flags) (nav-state-flag at-target)) - (ja-no-eval :group! (-> self draw art-group data 55) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 55)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 55) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -765,12 +744,12 @@ (ja-channel-push! 1 (seconds 0.13)) (go-virtual mech-post-circling) ) - :post (the-as (function none :behavior grunt-mech) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate mech-post-circling (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type grunt circling) enter)) (set! (-> self state-timeout) (+ (current-time) (get-rand-int-range self 750 1200))) @@ -828,7 +807,7 @@ (defstate mech-pre-circling (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type grunt-mech mech-post-circling) enter)) (set! (-> self state-timeout) (+ (current-time) (get-rand-int-range self 900 1800))) diff --git a/goal_src/jak2/engine/target/mech/mech-states.gc b/goal_src/jak2/engine/target/mech/mech-states.gc index 88f454f9e68..b1509b3663c 100644 --- a/goal_src/jak2/engine/target/mech/mech-states.gc +++ b/goal_src/jak2/engine/target/mech/mech-states.gc @@ -439,11 +439,8 @@ ) (ja-channel-push! 1 (seconds 0.1)) (if (zero? arg0) - (ja-no-eval :group! s5-0 :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-0) frames num-frames) -1)))) - (ja-no-eval :group! s5-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-0) frames num-frames) -1))) - :frame-num (ja-aframe 10.0 0) - ) + (ja-no-eval :group! s5-0 :num! (seek!)) + (ja-no-eval :group! s5-0 :num! (seek!) :frame-num (ja-aframe 10.0 0)) ) ) (-> self mech walk-anim-leg) @@ -1240,10 +1237,7 @@ ) ) ) - (ja-no-eval :group! gp-5 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-5) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-5 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) @@ -1324,10 +1318,7 @@ (set! (-> self alt-cam-pos quad) (-> self control trans quad)) (set! (-> self post-hook) target-no-move-post) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 70) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self control transv quad) (the-as uint128 0)) (vector-seek! @@ -1567,10 +1558,7 @@ (cond (gp-0 (ja-channel-push! 1 (seconds 0.01)) - (ja-no-eval :group! (-> self draw art-group data 347) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 347)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 347) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1723,9 +1711,7 @@ ) ) (ja-channel-push! 2 (seconds 0.1)) - (ja :group! (-> self draw art-group data 337) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 337)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 337) :num! max) (let ((a0-19 (-> self skel root-channel 1))) (set! (-> a0-19 frame-interp 1) f30-0) (set! (-> a0-19 frame-interp 0) f30-0) @@ -2573,10 +2559,7 @@ ) (set! (-> self mech mech-scale quad) (-> self control scale quad)) (set! (-> self mech stick-off) (the-as basic #t)) - (ja-no-eval :group! (-> self draw art-group data 350) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 350)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 350) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 70.0 80.0)))) (let ((f28-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 70.0 80.0))) @@ -2626,10 +2609,7 @@ (send-event *camera* 'set-dist #f #f) (set! (-> self neck flex-blend) 0.0) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 349) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 349)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 349) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (< 51.0 (ja-aframe-num 0)) (logior! (-> self state-flags) (state-flags sf6)) diff --git a/goal_src/jak2/engine/target/mech/mech.gc b/goal_src/jak2/engine/target/mech/mech.gc index 63a199863c6..e15a87e2d4b 100644 --- a/goal_src/jak2/engine/target/mech/mech.gc +++ b/goal_src/jak2/engine/target/mech/mech.gc @@ -179,7 +179,7 @@ ) #f ) - :post (the-as (function none :behavior mech) ja-post) + :post ja-post ) (defstate pickup (mech) diff --git a/goal_src/jak2/engine/target/sidekick.gc b/goal_src/jak2/engine/target/sidekick.gc index 679e40828e8..4ff2475005f 100644 --- a/goal_src/jak2/engine/target/sidekick.gc +++ b/goal_src/jak2/engine/target/sidekick.gc @@ -249,7 +249,7 @@ ) ) ) - :code (the-as (function none :behavior sidekick) looping-code) + :code looping-code :post (behavior () (when (not (and (-> (ppointer->process (-> self parent)) next-state) (= (-> (ppointer->process (-> self parent)) next-state name) 'process-drawable-art-error) @@ -408,7 +408,7 @@ (the-as shadow-geo (if (or (and (movie?) (-> self shadow-in-movie?)) (logtest? (focus-status indax) (-> self parent 0 focus-status))) - (-> self draw art-group data 3) + daxter-shadow-mg ) ) ) diff --git a/goal_src/jak2/engine/target/target-anim.gc b/goal_src/jak2/engine/target/target-anim.gc index b6108ff7661..24217e86706 100644 --- a/goal_src/jak2/engine/target/target-anim.gc +++ b/goal_src/jak2/engine/target/target-anim.gc @@ -12,20 +12,18 @@ ((using-gun? self) (case (-> self gun gun-type) (((pickup-type eco-red) (pickup-type eco-dark)) - (-> self draw art-group data 277) + jakb-gun-jump-land-ja ) (else - (-> self draw art-group data 278) + jakb-gun-jump-land-side-ja ) ) ) (else (let ((v1-9 (ja-group))) - (if (or (and v1-9 (= v1-9 (-> self draw art-group data 394))) - (and (focus-test? self dark) (nonzero? (-> self darkjak))) - ) - (-> self draw art-group data 395) - (-> self draw art-group data 24) + (if (or (and v1-9 (= v1-9 jakb-darkjak-jump-ja)) (and (focus-test? self dark) (nonzero? (-> self darkjak)))) + jakb-darkjak-jump-land-ja + jakb-jump-land-ja ) ) ) @@ -39,11 +37,11 @@ (new 'stack 'ground-tween-info) (let ((v1-4 (ja-group))) (cond - ((and v1-4 (or (= v1-4 (-> self draw art-group data 94)) (= v1-4 (-> self draw art-group data 95)))) + ((and v1-4 (or (= v1-4 jakb-wade-shallow-walk-ja) (= v1-4 jakb-wade-deep-walk-ja))) (set! gp-0 45) ) ((let ((v1-11 (ja-group))) - (and v1-11 (= v1-11 (-> self draw art-group data 61))) + (and v1-11 (= v1-11 jakb-roll-flip-ja)) ) ((lambda :behavior target () @@ -54,7 +52,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 285)) + (the-as art-joint-anim jakb-gun-roll-flip-land-ja) 0.0 0 30 @@ -66,7 +64,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 285)) + (the-as art-joint-anim jakb-gun-roll-flip-land-ja) 0.0 0 30 @@ -76,17 +74,14 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek! (ja-aframe 48.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-roll-flip-land-ja :num! (seek! (ja-aframe 48.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 48.0 0))) ) (ja-channel-push! 1 (seconds 0.05)) (let ((gp-2 (target-land-anim))) - (ja-no-eval :group! gp-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-2) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! gp-2 :num! (seek!) :frame-num (ja-aframe 64.0 0)) ) (until (ja-done? 0) (ja-blend-eval) @@ -95,18 +90,12 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 62) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-roll-flip-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 55.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 55.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -118,11 +107,10 @@ ) ) ((let ((v1-18 (ja-group))) - (and v1-18 - (or (= v1-18 (-> self draw art-group data 40)) - (= v1-18 (-> self draw art-group data 248)) - (= v1-18 (-> self draw art-group data 250)) - ) + (and v1-18 (or (= v1-18 jakb-attack-from-stance-ja) + (= v1-18 jakb-gun-attack-from-stance-ja) + (= v1-18 jakb-gun-attack-from-stance-blue-ja) + ) ) ) ((lambda :behavior target @@ -130,20 +118,20 @@ (set! (-> self control mod-surface) *attack-end-mods*) (let* ((v1-3 (ja-group)) (a1-0 (cond - ((and v1-3 (= v1-3 (-> self draw art-group data 248))) - (-> self draw art-group data 249) + ((and v1-3 (= v1-3 jakb-gun-attack-from-stance-ja)) + jakb-gun-attack-from-stance-end-ja ) (else (let ((v1-10 (ja-group))) (cond - ((and v1-10 (= v1-10 (-> self draw art-group data 250))) - (-> self draw art-group data 251) + ((and v1-10 (= v1-10 jakb-gun-attack-from-stance-blue-ja)) + jakb-gun-attack-from-stance-blue-end-ja ) ((rand-vu-percent? 0.3) - (-> self draw art-group data 42) + jakb-attack-from-stance-alt-end-ja ) (else - (-> self draw art-group data 41) + jakb-attack-from-stance-end-ja ) ) ) @@ -151,10 +139,7 @@ ) ) ) - (ja-no-eval :group! a1-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (when (nonzero? (-> self gun track-target-hold-time)) @@ -175,14 +160,11 @@ (label cfg-23) (set! (-> self control mod-surface) *walk-mods*) (let ((v1-57 (ja-group))) - (when (and (and v1-57 (= v1-57 (-> self draw art-group data 249))) + (when (and (and v1-57 (= v1-57 jakb-gun-attack-from-stance-end-ja)) (and (using-gun? self) (= (-> self gun gun-type) (pickup-type eco-yellow))) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 270) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 270)) frames num-frames) -1))) - :frame-num (ja-aframe 5.0 0) - ) + (ja-no-eval :group! jakb-gun-front-to-side-hop-ja :num! (seek!) :frame-num (ja-aframe 5.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -194,31 +176,25 @@ ) ) ((let ((v1-25 (ja-group))) - (and v1-25 (= v1-25 (-> self draw art-group data 399))) + (and v1-25 (= v1-25 jakb-darkjak-attack-spin-ja)) ) - (ja-no-eval :group! (-> self draw art-group data 400) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 400)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-attack-spin-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-55 (ja-group))) - (and v1-55 (= v1-55 (-> self draw art-group data 71))) + (and v1-55 (= v1-55 jakb-smack-surface-ja)) ) - (ja-no-eval :group! (-> self draw art-group data 72) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 72)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-smack-surface-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-85 (ja-group))) - (and v1-85 (= v1-85 (-> self draw art-group data 412))) + (and v1-85 (= v1-85 jakb-darkjak-get-on-fast-ja)) ) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) @@ -226,10 +202,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 396) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 396)) frames num-frames) -1))) - :frame-num (ja-aframe 15.0 0) - ) + (ja-no-eval :group! jakb-darkjak-stance-ja :num! (seek!) :frame-num (ja-aframe 15.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -237,12 +210,12 @@ (set! gp-0 0) ) ((let ((v1-125 (ja-group))) - (and v1-125 (or (= v1-125 (-> self draw art-group data 48)) - (= v1-125 (-> self draw art-group data 402)) - (= v1-125 (-> self draw art-group data 409)) - (= v1-125 (-> self draw art-group data 404)) - (= v1-125 (-> self draw art-group data 406)) - (= v1-125 (-> self draw art-group data 413)) + (and v1-125 (or (= v1-125 jakb-attack-punch-ja) + (= v1-125 jakb-darkjak-attack-combo1-ja) + (= v1-125 jakb-darkjak-attack-combo1b-ja) + (= v1-125 jakb-darkjak-attack-combo2-ja) + (= v1-125 jakb-darkjak-attack-combo3-ja) + (= v1-125 jakb-darkjak-attack-combo3c-ja) ) ) ) @@ -252,40 +225,40 @@ (set! (-> self control mod-surface) *walk-no-turn-mods*) (let* ((v1-5 (ja-group)) (a1-0 (cond - ((and v1-5 (= v1-5 (-> self draw art-group data 402))) + ((and v1-5 (= v1-5 jakb-darkjak-attack-combo1-ja)) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 403) + jakb-darkjak-attack-combo1-end-ja ) ((let ((v1-14 (ja-group))) - (and v1-14 (= v1-14 (-> self draw art-group data 409))) + (and v1-14 (= v1-14 jakb-darkjak-attack-combo1b-ja)) ) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 410) + jakb-darkjak-attack-combo1b-end-ja ) ((let ((v1-23 (ja-group))) - (and v1-23 (= v1-23 (-> self draw art-group data 404))) + (and v1-23 (= v1-23 jakb-darkjak-attack-combo2-ja)) ) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 405) + jakb-darkjak-attack-combo2-end-ja ) ((let ((v1-32 (ja-group))) - (and v1-32 (= v1-32 (-> self draw art-group data 406))) + (and v1-32 (= v1-32 jakb-darkjak-attack-combo3-ja)) ) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 407) + jakb-darkjak-attack-combo3-end-ja ) (else (let ((v1-41 (ja-group))) (cond - ((and v1-41 (= v1-41 (-> self draw art-group data 413))) + ((and v1-41 (= v1-41 jakb-darkjak-attack-combo3c-ja)) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 414) + jakb-darkjak-attack-combo3c-end-ja ) ((rand-vu-percent? 0.3) - (-> self draw art-group data 50) + jakb-attack-punch-alt-end-ja ) (else - (-> self draw art-group data 49) + jakb-attack-punch-end-ja ) ) ) @@ -293,10 +266,7 @@ ) ) ) - (ja-no-eval :group! a1-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (seek! (-> self control bend-target) 0.0 (seconds-per-frame)) @@ -312,15 +282,12 @@ ) ) ((let ((v1-132 (ja-group))) - (and v1-132 (= v1-132 (-> self draw art-group data 273))) + (and v1-132 (= v1-132 jakb-gun-attack-butt-ja)) ) (set! (-> self control bend-target) (-> self control bend-amount)) (set! (-> self control mod-surface) *walk-no-turn-mods*) - (let ((a1-18 (-> self draw art-group data 274))) - (ja-no-eval :group! a1-18 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-18) frames num-frames) -1))) - :frame-num 0.0 - ) + (let ((a1-18 jakb-gun-attack-butt-end-ja)) + (ja-no-eval :group! a1-18 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (seek! (-> self control bend-target) 0.0 (seconds-per-frame)) @@ -332,15 +299,12 @@ (rot->dir-targ! (-> self control)) ) ((let ((v1-166 (ja-group))) - (and v1-166 (= v1-166 (-> self draw art-group data 275))) + (and v1-166 (= v1-166 jakb-gun-attack-butt-blue-ja)) ) (set! (-> self control bend-target) (-> self control bend-amount)) (set! (-> self control mod-surface) *walk-no-turn-mods*) - (let ((a1-21 (-> self draw art-group data 276))) - (ja-no-eval :group! a1-21 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-21) frames num-frames) -1))) - :frame-num 0.0 - ) + (let ((a1-21 jakb-gun-attack-butt-blue-end-ja)) + (ja-no-eval :group! a1-21 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (seek! (-> self control bend-target) 0.0 (seconds-per-frame)) @@ -352,18 +316,18 @@ (rot->dir-targ! (-> self control)) ) ((let ((v1-200 (ja-group))) - (and (and v1-200 (or (= v1-200 (-> self draw art-group data 277)) (= v1-200 (-> self draw art-group data 278)))) + (and (and v1-200 (or (= v1-200 jakb-gun-jump-land-ja) (= v1-200 jakb-gun-jump-land-side-ja))) (not (using-gun? self)) ) ) (set! gp-0 60) ) ((let ((v1-208 (ja-group))) - (and v1-208 (or (= v1-208 (-> self draw art-group data 20)) - (= v1-208 (-> self draw art-group data 21)) - (= v1-208 (-> self draw art-group data 302)) - (= v1-208 (-> self draw art-group data 59)) - (= v1-208 (-> self draw art-group data 282)) + (and v1-208 (or (= v1-208 jakb-duck-stance-ja) + (= v1-208 jakb-duck-walk-ja) + (= v1-208 jakb-gun-duck-walk-ja) + (= v1-208 jakb-duck-roll-ja) + (= v1-208 jakb-gun-duck-roll-ja) ) ) ) @@ -373,10 +337,7 @@ ) (else (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! 0.0 1.2) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - ) + (ja-no-eval :group! jakb-stance-to-duck-ja :num! (seek! 0.0 1.2) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0 1.2)) @@ -386,15 +347,15 @@ ) ) ((let ((v1-240 (ja-group))) - (or (and (and v1-240 (or (= v1-240 (-> self draw art-group data 12)) (= v1-240 (-> self draw art-group data 392)))) + (or (and (and v1-240 (or (= v1-240 jakb-walk-ja) (= v1-240 jakb-darkjak-walk-ja))) (begin (set! gp-0 45) (< 0.5 (-> self skel root-channel 6 frame-interp (-> self skel active-frame-interp)))) (not (using-gun? self)) ) (let ((v1-253 (ja-group))) - (and v1-253 (or (= v1-253 (-> self draw art-group data 17)) - (= v1-253 (-> self draw art-group data 18)) - (= v1-253 (-> self draw art-group data 43)) - (= v1-253 (-> self draw art-group data 44)) + (and v1-253 (or (= v1-253 jakb-run-squash-ja) + (= v1-253 jakb-run-squash-weak-ja) + (= v1-253 jakb-attack-from-stance-run-end-ja) + (= v1-253 jakb-attack-from-stance-run-alt-end-ja) ) ) ) @@ -403,10 +364,7 @@ (cond ((and (rand-vu-percent? 0.3) (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-run-to-stance-fast-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -414,22 +372,21 @@ ) (else (let* ((v1-288 (ja-group)) - (f30-1 - (cond - ((and v1-288 (or (= v1-288 (-> self draw art-group data 12)) (= v1-288 (-> self draw art-group data 392)))) - (let ((f0-65 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) - (- f0-65 (* (the float (the int (/ f0-65 50.0))) 50.0)) + (f30-1 (cond + ((and v1-288 (or (= v1-288 jakb-walk-ja) (= v1-288 jakb-darkjak-walk-ja))) + (let ((f0-65 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) + (- f0-65 (* (the float (the int (/ f0-65 50.0))) 50.0)) + ) + ) + (else + 0.0 + ) + ) ) - ) - (else - 0.0 - ) - ) - ) ) (set! gp-0 45) (ja-channel-push! 1 (the-as time-frame gp-0)) - (ja :group! (-> self draw art-group data 4) :num! (identity (ja-aframe f30-1 0))) + (ja :group! jakb-run-to-stance-loop-ja :num! (identity (ja-aframe f30-1 0))) ) (dotimes (s5-1 3) (until (ja-done? 0) @@ -438,25 +395,19 @@ ) (ja :num-func num-func-identity :frame-num 0.0) ) - (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (ja-aframe 82.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek! (ja-aframe 82.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 82.0 0))) ) (when (not (and (focus-test? self dark) (nonzero? (-> self darkjak)))) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (ja-aframe 142.0 0)) - :frame-num (ja-aframe 82.0 0) - ) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek! (ja-aframe 142.0 0)) :frame-num (ja-aframe 82.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 142.0 0))) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num (ja-aframe 142.0 0) - ) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek!) :frame-num (ja-aframe 142.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -466,7 +417,7 @@ ) ) ((let ((v1-378 (ja-group))) - (and (and v1-378 (= v1-378 (-> self draw art-group data 12))) (>= (-> self control ctrl-xz-vel) 5734.4)) + (and (and v1-378 (= v1-378 jakb-walk-ja)) (>= (-> self control ctrl-xz-vel) 5734.4)) ) (set! gp-0 45) ) @@ -476,15 +427,15 @@ (go target-gun-stance) ) (let ((v1-395 (ja-group))) - (if (not (and (and v1-395 (= v1-395 (-> self draw art-group data 5))) (= (ja-group-size) 1))) + (if (not (and (and v1-395 (= v1-395 jakb-stance-loop-ja)) (= (ja-group-size) 1))) (ja-channel-push! 1 (the-as time-frame gp-0)) ) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (if (and (focus-test? self dark) (nonzero? (-> self darkjak))) - (ja :group! (-> self draw art-group data 396)) - (ja :group! (-> self draw art-group data 5)) + (ja :group! jakb-darkjak-stance-ja) + (ja :group! jakb-stance-loop-ja) ) (until #f (suspend) @@ -500,32 +451,25 @@ (defbehavior target-stance-push target ((arg0 int)) (let ((v1-2 (ja-group))) (cond - ((or (and (and v1-2 (= v1-2 (-> self draw art-group data 12))) + ((or (and (and v1-2 (= v1-2 jakb-walk-ja)) (< 0.5 (-> self skel root-channel 6 frame-interp (-> self skel active-frame-interp))) ) (let ((v1-14 (ja-group))) - (and v1-14 - (or (= v1-14 (-> self draw art-group data 17)) - (= v1-14 (-> self draw art-group data 18)) - (= v1-14 (-> self draw art-group data 43)) - (= v1-14 (-> self draw art-group data 44)) - ) + (and v1-14 (or (= v1-14 jakb-run-squash-ja) + (= v1-14 jakb-run-squash-weak-ja) + (= v1-14 jakb-attack-from-stance-run-end-ja) + (= v1-14 jakb-attack-from-stance-run-alt-end-ja) + ) ) ) ) (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-run-to-stance-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -533,11 +477,11 @@ (ja-channel-push! arg0 (seconds 0.15)) ) ((let ((v1-68 (ja-group))) - (and (and v1-68 (or (= v1-68 (-> self draw art-group data 28)) - (= v1-68 (-> self draw art-group data 24)) - (= v1-68 (-> self draw art-group data 277)) - (= v1-68 (-> self draw art-group data 278)) - (= v1-68 (-> self draw art-group data 395)) + (and (and v1-68 (or (= v1-68 jakb-jump-short-land-ja) + (= v1-68 jakb-jump-land-ja) + (= v1-68 jakb-gun-jump-land-ja) + (= v1-68 jakb-gun-jump-land-side-ja) + (= v1-68 jakb-darkjak-jump-land-ja) ) ) (not (ja-max? 0)) @@ -551,7 +495,7 @@ (ja-channel-push! arg0 (seconds 0.075)) ) ((let ((v1-84 (ja-group))) - (not (and (and v1-84 (= v1-84 (-> self draw art-group data 5))) (= (ja-group-size) 1))) + (not (and (and v1-84 (= v1-84 jakb-stance-loop-ja)) (= (ja-group-size) 1))) ) (ja-channel-push! arg0 (seconds 0.075)) ) @@ -563,27 +507,22 @@ (defbehavior target-falling-anim target ((arg0 int) (arg1 time-frame)) (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 27)) - (= v1-2 (-> self draw art-group data 51)) - (= v1-2 (-> self draw art-group data 267)) - ) + ((and v1-2 + (or (= v1-2 jakb-jump-loop-ja) (= v1-2 jakb-attack-uppercut-ja) (= v1-2 jakb-gun-attack-upperbutt-ja)) ) ) ((let ((v1-8 (ja-group))) - (and v1-8 (or (= v1-8 (-> self draw art-group data 33)) (= v1-8 (-> self draw art-group data 34)))) + (and v1-8 (or (= v1-8 jakb-edge-grab-stance0-ja) (= v1-8 jakb-edge-grab-stance1-ja))) ) (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 39) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-edge-grab-off-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-37 (ja-group))) - (and v1-37 (= v1-37 (-> self draw art-group data 39))) + (and v1-37 (= v1-37 jakb-edge-grab-off-ja)) ) (until (ja-done? 0) (suspend) @@ -594,14 +533,14 @@ (else (let ((v1-52 (ja-group))) (cond - ((and v1-52 (= v1-52 (-> self draw art-group data 61))) + ((and v1-52 (= v1-52 jakb-roll-flip-ja)) (let ((s5-0 (current-time))) (while (or (= arg0 -1) (< (- (current-time) s5-0) arg0)) (when (>= (- (current-time) s5-0) (seconds 0.01)) (let ((v1-62 (ja-group))) - (when (not (and v1-62 (= v1-62 (-> self draw art-group data 27)))) + (when (not (and v1-62 (= v1-62 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja :group! (-> self draw art-group data 27) :num! min) + (ja :group! jakb-jump-loop-ja :num! min) ) ) ) @@ -623,7 +562,7 @@ ) (suspend) (let ((v1-74 (ja-group))) - (if (and v1-74 (= v1-74 (-> self draw art-group data 27))) + (if (and v1-74 (= v1-74 jakb-jump-loop-ja)) (ja :num! (loop!)) (ja :num! (seek!)) ) @@ -634,7 +573,7 @@ ) (else (ja-channel-push! 1 arg1) - (ja :group! (-> self draw art-group data 27)) + (ja :group! jakb-jump-loop-ja) (while (!= (-> self skel root-channel 0) (-> self skel channel)) (suspend) ) @@ -644,13 +583,13 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (let ((s5-1 (current-time))) (while (or (= arg0 -1) (and (< (- (current-time) s5-1) arg0) (not (logtest? (-> self control status) (collide-status on-surface)))) ) (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) ) #f @@ -659,19 +598,19 @@ (defbehavior target-falling-anim-trans target () (let ((v1-2 (ja-group))) (cond - ((not (and v1-2 (or (= v1-2 (-> self draw art-group data 27)) - (= v1-2 (-> self draw art-group data 24)) - (= v1-2 (-> self draw art-group data 277)) - (= v1-2 (-> self draw art-group data 278)) + ((not (and v1-2 (or (= v1-2 jakb-jump-loop-ja) + (= v1-2 jakb-jump-land-ja) + (= v1-2 jakb-gun-jump-land-ja) + (= v1-2 jakb-gun-jump-land-side-ja) ) ) ) (ja-channel-push! 1 (seconds 0.33)) - (ja :group! (-> self draw art-group data 27)) + (ja :group! jakb-jump-loop-ja) ) ((and (logtest? (-> self control status) (collide-status on-surface)) (let ((v1-15 (ja-group))) - (and (not (and v1-15 (= v1-15 (-> self draw art-group data 24)))) + (and (not (and v1-15 (= v1-15 jakb-jump-land-ja))) (not (logtest? (-> self control status) (collide-status on-water))) ) ) @@ -680,15 +619,13 @@ (set! (-> self skel root-channel 0 frame-group) (the-as art-joint-anim (target-land-anim))) ) ((let ((v1-23 (ja-group))) - (and v1-23 (= v1-23 (-> self draw art-group data 27))) + (and v1-23 (= v1-23 jakb-jump-loop-ja)) ) (ja :num! (loop!)) ) ((let ((v1-33 (ja-group))) - (and v1-33 (or (= v1-33 (-> self draw art-group data 24)) - (= v1-33 (-> self draw art-group data 277)) - (= v1-33 (-> self draw art-group data 278)) - ) + (and v1-33 + (or (= v1-33 jakb-jump-land-ja) (= v1-33 jakb-gun-jump-land-ja) (= v1-33 jakb-gun-jump-land-side-ja)) ) ) (ja :num! (seek!)) @@ -710,54 +647,42 @@ ) (let ((v1-6 (ja-group))) (cond - ((and v1-6 (= v1-6 (-> self draw art-group data 22))) + ((and v1-6 (= v1-6 jakb-turn-around-ja)) (set! f26-0 1.0) (ja-channel-push! 7 (seconds 0.05)) ) ((let ((v1-12 (ja-group))) - (and v1-12 (or (= v1-12 (-> self draw art-group data 59)) (= v1-12 (-> self draw art-group data 282)))) + (and v1-12 (or (= v1-12 jakb-duck-roll-ja) (= v1-12 jakb-gun-duck-roll-ja))) ) (ja-channel-push! 7 (seconds 0.075)) (set! f26-0 1.0) ) ((let ((v1-19 (ja-group))) - (and v1-19 (= v1-19 (-> self draw art-group data 40))) + (and v1-19 (= v1-19 jakb-attack-from-stance-ja)) ) ((lambda :behavior target () (let ((f30-0 (fmax 0.8 (fmin 1.0 (* 0.000048828126 (-> self control ctrl-xz-vel)))))) (cond ((and (rand-vu-percent? 0.3) (< 20480.0 (-> self control ctrl-xz-vel))) - (ja-no-eval :group! (-> self draw art-group data 42) :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) + (ja-no-eval :group! jakb-attack-from-stance-alt-end-ja :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 29.0 0) f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 44) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-stance-run-alt-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 41) :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) + (ja-no-eval :group! jakb-attack-from-stance-end-ja :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 29.0 0) f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 43) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 43)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-stance-run-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -773,21 +698,21 @@ (set! f24-0 30.0) ) ((let ((v1-27 (ja-group))) - (and v1-27 (or (= v1-27 (-> self draw art-group data 408)) (= v1-27 (-> self draw art-group data 411)))) + (and v1-27 (or (= v1-27 jakb-darkjak-get-off-ja) (= v1-27 jakb-darkjak-bomb-end-ja))) ) (set! f26-0 1.0) (ja-channel-push! 7 (seconds 0.3)) ) ((let ((v1-33 (ja-group))) - (and v1-33 (or (= v1-33 (-> self draw art-group data 48)) - (= v1-33 (-> self draw art-group data 49)) - (= v1-33 (-> self draw art-group data 273)) - (= v1-33 (-> self draw art-group data 275)) - (= v1-33 (-> self draw art-group data 403)) - (= v1-33 (-> self draw art-group data 410)) - (= v1-33 (-> self draw art-group data 405)) - (= v1-33 (-> self draw art-group data 407)) - (= v1-33 (-> self draw art-group data 414)) + (and v1-33 (or (= v1-33 jakb-attack-punch-ja) + (= v1-33 jakb-attack-punch-end-ja) + (= v1-33 jakb-gun-attack-butt-ja) + (= v1-33 jakb-gun-attack-butt-blue-ja) + (= v1-33 jakb-darkjak-attack-combo1-end-ja) + (= v1-33 jakb-darkjak-attack-combo1b-end-ja) + (= v1-33 jakb-darkjak-attack-combo2-end-ja) + (= v1-33 jakb-darkjak-attack-combo3-end-ja) + (= v1-33 jakb-darkjak-attack-combo3c-end-ja) ) ) ) @@ -796,11 +721,7 @@ (ja-channel-push! 7 (seconds 0.15)) ) ((let ((v1-40 (ja-group))) - (and (and v1-40 (or (= v1-40 (-> self draw art-group data 12)) - (= v1-40 (-> self draw art-group data 261)) - (= v1-40 (-> self draw art-group data 392)) - ) - ) + (and (and v1-40 (or (= v1-40 jakb-walk-ja) (= v1-40 jakb-gun-walk-side-ja) (= v1-40 jakb-darkjak-walk-ja))) (= (ja-group-size) 7) ) ) @@ -816,25 +737,23 @@ (ja-channel-push! 7 (seconds 0.1)) ) ((let ((v1-55 (ja-group))) - (and v1-55 (= v1-55 (-> self draw art-group data 94))) + (and v1-55 (= v1-55 jakb-wade-shallow-walk-ja)) ) (set! f24-0 (ja-aframe-num 0)) (ja-channel-push! 7 (seconds 0.05)) ) ((let ((v1-60 (ja-group))) (and (or (and v1-60 - (or (= v1-60 (-> self draw art-group data 27)) - (= v1-60 (-> self draw art-group data 61)) - (= v1-60 (-> self draw art-group data 47)) - (= v1-60 (-> self draw art-group data 51)) - (= v1-60 (-> self draw art-group data 267)) - (= v1-60 (-> self draw art-group data 54)) + (or (= v1-60 jakb-jump-loop-ja) + (= v1-60 jakb-roll-flip-ja) + (= v1-60 jakb-attack-from-jump-end-ja) + (= v1-60 jakb-attack-uppercut-ja) + (= v1-60 jakb-gun-attack-upperbutt-ja) + (= v1-60 jakb-flop-down-land-ja) ) ) (let ((v1-66 (ja-group))) - (and (and v1-66 (or (= v1-66 (-> self draw art-group data 23)) (= v1-66 (-> self draw art-group data 394)))) - (< 30.0 (ja-aframe-num 0)) - ) + (and (and v1-66 (or (= v1-66 jakb-jump-ja) (= v1-66 jakb-darkjak-jump-ja))) (< 30.0 (ja-aframe-num 0))) ) ) (< 12288.0 (-> self control ctrl-xz-vel)) @@ -846,41 +765,38 @@ (f30-0 (-> self control ground-impact-vel)) ) (let ((v1-7 (ja-group))) - (if (and v1-7 (or (= v1-7 (-> self draw art-group data 61)) (= v1-7 (-> self draw art-group data 47)))) + (if (and v1-7 (or (= v1-7 jakb-roll-flip-ja) (= v1-7 jakb-attack-from-jump-end-ja))) (ja-channel-push! 1 (seconds 0.05)) (ja-channel-set! 1) ) ) (cond - ((< (if (= gp-0 (-> self draw art-group data 23)) + ((< (if (= gp-0 jakb-jump-ja) 77824.0 102400.0 ) f30-0 ) - (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek! (ja-aframe 3.0 0) 1.00001) :frame-num 0.0) + (ja-no-eval :group! jakb-run-squash-ja :num! (seek! (ja-aframe 3.0 0) 1.00001) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 1.00001)) ) ) - ((< (if (= gp-0 (-> self draw art-group data 23)) + ((< (if (= gp-0 jakb-jump-ja) 61440.0 102400.0 ) f30-0 ) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (ja-aframe 3.0 0) 1.00001) - :frame-num (ja-aframe -1.0 0) - ) + (ja-no-eval :group! jakb-run-squash-ja :num! (seek! (ja-aframe 3.0 0) 1.00001) :frame-num (ja-aframe -1.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 1.00001)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek! (ja-aframe 4.0 0) 1.00001) :frame-num 0.0) + (ja-no-eval :group! jakb-run-squash-weak-ja :num! (seek! (ja-aframe 4.0 0) 1.00001) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 4.0 0) 1.00001)) @@ -892,21 +808,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 262)) - 16.0 - 90 - 60 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-run-blue-ja) 16.0 90 60 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 299)) + (the-as art-joint-anim jakb-gun-front-run-ja) 16.0 90 60 @@ -934,7 +841,7 @@ (set! f26-0 1.0) ) ((let ((v1-78 (ja-group))) - (and v1-78 (or (= v1-78 (-> self draw art-group data 23)) (= v1-78 (-> self draw art-group data 394)))) + (and v1-78 (or (= v1-78 jakb-jump-ja) (= v1-78 jakb-darkjak-jump-ja))) ) (ja-channel-push! 7 (seconds 0.05)) (set! s5-0 #t) @@ -942,7 +849,7 @@ (else (let ((v1-84 (ja-group))) (cond - ((and v1-84 (= v1-84 (-> self draw art-group data 71))) + ((and v1-84 (= v1-84 jakb-smack-surface-ja)) (ja-channel-push! 7 (seconds 0.15)) ) ((and (focus-test? self dark) (nonzero? (-> self darkjak))) @@ -959,7 +866,7 @@ ) (set! (-> self skel root-channel 3 command) (joint-control-command push)) (set! (-> self skel root-channel 6 command) (joint-control-command stack)) - (ja :group! (-> self draw art-group data 12)) + (ja :group! jakb-walk-ja) (let ((f24-1 (ja-aframe f24-0 0))) (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) @@ -969,11 +876,7 @@ (set! (-> s4-0 frame-interp 0) f0-3) ) (set! (-> s4-0 dist) 12288.0) - (joint-control-channel-group-eval! - s4-0 - (the-as art-joint-anim (-> self draw art-group data 392)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-0 (the-as art-joint-anim jakb-darkjak-walk-ja) num-func-identity) (set! (-> s4-0 frame-num) f24-1) ) ) @@ -986,11 +889,7 @@ (set! (-> s4-1 frame-interp 0) f0-5) ) (set! (-> s4-1 dist) 12288.0) - (joint-control-channel-group-eval! - s4-1 - (the-as art-joint-anim (-> self draw art-group data 261)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-1 (the-as art-joint-anim jakb-gun-walk-side-ja) num-func-identity) (set! (-> s4-1 frame-num) f24-1) ) ) @@ -1001,11 +900,7 @@ (set! (-> s4-2 frame-interp 0) f0-7) ) (set! (-> s4-2 dist) (-> *TARGET-bank* walk-cycle-dist)) - (joint-control-channel-group-eval! - s4-2 - (the-as art-joint-anim (-> self draw art-group data 12)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-2 (the-as art-joint-anim jakb-walk-ja) num-func-identity) (set! (-> s4-2 frame-num) f24-1) ) ) @@ -1016,11 +911,7 @@ (set! (-> s4-3 frame-interp 0) f0-9) ) (set! (-> s4-3 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (joint-control-channel-group-eval! - s4-3 - (the-as art-joint-anim (-> self draw art-group data 14)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-3 (the-as art-joint-anim jakb-walk-down-ja) num-func-identity) (set! (-> s4-3 frame-num) f24-1) ) (let ((s4-4 (-> self skel root-channel 2))) @@ -1029,11 +920,7 @@ (set! (-> s4-4 frame-interp 0) f0-11) ) (set! (-> s4-4 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (joint-control-channel-group-eval! - s4-4 - (the-as art-joint-anim (-> self draw art-group data 16)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-4 (the-as art-joint-anim jakb-walk-left-ja) num-func-identity) (set! (-> s4-4 frame-num) f24-1) ) (let ((s4-5 (-> self skel root-channel 4))) @@ -1042,11 +929,7 @@ (set! (-> s4-5 frame-interp 0) f0-13) ) (set! (-> s4-5 dist) (-> *TARGET-bank* run-down-cycle-dist)) - (joint-control-channel-group-eval! - s4-5 - (the-as art-joint-anim (-> self draw art-group data 9)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-5 (the-as art-joint-anim jakb-run-down-ja) num-func-identity) (set! (-> s4-5 frame-num) f24-1) ) (let ((s4-6 (-> self skel root-channel 5))) @@ -1055,11 +938,7 @@ (set! (-> s4-6 frame-interp 0) f0-15) ) (set! (-> s4-6 dist) (-> *TARGET-bank* run-side-cycle-dist)) - (joint-control-channel-group-eval! - s4-6 - (the-as art-joint-anim (-> self draw art-group data 11)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-6 (the-as art-joint-anim jakb-run-left-ja) num-func-identity) (set! (-> s4-6 frame-num) f24-1) ) (cond @@ -1070,11 +949,7 @@ (set! (-> s4-7 frame-interp 0) f0-17) ) (set! (-> s4-7 dist) 27033.6) - (joint-control-channel-group-eval! - s4-7 - (the-as art-joint-anim (-> self draw art-group data 393)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-7 (the-as art-joint-anim jakb-darkjak-run-ja) num-func-identity) (set! (-> s4-7 frame-num) f24-1) ) ) @@ -1085,11 +960,7 @@ (set! (-> s4-8 frame-interp 0) f0-19) ) (set! (-> s4-8 dist) (-> *TARGET-bank* run-cycle-dist)) - (joint-control-channel-group-eval! - s4-8 - (the-as art-joint-anim (-> self draw art-group data 299)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-8 (the-as art-joint-anim jakb-gun-front-run-ja) num-func-identity) (set! (-> s4-8 frame-num) f24-1) ) ) @@ -1100,11 +971,7 @@ (set! (-> s4-9 frame-interp 0) f0-21) ) (set! (-> s4-9 dist) (-> *TARGET-bank* run-cycle-dist)) - (joint-control-channel-group-eval! - s4-9 - (the-as art-joint-anim (-> self draw art-group data 7)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-9 (the-as art-joint-anim jakb-run-ja) num-func-identity) (set! (-> s4-9 frame-num) f24-1) ) ) @@ -1170,7 +1037,7 @@ (set! (-> v1-228 frame-interp 0) f0-48) ) (set! (-> v1-228 dist) (-> *TARGET-bank* walk-up-cycle-dist)) - (set! (-> v1-228 frame-group) (the-as art-joint-anim (-> self draw art-group data 13))) + (set! (-> v1-228 frame-group) (the-as art-joint-anim jakb-walk-up-ja)) ) (let ((v1-231 (-> self skel root-channel 4))) (let ((f0-50 (fabs f30-0))) @@ -1178,7 +1045,7 @@ (set! (-> v1-231 frame-interp 0) f0-50) ) (set! (-> v1-231 dist) (-> *TARGET-bank* run-up-cycle-dist)) - (set! (-> v1-231 frame-group) (the-as art-joint-anim (-> self draw art-group data 8))) + (set! (-> v1-231 frame-group) (the-as art-joint-anim jakb-run-up-ja)) ) ) (else @@ -1188,7 +1055,7 @@ (set! (-> v1-234 frame-interp 0) f0-53) ) (set! (-> v1-234 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (set! (-> v1-234 frame-group) (the-as art-joint-anim (-> self draw art-group data 14))) + (set! (-> v1-234 frame-group) (the-as art-joint-anim jakb-walk-down-ja)) ) (let ((v1-237 (-> self skel root-channel 4))) (let ((f0-55 (fabs f30-0))) @@ -1196,7 +1063,7 @@ (set! (-> v1-237 frame-interp 0) f0-55) ) (set! (-> v1-237 dist) (-> *TARGET-bank* run-down-cycle-dist)) - (set! (-> v1-237 frame-group) (the-as art-joint-anim (-> self draw art-group data 9))) + (set! (-> v1-237 frame-group) (the-as art-joint-anim jakb-run-down-ja)) ) ) ) @@ -1208,7 +1075,7 @@ (set! (-> v1-240 frame-interp 0) f0-59) ) (set! (-> v1-240 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-240 frame-group) (the-as art-joint-anim (-> self draw art-group data 15))) + (set! (-> v1-240 frame-group) (the-as art-joint-anim jakb-walk-right-ja)) ) (let ((v1-243 (-> self skel root-channel 5))) (let ((f0-61 (fabs f28-0))) @@ -1216,7 +1083,7 @@ (set! (-> v1-243 frame-interp 0) f0-61) ) (set! (-> v1-243 dist) (-> *TARGET-bank* run-side-cycle-dist)) - (set! (-> v1-243 frame-group) (the-as art-joint-anim (-> self draw art-group data 10))) + (set! (-> v1-243 frame-group) (the-as art-joint-anim jakb-run-right-ja)) ) ) (else @@ -1226,7 +1093,7 @@ (set! (-> v1-246 frame-interp 0) f0-64) ) (set! (-> v1-246 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-246 frame-group) (the-as art-joint-anim (-> self draw art-group data 16))) + (set! (-> v1-246 frame-group) (the-as art-joint-anim jakb-walk-left-ja)) ) (let ((v1-249 (-> self skel root-channel 5))) (let ((f0-66 (fabs f28-0))) @@ -1234,7 +1101,7 @@ (set! (-> v1-249 frame-interp 0) f0-66) ) (set! (-> v1-249 dist) (-> *TARGET-bank* run-side-cycle-dist)) - (set! (-> v1-249 frame-group) (the-as art-joint-anim (-> self draw art-group data 11))) + (set! (-> v1-249 frame-group) (the-as art-joint-anim jakb-run-left-ja)) ) ) ) @@ -1272,7 +1139,7 @@ (if (using-gun? self) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 288)) + (the-as art-joint-anim jakb-gun-flop-down-land-ja) 0.0 0 30 @@ -1283,14 +1150,14 @@ ) (ja-channel-set! 1) (let ((s5-0 (-> self skel root-channel 0))) - (set! (-> s5-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 54))) + (set! (-> s5-0 frame-group) (the-as art-joint-anim jakb-flop-down-land-ja)) (set! (-> s5-0 param 0) - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 54)) frames num-frames) -1)) + (the float (+ (-> (the-as art-joint-anim jakb-flop-down-land-ja) frames num-frames) -1)) ) (let ((f30-1 (seek f30-0 1.0 (* 0.5 (seconds-per-frame))))) (set! (-> s5-0 param 1) f30-1) (set! (-> s5-0 frame-num) 0.0) - (joint-control-channel-group! s5-0 (the-as art-joint-anim (-> self draw art-group data 54)) num-func-seek!) + (joint-control-channel-group! s5-0 (the-as art-joint-anim jakb-flop-down-land-ja) num-func-seek!) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! @@ -1370,10 +1237,10 @@ ((logtest? (water-flags swimming) (-> self water flags)) ) ((let ((v1-5 (ja-group))) - (and v1-5 (or (= v1-5 (-> self draw art-group data 52)) - (= v1-5 (-> self draw art-group data 53)) - (= v1-5 (-> self draw art-group data 55)) - (= v1-5 (-> self draw art-group data 56)) + (and v1-5 (or (= v1-5 jakb-flop-down-ja) + (= v1-5 jakb-flop-down-loop-ja) + (= v1-5 jakb-moving-flop-down-ja) + (= v1-5 jakb-moving-flop-down-loop-ja) ) ) ) @@ -1382,13 +1249,9 @@ ((and (= (-> self control ground-pat material) (pat-material ice)) (< 16384.0 (-> self control ctrl-xz-vel))) ) ((let ((v1-20 (ja-group))) - (or (and v1-20 (or (= v1-20 (-> self draw art-group data 27)) - (= v1-20 (-> self draw art-group data 394)) - (= v1-20 (-> self draw art-group data 58)) - ) - ) + (or (and v1-20 (or (= v1-20 jakb-jump-loop-ja) (= v1-20 jakb-darkjak-jump-ja) (= v1-20 jakb-flop-jump-ja))) (let ((v1-26 (ja-group))) - (and (and v1-26 (= v1-26 (-> self draw art-group data 23))) + (and (and v1-26 (= v1-26 jakb-jump-ja)) (or (>= (ja-aframe-num 0) 38.0) (and (focus-test? self dark) (nonzero? (-> self darkjak)))) ) ) @@ -1397,20 +1260,15 @@ (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.02)) (let ((a1-4 (target-land-anim))) - (ja-no-eval :group! a1-4 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-4) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-4 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (let ((v1-46 (ja-group))) - (if (or (and (and v1-46 (or (= v1-46 (-> self draw art-group data 277)) (= v1-46 (-> self draw art-group data 278)))) + (if (or (and (and v1-46 (or (= v1-46 jakb-gun-jump-land-ja) (= v1-46 jakb-gun-jump-land-side-ja))) (not (using-gun? self)) ) (let ((v1-53 (ja-group))) - (and (and v1-53 (= v1-53 (-> self draw art-group data 24))) - (and (>= (ja-aframe-num 0) 60.0) (using-gun? self)) - ) + (and (and v1-53 (= v1-53 jakb-jump-land-ja)) (and (>= (ja-aframe-num 0) 60.0) (using-gun? self))) ) ) (goto cfg-78) @@ -1422,37 +1280,26 @@ (label cfg-78) ) ((let ((v1-70 (ja-group))) - (and (and v1-70 (or (= v1-70 (-> self draw art-group data 23)) (= v1-70 (-> self draw art-group data 394)))) + (and (and v1-70 (or (= v1-70 jakb-jump-ja) (= v1-70 jakb-darkjak-jump-ja))) (>= (ja-aframe-num 0) 35.0) (not (using-gun? self)) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-128 (ja-group))) - (and v1-128 - (or (= v1-128 (-> self draw art-group data 23)) - (= v1-128 (-> self draw art-group data 30)) - (= v1-128 (-> self draw art-group data 394)) - ) - ) + (and v1-128 (or (= v1-128 jakb-jump-ja) (= v1-128 jakb-duck-high-jump-ja) (= v1-128 jakb-darkjak-jump-ja))) ) ((lambda :behavior target () @@ -1460,10 +1307,7 @@ (ja-channel-set! 1) (cond ((using-gun? self) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (ja-aframe 41.0 0)) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek! (ja-aframe 41.0 0)) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 41.0 0))) @@ -1472,10 +1316,7 @@ (ja-channel-push! 1 (seconds 0.1)) (case (-> self gun gun-type) (((pickup-type eco-red) (pickup-type eco-dark)) - (ja-no-eval :group! (-> self draw art-group data 277) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 277)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (if (not (using-gun? self)) @@ -1486,10 +1327,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 278) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 278)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-side-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (if (not (using-gun? self)) @@ -1503,18 +1341,12 @@ (label cfg-19) ) (else - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek!) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1527,35 +1359,26 @@ ) ((let ((v1-134 (ja-group))) (and v1-134 - (or (= v1-134 (-> self draw art-group data 66)) - (= v1-134 (-> self draw art-group data 65)) - (= v1-134 (-> self draw art-group data 67)) - ) + (or (= v1-134 jakb-hit-from-front-ja) (= v1-134 jakb-hit-from-front-alt1-ja) (= v1-134 jakb-hit-from-back-ja)) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let* ((v1-142 (ja-group)) - (f30-0 (if (and v1-142 (= v1-142 (-> self draw art-group data 67))) + (f30-0 (if (and v1-142 (= v1-142 jakb-hit-from-back-ja)) 24576.0 -24576.0 ) ) ) (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek!) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (set-forward-vel f30-0) (suspend) (ja :num! (seek!)) ) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1563,16 +1386,16 @@ ) ((let ((v1-195 (ja-group))) (and v1-195 - (or (= v1-195 (-> self draw art-group data 23)) - (= v1-195 (-> self draw art-group data 394)) - (= v1-195 (-> self draw art-group data 45)) - (= v1-195 (-> self draw art-group data 46)) - (= v1-195 (-> self draw art-group data 47)) - (= v1-195 (-> self draw art-group data 54)) - (= v1-195 (-> self draw art-group data 51)) - (= v1-195 (-> self draw art-group data 267)) - (= v1-195 (-> self draw art-group data 279)) - (= v1-195 (-> self draw art-group data 171)) + (or (= v1-195 jakb-jump-ja) + (= v1-195 jakb-darkjak-jump-ja) + (= v1-195 jakb-attack-from-jump-ja) + (= v1-195 jakb-attack-from-jump-loop-ja) + (= v1-195 jakb-attack-from-jump-end-ja) + (= v1-195 jakb-flop-down-land-ja) + (= v1-195 jakb-attack-uppercut-ja) + (= v1-195 jakb-gun-attack-upperbutt-ja) + (= v1-195 jakb-gun-attack-upperbutt-blue-ja) + (= v1-195 jakb-board-get-off-ja) ) ) ) @@ -1582,10 +1405,7 @@ (ja-channel-push! 1 (seconds 0.04)) (cond ((using-gun? self) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (ja-aframe 41.0 0)) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek! (ja-aframe 41.0 0)) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 41.0 0))) @@ -1594,10 +1414,7 @@ (ja-channel-push! 1 (seconds 0.1)) (case (-> self gun gun-type) (((pickup-type eco-red) (pickup-type eco-dark)) - (ja-no-eval :group! (-> self draw art-group data 277) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 277)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -1605,10 +1422,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 278) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 278)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-side-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -1618,20 +1432,14 @@ ) ) ((and (focus-test? self dark) (nonzero? (-> self darkjak))) - (ja-no-eval :group! (-> self draw art-group data 395) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 395)) frames num-frames) -1))) - :frame-num (ja-aframe 42.0 0) - ) + (ja-no-eval :group! jakb-darkjak-jump-land-ja :num! (seek!) :frame-num (ja-aframe 42.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 42.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 42.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1647,22 +1455,19 @@ ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 323) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 323)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 323) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-232 (ja-group))) - (and v1-232 (or (= v1-232 (-> self draw art-group data 24)) - (= v1-232 (-> self draw art-group data 277)) - (= v1-232 (-> self draw art-group data 278)) + (and v1-232 (or (= v1-232 jakb-jump-land-ja) + (= v1-232 jakb-gun-jump-land-ja) + (= v1-232 jakb-gun-jump-land-side-ja) (= v1-232 (-> self draw art-group data 323)) - (= v1-232 (-> self draw art-group data 331)) - (= v1-232 (-> self draw art-group data 342)) + (= v1-232 jakb-mech-jump-land-ja) + (= v1-232 jakb-mech-carry-jump-land-ja) ) ) ) @@ -1675,37 +1480,28 @@ ) ((let ((v1-248 (ja-group))) (and v1-248 - (or (= v1-248 (-> self draw art-group data 328)) - (= v1-248 (-> self draw art-group data 330)) - (= v1-248 (-> self draw art-group data 348)) - ) + (or (= v1-248 jakb-mech-jump-ja) (= v1-248 jakb-mech-jump-loop-ja) (= v1-248 jakb-mech-hit-front-ja)) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.017)) - (ja-no-eval :group! (-> self draw art-group data 331) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 331)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-mech-jump-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-279 (ja-group))) - (and v1-279 (or (= v1-279 (-> self draw art-group data 340)) (= v1-279 (-> self draw art-group data 341)))) + (and v1-279 (or (= v1-279 jakb-mech-carry-jump-ja) (= v1-279 jakb-mech-carry-jump-loop-ja))) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let ((v1-286 (ja-group))) - (if (and v1-286 (= v1-286 (-> self draw art-group data 341))) + (if (and v1-286 (= v1-286 jakb-mech-carry-jump-loop-ja)) (ja-channel-set! 1) (ja-channel-push! 1 (seconds 0.04)) ) ) - (ja-no-eval :group! (-> self draw art-group data 342) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 342)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-mech-carry-jump-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1723,7 +1519,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 0.0 30 30 @@ -1735,7 +1531,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 3.0 30 30 @@ -1750,10 +1546,7 @@ (set! (-> self control unknown-float42) 0.0) (ja-channel-push! 1 (seconds 0.075)) (set! (-> self control unknown-sound-id01) (sound-play "spin-kick")) - (ja-no-eval :group! (-> self draw art-group data 45) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 45)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-jump-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-quat) 1.0 1.0 1.0) @@ -1761,7 +1554,7 @@ (ja :num! (seek!)) ) (set! (-> self control unknown-sound-id01) (sound-play "spin-kick")) - (ja :group! (-> self draw art-group data 46) :num! min) + (ja :group! jakb-attack-from-jump-loop-ja :num! min) (let ((f30-0 -393216.0)) (let ((f0-11 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) @@ -1781,10 +1574,7 @@ (set! f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) ) - (ja-no-eval :group! (-> self draw art-group data 47) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 47)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-jump-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (cond ((< (ja-aframe-num 0) 32.0) @@ -1821,27 +1611,21 @@ ;; WARN: new jak 2 until loop case, check carefully (defbehavior target-edge-grab-anim target ((arg0 float)) (ja-channel-push! 1 (seconds 0.15)) - (ja :group! (-> self draw art-group data 35) :num! min) + (ja :group! jakb-falling-to-edge-grab-ja :num! min) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-set! 1) (until #f - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-edge-grab-stance0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (can-play-stance-amibent?) (suspend) (ja :num! (seek!)) ) (+! (-> self anim-seed) 1) - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-edge-grab-stance1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (can-play-stance-amibent?) (suspend) diff --git a/goal_src/jak2/engine/target/target-carry.gc b/goal_src/jak2/engine/target/target-carry.gc index a153b205ce1..c93decc719a 100644 --- a/goal_src/jak2/engine/target/target-carry.gc +++ b/goal_src/jak2/engine/target/target-carry.gc @@ -326,9 +326,7 @@ ) ) (ja-channel-push! 2 (seconds 0.1)) - (ja :group! (-> self draw art-group data 319) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 319)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 319) :num! max) (let ((a0-16 (-> self skel root-channel 1))) (set! (-> a0-16 frame-interp 1) f30-0) (set! (-> a0-16 frame-interp 0) f30-0) @@ -569,7 +567,7 @@ (ja-no-eval :group! (-> self draw art-group data 322) :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) diff --git a/goal_src/jak2/engine/target/target-darkjak.gc b/goal_src/jak2/engine/target/target-darkjak.gc index 4a8ba02cfae..51f28757b44 100644 --- a/goal_src/jak2/engine/target/target-darkjak.gc +++ b/goal_src/jak2/engine/target/target-darkjak.gc @@ -334,10 +334,7 @@ (cond ((task-node-open? (game-task-node city-help-kid-battle)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 390) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 390)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-get-on-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 10.0 25.0)) (set-setting! 'bg-a 'abs (* 0.45 (-> self darkjak-interp)) 0) @@ -347,7 +344,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 412) :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-get-on-fast-ja :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 5.0 15.0)) (set-setting! 'bg-a 'abs (* 0.45 (-> self darkjak-interp)) 0) @@ -451,7 +448,7 @@ (go target-swim-stance) ) ((let ((v1-10 (ja-group))) - (not (and v1-10 (= v1-10 (-> self draw art-group data 412)))) + (not (and v1-10 (= v1-10 jakb-darkjak-get-on-fast-ja))) ) (let ((gp-0 0)) (while (not (logtest? (-> self control status) (collide-status on-surface))) @@ -472,7 +469,7 @@ (else (let ((v1-30 (ja-group))) (cond - ((and v1-30 (= v1-30 (-> self draw art-group data 412))) + ((and v1-30 (= v1-30 jakb-darkjak-get-on-fast-ja)) (ja-no-eval :num! (seek! 0.0)) (while (not (ja-done? 0)) (seek! (-> self darkjak-interp) 0.0 (* 2.0 (seconds-per-frame))) @@ -482,18 +479,14 @@ (ja-channel-push! 1 (seconds 0.1)) ) ((let ((v1-43 (ja-group))) - (and v1-43 - (or (= v1-43 (-> self draw art-group data 401)) - (= v1-43 (-> self draw art-group data 416)) - (= v1-43 (-> self draw art-group data 417)) - (= v1-43 (-> self draw art-group data 418)) - ) + (and v1-43 (or (= v1-43 jakb-darkjak-bomb-pre-ja) + (= v1-43 jakb-darkjak-bomb-ja) + (= v1-43 jakb-darkjak-bomb-loop-ja) + (= v1-43 jakb-darkjak-bomb-land-ja) + ) ) ) - (ja-no-eval :group! (-> self draw art-group data 411) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 411)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 1.0 0.0 (ja-aframe-num 0) 90.0 115.0)) (if (and (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) @@ -512,7 +505,7 @@ ) ) ((let ((v1-88 (ja-group))) - (and v1-88 (= v1-88 (-> self draw art-group data 411))) + (and v1-88 (= v1-88 jakb-darkjak-bomb-end-ja)) ) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) @@ -534,10 +527,7 @@ ) (else (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 408) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 408)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-get-off-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 1.0 0.0 (ja-aframe-num 0) 10.0 60.0)) (if (and (>= (ja-aframe-num 0) 24.0) @@ -555,10 +545,7 @@ (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 415) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 415)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-get-off-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 1.0 0.0 (ja-aframe-num 0) 10.0 60.0)) (if (and (>= (ja-aframe-num 0) 24.0) @@ -620,17 +607,17 @@ (let ((gp-1 (cond ((zero? (-> self control unknown-word000)) (set! (-> self control unknown-word000) 1) - (-> self draw art-group data 402) + jakb-darkjak-attack-combo1-ja ) (else (set! (-> self control unknown-word000) 0) - (-> self draw art-group data 409) + jakb-darkjak-attack-combo1b-ja ) ) ) ) (ja-channel-push! 1 (seconds 0.02)) - (ja-no-eval :group! gp-1 :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)))) + (ja-no-eval :group! gp-1 :num! (seek!)) ) (target-start-attack) (target-danger-set! 'punch #f) @@ -642,7 +629,7 @@ (t9-6 a0-8 a1-4 - (if (and v1-33 (= v1-33 (-> self draw art-group data 402))) + (if (and v1-33 (= v1-33 jakb-darkjak-attack-combo1-ja)) 22 18 ) @@ -709,17 +696,13 @@ (target-danger-set! 'punch #f) (let ((v1-18 (ja-group))) (cond - ((and v1-18 (or (= v1-18 (-> self draw art-group data 402)) (= v1-18 (-> self draw art-group data 409)))) + ((and v1-18 (or (= v1-18 jakb-darkjak-attack-combo1-ja) (= v1-18 jakb-darkjak-attack-combo1b-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 404) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 404)) frames num-frames) -1))) - ) + (ja-no-eval :group! jakb-darkjak-attack-combo2-ja :num! (seek!)) ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 413) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 413)) frames num-frames) -1))) - ) + (ja-no-eval :group! jakb-darkjak-attack-combo3c-ja :num! (seek!)) ) ) ) @@ -755,7 +738,7 @@ ((and (nonzero? sv-32) (>= sv-16 -40960.0) (let ((v1-84 (ja-group))) - (not (and (and v1-84 (= v1-84 (-> self draw art-group data 406))) (>= (ja-aframe-num 0) 77.0))) + (not (and (and v1-84 (= v1-84 jakb-darkjak-attack-combo3-ja)) (>= (ja-aframe-num 0) 77.0))) ) (send-event (handle->process (-> self control unknown-combo-tracker00 target)) 'combo) ) @@ -840,36 +823,36 @@ (let ((gp-2 (ja-group)) (f30-2 (ja-aframe-num 0)) ) - (if (or (and (= gp-2 (-> self draw art-group data 402)) + (if (or (and (= gp-2 jakb-darkjak-attack-combo1-ja) (>= f30-2 11.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 402)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo1-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= gp-2 (-> self draw art-group data 409)) + (and (= gp-2 jakb-darkjak-attack-combo1b-ja) (>= f30-2 11.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 409)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo1b-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= gp-2 (-> self draw art-group data 404)) + (and (= gp-2 jakb-darkjak-attack-combo2-ja) (>= f30-2 49.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 404)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo2-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= gp-2 (-> self draw art-group data 406)) + (and (= gp-2 jakb-darkjak-attack-combo3-ja) (or (and (>= f30-2 62.0) (>= 77.0 f30-2)) (and (>= f30-2 82.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 406)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo3-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) ) ) - (and (= gp-2 (-> self draw art-group data 413)) + (and (= gp-2 jakb-darkjak-attack-combo3c-ja) (>= f30-2 62.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 413)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo3c-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) @@ -939,9 +922,9 @@ (let ((gp-4 (ja-group)) (f0-53 (ja-aframe-num 0)) ) - (if (and (= gp-4 (-> self draw art-group data 406)) + (if (and (= gp-4 jakb-darkjak-attack-combo3-ja) (>= f0-53 80.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 406)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo3-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) @@ -1034,7 +1017,7 @@ (when (and (= (-> block param 0) 'bomb) (logtest? (process-mask enemy) (-> (the-as process v1-1) mask)) (let ((v1-7 (ja-group))) - (and v1-7 (= v1-7 (-> self draw art-group data 418))) + (and v1-7 (= v1-7 jakb-darkjak-bomb-land-ja)) ) (>= (ja-aframe-num 0) 35.0) (not (-> self darkjak clock-on)) @@ -1109,10 +1092,7 @@ (set! sv-20 1.0) (ja-channel-push! 1 (seconds 0.15)) (when (jump-hit-ground-stuck?) - (ja-no-eval :group! (-> self draw art-group data 401) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 401)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-pre-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self alt-cam-pos x) (-> self control trans x)) (set! (-> self alt-cam-pos z) (-> self control trans z)) @@ -1124,10 +1104,7 @@ (set-setting! 'music-volume 'rel 0.0 0) (set-setting! 'sfx-volume 'rel 0.0 0) (set-setting! 'ambient-volume 'rel 0.0 0) - (ja-no-eval :group! (-> self draw art-group data 416) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 416)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-y-vel) 1.0 1.0 1.0) @@ -1137,10 +1114,7 @@ (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 417) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 417)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-loop-ja :num! (seek!) :frame-num 0.0) (let ((f30-0 (the float (target-time-to-ground)))) (until v1-100 (set! (-> self alt-cam-pos x) (-> self control trans x)) @@ -1193,7 +1167,7 @@ (suspend) ) (set-forward-vel 0.0) - (ja-no-eval :group! (-> self draw art-group data 418) :num! (seek! (ja-aframe 35.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-bomb-land-ja :num! (seek! (ja-aframe 35.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 35.0 0))) @@ -1416,7 +1390,7 @@ (remove-setting! 'music-volume) (remove-setting! 'sfx-volume) (remove-setting! 'ambient-volume) - (ja-no-eval :group! (-> self draw art-group data 411) :num! (seek! (ja-aframe 90.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-bomb-end-ja :num! (seek! (ja-aframe 90.0 0)) :frame-num 0.0) (until (ja-done? 0) (target-darkjak-bomb-collide (the-as float (& sv-16)) sv-20) (suspend) @@ -1773,33 +1747,32 @@ ) ) ) - (set! (-> self control mod-surface) - (new 'static 'surface - :name 'uppercut - :turnv 524288.0 - :tiltv 32768.0 - :tiltvv 262144.0 - :transv-max 32768.0 - :target-speed 32768.0 - :fric 0.2 - :nonlin-fric-dist 1.0 - :slip-factor 1.0 - :slide-factor 1.0 - :slope-up-factor 1.0 - :slope-down-factor 1.0 - :slope-slip-angle 1.0 - :impact-fric 1.0 - :bend-factor 1.0 - :bend-speed 1.0 - :alignv 1.0 - :slope-up-traction 1.0 - :align-speed 1.0 - :turnvf 15.0 - :tiltvf 150.0 - :tiltvvf 15.0 - :mode 'air - :flags (surface-flag air attack spin gun-off laser-hide) - ) + (set! (-> self control mod-surface) (new 'static 'surface + :name 'uppercut + :turnv 524288.0 + :tiltv 32768.0 + :tiltvv 262144.0 + :transv-max 32768.0 + :target-speed 32768.0 + :fric 0.2 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :turnvf 15.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :mode 'air + :flags (surface-flag air attack spin gun-off laser-hide) + ) ) (set! sv-64 0) (set! sv-72 (current-time)) @@ -1814,8 +1787,8 @@ (set! sv-104 a0-33) ) (ja-channel-push! 2 (seconds 0.05)) - (ja :group! (-> self draw art-group data 419)) - (ja :chan 1 :group! (-> self draw art-group data 420)) + (ja :group! jakb-darkjak-attack-ice-loop-ja) + (ja :chan 1 :group! jakb-darkjak-attack-ice-loop2-ja) (while (or (< sv-64 sv-48) (< (- (current-time) sv-80) (seconds 1.5))) (let ((v1-77 (new-stack-vector0))) (let ((f0-8 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) @@ -1861,10 +1834,7 @@ ) (set! (-> self control mod-surface) *double-jump-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 421) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 421)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-attack-ice-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (compute-alignment! (-> self align)) @@ -1939,7 +1909,7 @@ (set-setting! 'string-spline-accel-player 'abs (meters 0.035) 0) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 412) :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-get-on-fast-ja :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) (until (ja-done? 0) (cond (gp-2 diff --git a/goal_src/jak2/engine/target/target-death.gc b/goal_src/jak2/engine/target/target-death.gc index 1d9cfa68253..a5b5dc9b34e 100644 --- a/goal_src/jak2/engine/target/target-death.gc +++ b/goal_src/jak2/engine/target/target-death.gc @@ -402,7 +402,7 @@ ) ) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 5)) + (ja :group! jakb-stance-loop-ja) (suspend) (logior! (-> self control status) (collide-status on-surface on-ground touch-surface)) (when (-> self mode-cache) @@ -773,12 +773,12 @@ (cond ((= v1-0 'back) (let ((v1-3 (ja-group))) - (when (not (and v1-3 (= v1-3 (-> self draw art-group data 67)))) + (when (not (and v1-3 (= v1-3 jakb-hit-from-back-ja))) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 290)) + (the-as art-joint-anim jakb-gun-hit-from-back-ja) 0.0 0 30 @@ -788,32 +788,29 @@ ) ) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 67) :num! min) + (ja :group! jakb-hit-from-back-ja :num! min) ) ) ) ((= v1-0 'lava) (let ((v1-19 (ja-group))) - (when (not (and v1-19 (= v1-19 (-> self draw art-group data 64)))) + (when (not (and v1-19 (= v1-19 jakb-hit-elec-ja))) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 64) :num! min) + (ja :group! jakb-hit-elec-ja :num! min) ) ) ) ((or (= v1-0 'up) (= v1-0 'up-forward) (= v1-0 'lava)) (let ((v1-28 (ja-group))) - (when (not (and v1-28 (= v1-28 (-> self draw art-group data 68)))) + (when (not (and v1-28 (= v1-28 jakb-hit-up-ja))) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 68) :num! min) + (ja :group! jakb-hit-up-ja :num! min) ) ) ) ((or (= v1-0 'air) (= v1-0 'jump)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-jump-ja :num! (seek!) :frame-num 0.0) (when (= (-> arg0 angle) 'air) (sound-play "smack-surface") (do-effect (-> self skel effect) 'group-smack-surface 0.0 6) @@ -822,20 +819,17 @@ ) ((= v1-0 'shove) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 71) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 71)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-smack-surface-ja :num! (seek!) :frame-num 0.0) (sound-play "smack-surface") ) ((rand-vu-percent? 0.5) (let ((v1-77 (ja-group))) - (when (not (and v1-77 (= v1-77 (-> self draw art-group data 65)))) + (when (not (and v1-77 (= v1-77 jakb-hit-from-front-alt1-ja))) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 289)) + (the-as art-joint-anim jakb-gun-hit-from-front-ja) 0.0 0 30 @@ -845,18 +839,18 @@ ) ) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 65) :num! min) + (ja :group! jakb-hit-from-front-alt1-ja :num! min) ) ) ) (else (let ((v1-93 (ja-group))) - (when (not (and v1-93 (= v1-93 (-> self draw art-group data 66)))) + (when (not (and v1-93 (= v1-93 jakb-hit-from-front-ja))) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 289)) + (the-as art-joint-anim jakb-gun-hit-from-front-ja) 0.0 0 30 @@ -866,7 +860,7 @@ ) ) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 66) :num! min) + (ja :group! jakb-hit-from-front-ja :num! min) ) ) ) @@ -1138,16 +1132,7 @@ (set! (-> self control mod-surface) *turn-around-mods*) (set! (-> self post-hook) target-no-stick-post) (if (using-gun? self) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 297)) - 0.0 - 30 - 0 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-hit-elec-ja) 0.0 30 0 1.0 0.0 #f) ) (let ((v1-141 (new-stack-vector0))) (let ((f0-31 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) @@ -1170,10 +1155,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 64) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 64)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-hit-elec-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((v1-157 (new-stack-vector0)) (f0-39 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) @@ -1346,7 +1328,7 @@ (set! (-> self control mod-surface) *neutral-mods*) (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 69) :num! (seek! (ja-aframe 30.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-deatha-ja :num! (seek! (ja-aframe 30.0 0)) :frame-num 0.0) (until (ja-done? 0) (if arg0 (gui-control-method-12 @@ -1414,7 +1396,7 @@ (set! (-> self post-hook) (lambda () (target-death-anim-trans) (target-no-stick-post) (none))) (ja-play-spooled-anim gp-2 - (the-as art-joint-anim (-> self draw art-group data 5)) + (the-as art-joint-anim jakb-stance-loop-ja) (the-as art-joint-anim #f) (the-as (function process-drawable symbol) false-func) ) @@ -1535,7 +1517,7 @@ (when (and a0-0 (= (-> *setting-control* user-current spooling) (process->ppointer self))) (ja-abort-spooled-anim a0-0 (the-as art-joint-anim #f) -1) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 5) :num! min) + (ja :group! jakb-stance-loop-ja :num! min) ) ) (logclear! (-> self focus-status) (focus-status dead hit)) @@ -1727,10 +1709,7 @@ ) (set-vector! (-> self control transv) 0.0 65502.96 0.0 1.0) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 66) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 66)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-hit-from-front-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (b! (not (and (logtest? (-> self control status) (collide-status on-surface)) @@ -1773,10 +1752,7 @@ ) 0 (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-painful-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self control transv quad) (the-as uint128 0)) (vector-seek! @@ -1901,7 +1877,7 @@ ) (target-falling-anim 30 (seconds 0.33)) (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 32) :num! (loop! 0.5) :frame-num 0.0) + (ja-no-eval :group! jakb-launch-jump-loop-ja :num! (loop! 0.5) :frame-num 0.0) (let ((gp-1 (current-time))) (until (>= (- (current-time) gp-1) (seconds 0.8)) (when (and (logtest? (-> self control status) (collide-status on-surface)) (!= (-> self control cur-pat event) 2)) @@ -1931,7 +1907,7 @@ ) ) ) - (ja :group! (-> self draw art-group data 32) :num! (loop! 0.5)) + (ja :group! jakb-launch-jump-loop-ja :num! (loop! 0.5)) (suspend) ) ) @@ -1942,10 +1918,7 @@ (set! (-> self post-hook) target-no-move-post) (set! (-> self control transv quad) (the-as uint128 0)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-painful-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (vector-seek! (-> self draw color-mult) *identity-vector* (seconds-per-frame)) (suspend) @@ -2012,10 +1985,7 @@ (set! (-> self control dynam gravity-max) 6144.0) (set! (-> self control dynam gravity-length) 6144.0) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 89) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 89)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-swim-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (< (+ -10240.0 (-> self water height)) (-> self control trans y)) (seek! (-> self control trans y) (+ -10240.0 (-> self water height)) (* 81920.0 (seconds-per-frame))) @@ -2024,22 +1994,13 @@ (ja :num! (seek!)) ) (dotimes (gp-1 1) - (ja-no-eval :group! (-> self draw art-group data 90) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 90)) frames num-frames) -1)) - 0.75 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-swim-loop-ja :num! (seek! max 0.75) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.75)) ) ) - (ja-no-eval :group! (-> self draw art-group data 91) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 91)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-swim-end-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -2051,10 +2012,7 @@ ((or (= v1-50 'target-hit-ground-hard) (= v1-50 'smush)) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-painful-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2070,7 +2028,7 @@ (set! (-> self control mod-surface) *neutral-mods*) (set! (-> self post-hook) target-no-move-post) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 67) :num! min) + (ja :group! jakb-hit-from-back-ja :num! min) (while (not (-> self control unknown-spool-anim00)) (suspend) (ja :num! (loop!)) @@ -2089,23 +2047,17 @@ ) (suspend) ) - (if (or (> gp-0 0) (let ((v1-14 (ja-group))) - (and v1-14 (or (= v1-14 (-> self draw art-group data 23)) - (= v1-14 (-> self draw art-group data 27)) - (= v1-14 (-> self draw art-group data 30)) - ) - ) - ) + (if (or (> gp-0 0) + (let ((v1-14 (ja-group))) + (and v1-14 (or (= v1-14 jakb-jump-ja) (= v1-14 jakb-jump-loop-ja) (= v1-14 jakb-duck-high-jump-ja))) + ) ) (target-hit-ground-anim #f (are-still?)) ) ) (target-stance-push 1) (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-stance-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (-> self control unknown-spool-anim00) (return #f) diff --git a/goal_src/jak2/engine/target/target-gun.gc b/goal_src/jak2/engine/target/target-gun.gc index 344e88f63e7..23b34bc659c 100644 --- a/goal_src/jak2/engine/target/target-gun.gc +++ b/goal_src/jak2/engine/target/target-gun.gc @@ -247,7 +247,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 229)) + (the-as art-joint-anim jakb-pilot-gun-yellow-takeout-ja) 0.0 0 15 @@ -259,7 +259,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 198)) + (the-as art-joint-anim jakb-pilot-gun-red-takeout-ja) 0.0 0 15 @@ -271,7 +271,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 230)) + (the-as art-joint-anim jakb-pilot-gun-blue-takeout-ja) 0.0 0 15 @@ -283,7 +283,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 231)) + (the-as art-joint-anim jakb-pilot-gun-dark-takeout-ja) 0.0 0 15 @@ -299,7 +299,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 265)) + (the-as art-joint-anim jakb-gun-yellow-takeout-ja) 0.0 0 15 @@ -311,7 +311,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 263)) + (the-as art-joint-anim jakb-gun-red-takeout-ja) 0.0 0 15 @@ -323,7 +323,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 266)) + (the-as art-joint-anim jakb-gun-blue-takeout-ja) 0.0 0 15 @@ -335,7 +335,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 264)) + (the-as art-joint-anim jakb-gun-dark-takeout-ja) 0.0 0 15 @@ -388,7 +388,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 229)) + (the-as art-joint-anim jakb-pilot-gun-yellow-takeout-ja) 0.0 10 0 @@ -401,7 +401,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 198)) + (the-as art-joint-anim jakb-pilot-gun-red-takeout-ja) 0.0 10 0 @@ -414,7 +414,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 230)) + (the-as art-joint-anim jakb-pilot-gun-blue-takeout-ja) 0.0 10 0 @@ -427,7 +427,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 231)) + (the-as art-joint-anim jakb-pilot-gun-dark-takeout-ja) 0.0 10 0 @@ -447,7 +447,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 265)) + (the-as art-joint-anim jakb-gun-yellow-takeout-ja) 0.0 10 0 @@ -460,7 +460,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 263)) + (the-as art-joint-anim jakb-gun-red-takeout-ja) 0.0 10 0 @@ -473,7 +473,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 266)) + (the-as art-joint-anim jakb-gun-blue-takeout-ja) 14.0 10 0 @@ -486,7 +486,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 264)) + (the-as art-joint-anim jakb-gun-dark-takeout-ja) 0.0 10 0 @@ -720,7 +720,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-164 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 225)) + (the-as art-joint-anim jakb-pilot-gun-red-dark-ja) 0.0 30 19 @@ -732,7 +732,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-164 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 225)) + (the-as art-joint-anim jakb-pilot-gun-red-dark-ja) 0.0 30 0 @@ -744,7 +744,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-164 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 19 @@ -756,7 +756,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-164 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 0 @@ -768,7 +768,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-164 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 19 @@ -780,7 +780,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-164 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 0 @@ -792,7 +792,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-164 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 228)) + (the-as art-joint-anim jakb-pilot-gun-yellow-blue-ja) 0.0 30 19 @@ -804,7 +804,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-164 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 228)) + (the-as art-joint-anim jakb-pilot-gun-yellow-blue-ja) 0.0 30 0 @@ -816,7 +816,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-164 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 19 @@ -828,7 +828,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-164 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 19 @@ -840,7 +840,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-164 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 0 @@ -852,7 +852,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-164 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 0 @@ -871,7 +871,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 30 19 @@ -881,7 +881,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -895,7 +895,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 30 19 @@ -905,7 +905,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -919,7 +919,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -929,7 +929,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 270)) + (the-as art-joint-anim jakb-gun-front-to-side-hop-ja) 0.0 19 19 @@ -943,7 +943,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -953,7 +953,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 270)) + (the-as art-joint-anim jakb-gun-front-to-side-hop-ja) 0.0 19 19 @@ -966,7 +966,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-227 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 19 19 @@ -978,7 +978,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-227 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 19 19 @@ -990,7 +990,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-227 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 271)) + (the-as art-joint-anim jakb-gun-front-to-blue-hop-ja) 0.0 19 19 @@ -1002,7 +1002,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-227 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 271)) + (the-as art-joint-anim jakb-gun-front-to-blue-hop-ja) 0.0 19 19 @@ -1014,7 +1014,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-227 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 272)) + (the-as art-joint-anim jakb-gun-blue-to-front-hop-ja) 0.0 19 19 @@ -1026,7 +1026,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-227 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 272)) + (the-as art-joint-anim jakb-gun-blue-to-front-hop-ja) 0.0 19 19 @@ -1038,7 +1038,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-227 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 271)) + (the-as art-joint-anim jakb-gun-front-to-blue-hop-ja) 0.0 30 19 @@ -1050,7 +1050,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-227 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 252)) + (the-as art-joint-anim jakb-gun-blue-to-yellow-ja) 0.0 19 19 @@ -1399,7 +1399,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 220)) + (the-as art-joint-anim jakb-pilot-gun-yellow-idle-ja) 0.0 arg0 0 @@ -1411,7 +1411,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 221)) + (the-as art-joint-anim jakb-pilot-gun-blue-idle-ja) 0.0 arg0 0 @@ -1423,7 +1423,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 218)) + (the-as art-joint-anim jakb-pilot-gun-red-idle-ja) 0.0 arg0 0 @@ -1435,7 +1435,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 219)) + (the-as art-joint-anim jakb-pilot-gun-dark-idle-ja) 0.0 arg0 0 @@ -1451,7 +1451,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 254)) + (the-as art-joint-anim jakb-gun-stance-yellow-ja) 0.0 arg0 0 @@ -1467,7 +1467,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 255)) + (the-as art-joint-anim jakb-gun-stance-blue-ja) 0.0 arg0 0 @@ -1477,21 +1477,12 @@ ) ) (((pickup-type eco-red)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 244)) - 0.0 - arg0 - 0 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-stance-ja) 0.0 arg0 0 1.0 0.0 #f) ) (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 253)) + (the-as art-joint-anim jakb-gun-stance-dark-ja) 0.0 arg0 0 @@ -1887,16 +1878,16 @@ (let ((v1-3 (-> self gun gun-type))) (set! (-> self skel top-anim base-anim) (cond ((= v1-3 (pickup-type eco-yellow)) - (-> self draw art-group data 220) + jakb-pilot-gun-yellow-idle-ja ) ((= v1-3 (pickup-type eco-red)) - (-> self draw art-group data 218) + jakb-pilot-gun-red-idle-ja ) ((= v1-3 (pickup-type eco-blue)) - (-> self draw art-group data 221) + jakb-pilot-gun-blue-idle-ja ) (else - (-> self draw art-group data 219) + jakb-pilot-gun-dark-idle-ja ) ) ) @@ -1909,13 +1900,11 @@ ((= v1-14 (pickup-type eco-yellow)) (let ((v1-17 (ja-group))) (cond - ((and (and v1-17 (or (= v1-17 self) (= v1-17 (-> self draw art-group data 261)))) - (< (-> self gun top-anim-low-high) 0.5) - ) + ((and (and v1-17 (or (= v1-17 self) (= v1-17 jakb-gun-walk-side-ja))) (< (-> self gun top-anim-low-high) 0.5)) (let ((s5-0 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 299) - (-> self draw art-group data 298) + jakb-gun-front-run-ja + jakb-gun-front-walk-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -1927,18 +1916,18 @@ gp-0 ) ((< (-> self gun top-anim-low-high) 0.5) - (-> self draw art-group data 245) + jakb-gun-stance-yellow-low-ja ) (else (when (and (>= (- (current-time) (-> self gun fire-time)) (seconds 1.5)) (let ((v1-50 (-> self skel top-anim frame-group))) - (or (= v1-50 (-> self draw art-group data 247)) (= v1-50 (-> self draw art-group data 254))) + (or (= v1-50 jakb-gun-yellow-highlow-ja) (= v1-50 jakb-gun-stance-yellow-ja)) ) ) (seek! (-> self gun top-anim-low-high) 0.0 (* 6.0 (seconds-per-frame))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 247)) + (the-as art-joint-anim jakb-gun-yellow-highlow-ja) 0.0 0 60 @@ -1950,7 +1939,7 @@ #f ) ) - (-> self draw art-group data 254) + jakb-gun-stance-yellow-ja ) ) ) @@ -1958,11 +1947,11 @@ ((= v1-14 (pickup-type eco-red)) (let ((v1-67 (ja-group))) (cond - ((and v1-67 (or (= v1-67 self) (= v1-67 (-> self draw art-group data 12)))) + ((and v1-67 (or (= v1-67 self) (= v1-67 jakb-walk-ja))) (let ((s5-1 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 299) - (-> self draw art-group data 298) + jakb-gun-front-run-ja + jakb-gun-front-walk-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -1974,23 +1963,23 @@ gp-0 ) ((< (-> self gun top-anim-low-high) 0.5) - (-> self draw art-group data 244) + jakb-gun-stance-ja ) (else (when (and (or (>= (- (current-time) (-> self gun fire-time)) (seconds 2.5)) (and (< 4096.0 (-> self control ctrl-xz-vel)) (>= (- (current-time) (-> self gun fire-time)) (seconds 1.25))) ) (let ((v1-104 (-> self skel top-anim frame-group))) - (or (= v1-104 (-> self draw art-group data 294)) - (= v1-104 (-> self draw art-group data 295)) - (= v1-104 (-> self draw art-group data 244)) + (or (= v1-104 jakb-gun-stance-red-sideways-ja) + (= v1-104 jakb-gun-red-from-sideways-ja) + (= v1-104 jakb-gun-stance-ja) ) ) ) (seek! (-> self gun top-anim-low-high) 0.0 (* 6.0 (seconds-per-frame))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 295)) + (the-as art-joint-anim jakb-gun-red-from-sideways-ja) 0.0 0 30 @@ -1999,7 +1988,7 @@ #f ) ) - (-> self draw art-group data 294) + jakb-gun-stance-red-sideways-ja ) ) ) @@ -2007,13 +1996,13 @@ ((= v1-14 (pickup-type eco-blue)) (let ((v1-119 (ja-group))) (cond - ((and (and v1-119 (or (= v1-119 self) (= v1-119 (-> self draw art-group data 261)))) + ((and (and v1-119 (or (= v1-119 self) (= v1-119 jakb-gun-walk-side-ja))) (and (< (-> self gun top-anim-low-high) 0.5) (>= (- (current-time) (-> self gun fire-time)) (seconds 0.2))) ) (let ((s5-2 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 262) - (-> self draw art-group data 303) + jakb-gun-run-blue-ja + jakb-gun-walk-blue-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -2025,18 +2014,18 @@ gp-0 ) (else - (-> self draw art-group data 255) + jakb-gun-stance-blue-ja ) ) ) ) ((let ((v1-150 (ja-group))) - (and v1-150 (or (= v1-150 self) (= v1-150 (-> self draw art-group data 12)))) + (and v1-150 (or (= v1-150 self) (= v1-150 jakb-walk-ja))) ) (let ((s5-3 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 299) - (-> self draw art-group data 298) + jakb-gun-front-run-ja + jakb-gun-front-walk-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -2048,7 +2037,7 @@ gp-0 ) (else - (-> self draw art-group data 253) + jakb-gun-stance-dark-ja ) ) ) @@ -2074,10 +2063,10 @@ (set! (-> self gun gun-pos scale quad) (-> self control scale quad)) (when (and (using-gun? self) (and (focus-test? self edge-grab) (let ((v1-18 (ja-group))) - (and v1-18 (or (= v1-18 (-> self draw art-group data 27)) - (= v1-18 (-> self draw art-group data 35)) - (= v1-18 (-> self draw art-group data 33)) - (= v1-18 (-> self draw art-group data 34)) + (and v1-18 (or (= v1-18 jakb-jump-loop-ja) + (= v1-18 jakb-falling-to-edge-grab-ja) + (= v1-18 jakb-edge-grab-stance0-ja) + (= v1-18 jakb-edge-grab-stance1-ja) ) ) ) @@ -2127,18 +2116,18 @@ ) ((handle->process (-> self gun charge-active?)) (cond - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 259)) (>= (-> v1-24 frame-num) 8.5)) + ((and (= (-> v1-24 frame-group) jakb-gun-dark-fire-ja) (>= (-> v1-24 frame-num) 8.5)) (set! (-> v1-24 frame-num) 5.0) ) - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 224)) (>= (-> v1-24 frame-num) 8.0)) + ((and (= (-> v1-24 frame-group) jakb-pilot-gun-dark-fire-ja) (>= (-> v1-24 frame-num) 8.0)) (set! (-> v1-24 frame-num) 3.0) ) ) ) - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 259)) (< (-> v1-24 frame-num) 9.0)) + ((and (= (-> v1-24 frame-group) jakb-gun-dark-fire-ja) (< (-> v1-24 frame-num) 9.0)) (set! (-> v1-24 frame-num) 10.0) ) - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 224)) (< (-> v1-24 frame-num) 9.0)) + ((and (= (-> v1-24 frame-group) jakb-pilot-gun-dark-fire-ja) (< (-> v1-24 frame-num) 9.0)) (set! (-> v1-24 frame-num) 9.0) ) ) @@ -2150,60 +2139,60 @@ (let ((v1-35 (-> self skel top-anim frame-group)) (f0-13 (-> self skel top-anim frame-num)) ) - (and (not (or (= v1-35 (-> self draw art-group data 263)) - (= v1-35 (-> self draw art-group data 266)) - (= v1-35 (-> self draw art-group data 265)) - (= v1-35 (-> self draw art-group data 264)) - (and (-> self draw art-group data 198) - (or (= v1-35 (-> self draw art-group data 198)) - (= v1-35 (-> self draw art-group data 230)) - (= v1-35 (-> self draw art-group data 229)) - (= v1-35 (-> self draw art-group data 231)) - (= v1-35 (-> self draw art-group data 225)) - (= v1-35 (-> self draw art-group data 226)) - (= v1-35 (-> self draw art-group data 227)) - (= v1-35 (-> self draw art-group data 228)) + (and (not (or (= v1-35 jakb-gun-red-takeout-ja) + (= v1-35 jakb-gun-blue-takeout-ja) + (= v1-35 jakb-gun-yellow-takeout-ja) + (= v1-35 jakb-gun-dark-takeout-ja) + (and jakb-pilot-gun-red-takeout-ja + (or (= v1-35 jakb-pilot-gun-red-takeout-ja) + (= v1-35 jakb-pilot-gun-blue-takeout-ja) + (= v1-35 jakb-pilot-gun-yellow-takeout-ja) + (= v1-35 jakb-pilot-gun-dark-takeout-ja) + (= v1-35 jakb-pilot-gun-red-dark-ja) + (= v1-35 jakb-pilot-gun-red-yellow-ja) + (= v1-35 jakb-pilot-gun-red-blue-ja) + (= v1-35 jakb-pilot-gun-yellow-blue-ja) ) ) - (and (= v1-35 (-> self draw art-group data 274)) (>= 6.8 f0-13)) - (or (and (= v1-35 (-> self draw art-group data 276)) (>= 6.8 f0-13)) - (= v1-35 (-> self draw art-group data 293)) - (= v1-35 (-> self draw art-group data 296)) - (= v1-35 (-> self draw art-group data 269)) - (= v1-35 (-> self draw art-group data 270)) - (= v1-35 (-> self draw art-group data 268)) - (= v1-35 (-> self draw art-group data 272)) - (= v1-35 (-> self draw art-group data 271)) - (= v1-35 (-> self draw art-group data 289)) - (= v1-35 (-> self draw art-group data 290)) + (and (= v1-35 jakb-gun-attack-butt-end-ja) (>= 6.8 f0-13)) + (or (and (= v1-35 jakb-gun-attack-butt-blue-end-ja) (>= 6.8 f0-13)) + (= v1-35 jakb-gun-dark-fire-twirl-ja) + (= v1-35 jakb-gun-yellow-fire-twirl-ja) + (= v1-35 jakb-gun-transformation-twirl-ja) + (= v1-35 jakb-gun-front-to-side-hop-ja) + (= v1-35 jakb-gun-side-to-front-hop-ja) + (= v1-35 jakb-gun-blue-to-front-hop-ja) + (= v1-35 jakb-gun-front-to-blue-hop-ja) + (= v1-35 jakb-gun-hit-from-front-ja) + (= v1-35 jakb-gun-hit-from-back-ja) ) ) ) (let ((v1-40 (-> self skel top-anim frame-group-push))) - (not (or (= v1-40 (-> self draw art-group data 263)) - (= v1-40 (-> self draw art-group data 266)) - (= v1-40 (-> self draw art-group data 265)) - (= v1-40 (-> self draw art-group data 264)) - (and (-> self draw art-group data 198) - (or (= v1-40 (-> self draw art-group data 198)) - (= v1-40 (-> self draw art-group data 230)) - (= v1-40 (-> self draw art-group data 229)) - (= v1-40 (-> self draw art-group data 231)) - (= v1-40 (-> self draw art-group data 225)) - (= v1-40 (-> self draw art-group data 226)) - (= v1-40 (-> self draw art-group data 227)) - (= v1-40 (-> self draw art-group data 228)) + (not (or (= v1-40 jakb-gun-red-takeout-ja) + (= v1-40 jakb-gun-blue-takeout-ja) + (= v1-40 jakb-gun-yellow-takeout-ja) + (= v1-40 jakb-gun-dark-takeout-ja) + (and jakb-pilot-gun-red-takeout-ja + (or (= v1-40 jakb-pilot-gun-red-takeout-ja) + (= v1-40 jakb-pilot-gun-blue-takeout-ja) + (= v1-40 jakb-pilot-gun-yellow-takeout-ja) + (= v1-40 jakb-pilot-gun-dark-takeout-ja) + (= v1-40 jakb-pilot-gun-red-dark-ja) + (= v1-40 jakb-pilot-gun-red-yellow-ja) + (= v1-40 jakb-pilot-gun-red-blue-ja) + (= v1-40 jakb-pilot-gun-yellow-blue-ja) ) ) - (= v1-40 (-> self draw art-group data 293)) - (= v1-40 (-> self draw art-group data 296)) - (= v1-40 (-> self draw art-group data 269)) - (= v1-40 (-> self draw art-group data 270)) - (= v1-40 (-> self draw art-group data 268)) - (= v1-40 (-> self draw art-group data 272)) - (= v1-40 (-> self draw art-group data 271)) - (= v1-40 (-> self draw art-group data 289)) - (= v1-40 (-> self draw art-group data 290)) + (= v1-40 jakb-gun-dark-fire-twirl-ja) + (= v1-40 jakb-gun-yellow-fire-twirl-ja) + (= v1-40 jakb-gun-transformation-twirl-ja) + (= v1-40 jakb-gun-front-to-side-hop-ja) + (= v1-40 jakb-gun-side-to-front-hop-ja) + (= v1-40 jakb-gun-blue-to-front-hop-ja) + (= v1-40 jakb-gun-front-to-blue-hop-ja) + (= v1-40 jakb-gun-hit-from-front-ja) + (= v1-40 jakb-gun-hit-from-back-ja) ) ) ) @@ -2292,14 +2281,14 @@ (>= (- (current-time) (-> self gun gun-get-on-time)) (seconds 0.1)) (let ((v1-110 (-> self skel top-anim frame-targ))) (or (not v1-110) - (= v1-110 (-> self draw art-group data 304)) - (= v1-110 (-> self draw art-group data 300)) - (= v1-110 (-> self draw art-group data 305)) - (= v1-110 (-> self draw art-group data 301)) - (= v1-110 (-> self draw art-group data 299)) - (= v1-110 (-> self draw art-group data 298)) - (= v1-110 (-> self draw art-group data 262)) - (= v1-110 (-> self draw art-group data 303)) + (= v1-110 jakb-gun-side-jump-ja) + (= v1-110 jakb-gun-front-jump-ja) + (= v1-110 jakb-gun-side-jump-land-ja) + (= v1-110 jakb-gun-front-jump-land-ja) + (= v1-110 jakb-gun-front-run-ja) + (= v1-110 jakb-gun-front-walk-ja) + (= v1-110 jakb-gun-run-blue-ja) + (= v1-110 jakb-gun-walk-blue-ja) (logtest? (surface-flag gun-fast-exit) (-> self control current-surface flags)) ) ) @@ -2334,14 +2323,14 @@ (cond ((focus-test? self pilot-riding) (let ((v1-15 (get-channel (-> self skel top-anim) 0))) - (when (not (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 206)) - (and v1-15 (= (-> v1-15 frame-group) (-> self draw art-group data 206))) + (when (not (or (= (-> self skel top-anim frame-group) jakb-pilot-gun-blue-fire-ja) + (and v1-15 (= (-> v1-15 frame-group) jakb-pilot-gun-blue-fire-ja)) ) ) (if (< 4096.0 (-> self control ctrl-xz-vel)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 207)) + (the-as art-joint-anim jakb-pilot-gun-blue-fire-single-ja) 1.0 9 9 @@ -2351,7 +2340,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 207)) + (the-as art-joint-anim jakb-pilot-gun-blue-fire-single-ja) 1.0 6 6 @@ -2365,14 +2354,14 @@ ) (else (let ((v1-32 (get-channel (-> self skel top-anim) 0))) - (when (not (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 257)) - (and v1-32 (= (-> v1-32 frame-group) (-> self draw art-group data 257))) + (when (not (or (= (-> self skel top-anim frame-group) jakb-gun-blue-fire-ja) + (and v1-32 (= (-> v1-32 frame-group) jakb-gun-blue-fire-ja)) ) ) (if (< 4096.0 (-> self control ctrl-xz-vel)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 258)) + (the-as art-joint-anim jakb-gun-blue-fire-single-ja) 1.0 9 9 @@ -2382,7 +2371,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 258)) + (the-as art-joint-anim jakb-gun-blue-fire-single-ja) 1.0 6 6 @@ -2402,7 +2391,7 @@ ((focus-test? self pilot-riding) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 223)) + (the-as art-joint-anim jakb-pilot-gun-yellow-fire-ja) 0.0 15 0 @@ -2414,7 +2403,7 @@ ((< (-> self gun top-anim-low-high) 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 246)) + (the-as art-joint-anim jakb-gun-yellow-fire-low-ja) 0.0 15 0 @@ -2425,16 +2414,7 @@ (set! (-> self gun top-anim-low-high) 1.0) ) (else - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 260)) - 0.0 - 0 - 0 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-yellow-fire-ja) 0.0 0 0 1.0 0.0 #f) ) ) (target-gun-fire-yellow) @@ -2450,7 +2430,7 @@ ((focus-test? self pilot-riding) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 222)) + (the-as art-joint-anim jakb-pilot-gun-red-fire-ja) 0.0 15 0 @@ -2465,7 +2445,7 @@ ((< 0.5 (-> self gun top-anim-low-high)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 292)) + (the-as art-joint-anim jakb-gun-red-fire-from-sideways-ja) 0.0 0 15 @@ -2478,7 +2458,7 @@ ((and (rand-vu-percent? 0.2) (< (- (current-time) (-> self gun fire-time)) (seconds 2))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 293)) + (the-as art-joint-anim jakb-gun-dark-fire-twirl-ja) 0.0 0 15 @@ -2490,12 +2470,12 @@ #f ) ) - ((and (or (rand-vu-percent? 0.2) (= (-> self skel top-anim frame-targ) (-> self draw art-group data 256))) + ((and (or (rand-vu-percent? 0.2) (= (-> self skel top-anim frame-targ) jakb-gun-red-fire-ja)) (< (- (current-time) (-> self gun fire-time)) (seconds 2)) ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 291)) + (the-as art-joint-anim jakb-gun-red-fire-to-sideways-ja) 0.0 0 15 @@ -2508,7 +2488,7 @@ ((logtest? (-> self game features) (game-feature gun-upgrade-speed)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 309)) + (the-as art-joint-anim jakb-gun-red-fire-fast-ja) 0.0 0 15 @@ -2518,16 +2498,7 @@ ) ) (else - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 256)) - 1.0 - 0 - 15 - f30-0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-red-fire-ja) 1.0 0 15 f30-0 0.0 #f) ) ) ) @@ -2537,17 +2508,7 @@ (if (focus-test? self pilot-riding) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 224)) - 0.0 - 0 - 15 - 1.0 - 0.0 - #f - ) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 259)) + (the-as art-joint-anim jakb-pilot-gun-dark-fire-ja) 0.0 0 15 @@ -2555,6 +2516,7 @@ 0.0 #f ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-dark-fire-ja) 0.0 0 15 1.0 0.0 #f) ) (target-gun-fire-dark) ) @@ -2694,8 +2656,8 @@ (logtest? (state-flags sf16) (-> self state-flags)) (logtest? (-> self game secrets) (game-secrets endless-ammo)) ) - (and (-> gp-0 active?) (not (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 257)) - (= (-> self skel top-anim frame-group) (-> self draw art-group data 206)) + (and (-> gp-0 active?) (not (or (= (-> self skel top-anim frame-group) jakb-gun-blue-fire-ja) + (= (-> self skel top-anim frame-group) jakb-pilot-gun-blue-fire-ja) ) ) ) @@ -2708,8 +2670,8 @@ (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim (if (focus-test? self pilot-riding) - (-> self draw art-group data 206) - (-> self draw art-group data 257) + jakb-pilot-gun-blue-fire-ja + jakb-gun-blue-fire-ja ) ) (* 6.0 f0-24) diff --git a/goal_src/jak2/engine/target/target-swim.gc b/goal_src/jak2/engine/target/target-swim.gc index 2244df3eb03..383ff096e1c 100644 --- a/goal_src/jak2/engine/target/target-swim.gc +++ b/goal_src/jak2/engine/target/target-swim.gc @@ -58,7 +58,7 @@ (go target-running-attack) ) (if (and (using-gun? self) (let ((v1-79 (ja-group))) - (and v1-79 (= v1-79 (-> self draw art-group data 5))) + (and v1-79 (= v1-79 jakb-stance-loop-ja)) ) ) (go target-gun-stance) @@ -116,17 +116,17 @@ ) (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 12)) (= v1-2 (-> self draw art-group data 7)))) + ((and v1-2 (or (= v1-2 jakb-walk-ja) (= v1-2 jakb-run-ja))) (set! gp-0 15) (set! f30-0 (ja-frame-num 0)) ) ((let ((v1-9 (ja-group))) - (and v1-9 (or (= v1-9 (-> self draw art-group data 23)) (= v1-9 (-> self draw art-group data 27)))) + (and v1-9 (or (= v1-9 jakb-jump-ja) (= v1-9 jakb-jump-loop-ja))) ) (set! gp-0 30) ) ((let ((v1-16 (ja-group))) - (and v1-16 (= v1-16 (-> self draw art-group data 97))) + (and v1-16 (= v1-16 jakb-swim-walk-ja)) ) (set! gp-0 120) ) @@ -134,18 +134,18 @@ ) (cond ((and (= (ja-group-size) 6) (let ((v1-25 (ja-group))) - (and v1-25 (= v1-25 (-> self draw art-group data 94))) + (and v1-25 (= v1-25 jakb-wade-shallow-walk-ja)) ) ) ) (else (ja-channel-push! 6 (the-as time-frame gp-0)) - (ja :group! (-> self draw art-group data 94) + (ja :group! jakb-wade-shallow-walk-ja :num! (identity f30-0) :dist (-> *TARGET-bank* wade-shallow-walk-cycle-dist) ) (ja :chan 1 - :group! (-> self draw art-group data 95) + :group! jakb-wade-deep-walk-ja :num! (identity f30-0) :dist (-> *TARGET-bank* wade-deep-walk-cycle-dist) ) @@ -155,11 +155,7 @@ (set! (-> gp-3 frame-interp 0) f0-2) ) (set! (-> gp-3 dist) (-> *TARGET-bank* walk-cycle-dist)) - (joint-control-channel-group-eval! - gp-3 - (the-as art-joint-anim (-> self draw art-group data 12)) - num-func-identity - ) + (joint-control-channel-group-eval! gp-3 (the-as art-joint-anim jakb-walk-ja) num-func-identity) (set! (-> gp-3 frame-num) f30-0) ) (let ((gp-4 (-> self skel root-channel 3))) @@ -168,11 +164,7 @@ (set! (-> gp-4 frame-interp 0) f0-4) ) (set! (-> gp-4 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (joint-control-channel-group-eval! - gp-4 - (the-as art-joint-anim (-> self draw art-group data 14)) - num-func-identity - ) + (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim jakb-walk-down-ja) num-func-identity) (set! (-> gp-4 frame-num) f30-0) ) (let ((gp-5 (-> self skel root-channel 4))) @@ -181,11 +173,7 @@ (set! (-> gp-5 frame-interp 0) f0-6) ) (set! (-> gp-5 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (joint-control-channel-group-eval! - gp-5 - (the-as art-joint-anim (-> self draw art-group data 16)) - num-func-identity - ) + (joint-control-channel-group-eval! gp-5 (the-as art-joint-anim jakb-walk-left-ja) num-func-identity) (set! (-> gp-5 frame-num) f30-0) ) ) @@ -209,7 +197,7 @@ (set! f26-0 (seek f26-0 f24-0 (fmax 0.05 (fmin 0.2 (* 0.25 f0-14))))) ) ) - (ja :chan 3 :group! (-> self draw art-group data 14) :dist (-> *TARGET-bank* walk-down-cycle-dist)) + (ja :chan 3 :group! jakb-walk-down-ja :dist (-> *TARGET-bank* walk-down-cycle-dist)) (cond ((>= f28-0 0.0) (let ((v1-83 (-> self skel root-channel 3))) @@ -218,7 +206,7 @@ (set! (-> v1-83 frame-interp 0) f0-20) ) (set! (-> v1-83 dist) (-> *TARGET-bank* walk-up-cycle-dist)) - (set! (-> v1-83 frame-group) (the-as art-joint-anim (-> self draw art-group data 13))) + (set! (-> v1-83 frame-group) (the-as art-joint-anim jakb-walk-up-ja)) ) ) (else @@ -228,7 +216,7 @@ (set! (-> v1-86 frame-interp 0) f0-22) ) (set! (-> v1-86 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (set! (-> v1-86 frame-group) (the-as art-joint-anim (-> self draw art-group data 14))) + (set! (-> v1-86 frame-group) (the-as art-joint-anim jakb-walk-down-ja)) ) ) ) @@ -240,7 +228,7 @@ (set! (-> v1-89 frame-interp 0) f0-25) ) (set! (-> v1-89 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-89 frame-group) (the-as art-joint-anim (-> self draw art-group data 15))) + (set! (-> v1-89 frame-group) (the-as art-joint-anim jakb-walk-right-ja)) ) ) (else @@ -250,7 +238,7 @@ (set! (-> v1-92 frame-interp 0) f0-27) ) (set! (-> v1-92 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-92 frame-group) (the-as art-joint-anim (-> self draw art-group data 16))) + (set! (-> v1-92 frame-group) (the-as art-joint-anim jakb-walk-left-ja)) ) ) ) @@ -449,7 +437,7 @@ (if (and (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) (let ((gp-0 (ja-group))) (ja-aframe-num 0) - (if (or (and (= gp-0 (-> self draw art-group data 101)) #t) (and (= gp-0 (-> self draw art-group data 100)) #t)) + (if (or (and (= gp-0 jakb-swim-up-ja) #t) (and (= gp-0 jakb-swim-down-to-up-ja) #t)) #f #t ) @@ -463,16 +451,14 @@ :code (behavior () (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 101)) (= v1-2 (-> self draw art-group data 100)))) + ((and v1-2 (or (= v1-2 jakb-swim-up-ja) (= v1-2 jakb-swim-down-to-up-ja))) (ja-channel-push! 1 (seconds 0.075)) - (ja-no-eval :group! (-> self draw art-group data 102) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 102)) frames num-frames) -1)) - (if (= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) - 1.0 - 2.0 - ) - ) + (ja-no-eval :group! jakb-swim-up-to-stance-ja + :num! (seek! max (if (= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) + 1.0 + 2.0 + ) + ) :frame-num 0.0 ) (until (ja-done? 0) @@ -493,7 +479,7 @@ ) (else (let ((v1-43 (ja-group))) - (if (and v1-43 (= v1-43 (-> self draw art-group data 97))) + (if (and v1-43 (= v1-43 jakb-swim-walk-ja)) (ja-channel-push! 1 (seconds 0.83)) (ja-channel-push! 1 (seconds 0.15)) ) @@ -502,7 +488,7 @@ ) ) (until #f - (ja :group! (-> self draw art-group data 96) :num! min) + (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (can-play-stance-amibent?) (suspend) @@ -581,21 +567,14 @@ :code (behavior () (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 101)) - (= v1-2 (-> self draw art-group data 100)) - (= v1-2 (-> self draw art-group data 102)) - ) - ) + ((and v1-2 (or (= v1-2 jakb-swim-up-ja) (= v1-2 jakb-swim-down-to-up-ja) (= v1-2 jakb-swim-up-to-stance-ja))) (ja-channel-push! 1 (seconds 0.3)) ) ((let ((v1-8 (ja-group))) - (and v1-8 (= v1-8 (-> self draw art-group data 102))) + (and v1-8 (= v1-8 jakb-swim-up-to-stance-ja)) ) (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 97) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 97)) frames num-frames) -1))) - :frame-num (ja-aframe 19.0 0) - ) + (ja-no-eval :group! jakb-swim-walk-ja :num! (seek!) :frame-num (ja-aframe 19.0 0)) (until (ja-done? 0) (compute-alignment! (-> self align)) (if (not (logtest? (-> self align flags) (align-flags disabled))) @@ -613,10 +592,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 97) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 97)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-swim-walk-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (if (not (logtest? (-> self align flags) (align-flags disabled))) @@ -749,66 +725,61 @@ (f30-0 0.0) ) (let ((v1-2 (ja-group))) - (set! f30-0 - (cond - ((and v1-2 - (or (= v1-2 (-> self draw art-group data 96)) - (= v1-2 (-> self draw art-group data 97)) - (= v1-2 (-> self draw art-group data 102)) - (= v1-2 (-> self draw art-group data 101)) - (= v1-2 (-> self draw art-group data 100)) - ) - ) - (let ((t9-0 ja-channel-push!) - (a0-16 1) - (v1-7 (ja-group)) - ) - (t9-0 a0-16 (the-as time-frame (if (and v1-7 (= v1-7 (-> self draw art-group data 100))) - 105 - 22 - ) - ) + (set! f30-0 (cond + ((and v1-2 (or (= v1-2 jakb-swim-stance-ja) + (= v1-2 jakb-swim-walk-ja) + (= v1-2 jakb-swim-up-to-stance-ja) + (= v1-2 jakb-swim-up-ja) + (= v1-2 jakb-swim-down-to-up-ja) + ) + ) + (let ((t9-0 ja-channel-push!) + (a0-16 1) + (v1-7 (ja-group)) + ) + (t9-0 a0-16 (the-as time-frame (if (and v1-7 (= v1-7 jakb-swim-down-to-up-ja)) + 105 + 22 + ) + ) + ) ) - ) - (ja-no-eval :group! (-> self draw art-group data 98) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 98)) frames num-frames) -1))) - :frame-num 0.0 + (ja-no-eval :group! jakb-swim-walk-to-down-ja :num! (seek!) :frame-num 0.0) + (until (ja-done? 0) + (compute-alignment! (-> self align)) + (align! (-> self align) (align-opts adjust-y-vel adjust-xz-vel) 1.0 1.0 1.0) + (if (= (ja-aframe-num 0) 73.0) + (spawn-ripples (-> self water) 0.7 (-> self control trans) 1 *null-vector* #f) ) - (until (ja-done? 0) - (compute-alignment! (-> self align)) - (align! (-> self align) (align-opts adjust-y-vel adjust-xz-vel) 1.0 1.0 1.0) - (if (= (ja-aframe-num 0) 73.0) - (spawn-ripples (-> self water) 0.7 (-> self control trans) 1 *null-vector* #f) - ) - (suspend) - (ja :num! (seek!)) - ) - (ja :group! (-> self draw art-group data 99) :num! min) - f30-0 - ) - (else - (let ((v1-50 (ja-group))) - (cond - ((and v1-50 (or (= v1-50 (-> self draw art-group data 52)) - (= v1-50 (-> self draw art-group data 55)) - (= v1-50 (-> self draw art-group data 53)) - (= v1-50 (-> self draw art-group data 56)) - ) - ) - (ja-channel-push! 1 (seconds 0.075)) - (set! gp-0 120) - (ja :group! (-> self draw art-group data 99) :num! (identity (ja-aframe 124.0 0))) - -16384.0 + (suspend) + (ja :num! (seek!)) + ) + (ja :group! jakb-swim-down-ja :num! min) + f30-0 ) (else - (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 99) :num! min) - f30-0 + (let ((v1-50 (ja-group))) + (cond + ((and v1-50 (or (= v1-50 jakb-flop-down-ja) + (= v1-50 jakb-moving-flop-down-ja) + (= v1-50 jakb-flop-down-loop-ja) + (= v1-50 jakb-moving-flop-down-loop-ja) + ) + ) + (ja-channel-push! 1 (seconds 0.075)) + (set! gp-0 120) + (ja :group! jakb-swim-down-ja :num! (identity (ja-aframe 124.0 0))) + -16384.0 + ) + (else + (ja-channel-push! 1 (seconds 0.075)) + (ja :group! jakb-swim-down-ja :num! min) + f30-0 + ) + ) + ) ) ) - ) - ) - ) ) ) (until #f @@ -897,10 +868,7 @@ (let ((s5-0 #t) (gp-0 #f) ) - (ja-no-eval :group! (-> self draw art-group data 100) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 100)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-swim-down-to-up-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (target-swim-tilt (if (< 8192.0 (-> self water swim-depth)) @@ -939,7 +907,7 @@ (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 101) :num! min) + (ja :group! jakb-swim-up-ja :num! min) (until #f (target-swim-tilt (if (< 8192.0 (-> self water swim-depth)) @@ -1009,7 +977,7 @@ :code (behavior ((arg0 float) (arg1 float)) (die-on-next-update! (-> self water bob)) (ja-channel-push! 1 (seconds 0.05)) - (ja :group! (-> self draw art-group data 103) :num! min) + (ja :group! jakb-swim-jump-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (compute-alignment! (-> self align)) (if (not (logtest? (-> self align flags) (align-flags disabled))) diff --git a/goal_src/jak2/engine/target/target-tube.gc b/goal_src/jak2/engine/target/target-tube.gc index e92a26e943e..196ee65dd1c 100644 --- a/goal_src/jak2/engine/target/target-tube.gc +++ b/goal_src/jak2/engine/target/target-tube.gc @@ -667,7 +667,7 @@ ) (update-rates! (-> self clock) f30-0) ) - (ja :group! (-> self draw art-group data 111) + (ja :group! jakb-tube-turn-ja :num! (identity (ja-aframe (+ (-> self tube turn-anim-frame) (* 5.0 (sin (* 145.63556 (the float (- (current-time) (-> self state-time)))))) @@ -703,12 +703,9 @@ :code (behavior () (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 30)) (= v1-2 (-> self draw art-group data 27)))) + ((and v1-2 (or (= v1-2 jakb-duck-high-jump-ja) (= v1-2 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 112) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 112)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-tube-jump-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -754,7 +751,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (ja-channel-push! 1 (seconds 0.05)) - (ja :group! (-> self draw art-group data 30) :num! (identity (ja-aframe 16.0 0))) + (ja :group! jakb-duck-high-jump-ja :num! (identity (ja-aframe 16.0 0))) (let ((f30-0 35.0) (f28-0 1.0) ) @@ -777,10 +774,10 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -928,7 +925,7 @@ (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 69) :num! (seek! (ja-aframe 134.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-deatha-ja :num! (seek! (ja-aframe 134.0 0)) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (let ((gp-2 (new 'stack-no-clear 'vector))) @@ -1045,7 +1042,7 @@ (go-virtual slide-control-ride) ) ) - :code (the-as (function none :behavior slide-control) sleep-code) + :code sleep-code ) (defstate slide-control-ride (slide-control) @@ -1099,7 +1096,7 @@ ) ) ) - :code (the-as (function none :behavior slide-control) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/engine/target/target-turret.gc b/goal_src/jak2/engine/target/target-turret.gc index e6327f23d9f..35cf2fcdc6f 100644 --- a/goal_src/jak2/engine/target/target-turret.gc +++ b/goal_src/jak2/engine/target/target-turret.gc @@ -1025,8 +1025,8 @@ :enter (behavior () (set-setting! 'mode-name 'cam-turret 0.0 0) ) - :code (the-as (function none :behavior base-turret) sleep-code) - :post (the-as (function none :behavior base-turret) transform-post) + :code sleep-code + :post transform-post ) ;; WARN: Return type mismatch symbol vs none. @@ -1469,7 +1469,7 @@ (base-turret-method-43 self) (set! (-> self focus-status) (focus-status disable ignore inactive)) ) - :code (the-as (function none :behavior base-turret) sleep-code) + :code sleep-code ) (defstate die (base-turret) @@ -2295,10 +2295,7 @@ This commonly includes things such as: ) ) (set! (-> self alt-cam-pos quad) (-> self control camera-pos quad)) - (ja-no-eval :group! (-> self draw art-group data 361) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 361)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 361) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 12.0)))) (let ((f28-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 0.0 12.0))) @@ -2358,10 +2355,7 @@ This commonly includes things such as: (set! (-> self control unknown-vector40 quad) (-> gp-0 quad)) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 360) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 360)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 360) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (cond ((< (ja-aframe-num 0) 88.0) diff --git a/goal_src/jak2/engine/target/target.gc b/goal_src/jak2/engine/target/target.gc index 943d745e687..d14fceb1a89 100644 --- a/goal_src/jak2/engine/target/target.gc +++ b/goal_src/jak2/engine/target/target.gc @@ -117,7 +117,7 @@ (if (and (using-gun? self) (and (-> self next-state) (= (-> self next-state name) 'target-stance)) (let ((v1-85 (ja-group))) - (and v1-85 (= v1-85 (-> self draw art-group data 5))) + (and v1-85 (= v1-85 jakb-stance-loop-ja)) ) ) (go target-gun-stance) @@ -289,7 +289,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.04)) - (ja :group! (-> self draw art-group data 22) :num! min) + (ja :group! jakb-turn-around-ja :num! min) (quaternion-rotate-y! (-> self control dir-targ) (-> self control dir-targ) 32768.0) (compute-alignment! (-> self align)) (until (ja-done? 0) @@ -331,15 +331,12 @@ ) :code (behavior () (let ((v1-2 (ja-group))) - (if (not (and v1-2 (= v1-2 (-> self draw art-group data 20)))) + (if (not (and v1-2 (= v1-2 jakb-duck-stance-ja))) (ja-channel-push! 1 (seconds 0.1)) ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-duck-stance-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -794,10 +791,10 @@ (logtest? (-> self state-flags) (state-flags prevent-duck)) ) (let ((v1-13 (ja-group))) - (and (not (and v1-13 (or (= v1-13 (-> self draw art-group data 60)) - (= v1-13 (-> self draw art-group data 59)) - (= v1-13 (-> self draw art-group data 283)) - (= v1-13 (-> self draw art-group data 282)) + (and (not (and v1-13 (or (= v1-13 jakb-duck-roll-end-ja) + (= v1-13 jakb-duck-roll-ja) + (= v1-13 jakb-gun-duck-roll-end-ja) + (= v1-13 jakb-gun-duck-roll-ja) ) ) ) @@ -845,7 +842,7 @@ :code (behavior ((arg0 symbol)) (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 59)) (= v1-2 (-> self draw art-group data 282)))) + ((and v1-2 (or (= v1-2 jakb-duck-roll-ja) (= v1-2 jakb-gun-duck-roll-ja))) (set! (-> self neck flex-blend) 0.0) (set! (-> self neck base-joint) (the-as uint 8)) (cond @@ -853,7 +850,7 @@ (set! (-> self gun surpress-time) (+ (current-time) (seconds 0.7))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 283)) + (the-as art-joint-anim jakb-gun-duck-roll-end-ja) 0.0 0 30 @@ -861,20 +858,14 @@ 6.0 #f ) - (ja-no-eval :group! (-> self draw art-group data 283) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 283)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-gun-duck-roll-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 60) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 60)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-duck-roll-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -885,13 +876,11 @@ (set! (-> self neck base-joint) (the-as uint 6)) ) ((let ((v1-68 (ja-group))) - (and (and v1-68 (= v1-68 (-> self draw art-group data 20))) - (= (-> self skel root-channel 0) (-> self skel channel)) - ) + (and (and v1-68 (= v1-68 jakb-duck-stance-ja)) (= (-> self skel root-channel 0) (-> self skel channel))) ) ) ((let ((v1-78 (ja-group))) - (and v1-78 (or (= v1-78 (-> self draw art-group data 21)) (= v1-78 (-> self draw art-group data 302)))) + (and v1-78 (or (= v1-78 jakb-duck-walk-ja) (= v1-78 jakb-gun-duck-walk-ja))) ) (ja-channel-push! 1 (seconds 0.1)) ) @@ -900,10 +889,7 @@ ) (else (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-stance-to-duck-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -912,10 +898,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-duck-stance-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -935,7 +918,7 @@ (set! (-> self control bend-target) 1.0) (target-collide-set! 'duck 1.0) (let ((v1-7 (ja-group))) - (if (not (and v1-7 (or (= v1-7 (-> self draw art-group data 59)) (= v1-7 (-> self draw art-group data 282))))) + (if (not (and v1-7 (or (= v1-7 jakb-duck-roll-ja) (= v1-7 jakb-gun-duck-roll-ja)))) (set! (-> self control mod-surface) *duck-mods*) ) ) @@ -954,7 +937,7 @@ ) (if (and (using-gun? self) (begin (set! v1-22 (get-channel (-> self skel top-anim) 0)) v1-22) - (= (-> v1-22 frame-group) (-> self draw art-group data 283)) + (= (-> v1-22 frame-group) jakb-gun-duck-roll-end-ja) ) (target-top-anim-base-mode 60) ) @@ -997,21 +980,21 @@ ) :code (behavior ((arg0 symbol)) (let ((gp-0 (if (using-gun? self) - (-> self draw art-group data 302) - (-> self draw art-group data 21) + jakb-gun-duck-walk-ja + jakb-duck-walk-ja ) ) (v1-6 (ja-group)) ) (cond - ((and (and v1-6 (or (= v1-6 (-> self draw art-group data 21)) (= v1-6 (-> self draw art-group data 302)))) + ((and (and v1-6 (or (= v1-6 jakb-duck-walk-ja) (= v1-6 jakb-gun-duck-walk-ja))) (= (-> self skel root-channel 0) (-> self skel channel)) ) ) (else (let ((v1-16 (ja-group))) (cond - ((and v1-16 (= v1-16 (-> self draw art-group data 20))) + ((and v1-16 (= v1-16 jakb-duck-stance-ja)) (ja-channel-push! 1 (seconds 0.45)) (ja :group! gp-0 :num! min) ) @@ -1048,9 +1031,9 @@ (let ((s5-0 (-> gp-0 frame-group)) (f0-0 (ja-aframe-num 0)) ) - (when (or (= s5-0 (-> self draw art-group data 304)) (= s5-0 (-> self draw art-group data 300))) + (when (or (= s5-0 jakb-gun-side-jump-ja) (= s5-0 jakb-gun-front-jump-ja)) (let ((v1-13 (ja-group))) - (if (and v1-13 (= v1-13 (-> self draw art-group data 30))) + (if (and v1-13 (= v1-13 jakb-duck-high-jump-ja)) (set! (-> gp-0 frame-num) (/ (- f0-0 (+ 16.0 (-> s5-0 artist-base))) (-> s5-0 artist-step))) (set! (-> gp-0 frame-num) (/ (- f0-0 (-> s5-0 artist-base)) (-> s5-0 artist-step))) ) @@ -1112,7 +1095,7 @@ (a0-1 #f) (v1-12 (ja-group)) ) - (t9-0 a0-1 (the-as time-frame (if (and v1-12 (= v1-12 (-> self draw art-group data 27))) + (t9-0 a0-1 (the-as time-frame (if (and v1-12 (= v1-12 jakb-jump-loop-ja)) 15 -1 ) @@ -1171,21 +1154,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 0.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 0.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 0.0 30 30 @@ -1198,19 +1172,16 @@ ) (let ((v1-18 (ja-group))) (cond - ((and (and v1-18 (= v1-18 (-> self draw art-group data 54))) - (>= 25.0 (ja-aframe-num 0)) - (>= (ja-aframe-num 0) 17.0) - ) + ((and (and v1-18 (= v1-18 jakb-flop-down-land-ja)) (>= 25.0 (ja-aframe-num 0)) (>= (ja-aframe-num 0) 17.0)) (set! (-> self neck flex-blend) 0.0) (ja-channel-push! 1 0) (cond ((using-gun? self) - (ja :group! (-> self draw art-group data 30) :num! (identity (ja-aframe 16.0 0))) + (ja :group! jakb-duck-high-jump-ja :num! (identity (ja-aframe 16.0 0))) (set! f28-0 35.0) ) (else - (ja :group! (-> self draw art-group data 58) :num! (identity (ja-aframe 25.0 0))) + (ja :group! jakb-flop-jump-ja :num! (identity (ja-aframe 25.0 0))) (set! f28-0 24.0) (set! f30-0 0.3) ) @@ -1218,40 +1189,32 @@ ) ((and (focus-test? self dark) (nonzero? (-> self darkjak))) (ja-channel-push! 1 (seconds 0.05)) - (ja :group! (-> self draw art-group data 394) :num! min) + (ja :group! jakb-darkjak-jump-ja :num! min) (suspend) 0 ) (else (ja-channel-push! 2 (seconds 0.05)) - (ja :group! (-> self draw art-group data 23) :num! min) + (ja :group! jakb-jump-ja :num! min) (let ((a0-23 (-> self skel root-channel 1))) (let ((f0-8 (-> self control unknown-float35))) (set! (-> a0-23 frame-interp 1) f0-8) (set! (-> a0-23 frame-interp 0) f0-8) ) - (set! (-> a0-23 frame-group) (the-as art-joint-anim (-> self draw art-group data 29))) + (set! (-> a0-23 frame-group) (the-as art-joint-anim jakb-jump-forward-ja)) (set! (-> a0-23 param 0) 0.0) - (joint-control-channel-group-eval! - a0-23 - (the-as art-joint-anim (-> self draw art-group data 29)) - num-func-chan - ) + (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim jakb-jump-forward-ja) num-func-chan) ) (suspend) - (ja :group! (-> self draw art-group data 23) :num! (+!)) + (ja :group! jakb-jump-ja :num! (+!)) (let ((a0-25 (-> self skel root-channel 1))) (let ((f0-11 (-> self control unknown-float35))) (set! (-> a0-25 frame-interp 1) f0-11) (set! (-> a0-25 frame-interp 0) f0-11) ) - (set! (-> a0-25 frame-group) (the-as art-joint-anim (-> self draw art-group data 29))) + (set! (-> a0-25 frame-group) (the-as art-joint-anim jakb-jump-forward-ja)) (set! (-> a0-25 param 0) 0.0) - (joint-control-channel-group-eval! - a0-25 - (the-as art-joint-anim (-> self draw art-group data 29)) - num-func-chan - ) + (joint-control-channel-group-eval! a0-25 (the-as art-joint-anim jakb-jump-forward-ja) num-func-chan) ) (suspend) 0 @@ -1302,21 +1265,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 3.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 3.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 3.0 30 30 @@ -1328,20 +1282,17 @@ ) ) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num (ja-aframe 3.0 0) - ) + (ja-no-eval :group! jakb-jump-ja :num! (seek!) :frame-num (ja-aframe 3.0 0)) (until (ja-done? 0) (set! (-> self control time-of-last-clear-wall-in-jump) 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) (target-jump-top-anim) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -1374,7 +1325,7 @@ (a0-0 #f) (v1-2 (ja-group)) ) - (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 (-> self draw art-group data 27))) + (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 jakb-jump-loop-ja)) 15 -1 ) @@ -1418,21 +1369,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 7.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 7.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 7.0 30 30 @@ -1446,18 +1388,12 @@ (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 394) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 394)) frames num-frames) -1))) - :frame-num (ja-aframe 7.0 0) - ) + (ja-no-eval :group! jakb-darkjak-jump-ja :num! (seek!) :frame-num (ja-aframe 7.0 0)) ) (else (ja-channel-push! 2 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num (ja-aframe 5.0 0) - ) - (ja :chan 1 :group! (-> self draw art-group data 29) :num! (chan 0)) + (ja-no-eval :group! jakb-jump-ja :num! (seek!) :frame-num (ja-aframe 5.0 0)) + (ja :chan 1 :group! jakb-jump-forward-ja :num! (chan 0)) ) ) (until (ja-done? 0) @@ -1524,7 +1460,7 @@ (a0-0 #f) (v1-2 (ja-group)) ) - (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 (-> self draw art-group data 27))) + (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 jakb-jump-loop-ja)) 15 -1 ) @@ -1586,27 +1522,24 @@ :exit target-exit :code (behavior ((arg0 float) (arg1 float) (arg2 symbol)) (let ((v1-2 (ja-group))) - (if (not (and (and v1-2 (= v1-2 (-> self draw art-group data 20))) - (= (-> self skel root-channel 0) (-> self skel channel)) - ) - ) + (if (not (and (and v1-2 (= v1-2 jakb-duck-stance-ja)) (= (-> self skel root-channel 0) (-> self skel channel)))) (ja-channel-push! 1 (seconds 0.04)) ) ) (let ((v1-11 arg2)) (cond ((or (= v1-11 'flop) (= v1-11 'flop-forward)) - (ja-no-eval :group! (-> self draw art-group data 58) :num! (seek! (ja-aframe 25.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-flop-jump-ja :num! (seek! (ja-aframe 25.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 25.0 0))) ) ) ((using-gun? self) - (ja :group! (-> self draw art-group data 30) :num! (identity (ja-aframe 16.0 0))) + (ja :group! jakb-duck-high-jump-ja :num! (identity (ja-aframe 16.0 0))) ) (else - (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek! (ja-aframe 16.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-duck-high-jump-ja :num! (seek! (ja-aframe 16.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 16.0 0))) @@ -1669,21 +1602,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 0.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 0.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 0.0 30 30 @@ -1743,18 +1667,18 @@ (cond ((or (= arg2 'flop) (= arg2 'flop-forward)) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) (else - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -1802,10 +1726,7 @@ ) (('hit) (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 66) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 66)) frames num-frames) -1))) - :frame-num (ja-aframe 15.0 0) - ) + (ja-no-eval :group! jakb-hit-from-front-ja :num! (seek!) :frame-num (ja-aframe 15.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1879,7 +1800,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 305)) + (the-as art-joint-anim jakb-gun-side-jump-land-ja) 0.0 30 30 @@ -1891,7 +1812,7 @@ (((pickup-type eco-red) (pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 301)) + (the-as art-joint-anim jakb-gun-front-jump-land-ja) 0.0 30 30 @@ -1903,7 +1824,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 301)) + (the-as art-joint-anim jakb-gun-front-jump-land-ja) 0.0 30 30 @@ -2109,10 +2030,10 @@ (target-exit) ) :code (behavior () - (let ((gp-0 (-> self draw art-group data 40))) + (let ((gp-0 jakb-attack-from-stance-ja)) (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) - (set! gp-0 (-> self draw art-group data 399)) + (set! gp-0 jakb-darkjak-attack-spin-ja) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -1365.3334) ) ((using-gun? self) @@ -2121,7 +2042,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 0.0 30 30 @@ -2129,13 +2050,13 @@ 0.0 #f ) - (set! gp-0 (-> self draw art-group data 248)) + (set! gp-0 jakb-gun-attack-from-stance-ja) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -3276.8) ) (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 250)) + (the-as art-joint-anim jakb-gun-attack-from-stance-blue-ja) 0.0 30 30 @@ -2143,12 +2064,12 @@ 0.0 #f ) - (set! gp-0 (-> self draw art-group data 250)) + (set! gp-0 jakb-gun-attack-from-stance-blue-ja) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 0.0 30 30 @@ -2156,7 +2077,7 @@ 0.0 #f ) - (set! gp-0 (-> self draw art-group data 248)) + (set! gp-0 jakb-gun-attack-from-stance-ja) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -3276.8) ) ) @@ -2167,13 +2088,7 @@ ) (ja-channel-push! 1 (seconds 0.05)) (set! (-> self control unknown-sound-id01) (sound-play "spin-kick")) - (ja-no-eval :group! gp-0 - :num! (seek! - (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) - (-> self control current-surface align-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self control current-surface align-speed)) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -2208,7 +2123,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 251)) + (the-as art-joint-anim jakb-gun-attack-from-stance-blue-end-ja) 0.0 0 60 @@ -2221,7 +2136,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 249)) + (the-as art-joint-anim jakb-gun-attack-from-stance-end-ja) 0.0 0 60 @@ -2234,7 +2149,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 249)) + (the-as art-joint-anim jakb-gun-attack-from-stance-end-ja) 0.0 0 60 @@ -2451,7 +2366,7 @@ (not (logtest? (-> self state-flags) (state-flags prevent-jump prevent-attack))) (not (logtest? (-> self control current-surface flags) (surface-flag no-attack))) (let ((v1-48 (ja-group))) - (and (not (and v1-48 (= v1-48 (-> self draw art-group data 406)))) + (and (not (and v1-48 (= v1-48 jakb-darkjak-attack-combo3-ja))) (and (not (logtest? (-> self control current-surface flags) (surface-flag no-jump))) (not (logtest? (-> self state-flags) (state-flags prevent-jump))) ) @@ -2489,7 +2404,7 @@ ) (set! (-> self control dynam gravity-max) 368640.0) (set! (-> self control dynam gravity-length) 368640.0) - (let ((gp-1 (-> self draw art-group data 48))) + (let ((gp-1 jakb-attack-punch-ja)) (ja-channel-push! 1 (seconds 0.02)) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) @@ -2497,7 +2412,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 273)) + (the-as art-joint-anim jakb-gun-attack-butt-ja) 0.0 30 60 @@ -2505,12 +2420,12 @@ 0.0 #f ) - (set! gp-1 (-> self draw art-group data 275)) + (set! gp-1 jakb-gun-attack-butt-blue-ja) ) (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 275)) + (the-as art-joint-anim jakb-gun-attack-butt-blue-ja) 0.0 30 60 @@ -2518,12 +2433,12 @@ 0.0 #f ) - (set! gp-1 (-> self draw art-group data 275)) + (set! gp-1 jakb-gun-attack-butt-blue-ja) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 273)) + (the-as art-joint-anim jakb-gun-attack-butt-ja) 0.0 30 60 @@ -2531,11 +2446,11 @@ 0.0 #f ) - (set! gp-1 (-> self draw art-group data 273)) + (set! gp-1 jakb-gun-attack-butt-ja) ) ) ) - (ja-no-eval :group! gp-1 :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)))) + (ja-no-eval :group! gp-1 :num! (seek!)) ) (target-start-attack) (target-danger-set! 'punch #f) @@ -2604,21 +2519,19 @@ (let ((s5-2 (ja-group)) (f24-0 (ja-aframe-num 0)) ) - (if (or (and (= s5-2 (-> self draw art-group data 48)) + (if (or (and (= s5-2 jakb-attack-punch-ja) (>= f24-0 10.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 48)) frames num-frames) -1)) - (ja-frame-num 0) - ) + (>= (the float (+ (-> (the-as art-joint-anim jakb-attack-punch-ja) frames num-frames) -1)) (ja-frame-num 0)) ) - (and (= s5-2 (-> self draw art-group data 273)) + (and (= s5-2 jakb-gun-attack-butt-ja) (>= f24-0 10.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 273)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-gun-attack-butt-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= s5-2 (-> self draw art-group data 275)) + (and (= s5-2 jakb-gun-attack-butt-blue-ja) (>= f24-0 10.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 275)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-gun-attack-butt-blue-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) @@ -2719,7 +2632,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 276)) + (the-as art-joint-anim jakb-gun-attack-butt-blue-end-ja) 0.0 0 60 @@ -2731,7 +2644,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 274)) + (the-as art-joint-anim jakb-gun-attack-butt-end-ja) 0.0 0 60 @@ -2845,9 +2758,9 @@ ) (let ((v1-22 (ja-group))) (if (and v1-22 - (or (= v1-22 (-> self draw art-group data 51)) - (= v1-22 (-> self draw art-group data 267)) - (= v1-22 (-> self draw art-group data 279)) + (or (= v1-22 jakb-attack-uppercut-ja) + (= v1-22 jakb-gun-attack-upperbutt-ja) + (= v1-22 jakb-gun-attack-upperbutt-blue-ja) ) ) (set! f0-7 @@ -3017,7 +2930,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (let* ((v1-2 (ja-group)) - (f30-0 (if (and v1-2 (= v1-2 (-> self draw art-group data 20))) + (f30-0 (if (and v1-2 (= v1-2 jakb-duck-stance-ja)) 5.0 0.0 ) @@ -3030,7 +2943,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 279)) + (the-as art-joint-anim jakb-gun-attack-upperbutt-blue-ja) f30-0 5 30 @@ -3038,7 +2951,7 @@ 0.0 #f ) - (ja-no-eval :group! (-> self draw art-group data 279) + (ja-no-eval :group! jakb-gun-attack-upperbutt-blue-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0) ) @@ -3050,7 +2963,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 267)) + (the-as art-joint-anim jakb-gun-attack-upperbutt-ja) f30-0 5 30 @@ -3058,7 +2971,7 @@ 0.0 #f ) - (ja-no-eval :group! (-> self draw art-group data 267) + (ja-no-eval :group! jakb-gun-attack-upperbutt-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0) ) @@ -3076,10 +2989,7 @@ (set! (-> self control unknown-sound-id00) (add-process *gui-control* self (gui-channel jak) (gui-action queue) "darkbom1" -99.0 0) ) - (ja-no-eval :group! (-> self draw art-group data 391) - :num! (seek! (ja-aframe 7.0 0)) - :frame-num (ja-aframe f30-0 0) - ) + (ja-no-eval :group! jakb-darkjak-attack-ice-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 7.0 0))) @@ -3087,10 +2997,7 @@ (go target-darkjak-bomb1 arg0 arg1) ) (else - (ja-no-eval :group! (-> self draw art-group data 51) - :num! (seek! (ja-aframe 7.0 0)) - :frame-num (ja-aframe f30-0 0) - ) + (ja-no-eval :group! jakb-attack-uppercut-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 7.0 0))) @@ -3191,7 +3098,7 @@ (if (and (cpad-pressed? (-> self control cpad number) circle) (and (can-feet? #f) (let ((v1-65 (ja-group))) - (and v1-65 (or (= v1-65 (-> self draw art-group data 51)) (= v1-65 (-> self draw art-group data 267)))) + (and v1-65 (or (= v1-65 jakb-attack-uppercut-ja) (= v1-65 jakb-gun-attack-upperbutt-ja))) ) (>= (ja-aframe-num 0) 12.0) ) @@ -3211,8 +3118,8 @@ (slide-down-test) ) :code (behavior ((arg0 float) (arg1 float)) - (when (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 267)) - (= (-> self skel top-anim frame-group) (-> self draw art-group data 279)) + (when (or (= (-> self skel top-anim frame-group) jakb-gun-attack-upperbutt-ja) + (= (-> self skel top-anim frame-group) jakb-gun-attack-upperbutt-blue-ja) ) (let ((v1-10 (get-channel (-> self skel top-anim) 0))) (if v1-10 @@ -3227,7 +3134,7 @@ (compute-alignment! (-> self align)) (set! (-> self control turn-go-the-long-way) 1.0) (let ((v1-27 (ja-group))) - (if (and v1-27 (= v1-27 (-> self draw art-group data 51))) + (if (and v1-27 (= v1-27 jakb-attack-uppercut-ja)) (align! (-> self align) (the-as align-opts (cond @@ -3357,7 +3264,7 @@ (let ((v1-2 (get-channel (-> self skel top-anim) 0))) (when v1-2 (case (-> v1-2 frame-group) - (((-> self draw art-group data 286)) + ((jakb-gun-flop-down-ja) (set! (-> v1-2 param 1) 10.0) ) ) @@ -3372,10 +3279,9 @@ :trans (behavior () (delete-back-vel) (let ((gp-1 (logtest? (-> self control status) (collide-status on-surface)))) - (when (and (not gp-1) - (let ((v1-6 (ja-group))) - (and v1-6 (or (= v1-6 (-> self draw art-group data 53)) (= v1-6 (-> self draw art-group data 55)))) - ) + (when (and (not gp-1) (let ((v1-6 (ja-group))) + (and v1-6 (or (= v1-6 jakb-flop-down-loop-ja) (= v1-6 jakb-moving-flop-down-ja))) + ) ) (when (and (or (< (target-move-dist (seconds 0.1)) 1638.4) (and (logtest? (-> self control status) (collide-status touch-wall)) (< 0.7 (-> self control poly-angle))) @@ -3426,7 +3332,7 @@ ) (when (and (not (-> self control danger-mode)) (let ((v1-82 (ja-group))) - (and v1-82 (= v1-82 (-> self draw art-group data 52))) + (and v1-82 (= v1-82 jakb-flop-down-ja)) ) (>= (ja-aframe-num 0) 8.0) ) @@ -3436,23 +3342,11 @@ ) :code (behavior ((arg0 float) (arg1 float) (arg2 float)) (if (using-gun? self) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 286)) - 0.0 - 0 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-flop-down-ja) 0.0 0 30 1.0 0.0 #f) ) (ja-channel-set! 2) - (ja-no-eval :group! (-> self draw art-group data 52) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 52)) frames num-frames) -1))) - :frame-num 0.0 - ) - (ja :chan 1 :group! (-> self draw art-group data 55) :num! (chan 0) :frame-num 0.0) + (ja-no-eval :group! jakb-flop-down-ja :num! (seek!) :frame-num 0.0) + (ja :chan 1 :group! jakb-moving-flop-down-ja :num! (chan 0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3470,7 +3364,7 @@ (set! (-> self control dynam gravity quad) (-> self control standard-dynamics gravity quad)) (target-danger-set! 'flop-down #f) (let ((v1-56 (get-channel (-> self skel top-anim) 0))) - (if (and v1-56 (= (-> v1-56 frame-group) (-> self draw art-group data 286))) + (if (and v1-56 (= (-> v1-56 frame-group) jakb-gun-flop-down-ja)) (set! (-> v1-56 param 1) 0.0) ) ) @@ -3633,7 +3527,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) ) (let ((v1-37 (ja-group))) - (if (and (and v1-37 (= v1-37 (-> self draw art-group data 54))) (>= (ja-aframe-num 0) 28.0)) + (if (and (and v1-37 (= v1-37 jakb-flop-down-land-ja)) (>= (ja-aframe-num 0) 28.0)) (logior! (-> *flop-land-mods* flags) (surface-flag check-edge)) ) ) @@ -3709,20 +3603,11 @@ (cond ((using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 282)) - 0.0 - 15 - 30 - 1.0 - 0.0 - #f - ) - (ja :group! (-> self draw art-group data 282) :num! min) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-duck-roll-ja) 0.0 15 30 1.0 0.0 #f) + (ja :group! jakb-gun-duck-roll-ja :num! min) ) (else - (ja :group! (-> self draw art-group data 59) :num! min) + (ja :group! jakb-duck-roll-ja :num! min) ) ) (until (ja-done? 0) @@ -3862,9 +3747,7 @@ (if (and (cpad-pressed? (-> self control cpad number) circle) (can-feet? #f) (let ((v1-20 (ja-group))) - (and (and v1-20 (= v1-20 (-> self draw art-group data 27))) - (= (-> self skel root-channel 0) (-> self skel channel)) - ) + (and (and v1-20 (= v1-20 jakb-jump-loop-ja)) (= (-> self skel root-channel 0) (-> self skel channel))) ) ) (go target-attack-air #f) @@ -3873,19 +3756,10 @@ :code (behavior ((arg0 float) (arg1 float)) (local-vars (v1-37 symbol)) (ja-channel-push! 1 (seconds 0.04)) - (ja :group! (-> self draw art-group data 61) :num! min) + (ja :group! jakb-roll-flip-ja :num! min) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 284)) - 0.0 - 0 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-roll-flip-ja) 0.0 0 30 1.0 0.0 #f) ) (let ((f30-0 1.0)) (until v1-37 @@ -3925,9 +3799,9 @@ (while (not (logtest? (-> self control status) (collide-status on-surface))) (when (>= (- (current-time) (-> self state-time)) (seconds 0.01)) (let ((v1-50 (ja-group))) - (when (not (and v1-50 (= v1-50 (-> self draw art-group data 27)))) + (when (not (and v1-50 (= v1-50 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja :group! (-> self draw art-group data 27) :num! min) + (ja :group! jakb-jump-loop-ja :num! min) ) ) ) @@ -3949,7 +3823,7 @@ ) (suspend) (let ((v1-62 (ja-group))) - (if (and v1-62 (= v1-62 (-> self draw art-group data 27))) + (if (and v1-62 (= v1-62 jakb-jump-loop-ja)) (ja :num! (loop!)) (ja :num-func num-func-identity :frame-num max) ) @@ -3989,7 +3863,7 @@ ) (else (let ((v1-86 (ja-group))) - (if (and v1-86 (= v1-86 (-> self draw art-group data 27))) + (if (and v1-86 (= v1-86 jakb-jump-loop-ja)) (go target-hit-ground #f) (go target-stance) ) diff --git a/goal_src/jak2/engine/target/target2.gc b/goal_src/jak2/engine/target/target2.gc index ad4d5f3e899..b6b349447ce 100644 --- a/goal_src/jak2/engine/target/target2.gc +++ b/goal_src/jak2/engine/target/target2.gc @@ -33,10 +33,7 @@ (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 0.05)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 63) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 63)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-trip-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-xz-vel) 1.0 1.0 1.0) @@ -61,18 +58,12 @@ ) ) (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1))) - :frame-num (ja-aframe 40.0 0) - ) + (ja-no-eval :group! jakb-painful-land-ja :num! (seek!) :frame-num (ja-aframe 40.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-painful-land-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -144,7 +135,7 @@ (when (and a0-0 (= (-> *setting-control* user-current spooling) (process->ppointer self))) (ja-abort-spooled-anim a0-0 (the-as art-joint-anim #f) -1) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 5) :num! min) + (ja :group! jakb-stance-loop-ja :num! min) ) ) (set! (-> self spool-anim) #f) @@ -181,8 +172,8 @@ ) (ja-play-spooled-anim (-> self spool-anim) - (the-as art-joint-anim (-> self draw art-group data 5)) - (the-as art-joint-anim (-> self draw art-group data 5)) + (the-as art-joint-anim jakb-stance-loop-ja) + (the-as art-joint-anim jakb-stance-loop-ja) (lambda ((arg0 process-drawable)) (!= (-> *cpad-list* cpads 0 stick0-speed) 0.0)) ) (go target-stance) @@ -386,13 +377,10 @@ (+! gp-0 (- (current-time) (-> self clock old-frame-counter))) (suspend) ) - (if (or (> gp-0 0) (let ((v1-10 (ja-group))) - (and v1-10 (or (= v1-10 (-> self draw art-group data 23)) - (= v1-10 (-> self draw art-group data 27)) - (= v1-10 (-> self draw art-group data 30)) - ) - ) - ) + (if (or (> gp-0 0) + (let ((v1-10 (ja-group))) + (and v1-10 (or (= v1-10 jakb-jump-ja) (= v1-10 jakb-jump-loop-ja) (= v1-10 jakb-duck-high-jump-ja))) + ) ) (target-hit-ground-anim #f (are-still?)) ) @@ -406,7 +394,7 @@ ((logtest? (water-flags swimming) (-> self water flags)) (ja-channel-push! 1 (seconds 0.15)) (until #f - (ja :group! (-> self draw art-group data 96) :num! min) + (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -423,16 +411,16 @@ (let* ((v1-49 (-> self gun gun-type)) (s5-2 (cond ((= v1-49 (pickup-type eco-blue)) - (-> self draw art-group data 255) + jakb-gun-stance-blue-ja ) ((= v1-49 (pickup-type eco-yellow)) - (-> self draw art-group data 254) + jakb-gun-stance-yellow-ja ) ((= v1-49 (pickup-type eco-dark)) - (-> self draw art-group data 253) + jakb-gun-stance-dark-ja ) (else - (-> self draw art-group data 244) + jakb-gun-stance-ja ) ) ) @@ -456,10 +444,7 @@ (else (target-stance-push 1) (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-stance-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -474,7 +459,7 @@ ) (('shock-in) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 73) :num! (seek! (ja-aframe 15.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-shocked-ja :num! (seek! (ja-aframe 15.0 0)) :frame-num 0.0) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -483,10 +468,7 @@ (ja :num! (seek! (ja-aframe 15.0 0))) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 73) - :num! (seek! (ja-aframe 26.0 0)) - :frame-num (ja-aframe 16.0 0) - ) + (ja-no-eval :group! jakb-shocked-ja :num! (seek! (ja-aframe 26.0 0)) :frame-num (ja-aframe 16.0 0)) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -499,10 +481,7 @@ ) (('shock-out) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 73) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 73)) frames num-frames) -1))) - :frame-num (ja-aframe 17.0 0) - ) + (ja-no-eval :group! jakb-shocked-ja :num! (seek!) :frame-num (ja-aframe 17.0 0)) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -607,7 +586,7 @@ ) (let ((v1-8 (ja-group))) (cond - ((and v1-8 (= v1-8 (-> self draw art-group data 107))) + ((and v1-8 (= v1-8 jakb-pole-jump-loop-ja)) (while (not (-> self control did-move-to-pole-or-max-jump-height)) (ja :num! (seek!)) (suspend) @@ -623,10 +602,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 104) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 104)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -638,10 +614,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 104) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 104)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (can-play-stance-amibent?) (suspend) @@ -658,10 +631,7 @@ :exit (-> target-pole-cycle exit) :code (behavior ((arg0 object) (arg1 object) (arg2 float)) (let ((f0-2 (+ 1.0 (fmin 17.0 (ja-aframe-num 0))))) - (ja-no-eval :group! (-> self draw art-group data 105) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 105)) frames num-frames) -1))) - :frame-num (ja-aframe f0-2 0) - ) + (ja-no-eval :group! jakb-pole-flip-up-ja :num! (seek!) :frame-num (ja-aframe f0-2 0)) ) (until (ja-done? 0) (suspend) @@ -686,7 +656,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (send-event *camera* 'damp-up) - (ja :group! (-> self draw art-group data 107) :num! min) + (ja :group! jakb-pole-jump-loop-ja :num! min) (let ((f0-1 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) @@ -698,10 +668,10 @@ ) ) (ja-channel-push! 1 (seconds 0.25)) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -713,10 +683,7 @@ :exit (-> target-pole-cycle exit) :code (behavior ((arg0 float) (arg1 float) (arg2 float)) (let ((f30-1 (+ 4.0 (ja-aframe-num 0)))) - (ja-no-eval :group! (-> self draw art-group data 106) - :num! (seek! (ja-aframe 16.0 0)) - :frame-num (ja-aframe f30-1 0) - ) + (ja-no-eval :group! jakb-pole-flip-forward-ja :num! (seek! (ja-aframe 16.0 0)) :frame-num (ja-aframe f30-1 0)) ) (until (ja-done? 0) (suspend) @@ -887,17 +854,14 @@ (cond ((= (-> gp-0 pilot-edge-grab?) 'target-double-jump) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek! (ja-aframe 14.0 0) 0.75) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-ja :num! (seek! (ja-aframe 14.0 0) 0.75) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 14.0 0) 0.75)) ) (sound-play "jump-double") (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (ja-aframe 14.0 0)) - :frame-num (ja-aframe 5.0 0) - ) + (ja-no-eval :group! jakb-jump-ja :num! (seek! (ja-aframe 14.0 0)) :frame-num (ja-aframe 5.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 14.0 0))) @@ -905,7 +869,7 @@ ) ((-> gp-0 pilot-edge-grab?) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek! (ja-aframe 14.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-ja :num! (seek! (ja-aframe 14.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 14.0 0))) @@ -914,9 +878,9 @@ (else (while (< 0.0 (-> self control hand-to-edge-dist)) (let ((v1-60 (ja-group))) - (when (not (and v1-60 (= v1-60 (-> self draw art-group data 27)))) + (when (not (and v1-60 (= v1-60 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.15)) - (ja :group! (-> self draw art-group data 27) :num! min) + (ja :group! jakb-jump-loop-ja :num! min) ) ) (suspend) @@ -952,31 +916,27 @@ (logclear! (-> self control root-prim prim-core action) (collide-action dont-push-away)) (set! (-> self control transv quad) (the-as uint128 0)) (let ((s4-0 (new 'stack-no-clear 'vector))) - (let ((a1-3 - (cond - ((using-gun? self) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 281)) - 0.0 - 0 - 30 - 1.0 - 0.0 - #f - ) - (-> self draw art-group data 281) - ) - (else - (-> self draw art-group data 38) + (let ((a1-3 (cond + ((using-gun? self) + (push-anim-to-targ + (-> self skel top-anim) + (the-as art-joint-anim jakb-gun-edge-grab-to-jump-ja) + 0.0 + 0 + 30 + 1.0 + 0.0 + #f + ) + jakb-gun-edge-grab-to-jump-ja + ) + (else + jakb-edge-grab-to-jump-ja + ) + ) ) - ) - ) ) - (ja-no-eval :group! a1-3 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-3) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-3 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (target-compute-edge-rider) @@ -1010,7 +970,7 @@ (if (using-gun? self) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 280)) + (the-as art-joint-anim jakb-gun-edge-grab-off-ja) 0.0 0 30 @@ -1019,7 +979,7 @@ #f ) ) - (ja-no-eval :group! (-> self draw art-group data 39) :num! (seek! (ja-aframe 191.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-edge-grab-off-ja :num! (seek! (ja-aframe 191.0 0)) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (when (not (logtest? (-> self align flags) (align-flags disabled))) @@ -1084,14 +1044,14 @@ (else (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.1)) (ja-channel-push! 1 1) - (ja :group! (-> self draw art-group data 25) :num! min) + (ja :group! jakb-painful-land-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 26) :num! min) + (ja :group! jakb-painful-land-end-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) @@ -1210,7 +1170,7 @@ (if (and (using-gun? self) (and (-> self next-state) (= (-> self next-state name) 'target-stance)) (let ((v1-85 (ja-group))) - (and v1-85 (= v1-85 (-> self draw art-group data 5))) + (and v1-85 (= v1-85 jakb-stance-loop-ja)) ) ) (go target-gun-stance) @@ -1232,10 +1192,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 81) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 81)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1246,13 +1203,9 @@ (set! (-> a0-5 frame-interp 1) f0-7) (set! (-> a0-5 frame-interp 0) f0-7) ) - (set! (-> a0-5 frame-group) (the-as art-joint-anim (-> self draw art-group data 88))) + (set! (-> a0-5 frame-group) (the-as art-joint-anim jakb-wall-hide-body-ja)) (set! (-> a0-5 param 0) 1.0) - (joint-control-channel-group-eval! - a0-5 - (the-as art-joint-anim (-> self draw art-group data 88)) - num-func-loop! - ) + (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim jakb-wall-hide-body-ja) num-func-loop!) ) (set! (-> self control unknown-word04) (the-as uint 0.5)) (set! (-> self control did-move-to-pole-or-max-jump-height) 0.5) @@ -1278,7 +1231,7 @@ ) (until #f (let ((s5-0 (rand-vu-int-range 30 600))) - (ja :group! (-> self draw art-group data 85)) + (ja :group! jakb-wall-hide-head-ja) (let ((s4-0 (current-time))) (until (>= (- (current-time) s4-0) s5-0) (gp-0) @@ -1290,10 +1243,7 @@ (cond ((or (cpad-hold? 1 r3) (-> self control unknown-float35)) (let ((f30-1 (rand-vu-float-range 0.25 0.75))) - (ja-no-eval :group! (-> self draw art-group data 82) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 82)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-scared-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1301,13 +1251,7 @@ ) (let ((s5-1 (rand-vu-int-range 1 10))) (dotimes (s4-1 s5-1) - (ja-no-eval :group! (-> self draw art-group data 83) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 83)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-scared-loop-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1316,10 +1260,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 84) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 84)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-scared-return-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1327,13 +1268,7 @@ ) ) ((rand-vu-percent? 0.5) - (ja-no-eval :group! (-> self draw art-group data 86) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 86)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-head-left-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1347,10 +1282,7 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 86) - :num! (seek! 0.0 f30-0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 86)) frames num-frames) -1)) - ) + (ja-no-eval :group! jakb-wall-hide-head-left-ja :num! (seek! 0.0 f30-0) :frame-num max) (until (ja-done? 0) (gp-0) (suspend) @@ -1358,10 +1290,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 87) - :num! (seek! 0.0 f30-0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 87)) frames num-frames) -1)) - ) + (ja-no-eval :group! jakb-wall-hide-head-right-ja :num! (seek! 0.0 f30-0) :frame-num max) (until (ja-done? 0) (gp-0) (suspend) @@ -1375,13 +1304,7 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 87) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 87)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-head-right-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1409,7 +1332,7 @@ (set! (-> self control mod-surface) *turn-around-mods*) (ja-channel-push! 1 (seconds 0.15)) (set-forward-vel 0.0) - (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek! (ja-aframe 15.0 0) 3.0) :frame-num 0.0) + (ja-no-eval :group! jakb-duck-stance-ja :num! (seek! (ja-aframe 15.0 0) 3.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 15.0 0) 3.0)) @@ -1510,7 +1433,7 @@ (when gp-0 (send-event (ppointer->process (-> self sidekick)) 'matrix 'play-anim) (ja-channel-set! 1) - (ja-no-eval :group! gp-0 :num! (seek! (the float (+ (-> gp-0 frames num-frames) -1))) :frame-num 0.0) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/engine/ui/progress/progress.gc b/goal_src/jak2/engine/ui/progress/progress.gc index 7da5f0e48c0..d64dd06617f 100644 --- a/goal_src/jak2/engine/ui/progress/progress.gc +++ b/goal_src/jak2/engine/ui/progress/progress.gc @@ -1429,7 +1429,7 @@ ) #f ) - :post (the-as (function none :behavior progress) ja-post) + :post ja-post ) (defstate idle (progress) @@ -1696,7 +1696,7 @@ ) #f ) - :post (the-as (function none :behavior progress) ja-post) + :post ja-post ) (defstate gone (progress) diff --git a/goal_src/jak2/kernel/gkernel.gc b/goal_src/jak2/kernel/gkernel.gc index 4b1b39e89c7..701c9fc2ba4 100644 --- a/goal_src/jak2/kernel/gkernel.gc +++ b/goal_src/jak2/kernel/gkernel.gc @@ -2342,7 +2342,7 @@ :enter #f :event #f))) -(set! (-> dead-state code) (the (function none :behavior process) nothing)) +(set! (-> dead-state code) (the (function object :behavior process) nothing)) (define entity-deactivate-handler (the-as (function process entity-actor none) nothing)) ;; decomp deviation diff --git a/goal_src/jak2/levels/atoll/atoll-obs.gc b/goal_src/jak2/levels/atoll/atoll-obs.gc index de912c1b355..5b34b8c3947 100644 --- a/goal_src/jak2/levels/atoll/atoll-obs.gc +++ b/goal_src/jak2/levels/atoll/atoll-obs.gc @@ -70,13 +70,13 @@ ) ) ) - :code (the-as (function none :behavior piston) sleep-code) + :code sleep-code ) (defstate dormant-down (piston) :virtual #t :event (-> (method-of-type piston idle) event) - :code (the-as (function none :behavior piston) sleep-code) + :code sleep-code ) (defstate dormant-up (piston) @@ -87,7 +87,7 @@ (set! (-> self root trans y) (+ (-> self init-height) (+ (-> self range-bottom) f1-1))) ) ) - :code (the-as (function none :behavior piston) transform-and-sleep) + :code transform-and-sleep ) (defstate running (piston) @@ -98,8 +98,8 @@ (set! (-> self sound-time 0) (+ (get-timeframe-offset! (-> self sync) 0) (seconds -0.1))) ) ) - :trans (the-as (function none :behavior piston) rider-trans) - :code (the-as (function none :behavior piston) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (let ((f0-1 (- (-> self range-top) (-> self range-bottom)))) (set! (-> self root trans y) @@ -254,7 +254,7 @@ This commonly includes things such as: ) (rider-trans) ) - :code (the-as (function none :behavior turbine) sleep-code) + :code sleep-code :post (behavior () (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (-> self rotspeed) (seconds-per-frame))) (let ((f1-2 (- (-> self dest-height) (-> self root trans y)))) @@ -272,8 +272,8 @@ This commonly includes things such as: :enter (behavior () (set! (-> self dest-height) (+ (-> self root trans y) (-> self rise-height))) ) - :trans (the-as (function none :behavior turbine) rider-trans) - :code (the-as (function none :behavior turbine) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (-> self rotspeed) (seconds-per-frame))) (let ((f1-2 (- (-> self dest-height) (-> self root trans y)))) @@ -389,9 +389,9 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior liftcat) rider-trans) - :code (the-as (function none :behavior liftcat) sleep-code) - :post (the-as (function none :behavior liftcat) rider-post) + :trans rider-trans + :code sleep-code + :post rider-post ) (defstate going-down (liftcat) @@ -423,8 +423,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior liftcat) sleep-code) - :post (the-as (function none :behavior liftcat) rider-post) + :code sleep-code + :post rider-post ) (defstate idle-down (liftcat) @@ -439,7 +439,7 @@ This commonly includes things such as: :enter (behavior () (process-entity-status! self (entity-perm-status subtask-complete) #t) ) - :code (the-as (function none :behavior liftcat) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -757,7 +757,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior slider) sleep-code) + :code sleep-code :post (behavior () (let ((f30-0 (get-norm! (-> self sync) 0))) (set! (-> self path-pos) f30-0) @@ -970,7 +970,7 @@ This commonly includes things such as: (defstate idle (atoll-windmill) :virtual #t - :code (the-as (function none :behavior atoll-windmill) sleep-code) + :code sleep-code :post (behavior () (let ((f0-0 (get-scaled-val! (-> self sync) -65536.0 0))) (quaternion-axis-angle! @@ -1058,7 +1058,7 @@ This commonly includes things such as: (defstate idle (atoll-valve) :virtual #t - :code (the-as (function none :behavior atoll-valve) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -1103,7 +1103,7 @@ This commonly includes things such as: (defstate idle (atoll-hatch) :virtual #t - :code (the-as (function none :behavior atoll-hatch) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -1167,7 +1167,7 @@ This commonly includes things such as: (defstate idle (atoll-hellcat) :virtual #t - :code (the-as (function none :behavior atoll-hellcat) sleep-code) + :code sleep-code ) (defstate die-fast (atoll-hellcat) @@ -1239,7 +1239,7 @@ This commonly includes things such as: (defstate idle (atoll-mar-symbol) :virtual #t - :code (the-as (function none :behavior atoll-mar-symbol) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/atoll/atoll-tank.gc b/goal_src/jak2/levels/atoll/atoll-tank.gc index 73773440be4..5cb2bd1dfa8 100644 --- a/goal_src/jak2/levels/atoll/atoll-tank.gc +++ b/goal_src/jak2/levels/atoll/atoll-tank.gc @@ -1678,7 +1678,7 @@ (defstate dormant (atoll-tank) :virtual #t - :code (the-as (function none :behavior atoll-tank) sleep-code) + :code sleep-code ) (defstate idle (atoll-tank) diff --git a/goal_src/jak2/levels/atoll/juicer.gc b/goal_src/jak2/levels/atoll/juicer.gc index 590dad5a015..1e8f0d01707 100644 --- a/goal_src/jak2/levels/atoll/juicer.gc +++ b/goal_src/jak2/levels/atoll/juicer.gc @@ -843,10 +843,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -866,15 +863,9 @@ (a1-16 (-> self draw art-group data (-> *juicer-global-info* idle-anim v1-62))) ) (set! gp-1 (ash 1 v1-62)) - (ja-no-eval :group! a1-16 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-16) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-16 :num! (seek! max f30-0) :frame-num 0.0) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -963,7 +954,7 @@ (defstate ambush-cont (juicer) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior juicer) enemy-event-handler) + :event enemy-event-handler :code (behavior () (let ((a0-0 (-> self intro-path)) (v1-1 (+ (-> self ambush-path-pt) 1)) @@ -1023,10 +1014,7 @@ (let* ((a0-13 (enemy-method-120 self 2 s5-0)) (a1-8 (-> self draw art-group data (-> *juicer-global-info* notice-anim a0-13))) ) - (ja-no-eval :group! a1-8 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-8) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-8 :num! (seek! max f30-1) :frame-num 0.0) ) (until (ja-done? 0) (let ((a1-9 (-> self nav state))) @@ -1049,10 +1037,7 @@ (let ((gp-1 (-> self draw art-group data (-> *juicer-global-info* celebrate-anim (get-rand-int self 2)))) (f30-0 (get-rand-float-range self 0.9 1.1)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1250,7 +1235,7 @@ (defstate attack (juicer) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior juicer) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state)) (a0-1 (-> self root trans)) @@ -1288,10 +1273,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! juicer-attack0-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim juicer-attack0-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! juicer-attack0-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (< 11.0 (ja-aframe-num 0)) (juicer-method-184 self #t) @@ -1307,10 +1289,7 @@ (set! (-> v1-29 attack-id) s5-0) (let ((s4-0 (current-time))) (until (>= (- (current-time) s4-0) (seconds 0.25)) - (ja-no-eval :group! juicer-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim juicer-attack0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! juicer-attack0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((s3-0 (handle->process (-> self focus handle)))) (when s3-0 @@ -1410,10 +1389,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1436,10 +1412,7 @@ (let ((gp-2 (-> self draw art-group data (-> *juicer-global-info* celebrate-anim (get-rand-int self 2)))) (f30-2 (get-rand-float-range self 0.9 1.1)) ) - (ja-no-eval :group! gp-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-2) frames num-frames) -1)) f30-2) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-2 :num! (seek! max f30-2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-2)) @@ -1458,14 +1431,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1509,10 +1475,7 @@ (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1543,14 +1506,7 @@ ) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info taunt-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info taunt-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/atoll/sniper.gc b/goal_src/jak2/levels/atoll/sniper.gc index d93dbf7ab1c..96e638d6a8a 100644 --- a/goal_src/jak2/levels/atoll/sniper.gc +++ b/goal_src/jak2/levels/atoll/sniper.gc @@ -257,14 +257,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/castle/boss/castle-baron.gc b/goal_src/jak2/levels/castle/boss/castle-baron.gc index 1b12df98394..a3ae7b7c7bd 100644 --- a/goal_src/jak2/levels/castle/boss/castle-baron.gc +++ b/goal_src/jak2/levels/castle/boss/castle-baron.gc @@ -28,10 +28,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -39,7 +36,7 @@ ) #f ) - :post (the-as (function none :behavior cboss-tractor) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -861,10 +858,7 @@ For example for an elevator pre-compute the distance between the first and last (defstate spawning (krew-boss-clone) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior krew-boss-clone) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (sound-play "krew-spawn") ) @@ -884,10 +878,7 @@ For example for an elevator pre-compute the distance between the first and last ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 12) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1133,10 +1124,7 @@ For example for an elevator pre-compute the distance between the first and last (defstate die (krew-boss-clone) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior krew-boss-clone) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (if (nonzero? (-> self id)) (sound-stop (-> self id)) @@ -1182,7 +1170,7 @@ For example for an elevator pre-compute the distance between the first and last ) (cleanup-for-death self) ) - :post (the-as (function none :behavior krew-boss-clone) enemy-simple-post) + :post enemy-simple-post ) (defmethod init-enemy-collision! krew-boss-clone ((obj krew-boss-clone)) @@ -1937,7 +1925,7 @@ For example for an elevator pre-compute the distance between the first and last (go-virtual play-intro) ) ) - :code (the-as (function none :behavior krew-boss) sleep-code) + :code sleep-code ) (defstate play-intro (krew-boss) @@ -2651,7 +2639,7 @@ For example for an elevator pre-compute the distance between the first and last (defstate hostile (krew-boss) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior krew-boss) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((gp-0 (/ (-> self hit-points) (if (logtest? (-> *game-info* secrets) (game-secrets hero-mode)) 2 @@ -2967,7 +2955,7 @@ For example for an elevator pre-compute the distance between the first and last (defstate die (krew-boss) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior krew-boss) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type nav-enemy die) enter))) (if t9-0 @@ -3062,10 +3050,7 @@ For example for an elevator pre-compute the distance between the first and last ) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1)) - (-> self clock time-adjust-ratio) - ) + :num! (seek! max (-> self clock time-adjust-ratio)) :frame-num 0.0 ) (while (not (ja-done? 0)) diff --git a/goal_src/jak2/levels/castle/castle-obs.gc b/goal_src/jak2/levels/castle/castle-obs.gc index 972b660f154..9facf7c4669 100644 --- a/goal_src/jak2/levels/castle/castle-obs.gc +++ b/goal_src/jak2/levels/castle/castle-obs.gc @@ -108,7 +108,7 @@ This commonly includes things such as: (defstate idle (cas-conveyor) :virtual #t :trans sound-update - :code (the-as (function none :behavior cas-conveyor) sleep-code) + :code sleep-code :post (behavior () (when (or (= (-> self my-id) -1) (= (-> self my-id) (/ *cas-conveyor-room-id* 8))) (cond @@ -275,7 +275,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-conveyor-switch) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-608 symbol) (sv-624 symbol) (sv-640 (function vector cspace vector)) (sv-656 vector)) (when (and (logtest? (actor-option user17) (-> self fact options)) @@ -524,7 +524,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-electric-fence) sleep-code) + :code sleep-code :post (behavior () (when (not (-> self stop)) (when (< (-> self next-spawn-time) (current-time)) @@ -1077,20 +1077,14 @@ For example for an elevator pre-compute the distance between the first and last (when (or (= f0-0 10.0) (= f0-0 40.0) (= f0-0 50.0)) (cond ((= f0-0 10.0) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1103,20 +1097,14 @@ For example for an elevator pre-compute the distance between the first and last (when (or (= f0-0 40.0) (= f0-0 50.0) (= f0-0 80.0) (= f0-0 90.0)) (cond ((or (= f0-0 40.0) (= f0-0 50.0)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1129,20 +1117,14 @@ For example for an elevator pre-compute the distance between the first and last (when (or (= f0-0 80.0) (= f0-0 90.0) (= f0-0 120.0)) (cond ((or (= f0-0 80.0) (= f0-0 90.0)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1154,20 +1136,14 @@ For example for an elevator pre-compute the distance between the first and last ((= (-> self anim-index) 3) (cond ((= f0-0 10.0) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1390,8 +1366,8 @@ This commonly includes things such as: ) -(defskelgroup skel-cas-switch cas-switch 0 2 - ((1 (meters 999999))) +(defskelgroup skel-cas-switch cas-switch cas-switch-lod0-jg cas-switch-idle-ja + ((cas-switch-lod0-mg (meters 999999))) :bounds (static-spherem 0 2.7 0 3) :origin-joint-index 3 ) @@ -1443,7 +1419,7 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior cas-switch) rider-trans) + :trans rider-trans :code (behavior () (until #f (let ((a1-0 (new 'stack-no-clear 'event-message-block))) @@ -1502,7 +1478,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-switch) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. @@ -1663,7 +1639,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-trapdoor) sleep-code) + :code sleep-code ) (defstate die (cas-trapdoor) @@ -1716,7 +1692,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior cas-trapdoor) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1796,29 +1772,26 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-chain-plat) sleep-code) - :post (the-as (function none :behavior cas-chain-plat) ja-post) + :code sleep-code + :post ja-post ) (defstate drop (cas-chain-plat) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual down) ) - :post (the-as (function none :behavior cas-chain-plat) transform-post) + :post transform-post ) (defstate down (cas-chain-plat) :virtual #t - :code (the-as (function none :behavior cas-chain-plat) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -1928,10 +1901,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1939,7 +1909,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-rot-blade) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -2042,10 +2012,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2053,7 +2020,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-flag-a) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2096,10 +2063,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2107,7 +2071,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-flag-b) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2185,7 +2149,7 @@ This commonly includes things such as: (set! (-> self state-time) (current-time)) ) ) - :code (the-as (function none :behavior cas-robot-door) sleep-code) + :code sleep-code ) (defstate spawning (cas-robot-door) @@ -2218,10 +2182,7 @@ This commonly includes things such as: ) :code (behavior () (sound-play "robo-hatch-open") - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -2358,10 +2319,7 @@ This commonly includes things such as: ) ) (sound-play "robo-hatch-cls") - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (transform-post) (suspend) @@ -2388,10 +2346,7 @@ This commonly includes things such as: :code (behavior () (local-vars (v1-28 symbol)) (sound-play "robo-hatch-cls") - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (transform-post) (suspend) @@ -2590,7 +2545,7 @@ This commonly includes things such as: (defstate idle (lightning-ball) :virtual #t - :code (the-as (function none :behavior lightning-ball) sleep-code) + :code sleep-code :post (behavior () (when (>= (- (current-time) (-> self timer)) (seconds 0.08)) (let ((gp-0 (new 'stack-no-clear 'collide-query))) diff --git a/goal_src/jak2/levels/castle/roboguard-level.gc b/goal_src/jak2/levels/castle/roboguard-level.gc index 3d0fa95ba18..4ea8c01ea22 100644 --- a/goal_src/jak2/levels/castle/roboguard-level.gc +++ b/goal_src/jak2/levels/castle/roboguard-level.gc @@ -520,10 +520,7 @@ (logand! (-> self flags) -9) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -544,10 +541,7 @@ (defstate roll-hostile (roboguard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior roboguard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag use-notice-distance)) (logior! (-> self flags) 4) @@ -703,18 +697,12 @@ (defstate roll-to-walk (roboguard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior roboguard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () '() ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (< 17.0 (ja-aframe-num 0)) (logand! (-> self flags) -5) @@ -739,20 +727,14 @@ (defstate idle-dizzy (roboguard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior roboguard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logand! (-> self flags) -5) (roboguard-level-method-185 self (the-as symbol 0)) ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -823,9 +805,9 @@ (defstate explode (roboguard-level) :virtual #t - :enter (the-as (function none :behavior roboguard-level) #f) - :exit (the-as (function none :behavior roboguard-level) #f) - :trans (the-as (function none :behavior roboguard-level) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (sound-play "robo-explode") (let ((v1-2 (-> self root root-prim))) @@ -839,7 +821,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior roboguard-level) #f) + :post #f ) (defmethod roboguard-level-method-185 roboguard-level ((obj roboguard-level) (arg0 symbol)) diff --git a/goal_src/jak2/levels/city/bombbot/bombbot.gc b/goal_src/jak2/levels/city/bombbot/bombbot.gc index 325d96f4098..97c72f163f5 100644 --- a/goal_src/jak2/levels/city/bombbot/bombbot.gc +++ b/goal_src/jak2/levels/city/bombbot/bombbot.gc @@ -1977,10 +1977,7 @@ :code (behavior () (until #f (suspend) - (ja-no-eval :group! bombbot-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim bombbot-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! bombbot-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2073,10 +2070,7 @@ :code (behavior () (until #f (suspend) - (ja-no-eval :group! bombbot-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim bombbot-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! bombbot-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc b/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc index acaf773901f..46ba2186cb1 100644 --- a/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc +++ b/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc @@ -442,7 +442,7 @@ ) #f ) - :post (the-as (function none :behavior race-ring) ja-post) + :post ja-post ) (defstate die (race-ring) @@ -1731,7 +1731,7 @@ ) ) ) - :code (the-as (function none :behavior bush-collect) sleep-code) + :code sleep-code :post (behavior () (ja-post) ) diff --git a/goal_src/jak2/levels/city/common/pilot-states.gc b/goal_src/jak2/levels/city/common/pilot-states.gc index d33b2d09459..b97a3b08993 100644 --- a/goal_src/jak2/levels/city/common/pilot-states.gc +++ b/goal_src/jak2/levels/city/common/pilot-states.gc @@ -11,7 +11,7 @@ (defstate target-pilot-start (target) :event target-pilot-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :code (behavior ((arg0 handle) (arg1 symbol) (arg2 symbol)) (target-pilot-init arg0 arg2) (suspend) @@ -238,7 +238,7 @@ (defstate target-pilot-stance (target) :event target-pilot-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :trans (behavior () (target-pilot-trans) ) @@ -266,7 +266,7 @@ (defstate target-pilot-impact (target) :event target-pilot-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :trans (behavior () (target-pilot-trans) ) @@ -322,50 +322,35 @@ (ja-channel-push! 1 (seconds 0.05)) (cond ((= s5-0 4) - (ja-no-eval :group! (-> self draw art-group data 457) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 457)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 457) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= s5-0 5) - (ja-no-eval :group! (-> self draw art-group data 458) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 458)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 458) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((zero? s5-0) - (ja-no-eval :group! (-> self draw art-group data 455) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 455)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 455) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= s5-0 1) - (ja-no-eval :group! (-> self draw art-group data 456) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 456)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 456) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 455) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 455)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 455) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -378,50 +363,35 @@ (let ((v1-131 s5-0)) (cond ((= v1-131 4) - (ja-no-eval :group! (-> self draw art-group data 232) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 232)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 232) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-131 5) - (ja-no-eval :group! (-> self draw art-group data 233) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 233)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 233) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((zero? v1-131) - (ja-no-eval :group! (-> self draw art-group data 211) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 211)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 211) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-131 1) - (ja-no-eval :group! (-> self draw art-group data 212) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 212)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 212) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 215) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 215)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 215) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -431,53 +401,35 @@ ) ) ((begin (ja-channel-push! 1 (seconds 0.05)) (set! v1-252 s5-0) (= v1-252 4)) - (ja-no-eval :group! (-> self draw art-group data 234) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 234)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 234) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-252 5) - (ja-no-eval :group! (-> self draw art-group data 235) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 235)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 235) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((zero? v1-252) - (ja-no-eval :group! (-> self draw art-group data 204) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 204)) frames num-frames) -1)) - 1.3 - ) - :frame-num (ja-aframe 4.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 204) :num! (seek! max 1.3) :frame-num (ja-aframe 4.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.3)) ) ) ((= v1-252 1) - (ja-no-eval :group! (-> self draw art-group data 205) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 205)) frames num-frames) -1))) - :frame-num (ja-aframe 2.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 205) :num! (seek!) :frame-num (ja-aframe 2.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 208) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 208)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 208) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -522,7 +474,7 @@ ) ) ) - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :trans (behavior () (let* ((s5-0 (handle->process (-> self pilot vehicle))) (gp-0 (if (type? s5-0 vehicle) @@ -561,10 +513,7 @@ (set! (-> self neck flex-blend) 0.0) (set! (-> self control unknown-vector37 quad) (-> self control trans quad)) (set! (-> self control unknown-vector39 quad) (-> self control quat quad)) - (ja :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja :group! gp-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 10.0)))) @@ -628,7 +577,7 @@ (defstate target-pilot-get-off (target) :event target-standard-event-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :trans (behavior () (let ((gp-0 (handle->process (-> self pilot vehicle)))) (when (not (if (type? gp-0 vehicle) diff --git a/goal_src/jak2/levels/city/common/searchlight.gc b/goal_src/jak2/levels/city/common/searchlight.gc index b52cda2f9e7..2bce49ae601 100644 --- a/goal_src/jak2/levels/city/common/searchlight.gc +++ b/goal_src/jak2/levels/city/common/searchlight.gc @@ -67,7 +67,7 @@ ) #f ) - :post (the-as (function none :behavior searchlight) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/city/ctyport-obs.gc b/goal_src/jak2/levels/city/ctyport-obs.gc index 9bf0c8dd773..0e124157541 100644 --- a/goal_src/jak2/levels/city/ctyport-obs.gc +++ b/goal_src/jak2/levels/city/ctyport-obs.gc @@ -595,7 +595,7 @@ (defstate idle (boat-base) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior boat-base) vehicle-event-handler) + :event vehicle-event-handler :enter (behavior () (logior! (-> self flags) (rigid-body-object-flag riding)) (set! (-> self state-time) (current-time)) @@ -904,7 +904,7 @@ ) ) ) - :code (the-as (function none :behavior boat-manager) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/city/ctywide-obs.gc b/goal_src/jak2/levels/city/ctywide-obs.gc index 01fff4676af..e13eec62bc4 100644 --- a/goal_src/jak2/levels/city/ctywide-obs.gc +++ b/goal_src/jak2/levels/city/ctywide-obs.gc @@ -906,10 +906,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1411,7 +1408,7 @@ This commonly includes things such as: :exit (behavior () (logclear! (-> self focus-status) (focus-status ignore)) ) - :code (the-as (function none :behavior cty-guard-turret) sleep-code) + :code sleep-code :post (behavior () (when (>= (-> self id) 0) (let* ((v1-4 (-> *game-info* sub-task-list (game-task-node city-power-resolution))) @@ -2369,7 +2366,7 @@ This commonly includes things such as: (parking-spot-method-21 self) (send-event (handle->process (-> self vehicle)) 'traffic-off-force) ) - :code (the-as (function none :behavior parking-spot) sleep-code) + :code sleep-code :post (behavior () (when (>= (- (current-time) (-> self state-time)) (seconds 0.25)) (set! (-> self state-time) (current-time)) @@ -2534,7 +2531,7 @@ This commonly includes things such as: (defstate broken (propa) :virtual #t - :code (the-as (function none :behavior propa) sleep-code) + :code sleep-code ) (defstate idle (propa) @@ -2647,7 +2644,7 @@ This commonly includes things such as: 0 ) ) - :code (the-as (function none :behavior propa) sleep-code) + :code sleep-code :post (behavior () (cond ((or (not (-> *setting-control* user-current speech-control)) @@ -2901,7 +2898,7 @@ This commonly includes things such as: (defstate idle (baron-statue) :virtual #t - :code (the-as (function none :behavior baron-statue) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -3044,7 +3041,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior burning-bush) sleep-code) + :code sleep-code :post (behavior () (rlet ((acc :class vf) (vf0 :class vf) @@ -4006,7 +4003,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior barons-ship-lores) ja-post) + :post ja-post ) (defmethod city-race-ring-info-method-9 city-race-ring-info ((obj city-race-ring-info) (arg0 symbol)) @@ -4081,7 +4078,7 @@ This commonly includes things such as: :trans (behavior () '() ) - :code (the-as (function none :behavior lurker-pipe-lid) sleep-code) + :code sleep-code :post (behavior () (if (< 0.0 (-> self angle)) (set! (-> self angle) @@ -4212,14 +4209,14 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior ctyn-lamp) sleep-code) + :code sleep-code ) (defstate die (ctyn-lamp) :virtual #t - :enter (the-as (function none :behavior ctyn-lamp) #f) - :exit (the-as (function none :behavior ctyn-lamp) #f) - :trans (the-as (function none :behavior ctyn-lamp) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (sound-play "lamp-hit") (let ((v1-3 (-> self root root-prim))) @@ -4233,7 +4230,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ctyn-lamp) #f) + :post #f ) (defmethod ctyn-lamp-method-29 ctyn-lamp ((obj ctyn-lamp)) diff --git a/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc b/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc index a42f654437e..1c9acf92539 100644 --- a/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc +++ b/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc @@ -1014,9 +1014,9 @@ (defstate die (farm-marrow) :virtual #t - :enter (the-as (function none :behavior farm-marrow) #f) - :exit (the-as (function none :behavior farm-marrow) #f) - :trans (the-as (function none :behavior farm-marrow) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1029,7 +1029,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-marrow) #f) + :post #f ) (defstate idle (farm-marrow) @@ -1170,7 +1170,7 @@ :exit (behavior () '() ) - :code (the-as (function none :behavior farm-marrow) sleep-code) + :code sleep-code :post (behavior () (dotimes (gp-0 5) (shaker-method-9 (-> self shakers gp-0)) @@ -1304,9 +1304,9 @@ This commonly includes things such as: (defstate die (farm-beetree) :virtual #t - :enter (the-as (function none :behavior farm-beetree) #f) - :exit (the-as (function none :behavior farm-beetree) #f) - :trans (the-as (function none :behavior farm-beetree) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1319,7 +1319,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-beetree) #f) + :post #f ) (defstate idle (farm-beetree) @@ -1418,8 +1418,8 @@ This commonly includes things such as: ) ) ) - :exit (the-as (function none :behavior farm-beetree) #f) - :code (the-as (function none :behavior farm-beetree) sleep-code) + :exit #f + :code sleep-code :post (behavior () (dotimes (gp-0 2) (shaker-method-9 (-> self shakers gp-0)) @@ -1549,9 +1549,9 @@ This commonly includes things such as: (defstate die (farm-cabbage) :virtual #t - :enter (the-as (function none :behavior farm-cabbage) #f) - :exit (the-as (function none :behavior farm-cabbage) #f) - :trans (the-as (function none :behavior farm-cabbage) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1564,7 +1564,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-cabbage) #f) + :post #f ) (defstate idle (farm-cabbage) @@ -1663,8 +1663,8 @@ This commonly includes things such as: ) ) ) - :exit (the-as (function none :behavior farm-cabbage) #f) - :code (the-as (function none :behavior farm-cabbage) sleep-code) + :exit #f + :code sleep-code :post (behavior () (dotimes (gp-0 2) (shaker-method-9 (-> self shakers gp-0)) @@ -1796,9 +1796,9 @@ This commonly includes things such as: (defstate die (farm-small-cabbage) :virtual #t - :enter (the-as (function none :behavior farm-small-cabbage) #f) - :exit (the-as (function none :behavior farm-small-cabbage) #f) - :trans (the-as (function none :behavior farm-small-cabbage) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1811,7 +1811,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-small-cabbage) #f) + :post #f ) (defstate idle (farm-small-cabbage) @@ -1895,8 +1895,8 @@ This commonly includes things such as: ) ) ) - :exit (the-as (function none :behavior farm-small-cabbage) #f) - :code (the-as (function none :behavior farm-small-cabbage) sleep-code) + :exit #f + :code sleep-code :post (behavior () (dotimes (gp-0 1) (shaker-method-9 (-> self shakers gp-0)) @@ -2028,9 +2028,9 @@ This commonly includes things such as: (defstate die (farm-chilirots) :virtual #t - :enter (the-as (function none :behavior farm-chilirots) #f) - :exit (the-as (function none :behavior farm-chilirots) #f) - :trans (the-as (function none :behavior farm-chilirots) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -2043,7 +2043,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-chilirots) #f) + :post #f ) (defstate idle (farm-chilirots) @@ -2172,7 +2172,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior farm-chilirots) sleep-code) + :code sleep-code :post (behavior () (dotimes (gp-0 4) (shaker-method-9 (-> self shakers gp-0)) @@ -2262,10 +2262,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/city/farm/yakow.gc b/goal_src/jak2/levels/city/farm/yakow.gc index 25466cfaeec..822e1168e9d 100644 --- a/goal_src/jak2/levels/city/farm/yakow.gc +++ b/goal_src/jak2/levels/city/farm/yakow.gc @@ -269,10 +269,7 @@ (ja-channel-push! 1 (seconds 0.15)) (until #f (let ((f30-0 (rand-vu-float-range 0.9 1.1))) - (ja-no-eval :group! yakow-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -280,10 +277,7 @@ ) (when (rand-vu-percent? 0.25) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! yakow-graze-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-graze-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-graze-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -316,14 +310,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -341,10 +328,7 @@ (nav-enemy-method-167 self) (until #f (let ((f28-0 (rand-vu-float-range 0.9 1.1))) - (ja-no-eval :group! yakow-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-idle-ja) frames num-frames) -1)) f28-0) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-idle-ja :num! (seek! max f28-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f28-0)) @@ -352,10 +336,7 @@ ) (when (rand-vu-percent? 0.25) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! yakow-graze-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-graze-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-graze-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -390,14 +371,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.6)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -414,7 +388,7 @@ (defstate kicked (yakow) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -431,17 +405,14 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! yakow-kicked-in-place-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-kicked-in-place-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-kicked-in-place-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual active) ) - :post (the-as (function none :behavior yakow) ja-post) + :post ja-post ) (defmethod init-enemy-collision! yakow ((obj yakow)) diff --git a/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc b/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc index eeaf15737cb..d9546c7ae9a 100644 --- a/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc +++ b/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc @@ -9,10 +9,7 @@ (defstate waiting-idle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -73,10 +70,7 @@ ) (let ((s5-0 (get-rand-int-range self 3 7))) (dotimes (s4-0 s5-0) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -91,10 +85,7 @@ (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 0.5)) ) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) 0.33) - :frame-num (ja-aframe 3.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.33)) @@ -117,10 +108,7 @@ ) (let ((s5-4 (get-rand-int-range self 5 7))) (dotimes (s4-1 s5-4) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) 0.5) - :frame-num (ja-aframe 2.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max 0.5) :frame-num (ja-aframe 2.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -145,10 +133,7 @@ ) (let ((s5-5 (get-rand-int-range self 3 7))) (dotimes (s4-2 s5-5) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -162,15 +147,12 @@ ) #f ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-turn (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -198,10 +180,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -216,10 +195,7 @@ (defstate traveling (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -278,10 +254,7 @@ (defstate move-to-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -361,15 +334,12 @@ ) #f ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate board-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -531,15 +501,12 @@ (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ride-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -599,13 +566,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 11) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1)) - (-> self anim-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek! max (-> self anim-speed)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max (-> self anim-speed))) @@ -613,15 +574,12 @@ ) #f ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate exit-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -776,15 +734,12 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate traveling-blocked (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -808,7 +763,7 @@ ) ) :code (-> (method-of-type crocadog-escort waiting-idle) code) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate stare (crocadog-escort) @@ -915,10 +870,7 @@ (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 0.5)) ) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) 0.33) - :frame-num (ja-aframe 3.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.33)) @@ -927,13 +879,7 @@ (else (ja-channel-push! 1 (seconds 0.1)) (let ((f30-0 (get-rand-float-range self 0.4 0.6))) - (ja-no-eval :group! (-> self draw art-group data 14) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 14)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 14) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -980,10 +926,7 @@ (defstate knocked-off-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1010,5 +953,5 @@ (set! (-> self travel-anim-interp) 0.0) ) :code (-> (method-of-type crocadog-escort waiting-idle) code) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc b/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc index 96f2d2a0125..1e7a4450c57 100644 --- a/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc +++ b/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc @@ -9,7 +9,7 @@ (defstate waiting-idle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -71,10 +71,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.1)) @@ -82,12 +79,12 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-turn (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -122,10 +119,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -140,7 +134,7 @@ (defstate traveling (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -206,7 +200,7 @@ (defstate move-to-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -294,12 +288,12 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate board-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -442,12 +436,12 @@ (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ride-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -524,12 +518,12 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate exit-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -678,12 +672,12 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate traveling-blocked (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -719,7 +713,7 @@ ) ) :code (-> (method-of-type kid-escort waiting-idle) code) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate stare (kid-escort) @@ -811,7 +805,7 @@ (defstate arrested (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -875,13 +869,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - 0.143 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.143)) @@ -893,10 +881,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) (when (not (logtest? (bot-flags bf19) (-> self bot-flags))) (until #f (until (ja-done? 0) @@ -906,10 +891,7 @@ (suspend) (ja :num! (seek! max 0.1)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) ) #f (label cfg-27) @@ -937,14 +919,11 @@ (suspend) (ja :num! (seek! max 0.1)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate die-falling (kid-escort) @@ -961,21 +940,12 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - 0.143 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.143)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) (until #f (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) @@ -987,10 +957,7 @@ (suspend) (ja :num! (seek! max 0.1)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) ) #f ) @@ -1013,7 +980,7 @@ (defstate knocked-off-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1043,32 +1010,20 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (dotimes (gp-0 3) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.1)) ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - 0.143 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.143)) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.1)) @@ -1076,5 +1031,5 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc b/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc index bd25b26ea6e..7eb66943e77 100644 --- a/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc +++ b/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc @@ -1220,7 +1220,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tanker-container) sleep-code) + :code sleep-code ) (defstate idle (tanker-container) @@ -1234,7 +1234,7 @@ ) (tanker-container-method-22 self) ) - :code (the-as (function none :behavior tanker-container) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -1341,7 +1341,7 @@ This commonly includes things such as: (logior! (-> self mask) (process-mask actor-pause)) (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tanker-crash) sleep-code) + :code sleep-code ) (defstate idle (tanker-crash) @@ -1354,8 +1354,8 @@ This commonly includes things such as: ) (logclear! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tanker-crash) sleep-code) - :post (the-as (function none :behavior tanker-crash) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1472,7 +1472,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tanker-deadly) sleep-code) + :code sleep-code :post (behavior () (set! (-> self prev-pos quad) (-> self root trans quad)) (let ((v1-1 (ppointer->process (-> self parent))) diff --git a/goal_src/jak2/levels/city/market/ctymark-obs.gc b/goal_src/jak2/levels/city/market/ctymark-obs.gc index 0b20a2da2ed..ec94b23d396 100644 --- a/goal_src/jak2/levels/city/market/ctymark-obs.gc +++ b/goal_src/jak2/levels/city/market/ctymark-obs.gc @@ -1017,11 +1017,11 @@ ) ) ) - :enter (the-as (function none :behavior market-object) #f) - :exit (the-as (function none :behavior market-object) #f) - :trans (the-as (function none :behavior market-object) #f) - :code (the-as (function none :behavior market-object) sleep-code) - :post (the-as (function none :behavior market-object) #f) + :enter #f + :exit #f + :trans #f + :code sleep-code + :post #f ) (defstate die (market-object) diff --git a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc index 22e6124e552..aeb10818216 100644 --- a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc +++ b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc @@ -533,8 +533,8 @@ :enter (behavior () '() ) - :trans (the-as (function none :behavior paddywagon) #f) - :code (the-as (function none :behavior paddywagon) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-158 self) ) @@ -1152,7 +1152,7 @@ (defstate exit-vehicle (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((a0-1 (find-nearest-nav-mesh (-> self root trans) (the-as float #x7f800000)))) (if a0-1 @@ -1343,14 +1343,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - 0.5 - ) + :num! (seek! max 0.5) :frame-num 0.0 ) (until (ja-done? 0) @@ -1382,14 +1375,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -1440,7 +1426,7 @@ (defstate go-at-end (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -1530,7 +1516,7 @@ (defstate go-at-pipe (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -1665,7 +1651,7 @@ (defstate wait-at-end (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logclear! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -1706,14 +1692,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/city/package/delivery-task.gc b/goal_src/jak2/levels/city/package/delivery-task.gc index afc45db189e..5331516cbaa 100644 --- a/goal_src/jak2/levels/city/package/delivery-task.gc +++ b/goal_src/jak2/levels/city/package/delivery-task.gc @@ -55,7 +55,7 @@ (defstate idle (krew-package) :virtual #t - :code (the-as (function none :behavior krew-package) sleep-code) + :code sleep-code :post (behavior () (let ((gp-0 (handle->process (-> self attach-object)))) (cond diff --git a/goal_src/jak2/levels/city/palace/ctypal-obs.gc b/goal_src/jak2/levels/city/palace/ctypal-obs.gc index f6347efdd31..d71cb3ed206 100644 --- a/goal_src/jak2/levels/city/palace/ctypal-obs.gc +++ b/goal_src/jak2/levels/city/palace/ctypal-obs.gc @@ -162,7 +162,7 @@ This commonly includes things such as: (go-virtual done) ) ) - :code (the-as (function none :behavior ctypal-broke-wall) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -170,7 +170,7 @@ This commonly includes things such as: (defstate done (ctypal-broke-wall) :virtual #t - :code (the-as (function none :behavior ctypal-broke-wall) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -244,7 +244,7 @@ This commonly includes things such as: (defstate idle (ctypal-baron-statue-broken) :virtual #t - :code (the-as (function none :behavior ctypal-baron-statue-broken) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/city/port/ctyport-part.gc b/goal_src/jak2/levels/city/port/ctyport-part.gc index 76169e37926..65ac2798be6 100644 --- a/goal_src/jak2/levels/city/port/ctyport-part.gc +++ b/goal_src/jak2/levels/city/port/ctyport-part.gc @@ -3440,7 +3440,7 @@ ) #f ) - :post (the-as (function none :behavior hiphog-exterior-marquee) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -3544,10 +3544,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/city/port/portrun/portrun.gc b/goal_src/jak2/levels/city/port/portrun/portrun.gc index a80d81ee7bf..122fcb94d1c 100644 --- a/goal_src/jak2/levels/city/port/portrun/portrun.gc +++ b/goal_src/jak2/levels/city/port/portrun/portrun.gc @@ -1108,7 +1108,7 @@ ) ) ) - :code (the-as (function none :behavior ctyport-mine) transform-and-sleep-code) + :code transform-and-sleep-code :post (behavior () (ctyport-mine-method-23 self) (transform-post) @@ -1228,10 +1228,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1239,7 +1236,7 @@ ) #f ) - :post (the-as (function none :behavior ctyport-spy) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1437,7 +1434,7 @@ ) #f ) - :post (the-as (function none :behavior ctyport-cargo) transform-post) + :post transform-post ) (defmethod ctyport-cargo-method-30 ctyport-cargo ((obj ctyport-cargo)) @@ -1474,10 +1471,7 @@ (set-setting! 'mode-name 'cam-fixed 0.0 0) (suspend) (ctyport-cargo-method-30 self) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1487,7 +1481,7 @@ ) #f ) - :post (the-as (function none :behavior ctyport-cargo) ja-post) + :post ja-post ) (defstate die (ctyport-cargo) diff --git a/goal_src/jak2/levels/city/port/race/errol-chal.gc b/goal_src/jak2/levels/city/port/race/errol-chal.gc index 1b59a4b1a2d..71f928f9a2f 100644 --- a/goal_src/jak2/levels/city/port/race/errol-chal.gc +++ b/goal_src/jak2/levels/city/port/race/errol-chal.gc @@ -441,10 +441,7 @@ (defstate taunt (errol-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior errol-racer) - vehicle-rider-event-handler - ) + :event vehicle-rider-event-handler :enter (behavior () (format #t "errol-rider::taunt race-errol-pass~%") (speech-control-method-12 *speech-control* self (speech-type speech-type-53)) @@ -453,20 +450,14 @@ (ja-channel-push! 1 (seconds 0.05)) (cond ((zero? (rand-vu-int-count 2)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -796,7 +787,7 @@ ) ) ) - :code (the-as (function none :behavior turbo-ring) sleep-code) + :code sleep-code :post (behavior () (if (and (-> self player-got) (>= (- (current-time) (-> self touch-time)) (seconds 3)) diff --git a/goal_src/jak2/levels/city/protect/protect.gc b/goal_src/jak2/levels/city/protect/protect.gc index 24b398ae92c..e7712f7aea1 100644 --- a/goal_src/jak2/levels/city/protect/protect.gc +++ b/goal_src/jak2/levels/city/protect/protect.gc @@ -54,7 +54,7 @@ (defstate idle (seal-of-mar) :virtual #t - :code (the-as (function none :behavior seal-of-mar) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self node-list data 3 bone transform trans)) (ja-post) diff --git a/goal_src/jak2/levels/city/sack/collection-task.gc b/goal_src/jak2/levels/city/sack/collection-task.gc index 546e17fb177..19301546613 100644 --- a/goal_src/jak2/levels/city/sack/collection-task.gc +++ b/goal_src/jak2/levels/city/sack/collection-task.gc @@ -139,10 +139,7 @@ (task-arrow-spawn beam-params self) ) (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -150,7 +147,7 @@ ) #f ) - :post (the-as (function none :behavior krew-collection-item) ja-post) + :post ja-post ) (defstate die (krew-collection-item) diff --git a/goal_src/jak2/levels/city/shuttle/shuttle.gc b/goal_src/jak2/levels/city/shuttle/shuttle.gc index 8ec6feb041e..bc0ca87dcc1 100644 --- a/goal_src/jak2/levels/city/shuttle/shuttle.gc +++ b/goal_src/jak2/levels/city/shuttle/shuttle.gc @@ -292,14 +292,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -318,12 +311,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -371,7 +359,7 @@ (defstate exit-vehicle (citizen-rebel) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen-rebel) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((a0-1 (find-nearest-nav-mesh (-> self root trans) (the-as float #x7f800000)))) (if a0-1 @@ -605,26 +593,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) @@ -764,26 +740,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) diff --git a/goal_src/jak2/levels/city/slums/kor/kid-states.gc b/goal_src/jak2/levels/city/slums/kor/kid-states.gc index 8882622dc94..4b90977c2ca 100644 --- a/goal_src/jak2/levels/city/slums/kor/kid-states.gc +++ b/goal_src/jak2/levels/city/slums/kor/kid-states.gc @@ -11,7 +11,7 @@ (defstate waiting-idle (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -68,10 +68,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -79,12 +76,12 @@ ) #f ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-turn (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -133,10 +130,7 @@ ) ) (ja-channel-push! 1 (seconds 0.4)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -195,10 +189,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -220,12 +211,12 @@ ) (kid-method-232 self) ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-with-kor (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type kid waiting-idle) enter) :exit (-> (method-of-type kid waiting-idle) exit) :trans (behavior () @@ -242,7 +233,7 @@ (defstate scared-idle (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -299,10 +290,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -310,12 +298,12 @@ ) #f ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate traveling (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -378,7 +366,7 @@ (defstate traveling-blocked (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -411,7 +399,7 @@ ) ) :code (-> (method-of-type kid waiting-idle) code) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate stare (kid) @@ -459,10 +447,7 @@ :code (behavior () (local-vars (v1-31 enemy-flag) (v1-39 enemy-flag)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -509,7 +494,7 @@ (defstate arrested (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -557,10 +542,7 @@ :code (behavior () (when (not (logtest? (bot-flags bf20) (-> self bot-flags))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -584,10 +566,7 @@ ) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 4)) @@ -601,7 +580,7 @@ ) #f ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate failed (kid) diff --git a/goal_src/jak2/levels/city/slums/kor/kor-states.gc b/goal_src/jak2/levels/city/slums/kor/kor-states.gc index dc26da7ce24..7c4b6a5bbcb 100644 --- a/goal_src/jak2/levels/city/slums/kor/kor-states.gc +++ b/goal_src/jak2/levels/city/slums/kor/kor-states.gc @@ -9,7 +9,7 @@ (defstate waiting-idle (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -66,10 +66,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -77,12 +74,12 @@ ) #f ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-turn (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -132,10 +129,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -204,10 +198,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -229,12 +220,12 @@ ) (kor-method-232 self) ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-with-kid (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type kor waiting-idle) enter) :exit (-> (method-of-type kor waiting-idle) exit) :trans (behavior () @@ -251,7 +242,7 @@ (defstate scared-idle (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -308,10 +299,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -319,12 +307,12 @@ ) #f ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate traveling (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -387,7 +375,7 @@ (defstate traveling-blocked (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -420,7 +408,7 @@ ) ) :code (-> (method-of-type kor waiting-idle) code) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate stare (kor) @@ -468,10 +456,7 @@ :code (behavior () (local-vars (v1-31 enemy-flag) (v1-39 enemy-flag)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -518,7 +503,7 @@ (defstate arrested (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -569,10 +554,7 @@ ((and (not (logtest? (bot-flags bf20) (-> self bot-flags))) (< (- (current-time) (-> self arrest-attempt-time)) (seconds 0.8)) ) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -598,20 +580,14 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) frames num-frames) -1))) - :frame-num (ja-aframe 4.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num (ja-aframe 4.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 3)) @@ -625,7 +601,7 @@ ) #f ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate failed (kor) diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen-chick.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen-chick.gc index 8e15c2c6c91..2b5f74cb94d 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen-chick.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen-chick.gc @@ -499,10 +499,7 @@ (let ((f30-1 (/ 1.0 (rand-vu-float-range 10.0 13.0)))) (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! citizen-chick-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-chick-idle-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-chick-idle-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc index c92df39a4fa..17b12bf47ee 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc @@ -227,14 +227,7 @@ (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen-fat.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen-fat.gc index 2814da793e5..82006a01932 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen-fat.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen-fat.gc @@ -523,20 +523,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! citizen-fat-arms-hips-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-fat-arms-hips-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-fat-arms-hips-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! citizen-fat-arms-crossed-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-fat-arms-crossed-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-fat-arms-crossed-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc index 1f54ba43bd7..1b0bda92526 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen-norm.gc @@ -568,20 +568,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! citizen-norm-arms-hips-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-norm-arms-hips-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-norm-arms-hips-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! citizen-norm-arms-crossed-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-norm-arms-crossed-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-norm-arms-crossed-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) @@ -682,7 +676,7 @@ (defstate knocked-off-vehicle (citizen-norm) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen-norm) enemy-event-handler) + :event enemy-event-handler :enter (behavior () '() ) diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen.gc index b32b33e4d78..65af12629ce 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen.gc @@ -1242,7 +1242,7 @@ This commonly includes things such as: (defstate in-ditch (citizen) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1269,21 +1269,13 @@ This commonly includes things such as: :exit (behavior () '() ) - :trans (the-as (function none :behavior citizen) #f) + :trans #f :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (cond ((focus-test? self touch-water) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self water-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self water-anim))) frames num-frames) -1) - ) - 0.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self water-anim)) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) @@ -1303,14 +1295,7 @@ This commonly includes things such as: (else (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -1329,7 +1314,7 @@ This commonly includes things such as: (defstate wait (citizen) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1354,14 +1339,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1381,7 +1359,7 @@ This commonly includes things such as: (defstate active (citizen) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1514,7 +1492,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior citizen) sleep-code) + :code sleep-code ) (defstate knocked (citizen) diff --git a/goal_src/jak2/levels/city/traffic/citizen/civilian.gc b/goal_src/jak2/levels/city/traffic/citizen/civilian.gc index 0d550fd55dc..329387af4c2 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/civilian.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/civilian.gc @@ -498,7 +498,7 @@ (defstate flee (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -710,7 +710,7 @@ (defstate avoid-danger (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -887,7 +887,7 @@ (defstate clear-path (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -986,7 +986,7 @@ (defstate on-ground (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1026,12 +1026,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-on-ground)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-on-ground))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1050,7 +1045,7 @@ (defstate dive (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1116,12 +1111,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-dive)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-dive))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1153,7 +1143,7 @@ (defstate cower-ground (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1199,16 +1189,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self info anim-cover-head-start)) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self info anim-cover-head-start))) - frames - num-frames - ) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1217,16 +1198,7 @@ ) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self info anim-cover-head-loop)) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self info anim-cover-head-loop))) - frames - num-frames - ) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1240,16 +1212,7 @@ #f (label cfg-9) (ja-no-eval :group! (-> self draw art-group data (-> self info anim-cover-head-end)) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self info anim-cover-head-end))) - frames - num-frames - ) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1272,7 +1235,7 @@ (defstate get-up-front (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1299,14 +1262,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1330,7 +1286,7 @@ (defstate get-up-back (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1357,12 +1313,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1512,14 +1463,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -1937,7 +1881,7 @@ (defstate exit-vehicle (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (change-to (find-nearest-nav-mesh (-> self root trans) (the-as float #x7f800000)) self) (if (not (-> self nav)) @@ -2086,7 +2030,7 @@ (defstate wait-at-dest (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logclear! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -2107,14 +2051,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/city/traffic/citizen/guard.gc b/goal_src/jak2/levels/city/traffic/citizen/guard.gc index ea3cfefdf23..7aa9f2432b0 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/guard.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/guard.gc @@ -697,7 +697,7 @@ (defstate get-up-front (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -733,14 +733,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -765,7 +758,7 @@ (defstate get-up-back (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -801,12 +794,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1195,7 +1183,7 @@ (defstate knocked-off-vehicle (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () '() ) @@ -1298,7 +1286,7 @@ (defstate close-attack-active (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -1336,10 +1324,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 7.0 (ja-frame-num 0)) (not gp-0)) (let ((v1-22 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) @@ -1651,7 +1636,7 @@ (defstate search (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1786,7 +1771,7 @@ (defstate hostile (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (when *debug-segment* (when (not (-> self nav)) @@ -1992,7 +1977,7 @@ (defstate close-attack (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -2035,10 +2020,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 7.0 (ja-frame-num 0)) (not gp-0)) (let ((v1-22 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) @@ -2059,7 +2041,7 @@ (defstate gun-shoot (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self other-side) (if (< (rand-vu) 0.5) @@ -2140,14 +2122,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 0 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 0 anim-index))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2215,14 +2190,7 @@ (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 2 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 2 anim-index))) frames num-frames) - -1 - ) - ) - f30-1 - ) + :num! (seek! max f30-1) :frame-num 0.0 ) (until (ja-done? 0) @@ -2300,7 +2268,7 @@ (defstate roll-right (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -2411,7 +2379,7 @@ (defstate roll-left (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -2502,7 +2470,7 @@ (defstate arrest (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) @@ -2541,13 +2509,7 @@ (speech-control-method-12 *speech-control* self (speech-type speech-type-13)) (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 19) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2561,10 +2523,7 @@ ) (goto cfg-17) ) - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2574,13 +2533,7 @@ (label cfg-17) (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2597,7 +2550,7 @@ (defstate waiting-ambush (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) @@ -2636,23 +2589,14 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 19) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (while (not (logtest? (-> self flags) (citizen-flag target-in-sight))) - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2660,13 +2604,7 @@ ) (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) @@ -3071,7 +3009,7 @@ (defstate attack (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self joint-enable) #t) @@ -3170,10 +3108,7 @@ ) (cond ((< f0-6 0.0) - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 25) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-rotate-local-y! (-> self root quat) (-> self root quat) (* f30-0 (seconds-per-frame))) (suspend) @@ -3181,10 +3116,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 25) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (quaternion-rotate-local-y! (-> self root quat) (-> self root quat) (* f30-0 (seconds-per-frame))) (suspend) @@ -3235,10 +3167,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 21) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 21)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 21) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3305,10 +3234,7 @@ ) (set! (-> v1-182 state mode) (the-as lightning-mode a0-62)) ) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3601,7 +3527,7 @@ (defstate exit-transport (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self nav flags) (nav-control-flag output-sphere-hash)) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc index c13d4dc4b45..42f40dae423 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc @@ -403,10 +403,7 @@ (defstate ambush-jumping (metalhead-flitter) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-flitter) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -429,9 +426,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1))) - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!)) (until #f (when (< (-> self base-height) (-> self root trans y)) (let ((gp-0 (get-process *default-dead-pool* part-tracker #x4000))) @@ -502,10 +497,7 @@ ) #f (label cfg-26) - (ja-no-eval :group! (-> self draw art-group data 11) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -520,7 +512,7 @@ (label cfg-33) (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-flitter) nav-enemy-falling-post) + :post nav-enemy-falling-post ) (defmethod enemy-method-99 metalhead-flitter ((obj metalhead-flitter) (arg0 process-focusable)) @@ -681,14 +673,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -772,10 +757,7 @@ (defstate attack (metalhead-flitter) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-flitter) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -840,10 +822,7 @@ :code (behavior () (ja-channel-push! 2 (seconds 0.1)) (let ((f30-0 (metalhead-flitter-method-209 self))) - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek! max 0.8) :frame-num 0.0) (let ((a0-3 (-> self skel root-channel 1))) (set! (-> a0-3 frame-interp 1) f30-0) (set! (-> a0-3 frame-interp 0) f30-0) @@ -876,10 +855,7 @@ (logclear! (-> self focus-status) (focus-status dangerous)) ) (dotimes (gp-1 (get-rand-int self 3)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -887,7 +863,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior metalhead-flitter) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate victory (metalhead-flitter) @@ -929,14 +905,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1019,14 +988,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - (get-rand-float-range self 0.9 1.1) - ) + :num! (seek! max (get-rand-float-range self 0.9 1.1)) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc index c59a6d0336f..ac931f58482 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc @@ -330,10 +330,7 @@ (defstate falling-ambush (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (when (logtest? (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) @@ -368,13 +365,7 @@ ) :code (behavior () (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -384,7 +375,7 @@ (sound-play "grunt-notice") (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; WARN: Return type mismatch object vs none. @@ -402,10 +393,7 @@ (defstate jumping-ambush (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy ambush) enter)) (when (zero? (-> self intro-path)) @@ -439,10 +427,7 @@ (defstate jumping-ambush-cont (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (let ((a0-0 (-> self intro-path)) (v1-1 (+ (-> self jumping-ambush-path-pt) 1)) @@ -514,10 +499,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -535,20 +517,14 @@ (let ((gp-1 (-> self draw art-group data (-> self patrol-anim anim-index))) (s5-1 (get-rand-int-range self 2 5)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) (ja :num! (seek! max f30-0)) ) (dotimes (s4-1 s5-1) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -567,14 +543,7 @@ (nav-enemy-method-167 self) (ja-channel-push! 1 (seconds 0.3)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -583,14 +552,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -730,10 +692,7 @@ 0 ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -743,15 +702,12 @@ ) #f ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate attack (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state))) (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) @@ -811,10 +767,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -855,15 +808,12 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate spin-attack (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -924,10 +874,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a0-9 (handle->process (-> self focus handle)))) (if a0-9 @@ -946,7 +893,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate stop-chase (metalhead-grunt) @@ -971,10 +918,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1179,10 +1123,7 @@ (defstate wait-for-focus (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy idle) enter) :trans (behavior () (let ((s5-0 (handle->process (-> self focus handle)))) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc index 0d5b85a88ea..1a53f0ce96f 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc @@ -850,19 +850,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 6.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 6.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -874,10 +868,7 @@ (defstate fire (metalhead-predator) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-predator) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-2 *game-info*) @@ -914,10 +905,7 @@ (let ((gp-0 0)) (set! (-> self shoot-angle) (* 182.04445 (rand-vu-float-range -45.0 45.0))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 9.0 (ja-frame-num 0)) (zero? gp-0)) (set! gp-0 1) @@ -949,15 +937,12 @@ (label cfg-26) (go-hostile self) ) - :post (the-as (function none :behavior metalhead-predator) enemy-simple-post) + :post enemy-simple-post ) (defstate close-attack (metalhead-predator) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-predator) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (traffic-danger-init! self) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -989,10 +974,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 4.0 (ja-frame-num 0)) (not gp-0)) (metalhead-predator-method-205 self #t) @@ -1006,10 +988,7 @@ (set! (-> v1-32 speed) 0.0) ) 0 - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1019,7 +998,7 @@ ) (go-hostile self) ) - :post (the-as (function none :behavior metalhead-predator) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defmethod metalhead-predator-method-205 metalhead-predator ((obj metalhead-predator) (arg0 symbol)) diff --git a/goal_src/jak2/levels/city/traffic/traffic-manager.gc b/goal_src/jak2/levels/city/traffic/traffic-manager.gc index 70b25803e07..3e5836cb399 100644 --- a/goal_src/jak2/levels/city/traffic/traffic-manager.gc +++ b/goal_src/jak2/levels/city/traffic/traffic-manager.gc @@ -777,7 +777,7 @@ (defstate active (traffic-manager) :virtual #t :event traffic-manager-event-handler - :code (the-as (function none :behavior traffic-manager) sleep-code) + :code sleep-code :post (behavior () (update self) ) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/transport.gc b/goal_src/jak2/levels/city/traffic/vehicle/transport.gc index 084abaf4fa6..2c11654b819 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/transport.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/transport.gc @@ -85,8 +85,8 @@ ) ) ) - :code (the-as (function none :behavior vehicle-turret) sleep-code) - :post (the-as (function none :behavior vehicle-turret) transform-post) + :code sleep-code + :post transform-post ) (defmethod vehicle-turret-method-28 vehicle-turret ((obj vehicle-turret)) @@ -284,10 +284,7 @@ ) :code (behavior () (ja-channel-push! 1 0) - (ja-no-eval :group! transport-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim transport-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! transport-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -321,10 +318,7 @@ :code (behavior () (ja-channel-push! 1 0) (sound-play "tran-door-open") - (ja-no-eval :group! transport-hatch-open-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim transport-hatch-open-ja) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! transport-hatch-open-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -389,10 +383,7 @@ (ja-channel-push! 1 0) (sound-play "tran-thrust") (sound-play "tran-door-close") - (ja-no-eval :group! transport-hatch-close-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim transport-hatch-close-ja) frames num-frames) -1)) 0.2) - :frame-num 0.0 - ) + (ja-no-eval :group! transport-hatch-close-ja :num! (seek! max 0.2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.2)) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc index 72c681b7ce0..c75ea80ba65 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc @@ -1185,10 +1185,7 @@ (defstate active (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (let ((v1-0 (-> self controller branch))) (when (or (not v1-0) (zero? v1-0)) @@ -1210,8 +1207,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (cond ((logtest? (rigid-body-object-flag alert) (-> self flags)) @@ -1239,15 +1236,12 @@ (defstate hostile (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self ai-hook) (method-of-object self vehicle-method-93)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (when (logtest? (rigid-body-object-flag in-pursuit) (-> self flags)) @@ -1292,15 +1286,12 @@ (defstate stop-and-shoot (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (let ((s5-0 (new 'stack-no-clear 'vehicle-guard-target-data))) @@ -1320,16 +1311,13 @@ (defstate slow-pursuit (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (let ((s5-0 (new 'stack-no-clear 'vehicle-guard-target-data))) @@ -1355,16 +1343,13 @@ (defstate waiting-ambush (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (logior! (-> self flags) (rigid-body-object-flag riding ignition ai-driving)) (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (let ((gp-0 (new 'stack-no-clear 'vehicle-guard-target-data))) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc index 91a308c274d..673e551cd40 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc @@ -191,7 +191,7 @@ (ja-channel-push! 1 (seconds 0.05)) (ja :group! (-> self draw art-group data (-> self riding-anim))) ) - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code :post (behavior () (vehicle-rider-method-34 self) ) @@ -200,7 +200,7 @@ (defstate taunt (vehicle-rider) :virtual #t :event vehicle-rider-event-handler - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code :post (behavior () (go-virtual active) (vehicle-rider-method-34 self) @@ -210,7 +210,7 @@ (defstate got-passed (vehicle-rider) :virtual #t :event vehicle-rider-event-handler - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code :post (behavior () (go-virtual active) (vehicle-rider-method-34 self) @@ -226,7 +226,7 @@ :exit (behavior () (logclear! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch entity-perm-status vs none. diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc index c83488fe1a4..df63fcb4dfe 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc @@ -19,7 +19,7 @@ (rigid-body-object-method-39 self) (go-virtual waiting) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (ja-post) ) @@ -46,7 +46,7 @@ (logclear! (-> self focus-status) (focus-status disable inactive)) (logclear! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code ) (defstate active (vehicle) @@ -62,8 +62,8 @@ :exit (behavior () '() ) - :trans (the-as (function none :behavior vehicle) #f) - :code (the-as (function none :behavior vehicle) sleep-code) + :trans #f + :code sleep-code :post (behavior () (check-player-get-on self) (vehicle-method-122 self) @@ -117,8 +117,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle) #f) - :code (the-as (function none :behavior vehicle) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-method-123 self) ) @@ -196,7 +196,7 @@ ) ) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (local-vars (a0-3 int) (a0-5 int)) (let* ((v1-1 (-> *perf-stats* data 18)) @@ -252,7 +252,7 @@ (go-virtual explode) ) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (vehicle-method-121 self) ) @@ -445,7 +445,7 @@ (set! (-> self state-time) (current-time)) ) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (vehicle-explode-post) ) diff --git a/goal_src/jak2/levels/city/vinroom/vinroom-obs.gc b/goal_src/jak2/levels/city/vinroom/vinroom-obs.gc index ede5ed1d22e..ab9e802e9bd 100644 --- a/goal_src/jak2/levels/city/vinroom/vinroom-obs.gc +++ b/goal_src/jak2/levels/city/vinroom/vinroom-obs.gc @@ -94,7 +94,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior vin-turbine) sleep-code) + :code sleep-code ) (defstate idle (vin-turbine) @@ -108,10 +108,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc b/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc index 43982f42ac8..8fb9f3f5367 100644 --- a/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc +++ b/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc @@ -9,7 +9,7 @@ (defstate waiting-idle (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -58,10 +58,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.03)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -88,10 +85,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -99,12 +93,12 @@ ) #f ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate standing-idle (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -217,10 +211,7 @@ (and v1-31 (= v1-31 (-> self draw art-group data 3))) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -233,10 +224,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -244,12 +232,12 @@ ) #f ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate standing-turn (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -306,10 +294,7 @@ (f28-0 10.0) ) (quaternion-rotate-y! s5-1 (-> gp-0 src-quat) f0-1) - (ja-no-eval :group! s4-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-0) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-0 :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (let ((f0-6 (ja-aframe-num 0))) (cond @@ -331,12 +316,12 @@ ) (go-virtual standing-idle) ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate traveling (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -398,7 +383,7 @@ (defstate traveling-blocked (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -426,7 +411,7 @@ ) ) :code (-> (method-of-type ashelin waiting-idle) code) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate stare (ashelin) @@ -461,7 +446,7 @@ (defstate standing-blast (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -491,10 +476,7 @@ ) ) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (not gp-0) (>= (ja-aframe-num 0) 7.0)) (set! gp-0 #t) @@ -515,12 +497,12 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate chase (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (nav-enemy-method-166 self) @@ -574,7 +556,7 @@ (defstate back-spring (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -605,10 +587,7 @@ ) (quaternion-copy! s5-0 (-> self root quat)) (quaternion<-rotate-y-vector s4-0 gp-1) - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 33) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) s5-0 s4-0 (/ (ja-frame-num 0) (the float (ja-num-frames 0)))) (suspend) @@ -654,10 +633,7 @@ (set! (-> self nav state speed) f0-13) ) 0 - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 34) :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (let ((a1-12 (-> self nav state))) (set! (-> gp-1 quad) (-> a1-12 heading quad)) @@ -687,10 +663,7 @@ (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) ) - (ja-no-eval :group! (-> self draw art-group data 35) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 35) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -712,7 +685,7 @@ (defstate cartwheel-left (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -744,10 +717,7 @@ (quaternion-copy! s5-0 (-> self root quat)) (quaternion<-rotate-y-vector s4-0 gp-1) (quaternion-rotate-y! s4-0 s4-0 -16384.0) - (ja-no-eval :group! (-> self draw art-group data 36) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 36)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 36) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) s5-0 s4-0 (/ (ja-frame-num 0) (the float (ja-num-frames 0)))) (suspend) @@ -791,10 +761,7 @@ (set! (-> self nav state speed) f0-13) ) 0 - (ja-no-eval :group! (-> self draw art-group data 37) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 37)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 37) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((a1-11 (-> self nav state))) (set! (-> gp-1 quad) (-> a1-11 heading quad)) @@ -818,10 +785,7 @@ (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) ) - (ja-no-eval :group! (-> self draw art-group data 38) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 38)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 38) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -843,7 +807,7 @@ (defstate tumble-right (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -875,10 +839,7 @@ (quaternion-copy! s5-0 (-> self root quat)) (quaternion<-rotate-y-vector s4-0 gp-1) (quaternion-rotate-y! s4-0 s4-0 16384.0) - (ja-no-eval :group! (-> self draw art-group data 39) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 39) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) s5-0 s4-0 (/ (ja-frame-num 0) (the float (ja-num-frames 0)))) (suspend) @@ -922,10 +883,7 @@ (set! (-> self nav state speed) f0-13) ) 0 - (ja-no-eval :group! (-> self draw art-group data 40) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 40)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 40) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((a1-11 (-> self nav state))) (set! (-> gp-1 quad) (-> a1-11 heading quad)) @@ -949,10 +907,7 @@ (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) ) - (ja-no-eval :group! (-> self draw art-group data 41) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 41)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 41) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1088,10 +1043,7 @@ ) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/goal_src/jak2/levels/common/ai/bot-states.gc b/goal_src/jak2/levels/common/ai/bot-states.gc index b7221566c9f..3e2676b0c87 100644 --- a/goal_src/jak2/levels/common/ai/bot-states.gc +++ b/goal_src/jak2/levels/common/ai/bot-states.gc @@ -32,14 +32,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -160,10 +153,7 @@ ) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -184,7 +174,7 @@ (defstate failed (bot) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior bot) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type bot die-falling) enter)) (logclear! (-> self bot-flags) (bot-flags bf11)) @@ -215,10 +205,7 @@ (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (when (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 0.5)) @@ -235,12 +222,12 @@ ) #f ) - :post (the-as (function none :behavior bot) nav-enemy-die-falling-post) + :post nav-enemy-die-falling-post ) (defstate hidden (bot) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior bot) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status disable)) (let ((v1-3 (-> self root root-prim))) @@ -268,6 +255,6 @@ ) (set! (-> self enemy-flags) v0-0) ) - :code (the-as (function none :behavior bot) sleep-code) - :post (the-as (function none :behavior bot) nav-enemy-simple-post) + :code sleep-code + :post nav-enemy-simple-post ) diff --git a/goal_src/jak2/levels/common/ai/halt/hal.gc b/goal_src/jak2/levels/common/ai/halt/hal.gc index 8b1ae362956..aec136dbed4 100644 --- a/goal_src/jak2/levels/common/ai/halt/hal.gc +++ b/goal_src/jak2/levels/common/ai/halt/hal.gc @@ -532,9 +532,9 @@ (defstate idle (hal) :virtual #t :event hal-event-handler - :enter (the-as (function none :behavior hal) nothing) - :exit (the-as (function none :behavior hal) nothing) - :trans (the-as (function none :behavior hal) nothing) - :code (the-as (function none :behavior hal) sleep-code) + :enter nothing + :exit nothing + :trans nothing + :code sleep-code :post hal-post ) diff --git a/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc b/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc index 50af09198fd..57716916976 100644 --- a/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc +++ b/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc @@ -9,7 +9,7 @@ (defstate waiting-idle (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -47,13 +47,13 @@ (ruffian-method-240 self) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) (defstate waiting-turn (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -82,7 +82,7 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 49152.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -91,7 +91,7 @@ (defstate scared-idle (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -126,13 +126,13 @@ (ruffian-method-240 self) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) (defstate scared-turn (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -161,7 +161,7 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 49152.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -170,7 +170,7 @@ (defstate alert-idle (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type ruffian scared-idle) enter) :trans (behavior () (bot-method-223 self #t) @@ -191,13 +191,13 @@ (ruffian-method-241 self) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) (defstate alert-turn (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -216,7 +216,7 @@ :trans (behavior () (bot-method-223 self #t) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 49152.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -225,7 +225,7 @@ (defstate traveling (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -284,7 +284,7 @@ (defstate traveling-blocked (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -311,8 +311,8 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) (defstate stare (ruffian) @@ -340,12 +340,12 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing ) (defstate kick (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -374,7 +374,7 @@ :trans (behavior () (bot-method-223 self #f) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 131072.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -383,7 +383,7 @@ (defstate blast (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -401,13 +401,13 @@ :exit (behavior () (logclear! (-> self enemy-flags) (enemy-flag actor-pause-backup)) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) (defstate bomb-recoil (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -417,8 +417,8 @@ (nav-enemy-method-167 self) (set! (-> self travel-anim-interp) 0.0) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) (defstate hit (ruffian) @@ -433,7 +433,7 @@ (set! (-> self next-fire-time) 0) 0 ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing ) (defstate knocked (ruffian) @@ -488,12 +488,12 @@ ) (set! (-> self travel-anim-interp) 0.0) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing ) (defstate plant-bomb (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -523,6 +523,6 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) diff --git a/goal_src/jak2/levels/common/ai/sig/sig-states.gc b/goal_src/jak2/levels/common/ai/sig/sig-states.gc index c12610a5481..35b129f98ef 100644 --- a/goal_src/jak2/levels/common/ai/sig/sig-states.gc +++ b/goal_src/jak2/levels/common/ai/sig/sig-states.gc @@ -9,7 +9,7 @@ (defstate waiting-crouched (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -49,10 +49,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data 47) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 47)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 47) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -60,12 +57,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-far (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -136,10 +133,7 @@ ) (else (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -149,10 +143,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -160,12 +151,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-close (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -217,48 +208,46 @@ ) :code (behavior () (let* ((v1-2 (ja-group)) - (gp-0 - (-> self - draw - art-group - data - (cond - ((and v1-2 (= v1-2 (-> self draw art-group data 4))) - (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) - (until (ja-done? 0) - (suspend) - (ja :num! (seek!)) - ) - 7 - ) - (else - (let ((v1-32 (ja-group))) - (cond - ((and v1-32 (= v1-32 (-> self draw art-group data 5))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + (gp-0 (-> self + draw + art-group + data + (cond + ((and v1-2 (= v1-2 (-> self draw art-group data 4))) + (ja-channel-push! 1 (seconds 0.1)) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) + (until (ja-done? 0) + (suspend) + (ja :num! (seek!)) ) - (else - (let ((v1-46 (ja-group))) - (cond - ((and v1-46 (= v1-46 (-> self draw art-group data 7))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + 7 + ) + (else + (let ((v1-32 (ja-group))) + (cond + ((and v1-32 (= v1-32 (-> self draw art-group data 5))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) ) - (else - 7 + 7 + ) + (else + (let ((v1-46 (ja-group))) + (cond + ((and v1-46 (= v1-46 (-> self draw art-group data 7))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) + ) + 7 + ) + (else + 7 + ) + ) ) ) ) @@ -266,9 +255,7 @@ ) ) ) - ) ) - ) ) (let ((v1-62 (ja-group))) (if (not (and v1-62 (= v1-62 gp-0))) @@ -276,10 +263,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -288,12 +272,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate waiting-turn (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -342,10 +326,7 @@ (cond ((and v1-8 (or (= v1-8 (-> self draw art-group data 4)) (= v1-8 (-> self draw art-group data 6)))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -389,10 +370,7 @@ ) ) ) - (ja-no-eval :group! a1-11 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-11) frames num-frames) -1)) 1.3) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-11 :num! (seek! max 1.3) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -451,10 +429,7 @@ ) ) (quaternion-rotate-y! s5-1 (-> gp-0 src-quat) f0-19) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1)) 1.3) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek! max 1.3) :frame-num 0.0) (until (ja-done? 0) (let ((f0-24 (ja-aframe-num 0))) (cond @@ -476,12 +451,12 @@ ) (go-virtual waiting-close) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate charge-plasma (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -526,10 +501,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 35) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 35) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -537,10 +509,7 @@ (logior! (-> self plasma flags) (plasma-flags pf01)) (ja-channel-push! 1 (seconds 0.07)) (until #f - (ja-no-eval :group! (-> self draw art-group data 36) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 36)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 36) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self plasma flags) (plasma-flags pf02)) (logtest? (-> self plasma flags) (plasma-flags pf03)) @@ -554,20 +523,14 @@ #f (label cfg-12) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 37) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 37)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 37) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-push! 1 (seconds 0.07)) (until #f - (ja-no-eval :group! (-> self draw art-group data 38) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 38)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 38) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (logtest? (-> self plasma flags) (plasma-flags pf03)) (logior! (-> self plasma flags) (plasma-flags pf04)) @@ -587,7 +550,7 @@ (defstate gun-jam (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -620,12 +583,12 @@ ) (go-virtual repair-gun) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate repair-gun (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -663,10 +626,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -674,10 +634,7 @@ (until #f (ja-channel-push! 1 (seconds 0.07)) (countdown (gp-0 (get-rand-int-range self 2 4)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -690,10 +647,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -705,10 +659,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.13)) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -720,10 +671,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 31) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 31) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -735,10 +683,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.13)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -750,10 +695,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 32) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 32)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 32) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -766,10 +708,7 @@ ) (countdown (gp-1 (get-rand-int-range self 2 3)) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 33) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -782,10 +721,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 34) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -799,12 +735,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate clean-gun (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -843,10 +779,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -860,10 +793,7 @@ (ja-channel-push! 1 (seconds 0.13)) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -876,10 +806,7 @@ (ja-channel-push! 1 (seconds 0.13)) (while (nonzero? s5-1) (+! s5-1 -1) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -890,10 +817,7 @@ ) (when (nonzero? gp-0) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 31) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 31) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -903,12 +827,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate traveling (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -974,7 +898,7 @@ (defstate traveling-blocked (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1011,10 +935,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.3)) (until #f - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1022,7 +943,7 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate stare (sig) @@ -1068,48 +989,46 @@ ) :code (behavior () (let* ((v1-2 (ja-group)) - (gp-0 - (-> self - draw - art-group - data - (cond - ((and v1-2 (= v1-2 (-> self draw art-group data 4))) - (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) - (until (ja-done? 0) - (suspend) - (ja :num! (seek!)) - ) - 7 - ) - (else - (let ((v1-32 (ja-group))) - (cond - ((and v1-32 (= v1-32 (-> self draw art-group data 5))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + (gp-0 (-> self + draw + art-group + data + (cond + ((and v1-2 (= v1-2 (-> self draw art-group data 4))) + (ja-channel-push! 1 (seconds 0.1)) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) + (until (ja-done? 0) + (suspend) + (ja :num! (seek!)) ) - (else - (let ((v1-46 (ja-group))) - (cond - ((and v1-46 (= v1-46 (-> self draw art-group data 7))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + 7 + ) + (else + (let ((v1-32 (ja-group))) + (cond + ((and v1-32 (= v1-32 (-> self draw art-group data 5))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) ) - (else - 7 + 7 + ) + (else + (let ((v1-46 (ja-group))) + (cond + ((and v1-46 (= v1-46 (-> self draw art-group data 7))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) + ) + 7 + ) + (else + 7 + ) + ) ) ) ) @@ -1117,9 +1036,7 @@ ) ) ) - ) ) - ) ) (let ((v1-62 (ja-group))) (if (not (and v1-62 (= v1-62 gp-0))) @@ -1127,10 +1044,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1143,7 +1057,7 @@ (defstate whip (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -1195,10 +1109,7 @@ ) ) ) - (ja-no-eval :group! a1-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-2) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-2 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (focus-test? self dangerous) (< f30-0 (ja-aframe-num 0))) (if (logtest? (-> self enemy-flags) (enemy-flag check-water)) @@ -1223,7 +1134,7 @@ (defstate blast (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -1292,12 +1203,12 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate chase (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self skel top-anim interp) 1.0) @@ -1349,7 +1260,7 @@ (defstate chase-attack (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type sig chase) enter)) (set! (-> self skel top-anim interp) 1.0) @@ -1442,10 +1353,7 @@ :code (behavior () (local-vars (v1-31 enemy-flag) (v1-39 enemy-flag)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1524,19 +1432,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1544,10 +1446,7 @@ (ja-channel-push! 1 (seconds 0.2)) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 0.5)) @@ -1565,7 +1464,7 @@ (defstate sig-path-run (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1619,12 +1518,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate sig-path-jump (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1674,10 +1573,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 57) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 57)) frames num-frames) -1))) - :frame-num f30-0 - ) + (ja-no-eval :group! (-> self draw art-group data 57) :num! (seek!) :frame-num f30-0) ) (until (ja-done? 0) (suspend) @@ -1688,12 +1584,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate sig-path-jump-land (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1736,13 +1632,7 @@ (let* ((f0-0 (vector-length (-> self root transv))) (f0-2 (fmax 0.1 (* 0.000020345053 f0-0))) ) - (ja-no-eval :group! (-> self draw art-group data 58) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 58)) frames num-frames) -1)) - f0-2 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 58) :num! (seek! max f0-2) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -1754,12 +1644,12 @@ ) (go-virtual sig-path-run) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate sig-path-shoot-jump (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1810,10 +1700,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 59) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 59)) frames num-frames) -1))) - :frame-num f30-0 - ) + (ja-no-eval :group! (-> self draw art-group data 59) :num! (seek!) :frame-num f30-0) ) (until (ja-done? 0) (if (and (not (logtest? (bot-flags bf25) (-> self bot-flags))) @@ -1829,12 +1716,12 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate sig-path-shoot-jump-land (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1877,13 +1764,7 @@ (let* ((f0-0 (vector-length (-> self root transv))) (f0-2 (fmax 0.1 (* 0.000020345053 f0-0))) ) - (ja-no-eval :group! (-> self draw art-group data 60) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 60)) frames num-frames) -1)) - f0-2 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 60) :num! (seek! max f0-2) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -1895,12 +1776,12 @@ ) (go-virtual sig-path-run) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate sig-path-idle (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1920,19 +1801,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 61) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 61)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 61) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 62) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1940,5 +1815,5 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/goal_src/jak2/levels/common/airlock.gc b/goal_src/jak2/levels/common/airlock.gc index 66a53c29169..e2ed65efa39 100644 --- a/goal_src/jak2/levels/common/airlock.gc +++ b/goal_src/jak2/levels/common/airlock.gc @@ -373,11 +373,7 @@ ) ) (if (and (>= argc 2) (and (= (-> block param 1) #t) (want-cross-airlock? self) (destination-loaded? self #f))) - (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) - :num! (identity - (the float (+ (-> (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) frames num-frames) -1)) - ) - ) + (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) :num! max) ) (and (-> self next-state) (= (-> self next-state name) 'close)) ) @@ -763,11 +759,7 @@ ) ) (process-entity-status! self (entity-perm-status subtask-complete) #t) - (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) - :num! (identity - (the float (+ (-> (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) frames num-frames) -1)) - ) - ) + (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) :num! max) (transform-post) (logior! (-> self mask) (process-mask sleep-code)) (suspend) @@ -1203,8 +1195,8 @@ This commonly includes things such as: (none) ) -(defskelgroup skel-vin-door-ctyinda vin-door-ctyinda 0 2 - ((1 (meters 999999))) +(defskelgroup skel-vin-door-ctyinda vin-door-ctyinda vin-door-ctyinda-lod0-jg vin-door-ctyinda-idle-ja + ((vin-door-ctyinda-lod0-mg (meters 999999))) :bounds (static-spherem 0 3 0 6) ) @@ -1343,7 +1335,10 @@ This commonly includes things such as: (none) ) -(defskelgroup skel-oracle-door oracle-door 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 4 0 10)) +(defskelgroup skel-oracle-door oracle-door oracle-door-lod0-jg oracle-door-idle-ja + ((oracle-door-lod0-mg (meters 999999))) + :bounds (static-spherem 0 4 0 10) + ) (deftype oracle-door (com-airlock) () diff --git a/goal_src/jak2/levels/common/battle.gc b/goal_src/jak2/levels/common/battle.gc index f39273077a9..bfa42840104 100644 --- a/goal_src/jak2/levels/common/battle.gc +++ b/goal_src/jak2/levels/common/battle.gc @@ -1380,7 +1380,7 @@ (draw-battle-marks self) ) ) - :code (the-as (function none :behavior battle) sleep-code) + :code sleep-code ) (defstate notice (battle) @@ -1537,7 +1537,7 @@ (draw-battle-marks self) ) ) - :code (the-as (function none :behavior battle) sleep-code) + :code sleep-code ) (defstate beaten (battle) @@ -1552,7 +1552,7 @@ ) (unset-battle-music self) ) - :code (the-as (function none :behavior battle) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch battle-flags vs none. diff --git a/goal_src/jak2/levels/common/elec-gate.gc b/goal_src/jak2/levels/common/elec-gate.gc index 165c7c68b0c..16571a43baf 100644 --- a/goal_src/jak2/levels/common/elec-gate.gc +++ b/goal_src/jak2/levels/common/elec-gate.gc @@ -233,7 +233,7 @@ ) ) ) - :code (the-as (function none :behavior elec-gate) sleep-code) + :code sleep-code :post (behavior () (set-elec-scale-if-close! self 0.0) (if (nonzero? (-> self part-off)) @@ -607,7 +607,7 @@ ) ) ) - :code (the-as (function none :behavior elec-gate) sleep-code) + :code sleep-code :post (behavior () (set-elec-scale-if-close! self 1.0) (if (nonzero? (-> self part)) @@ -700,7 +700,7 @@ ) ) ) - :code (the-as (function none :behavior elec-gate) sleep-code) + :code sleep-code :post (behavior () (set-elec-scale-if-close! self 0.0) (if (nonzero? (-> self part-off)) diff --git a/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc b/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc index 7ada7121a16..a5876523a0e 100644 --- a/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc +++ b/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc @@ -1039,32 +1039,14 @@ ) 0 (nav-enemy-method-167 self) - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) (ja :num! (seek!)) ) (until (not (enemy-method-123 self 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1122,10 +1104,7 @@ (gp-1 (new 'stack-no-clear 'vector)) ) (vector-! gp-1 (-> self focus-pos) (-> self root trans)) - (ja-no-eval :group! a1-3 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-3) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-3 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) gp-1 65536.0 (seconds 0.02)) (suspend) @@ -1246,10 +1225,7 @@ (vector-normalize! gp-0 1.0) (cond ((>= (vector-dot s4-0 gp-0) 0.707) - (ja-no-eval :group! amphibian-attack-forward-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-forward-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-forward-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) (else (let ((v1-22 (>= (vector-dot s5-0 gp-0) 0.0))) @@ -1257,14 +1233,8 @@ (set! v1-22 (not v1-22)) ) (if v1-22 - (ja-no-eval :group! amphibian-attack-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-right-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) - (ja-no-eval :group! amphibian-attack-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-left-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-right-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) + (ja-no-eval :group! amphibian-attack-left-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) ) ) @@ -1290,7 +1260,7 @@ (defstate stare-idle (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy stare) enter)) (let ((v1-2 self)) @@ -1304,10 +1274,7 @@ (ja-channel-push! 1 (seconds 0.1)) (let ((gp-0 (get-rand-int-range self 1 3))) (dotimes (s5-0 gp-0) - (ja-no-eval :group! amphibian-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! amphibian-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1316,7 +1283,7 @@ ) (go-virtual stare) ) - :post (the-as (function none :behavior amphibian) nav-enemy-stare-post) + :post nav-enemy-stare-post ) (defstate hostile (amphibian) @@ -1366,7 +1333,7 @@ (defstate attack-forward (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -1408,22 +1375,19 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! amphibian-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (>= (ja-aframe-num 0) (ja-aframe 2.0 0)) (suspend) (ja :num! (seek!)) ) (go-virtual attack-forward-lunge) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate attack-forward-lunge (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state))) (set! (-> v1-1 speed) 51200.0) @@ -1488,7 +1452,7 @@ (defstate attack-forward-end (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -1520,12 +1484,12 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate attack-spin (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -1582,10 +1546,7 @@ (vector-normalize! gp-0 1.0) (cond ((>= (vector-dot s4-0 gp-0) 0.707) - (ja-no-eval :group! amphibian-attack-forward-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-forward-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-forward-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) (else (let ((v1-22 (>= (vector-dot s5-0 gp-0) 0.0))) @@ -1593,14 +1554,8 @@ (set! v1-22 (not v1-22)) ) (if v1-22 - (ja-no-eval :group! amphibian-attack-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-right-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) - (ja-no-eval :group! amphibian-attack-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-left-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-right-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) + (ja-no-eval :group! amphibian-attack-left-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) ) ) @@ -1627,12 +1582,12 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate tongue-attack (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -1707,17 +1662,14 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.7)) - (ja-no-eval :group! amphibian-tongue-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-tongue-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! amphibian-tongue-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (react-to-focus self) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; WARN: Return type mismatch nav-enemy vs amphibian. diff --git a/goal_src/jak2/levels/common/enemy/bouncer.gc b/goal_src/jak2/levels/common/enemy/bouncer.gc index 3ea0506c33d..6b1e40ca2ae 100644 --- a/goal_src/jak2/levels/common/enemy/bouncer.gc +++ b/goal_src/jak2/levels/common/enemy/bouncer.gc @@ -166,7 +166,7 @@ ) #f ) - :post (the-as (function none :behavior bouncer) transform-post) + :post transform-post ) (defstate fire (bouncer) @@ -174,9 +174,7 @@ :code (behavior () (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) (ja-no-eval :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) - :num! (seek! - (the float (+ (-> (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) frames num-frames) -1)) - ) + :num! (seek!) :frame-num (ja-aframe 6.0 0) ) (until (ja-done? 0) @@ -185,7 +183,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior bouncer) transform-post) + :post transform-post ) (defmethod init-skeleton! bouncer ((obj bouncer)) diff --git a/goal_src/jak2/levels/common/enemy/centurion.gc b/goal_src/jak2/levels/common/enemy/centurion.gc index a24f1d043e7..dc91d429b37 100644 --- a/goal_src/jak2/levels/common/enemy/centurion.gc +++ b/goal_src/jak2/levels/common/enemy/centurion.gc @@ -615,14 +615,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -658,10 +651,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! centurion-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -670,7 +660,7 @@ ) #f ) - :post (the-as (function none :behavior centurion) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defmethod centurion-method-180 centurion ((obj centurion)) @@ -755,7 +745,7 @@ (defstate fire (centurion) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior centurion) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self can-shoot?) (the-as basic #t)) (if (and (-> self first-shoot?) (logtest? (-> self draw status) (draw-control-status on-screen))) @@ -791,10 +781,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! centurion-shoot-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-shoot-start-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-shoot-start-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((gp-2 (handle->process (-> self focus handle)))) (when gp-2 @@ -840,10 +827,7 @@ (when (handle->process (-> self focus handle)) ) (centurion-method-180 self) - (ja-no-eval :group! centurion-shoot-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-shoot-loop-ja) frames num-frames) -1)) 0.4) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-shoot-loop-ja :num! (seek! max 0.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4)) @@ -851,10 +835,7 @@ (set! (-> self can-take-damage?) #f) (set! (-> self root root-prim specific 0) (-> self root root-prim specific 1)) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! centurion-shoot-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-shoot-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-shoot-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -862,12 +843,12 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior centurion) enemy-simple-post) + :post enemy-simple-post ) (defstate attack (centurion) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior centurion) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3 prim-core action) (collide-action solid deadly) @@ -893,17 +874,14 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! centurion-hit-away-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-hit-away-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-hit-away-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual hostile) ) - :post (the-as (function none :behavior centurion) enemy-simple-post) + :post enemy-simple-post ) (defmethod dispose! centurion ((obj centurion)) @@ -1294,7 +1272,7 @@ ) #f ) - :post (the-as (function none :behavior centurion) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defmethod enemy-method-77 centurion ((obj centurion) (arg0 (pointer float))) diff --git a/goal_src/jak2/levels/common/enemy/flitter.gc b/goal_src/jak2/levels/common/enemy/flitter.gc index ed35e83fbba..66d2dee9be8 100644 --- a/goal_src/jak2/levels/common/enemy/flitter.gc +++ b/goal_src/jak2/levels/common/enemy/flitter.gc @@ -708,7 +708,7 @@ (defstate ambush-jumping (flitter) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flitter) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -731,9 +731,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! flitter-ambush-jump-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-jump-ja) frames num-frames) -1))) - ) + (ja-no-eval :group! flitter-ambush-jump-ja :num! (seek!)) (until #f (when (< (-> self base-height) (-> self root trans y)) (let ((gp-0 (get-process *default-dead-pool* part-tracker #x4000))) @@ -804,10 +802,7 @@ ) #f (label cfg-26) - (ja-no-eval :group! flitter-ambush-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flitter-ambush-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -822,7 +817,7 @@ (label cfg-33) (go-virtual hostile) ) - :post (the-as (function none :behavior flitter) nav-enemy-falling-post) + :post nav-enemy-falling-post ) (defmethod enemy-method-99 flitter ((obj flitter) (arg0 process-focusable)) @@ -981,14 +976,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1069,14 +1057,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - (get-rand-float-range self 0.9 1.1) - ) + :num! (seek! max (get-rand-float-range self 0.9 1.1)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1149,7 +1130,7 @@ (defstate attack (flitter) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flitter) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1212,10 +1193,7 @@ :code (behavior () (ja-channel-push! 2 (seconds 0.1)) (let ((f30-0 (flitter-method-183 self))) - (ja-no-eval :group! flitter-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-attack-ja) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! flitter-attack-ja :num! (seek! max 0.8) :frame-num 0.0) (let ((a0-3 (-> self skel root-channel 1))) (set! (-> a0-3 frame-interp 1) f30-0) (set! (-> a0-3 frame-interp 0) f30-0) @@ -1247,10 +1225,7 @@ (logclear! (-> self focus-status) (focus-status dangerous)) ) (dotimes (gp-1 (get-rand-int self 3)) - (ja-no-eval :group! flitter-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flitter-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1258,7 +1233,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior flitter) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate victory (flitter) diff --git a/goal_src/jak2/levels/common/enemy/fodder/fodder.gc b/goal_src/jak2/levels/common/enemy/fodder/fodder.gc index 38a831342e7..62d9fc4b1c6 100644 --- a/goal_src/jak2/levels/common/enemy/fodder/fodder.gc +++ b/goal_src/jak2/levels/common/enemy/fodder/fodder.gc @@ -401,14 +401,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -425,10 +418,7 @@ (until (not #f) (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) - (ja-no-eval :group! fodder-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! fodder-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -437,10 +427,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) (dotimes (num-chews (rand-vu-int-range 4 7)) - (ja-no-eval :group! fodder-chew-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-chew-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! fodder-chew-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -459,14 +446,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -505,14 +485,7 @@ (s4-0 (< f28-0 (+ -1.0 (the-as float v1-19)))) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - (* 2.0 f30-0) - ) + :num! (seek! max (* 2.0 f30-0)) :frame-num 0.0 ) (until (ja-done? 0) @@ -871,10 +844,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -900,14 +870,7 @@ ) (let ((f30-2 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-2 - ) + :num! (seek! max f30-2) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/common/enemy/grenadier.gc b/goal_src/jak2/levels/common/enemy/grenadier.gc index aa5fb5f2176..fbe87524b85 100644 --- a/goal_src/jak2/levels/common/enemy/grenadier.gc +++ b/goal_src/jak2/levels/common/enemy/grenadier.gc @@ -419,13 +419,7 @@ (s4-0 (-> (the-as (pointer int32) (+ (* (get-rand-int self gp-0) 8) (the-as int s5-0))))) ) (until #f - (ja-no-eval :group! (-> self draw art-group data s4-0) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data s4-0)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data s4-0) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -439,14 +433,7 @@ ) 0 (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -456,14 +443,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -482,13 +462,7 @@ (ja-no-eval :num! (loop!)) (set! s4-0 (-> (the-as (pointer int32) (+ (* (get-rand-int self gp-0) 8) (the-as int s5-0))))) (ja-channel-push! 1 (seconds 0.6)) - (ja-no-eval :group! (-> self draw art-group data s4-0) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data s4-0)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data s4-0) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -596,10 +570,7 @@ (f30-0 (get-rand-float-range self 0.9 1.1)) ) (until #f - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -628,7 +599,7 @@ (defstate backup (grenadier) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grenadier) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -649,10 +620,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! grenadier-run-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-run-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-run-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -675,7 +643,7 @@ (defstate spin-kick (grenadier) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grenadier) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -711,10 +679,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.135)) - (ja-no-eval :group! grenadier-spin-kick-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-spin-kick-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-spin-kick-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -905,10 +870,7 @@ 0 (logclear! (-> self nav flags) (nav-control-flag update-heading-from-facing)) (logior! (-> self status-flags) (grenadier-flags grflags-1)) - (ja-no-eval :group! grenadier-run-to-throw-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-run-to-throw-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-run-to-throw-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -929,10 +891,7 @@ (cond ((logtest? (-> self status-flags) (grenadier-flags grflags-0)) (ja-channel-push! 1 (seconds 0.135)) - (ja-no-eval :group! grenadier-throw-quick-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-throw-quick-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-throw-quick-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -972,20 +931,14 @@ (let ((f0-14 (vector-vector-distance (-> self root trans) (get-trans (the-as process-focusable a0-50) 0)))) (cond ((< 102400.0 f0-14) - (ja-no-eval :group! grenadier-throw-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-throw-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-throw-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (else - (ja-no-eval :group! grenadier-throw1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-throw1-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-throw1-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1053,10 +1006,7 @@ ) (let ((gp-1 (-> self draw art-group data v1-10))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -1127,20 +1077,14 @@ (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (cond ((zero? (rand-vu-int-range 0 1)) - (ja-no-eval :group! grenadier-victory-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-victory-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-victory-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (else - (ja-no-eval :group! grenadier-notice-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-notice-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-notice-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/goal_src/jak2/levels/common/enemy/grunt.gc b/goal_src/jak2/levels/common/enemy/grunt.gc index 9ec63c1562f..a5b1a802637 100644 --- a/goal_src/jak2/levels/common/enemy/grunt.gc +++ b/goal_src/jak2/levels/common/enemy/grunt.gc @@ -413,7 +413,7 @@ (defstate falling-ambush (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (when (logtest? (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) @@ -470,14 +470,7 @@ (sound-play "grunt-notice") (ja-channel-push! 1 0) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - 1.8 - ) + :num! (seek! max 1.8) :frame-num 0.0 ) (until (ja-done? 0) @@ -489,7 +482,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior grunt) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; WARN: Return type mismatch object vs none. @@ -507,7 +500,7 @@ (defstate jumping-ambush (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy ambush) enter)) (when (zero? (-> self intro-path)) @@ -541,7 +534,7 @@ (defstate jumping-ambush-cont (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :code (behavior () (let ((a0-0 (-> self intro-path)) (v1-1 (+ (-> self unknown-byte-1ji2n3) 1)) @@ -606,10 +599,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -627,20 +617,14 @@ (let ((gp-1 (-> self draw art-group data (-> self patrol-anim anim-index))) (s5-1 (get-rand-int-range self 2 5)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) (ja :num! (seek! max f30-0)) ) (dotimes (s4-1 s5-1) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -659,14 +643,7 @@ (nav-enemy-method-167 self) (ja-channel-push! 1 (seconds 0.3)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -675,14 +652,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -818,10 +788,7 @@ 0 ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -831,12 +798,12 @@ ) #f ) - :post (the-as (function none :behavior grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate attack (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state))) (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) @@ -885,10 +852,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -929,12 +893,12 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate spin-attack (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -984,10 +948,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a0-9 (handle->process (-> self focus handle)))) (if a0-9 @@ -1006,7 +967,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior grunt) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate circling (grunt) @@ -1062,10 +1023,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1091,18 +1049,12 @@ ) ) (let ((f30-2 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! grunt-celebrate-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-start-ja) frames num-frames) -1)) f30-2) - :frame-num 0.0 - ) + (ja-no-eval :group! grunt-celebrate-start-ja :num! (seek! max f30-2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-2)) ) - (ja-no-eval :group! grunt-celebrate-finish-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-finish-ja) frames num-frames) -1)) f30-2) - :frame-num 0.0 - ) + (ja-no-eval :group! grunt-celebrate-finish-ja :num! (seek! max f30-2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-2)) @@ -1164,10 +1116,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1200,10 +1149,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1412,7 +1358,7 @@ (defstate wait-for-focus (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy idle) enter) :trans (behavior () (let ((s5-0 (handle->process (-> self focus handle)))) diff --git a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc index ed8a75668ed..78773382fda 100644 --- a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc +++ b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc @@ -1596,14 +1596,7 @@ (gp-0 (new 'stack-no-clear 'vector)) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1629,10 +1622,7 @@ (defstate hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type nav-enemy hostile) enter))) (if t9-0 @@ -1721,10 +1711,7 @@ (defstate tazer-hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -1786,10 +1773,7 @@ (defstate blast-hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -1863,10 +1847,7 @@ (defstate grenade-hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -1938,10 +1919,7 @@ (defstate arrest (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) @@ -1994,13 +1972,7 @@ (speech-control-method-12 *speech-control* self (speech-type speech-type-13)) (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 19) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2013,10 +1985,7 @@ ) (goto cfg-13) ) - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2026,13 +1995,7 @@ (label cfg-13) (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2048,10 +2011,7 @@ (defstate gun-shoot (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self other-side) (the-as uint (if (< (rand-vu) 0.5) #t @@ -2113,14 +2073,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 0 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 0 anim-index))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2210,14 +2163,7 @@ (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 2 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 2 anim-index))) frames num-frames) - -1 - ) - ) - f30-1 - ) + :num! (seek! max f30-1) :frame-num 0.0 ) (until (ja-done? 0) @@ -2633,10 +2579,7 @@ (defstate close-attack (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-3 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) (logior! (-> v1-3 prim-core action) (collide-action deadly)) @@ -2669,10 +2612,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2735,10 +2675,7 @@ (defstate grenade-attack (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -2820,10 +2757,7 @@ (defstate attack (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self joint-enable) #t) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -2907,10 +2841,7 @@ ) (cond ((< 5461.3335 (fabs (-> self target-y-angle))) - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 25) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (< 5461.3335 (fabs (-> self target-y-angle))) (seek-to-point-toward-point! @@ -2925,10 +2856,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until v1-69 (suspend) (ja :num! (seek!)) @@ -2958,10 +2886,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 21) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 21)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 21) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3027,10 +2952,7 @@ ) (set! (-> v1-151 state mode) (the-as lightning-mode a0-44)) ) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3045,10 +2967,7 @@ ) ) (when (not (handle->process (-> self focus handle))) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3068,10 +2987,7 @@ (defstate get-up-front (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -3099,16 +3015,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3130,10 +3037,7 @@ (defstate get-up-back (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -3161,14 +3065,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3246,10 +3143,7 @@ (defstate roll-right (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -3360,10 +3254,7 @@ (defstate roll-left (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -3713,10 +3604,7 @@ (let ((gp-0 (-> self draw art-group data (-> self enemy-info die-falling-anim))) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -3743,10 +3631,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3762,10 +3647,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 32) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 32)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 32) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3781,10 +3663,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 34) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3799,10 +3678,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 33) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3812,10 +3688,7 @@ ) (when gp-1 (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -4095,10 +3968,7 @@ (defstate exit-transport (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self nav flags) (nav-control-flag output-sphere-hash)) diff --git a/goal_src/jak2/levels/common/enemy/guards/guard-conversation.gc b/goal_src/jak2/levels/common/enemy/guards/guard-conversation.gc index 6d8b318bb11..db9107c4ba8 100644 --- a/goal_src/jak2/levels/common/enemy/guards/guard-conversation.gc +++ b/goal_src/jak2/levels/common/enemy/guards/guard-conversation.gc @@ -250,7 +250,7 @@ ) ) ) - :code (the-as (function none :behavior guard-conversation) sleep-code) + :code sleep-code ) (defstate active (guard-conversation) @@ -304,7 +304,7 @@ (guard-conversation-method-24 self) ) ) - :code (the-as (function none :behavior guard-conversation) sleep-code) + :code sleep-code ) (defstate notice (guard-conversation) diff --git a/goal_src/jak2/levels/common/enemy/guards/transport-level.gc b/goal_src/jak2/levels/common/enemy/guards/transport-level.gc index e1183f98d3d..b5b3b005188 100644 --- a/goal_src/jak2/levels/common/enemy/guards/transport-level.gc +++ b/goal_src/jak2/levels/common/enemy/guards/transport-level.gc @@ -112,10 +112,7 @@ ) :code (behavior () (ja-channel-push! 1 0) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -149,10 +146,7 @@ :code (behavior () (ja-channel-push! 1 0) (sound-play "tran-door-open") - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -216,10 +210,7 @@ (ja-channel-push! 1 0) (sound-play "tran-thrust") (sound-play "tran-door-close") - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) 0.2) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.2)) diff --git a/goal_src/jak2/levels/common/enemy/hopper.gc b/goal_src/jak2/levels/common/enemy/hopper.gc index 4dc4d1aff69..b778f701e5f 100644 --- a/goal_src/jak2/levels/common/enemy/hopper.gc +++ b/goal_src/jak2/levels/common/enemy/hopper.gc @@ -787,7 +787,7 @@ ) ) ) - :post (the-as (function none :behavior hopper) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate active (hopper) @@ -803,10 +803,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! hopper-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hopper-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hopper-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -815,7 +812,7 @@ ) #f ) - :post (the-as (function none :behavior hopper) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate notice (hopper) @@ -829,10 +826,7 @@ (ja :group! hopper-notice-ja) (ja :group! hopper-notice-alt-ja) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a1-4 (-> self nav state))) (set! (-> gp-0 quad) (-> a1-4 travel quad)) 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 d1e79ec4af1..98cd894c2f0 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 @@ -616,10 +616,7 @@ (defstate ambush-fly (crimson-guard-hover) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-hover) - enemy-event-handler - ) + :event enemy-event-handler :trans (behavior () (when (hover-nav-control-method-23 (-> self hover)) (hover-enemy-method-153 self) @@ -640,7 +637,7 @@ ) ) ) - :code (the-as (function none :behavior crimson-guard-hover) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (-> (method-of-type hover-enemy ambush) post) ) @@ -708,13 +705,7 @@ (sound-play "hover-warn") (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -782,10 +773,7 @@ (defstate kick-attack (crimson-guard-hover) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-hover) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) ) @@ -794,7 +782,7 @@ (go-hostile self) ) ) - :code (the-as (function none :behavior crimson-guard-hover) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (let ((a1-0 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-0 from) (process->ppointer self)) @@ -890,13 +878,7 @@ ) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -944,16 +926,7 @@ :code (behavior () (local-vars (v1-35 enemy-flag) (v1-43 enemy-flag)) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-recover-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -990,10 +963,7 @@ (defstate die-now (crimson-guard-hover) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-hover) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (dispose! self) (let ((v1-3 (-> self root root-prim))) @@ -1011,7 +981,7 @@ (send-event self 'death-end) (cleanup-for-death self) ) - :post (the-as (function none :behavior crimson-guard-hover) transform-post) + :post transform-post ) (defstate flying-death (crimson-guard-hover) @@ -1057,20 +1027,14 @@ (ja-channel-push! 1 (seconds 0.2)) (cond ((< (-> self flying-death-spin-dest) 0.0) - (ja-no-eval :group! crimson-guard-hover-death-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim crimson-guard-hover-death-left-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! crimson-guard-hover-death-left-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! crimson-guard-hover-death-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim crimson-guard-hover-death-right-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! crimson-guard-hover-death-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/common/enemy/hover/flamer.gc b/goal_src/jak2/levels/common/enemy/hover/flamer.gc index 9a85fb5058d..1a998610b5a 100644 --- a/goal_src/jak2/levels/common/enemy/hover/flamer.gc +++ b/goal_src/jak2/levels/common/enemy/hover/flamer.gc @@ -638,10 +638,7 @@ (ja-channel-set! 3) ) ) - (ja-no-eval :group! flamer-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flamer-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flamer-idle-ja :num! (seek!) :frame-num 0.0) (let ((a0-7 (-> self skel root-channel 1))) (let ((f0-4 0.0)) (set! (-> a0-7 frame-interp 1) f0-4) @@ -736,7 +733,7 @@ (defstate wait-for-formation (flamer) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flamer) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type flamer idle) enter) :trans (-> (method-of-type flamer idle) trans) :code (behavior () @@ -894,7 +891,7 @@ (flamer-method-186 self f30-0) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (nav-enemy-simple-post) @@ -937,7 +934,7 @@ (go-virtual exit-ambush-path) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (flamer-flit-post) @@ -984,7 +981,7 @@ (flamer-method-186 self f30-0) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (when (>= (- (current-time) (-> self flit-timer)) (rand-vu-int-range (seconds 1.2) (seconds 3))) @@ -1051,7 +1048,7 @@ ) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (flamer-flit-post) @@ -1108,20 +1105,14 @@ (ja-channel-push! 1 (seconds 0.1)) (cond ((zero? (rand-vu-int-range 0 2)) - (ja-no-eval :group! flamer-shoot1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flamer-shoot1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flamer-shoot1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! flamer-shoot-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flamer-shoot-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flamer-shoot-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc b/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc index 2bd183df067..198f1740bce 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc @@ -152,7 +152,7 @@ ) ) ) - :code (the-as (function none :behavior hover-enemy-manager) sleep-code) + :code sleep-code :post hover-enemy-manager-post ) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc b/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc index 4f73170c1d7..57390882c34 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc @@ -373,10 +373,7 @@ (cond ((-> self restart-fly-anims) (ja-channel-push! 3 (seconds 0.2)) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) (-> self fly-anim-speed)) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self fly-anim-speed)) :frame-num 0.0) (let ((a0-4 (-> self skel root-channel 1))) (let ((f0-4 0.0)) (set! (-> a0-4 frame-interp 1) f0-4) @@ -645,21 +642,12 @@ (defstate knocked-recover (hover-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hover-enemy) enemy-event-handler) + :event enemy-event-handler :code (behavior () (local-vars (v1-38 enemy-flag) (v1-46 enemy-flag)) (ja-channel-push! 1 (seconds 0.5)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info knocked-land-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info knocked-land-anim))) - frames - num-frames - ) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -775,16 +763,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self flying-death-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self flying-death-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self flying-death-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc b/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc index 5c6ec403d52..7f42b297c9e 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc @@ -632,7 +632,7 @@ ) ) ) - :code (the-as (function none :behavior hover-formation) sleep-code) + :code sleep-code :post (behavior () (set-anchor-proc (-> self formation) (process->handle *target*)) (hover-formation-control-method-14 (-> self formation)) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc b/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc index 8c2afc6839b..2bff8eff8a1 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc @@ -24,7 +24,7 @@ (defstate idle (nav-network-control) :virtual #t - :code (the-as (function none :behavior nav-network-control) sleep-code) + :code sleep-code :post (behavior () (nav-network-method-29 (-> self nav-network)) (nav-network-method-27 (-> self nav-network)) diff --git a/goal_src/jak2/levels/common/enemy/hover/wasp.gc b/goal_src/jak2/levels/common/enemy/hover/wasp.gc index 286e33502e9..ebc9482a922 100644 --- a/goal_src/jak2/levels/common/enemy/hover/wasp.gc +++ b/goal_src/jak2/levels/common/enemy/hover/wasp.gc @@ -636,7 +636,7 @@ ) ) ) - :code (the-as (function none :behavior wasp) sleep-code) + :code sleep-code ) (defstate shoot-bridge-intro (wasp) @@ -661,7 +661,7 @@ (go-virtual shoot-bridge-hold) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (hover-nav-control-method-11 (-> self hover) (the-as vector #f)) (hover-enemy-dest-post) @@ -677,7 +677,7 @@ ) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (hover-nav-control-method-11 (-> self hover) (the-as vector #f)) (hover-enemy-dest-post) @@ -711,7 +711,7 @@ ) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self focus-pos quad)) @@ -760,13 +760,7 @@ (ja-channel-push! 1 (seconds 0.2)) (sound-play "wasp-warn" :position (-> self root trans)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -839,7 +833,7 @@ (go empty-state) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (if (not (hover-nav-control-method-23 (-> self hover))) (hover-nav-control-method-11 (-> self hover) (the-as vector #f)) @@ -914,13 +908,7 @@ (ja-channel-push! 1 (seconds 0.2)) (sound-play "wasp-warn" :position (-> self root trans)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -956,20 +944,11 @@ (defstate knocked-recover (wasp) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior wasp) enemy-event-handler) + :event enemy-event-handler :code (behavior () (local-vars (v1-35 enemy-flag) (v1-43 enemy-flag)) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-recover-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1006,7 +985,7 @@ (defstate die-explode (wasp) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior wasp) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (set! (-> self hit-points) 0) @@ -1067,7 +1046,7 @@ (defstate die-now (wasp) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior wasp) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (let ((v1-3 (-> self root root-prim))) @@ -1085,7 +1064,7 @@ (send-event self 'death-end) (cleanup-for-death self) ) - :post (the-as (function none :behavior wasp) transform-post) + :post transform-post ) ;; WARN: Return type mismatch process vs process-focusable. diff --git a/goal_src/jak2/levels/common/enemy/metalmonk.gc b/goal_src/jak2/levels/common/enemy/metalmonk.gc index bde300de2a4..9174fe1a6a6 100644 --- a/goal_src/jak2/levels/common/enemy/metalmonk.gc +++ b/goal_src/jak2/levels/common/enemy/metalmonk.gc @@ -574,10 +574,7 @@ (gp-0 (new 'stack-no-clear 'vector)) ) (ja :group! (-> self draw art-group data (-> *metalmonk-global-info* notice-anim (get-rand-int self 2)))) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a1-4 (-> self nav state))) (set! (-> gp-0 quad) (-> a1-4 travel quad)) @@ -661,10 +658,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -684,15 +678,9 @@ (a1-16 (-> self draw art-group data (-> *metalmonk-global-info* idle-anim v1-62))) ) (set! gp-1 (ash 1 v1-62)) - (ja-no-eval :group! a1-16 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-16) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-16 :num! (seek! max f30-0) :frame-num 0.0) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -716,7 +704,7 @@ (defstate attack (metalmonk) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior metalmonk) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (metalmonk-method-180 self #t) @@ -765,10 +753,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! s5-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-focus)) @@ -783,7 +768,7 @@ ) ) ) - :post (the-as (function none :behavior metalmonk) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate victory (metalmonk) @@ -821,10 +806,7 @@ (ja :group! (-> self draw art-group data (-> *metalmonk-global-info* celebrate-anim (get-rand-int self 2)))) (ja :num-func num-func-identity :frame-num 0.0) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/goal_src/jak2/levels/common/enemy/spyder.gc b/goal_src/jak2/levels/common/enemy/spyder.gc index 80dd2d59112..2999b70d216 100644 --- a/goal_src/jak2/levels/common/enemy/spyder.gc +++ b/goal_src/jak2/levels/common/enemy/spyder.gc @@ -925,7 +925,7 @@ (defstate backup (spyder) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior spyder) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -947,16 +947,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/common/entities/cty-guard-turret-button.gc b/goal_src/jak2/levels/common/entities/cty-guard-turret-button.gc index 087c856e0b8..44a7a294731 100644 --- a/goal_src/jak2/levels/common/entities/cty-guard-turret-button.gc +++ b/goal_src/jak2/levels/common/entities/cty-guard-turret-button.gc @@ -111,13 +111,7 @@ (defstate pop-up (cty-guard-turret-button) :virtual #t :code (behavior () - (ja-no-eval :group! cty-guard-turret-button-pop-up-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim cty-guard-turret-button-pop-up-ja) frames num-frames) -1)) - 0.4 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! cty-guard-turret-button-pop-up-ja :num! (seek! max 0.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4)) diff --git a/goal_src/jak2/levels/common/entities/fort-floor-spike.gc b/goal_src/jak2/levels/common/entities/fort-floor-spike.gc index 7132f7054a2..3ec6525341f 100644 --- a/goal_src/jak2/levels/common/entities/fort-floor-spike.gc +++ b/goal_src/jak2/levels/common/entities/fort-floor-spike.gc @@ -129,7 +129,7 @@ (set! (-> self no-overlap-timer) (the-as uint 0)) 0 ) - :code (the-as (function none :behavior fort-floor-spike) sleep-code) + :code sleep-code :post (behavior () (dotimes (gp-0 (-> self spike-dim 0)) (let ((s5-0 (-> self spike-row data gp-0))) diff --git a/goal_src/jak2/levels/common/entities/gun-buoy.gc b/goal_src/jak2/levels/common/entities/gun-buoy.gc index 324b9649e9b..e231158e3ad 100644 --- a/goal_src/jak2/levels/common/entities/gun-buoy.gc +++ b/goal_src/jak2/levels/common/entities/gun-buoy.gc @@ -512,7 +512,7 @@ (go-virtual open-guns) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post (behavior () (set! (-> self y-offset) (seek-ease (-> self y-offset) @@ -555,7 +555,7 @@ (go-virtual dormant-aware) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self y-offset) -81920.0 (* 49152.0 (seconds-per-frame))) (let ((f30-0 (- 1.0 (fabs (* 0.000012207031 (-> self y-offset)))))) @@ -603,14 +603,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -661,10 +654,7 @@ (sound-play "buoy-guns-in") (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) - (ja-no-eval :group! gun-buoy-close-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim gun-buoy-close-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gun-buoy-close-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -744,7 +734,7 @@ ) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post (behavior () (sound-play "buoy-alarm" :id (-> self warning-id)) (when *sound-player-enable* @@ -802,7 +792,7 @@ ) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post gun-buoy-chase-post ) @@ -867,10 +857,7 @@ (let ((t0-0 (-> *gun-buoy-victory-speech* *gun-buoy-victory-index*))) (set! (-> self voice-id) (add-process *gui-control* self (gui-channel guard) (gui-action play) t0-0 -99.0 0)) ) - (ja-no-eval :group! gun-buoy-close-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim gun-buoy-close-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gun-buoy-close-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/common/entities/spydroid.gc b/goal_src/jak2/levels/common/entities/spydroid.gc index 15cdf95f8e3..3cbea7f59af 100644 --- a/goal_src/jak2/levels/common/entities/spydroid.gc +++ b/goal_src/jak2/levels/common/entities/spydroid.gc @@ -887,7 +887,7 @@ (defstate attack (spydroid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior spydroid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self hit-target) #f) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -999,8 +999,8 @@ ) ) ) - :code (the-as (function none :behavior spydroid) sleep-code) - :post (the-as (function none :behavior spydroid) nav-enemy-chase-post) + :code sleep-code + :post nav-enemy-chase-post ) (defstate notice (spydroid) diff --git a/goal_src/jak2/levels/common/race/race-manager.gc b/goal_src/jak2/levels/common/race/race-manager.gc index 9fda30ea5ac..a0069744191 100644 --- a/goal_src/jak2/levels/common/race/race-manager.gc +++ b/goal_src/jak2/levels/common/race/race-manager.gc @@ -1366,7 +1366,7 @@ (defstate active (race-manager) :virtual #t :event race-manager-event-handler - :code (the-as (function none :behavior race-manager) sleep-code) + :code sleep-code :post (behavior () (update self) (let ((gp-0 (-> self race-state racer-array (-> self race-state i-player))) diff --git a/goal_src/jak2/levels/common/race/race-obs.gc b/goal_src/jak2/levels/common/race/race-obs.gc index 5653af41d7d..ba70617e469 100644 --- a/goal_src/jak2/levels/common/race/race-obs.gc +++ b/goal_src/jak2/levels/common/race/race-obs.gc @@ -33,10 +33,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -44,7 +41,7 @@ ) #f ) - :post (the-as (function none :behavior race-signal-banner) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -160,7 +157,7 @@ (defstate idle (race-signal) :virtual #t :event race-signal-event-handler - :code (the-as (function none :behavior race-signal) sleep-code) + :code sleep-code :post (behavior () (race-signal-method-29 self) ) @@ -551,28 +548,19 @@ (defstate taunt (stadium-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior stadium-racer) - vehicle-rider-event-handler - ) + :event vehicle-rider-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.05)) (cond ((zero? (rand-vu-int-count 2)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -686,7 +674,7 @@ ) ) ) - :code (the-as (function none :behavior turbo-pickup) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) 0 diff --git a/goal_src/jak2/levels/common/race/vehicle-racer.gc b/goal_src/jak2/levels/common/race/vehicle-racer.gc index 1a8449e8ca8..15700e8dfba 100644 --- a/goal_src/jak2/levels/common/race/vehicle-racer.gc +++ b/goal_src/jak2/levels/common/race/vehicle-racer.gc @@ -889,10 +889,7 @@ (defstate waiting-race (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self flags) (rigid-body-object-flag ignition)) @@ -932,8 +929,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle-racer) #f) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :trans #f + :code sleep-code :post (behavior () (when (logtest? (-> self flags) (rigid-body-object-flag waiting-for-player)) (set! (-> self camera-dist2) (vector-vector-distance-squared (-> self root trans) (camera-pos))) @@ -950,17 +947,14 @@ (defstate waiting-for-start (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self damage-factor) (-> self info damage-factor)) (vehicle-method-143 self) (logior! (-> self flags) (rigid-body-object-flag ignition)) ) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :code sleep-code :post (behavior () (vector-reset! (-> self target-acceleration)) (logclear! (-> self flags) (rigid-body-object-flag player-impulse-force player-contact-force)) @@ -977,10 +971,7 @@ (defstate racing (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self flags) (rigid-body-object-flag riding ignition)) @@ -1009,8 +1000,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle-racer) #f) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-racer-method-152 self) ) @@ -1018,10 +1009,7 @@ (defstate race-finished (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self flags) (the-as @@ -1033,8 +1021,8 @@ (set! (-> self controls brake) 0.0) (set! (-> self controls steering) 0.0) ) - :trans (the-as (function none :behavior vehicle-racer) #f) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-racer-method-155 self) ) diff --git a/goal_src/jak2/levels/common/scene-actor.gc b/goal_src/jak2/levels/common/scene-actor.gc index ff44e698a2d..781bd1fc6ad 100644 --- a/goal_src/jak2/levels/common/scene-actor.gc +++ b/goal_src/jak2/levels/common/scene-actor.gc @@ -249,8 +249,8 @@ :shadow-joint-index 3 ) -(defskelgroup skel-sew-gold-key sew-gold-key 0 2 - ((1 (meters 200))) +(defskelgroup skel-sew-gold-key sew-gold-key sew-gold-key-lod0-jg sew-gold-key-idle-ja + ((sew-gold-key-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) @@ -323,10 +323,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -334,7 +331,7 @@ ) #f ) - :post (the-as (function none :behavior metalkor-highres) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1030,8 +1027,8 @@ This commonly includes things such as: :origin-joint-index 6 ) -(defskelgroup skel-mtn-shard mtn-shard 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-shard mtn-shard mtn-shard-lod0-jg mtn-shard-idle-ja + ((mtn-shard-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.5) :origin-joint-index 3 ) @@ -1042,8 +1039,8 @@ This commonly includes things such as: :origin-joint-index 3 ) -(defskelgroup skel-mtn-gear-device-gear mtn-gear-device-gear 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-gear-device-gear mtn-gear-device-gear mtn-gear-device-gear-lod0-jg mtn-gear-device-gear-idle-ja + ((mtn-gear-device-gear-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.5) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/common/warp-gate.gc b/goal_src/jak2/levels/common/warp-gate.gc index 2dfb6c41870..c6095d67d8a 100644 --- a/goal_src/jak2/levels/common/warp-gate.gc +++ b/goal_src/jak2/levels/common/warp-gate.gc @@ -501,7 +501,7 @@ (defstate hidden (warp-gate) :virtual #t - :code (the-as (function none :behavior warp-gate) sleep-code) + :code sleep-code ) (defstate idle (warp-gate) @@ -1078,10 +1078,7 @@ This commonly includes things such as: (set! (-> v1-80 prim-core collide-as) (-> self control backup-collide-as)) (set! (-> v1-80 prim-core collide-with) (-> self control backup-collide-with)) ) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/consite/consite-obs.gc b/goal_src/jak2/levels/consite/consite-obs.gc index a0a2c363c63..83f33628161 100644 --- a/goal_src/jak2/levels/consite/consite-obs.gc +++ b/goal_src/jak2/levels/consite/consite-obs.gc @@ -28,7 +28,7 @@ (defstate idle (consite-break-scaffold) :virtual #t - :code (the-as (function none :behavior consite-break-scaffold) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -85,10 +85,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -96,7 +93,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior consite-bomb-elevator-hinges) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -159,10 +156,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -170,7 +164,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior consite-bomb-elevator) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -240,10 +234,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -251,7 +242,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior consite-silo-doors) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/demo/demo-obs.gc b/goal_src/jak2/levels/demo/demo-obs.gc index 63392b95976..a6412d7e0d8 100644 --- a/goal_src/jak2/levels/demo/demo-obs.gc +++ b/goal_src/jak2/levels/demo/demo-obs.gc @@ -1103,7 +1103,7 @@ ) ) ) - :code (the-as (function symbol none :behavior target) sleep-code) + :code (the-as (function symbol object) sleep-code) :post target-no-move-post ) diff --git a/goal_src/jak2/levels/dig/dig-digger.gc b/goal_src/jak2/levels/dig/dig-digger.gc index 72282391cda..ee544769b4a 100644 --- a/goal_src/jak2/levels/dig/dig-digger.gc +++ b/goal_src/jak2/levels/dig/dig-digger.gc @@ -588,21 +588,17 @@ ) (cond ((-> self b) - (ja :group! dig-digger-idle-ja - :num! (identity (the float (+ (-> (the-as art-joint-anim dig-digger-idle-ja) frames num-frames) -1))) - ) + (ja :group! dig-digger-idle-ja :num! max) (setup-masks (-> self draw) 0 2) ) (else - (ja :group! dig-digger-idle-ja - :num! (identity (the float (+ (-> (the-as art-joint-anim dig-digger-idle-ja) frames num-frames) -1))) - ) + (ja :group! dig-digger-idle-ja :num! max) (setup-masks (-> self draw) 0 2) ) ) (ja-post) ) - :code (the-as (function none :behavior dig-clasp) sleep-code) + :code sleep-code ) (defstate break-it (dig-clasp) @@ -649,8 +645,8 @@ (go-virtual broken) ) ) - :code (the-as (function none :behavior dig-clasp) sleep-code) - :post (the-as (function none :behavior dig-clasp) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (dig-clasp) @@ -676,7 +672,7 @@ :enter (behavior () (ja-post) ) - :code (the-as (function none :behavior dig-clasp) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -993,8 +989,8 @@ This commonly includes things such as: :trans (behavior () (dig-tether-method-24 self) ) - :code (the-as (function none :behavior dig-tether) sleep-code) - :post (the-as (function none :behavior dig-tether) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (dig-tether) @@ -1036,8 +1032,8 @@ This commonly includes things such as: (ja :num-func num-func-identity :frame-num (* 10.0 (-> self frame value))) ) ) - :code (the-as (function none :behavior dig-tether) sleep-code) - :post (the-as (function none :behavior dig-tether) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch process-drawable vs dig-tether. @@ -1331,7 +1327,7 @@ This commonly includes things such as: (spawn (-> self part) (-> self root trans)) ) ) - :code (the-as (function none :behavior dig-digger) sleep-code) + :code sleep-code :post (behavior () (transform-post) (dig-digger-method-24 self) @@ -1355,7 +1351,7 @@ This commonly includes things such as: ) (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior dig-digger) sleep-code) + :code sleep-code ) (defmethod deactivate dig-digger ((obj dig-digger)) diff --git a/goal_src/jak2/levels/dig/dig-obs.gc b/goal_src/jak2/levels/dig/dig-obs.gc index 92d66d8e5d4..d1c7c5d48e3 100644 --- a/goal_src/jak2/levels/dig/dig-obs.gc +++ b/goal_src/jak2/levels/dig/dig-obs.gc @@ -542,7 +542,7 @@ (defstate idle (dig-log) :virtual #t :event dig-log-event-handler - :code (the-as (function none :behavior dig-log) sleep-code) + :code sleep-code ) (defstate moving (dig-log) @@ -653,7 +653,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior dig-log) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/dig/dig1-obs.gc b/goal_src/jak2/levels/dig/dig1-obs.gc index 6bac96e1255..574e0d92ab9 100644 --- a/goal_src/jak2/levels/dig/dig1-obs.gc +++ b/goal_src/jak2/levels/dig/dig1-obs.gc @@ -445,123 +445,69 @@ (while (< (current-time) (-> self wait-time)) (suspend) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-1 (current-time))) (until (>= (- (current-time) gp-1) (seconds 0.5)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-2 (current-time))) (until (>= (- (current-time) gp-2) (seconds 0.5)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-3 (current-time))) (until (>= (- (current-time) gp-3) (seconds 0.5)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - 0.375 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.375) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.375)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-4 (current-time))) (until (>= (- (current-time) gp-4) (seconds 0.25)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - 0.4375 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.4375) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4375)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-5 (current-time))) (until (>= (- (current-time) gp-5) (seconds 0.125)) (suspend) ) ) (dotimes (gp-6 12) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - 0.437 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.437) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.437)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((s5-0 (current-time))) (until (>= (- (current-time) s5-0) (seconds 0.05)) (suspend) @@ -889,7 +835,7 @@ ) ) ) - :code (the-as (function none :behavior dig-bomb-crate) sleep-code) + :code sleep-code ) (defstate die (dig-bomb-crate) diff --git a/goal_src/jak2/levels/dig/dig3-obs.gc b/goal_src/jak2/levels/dig/dig3-obs.gc index 7d66c05bc53..e6f62ab525f 100644 --- a/goal_src/jak2/levels/dig/dig3-obs.gc +++ b/goal_src/jak2/levels/dig/dig3-obs.gc @@ -263,7 +263,7 @@ (defstate idle (dig-spikey-step) :virtual #t - :trans (the-as (function none :behavior dig-spikey-step) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 (current-time))) (until (>= (- (current-time) gp-0) (the int (-> self cycle-offset))) @@ -677,7 +677,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior dig-spikey-sphere-door) sleep-code) + :code sleep-code ) (defstate active (dig-spikey-sphere-door) @@ -717,17 +717,14 @@ This commonly includes things such as: ) ) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual idle) ) - :post (the-as (function none :behavior dig-spikey-sphere-door) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -898,7 +895,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior dig-balloon-lurker-trapeze) ja-post) + :post ja-post ) (defmethod dig-balloon-lurker-trapeze-method-21 dig-balloon-lurker-trapeze ((obj dig-balloon-lurker-trapeze)) @@ -1181,7 +1178,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior dig-balloon-lurker) transform-post) + :post transform-post ) (deftype dig-wheel-step (process-drawable) @@ -1211,10 +1208,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) (-> self anim-speed)) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max (-> self anim-speed)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max (-> self anim-speed))) @@ -1222,7 +1216,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior dig-wheel-step) rider-post) + :post rider-post ) (defmethod deactivate dig-wheel-step ((obj dig-wheel-step)) @@ -1396,8 +1390,8 @@ This commonly includes things such as: ) (rigid-body-object-event-handler proc argc message block) ) - :trans (the-as (function none :behavior dig-tipping-rock) rider-trans) - :code (the-as (function none :behavior dig-tipping-rock) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (rigid-body-object-method-37 self) ) @@ -1642,8 +1636,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior dig-stomp-block) sleep-code) - :post (the-as (function none :behavior dig-stomp-block) ja-post) + :code sleep-code + :post ja-post ) (defstate hit (dig-stomp-block) @@ -1667,7 +1661,7 @@ This commonly includes things such as: (send-event (ppointer->process (-> self parent)) 'clear-flag) (go-virtual waiting) ) - :post (the-as (function none :behavior dig-stomp-block) transform-post) + :post transform-post ) (defstate active (dig-stomp-block) @@ -1903,7 +1897,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior dig-stomp-block-controller) sleep-code) + :code sleep-code :post (behavior () (dotimes (v1-0 4) (when (-> self stomp-blocks v1-0) @@ -1974,7 +1968,7 @@ This commonly includes things such as: (defstate idle (dig-totem) :virtual #t - :code (the-as (function none :behavior dig-totem) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/drill/drill-baron.gc b/goal_src/jak2/levels/drill/drill-baron.gc index 90b0b80ac30..be7b830db11 100644 --- a/goal_src/jak2/levels/drill/drill-baron.gc +++ b/goal_src/jak2/levels/drill/drill-baron.gc @@ -1144,16 +1144,13 @@ This commonly includes things such as: (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 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior drill-barons-ship-explode) ja-post) + :post ja-post ) (defstate hidden (drill-barons-ship) diff --git a/goal_src/jak2/levels/drill/drill-mech-master.gc b/goal_src/jak2/levels/drill/drill-mech-master.gc index faa27520b5b..54b529dd762 100644 --- a/goal_src/jak2/levels/drill/drill-mech-master.gc +++ b/goal_src/jak2/levels/drill/drill-mech-master.gc @@ -151,7 +151,7 @@ (talker-spawn-func (-> *talker-speech* 182) *entity-pool* (target-pos 0) (the-as region #f)) ) ) - :code (the-as (function none :behavior drill-mech-master) sleep-code) + :code sleep-code ) (defstate active (drill-mech-master) diff --git a/goal_src/jak2/levels/drill/drill-obs.gc b/goal_src/jak2/levels/drill/drill-obs.gc index e12f2086146..9f285c44f7d 100644 --- a/goal_src/jak2/levels/drill/drill-obs.gc +++ b/goal_src/jak2/levels/drill/drill-obs.gc @@ -146,8 +146,8 @@ and translate the platform via the `smush` (logior! (-> self root root-prim prim-core action) (collide-action rideable)) ) :trans drill-plat-falling-trans - :code (the-as (function none :behavior drill-plat-falling) sleep-code) - :post (the-as (function none :behavior drill-plat-falling) plat-post) + :code sleep-code + :post plat-post ) (defstate falling (drill-plat-falling) @@ -159,17 +159,14 @@ and translate the platform via the `smush` (drill-plat-falling-trans) ) :code (behavior () - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual idle) ) - :post (the-as (function none :behavior drill-plat-falling) plat-post) + :post plat-post ) ;; WARN: Return type mismatch object vs none. @@ -292,10 +289,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -309,10 +303,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (ja-channel-push! 1 0) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (sound-play "drill-elevator" :id (-> self sound-id) :position (-> self root trans)) (suspend) @@ -325,10 +316,7 @@ This commonly includes things such as: ) (sound-stop (-> self sound-id)) (sound-play "d-elev-fence-dn" :position (-> self root trans)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -736,7 +724,7 @@ For example for an elevator pre-compute the distance between the first and last (find-overlapping-shapes (-> self root) a1-0) ) ) - :code (the-as (function none :behavior fire-floor) sleep-code) + :code sleep-code :post (behavior () (let ((f28-0 (+ -8192.0 (-> self size 0))) (f30-0 (+ -8192.0 (-> self size 1))) @@ -1495,7 +1483,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior drill-laser) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/drill/drill-obs2.gc b/goal_src/jak2/levels/drill/drill-obs2.gc index bf5904f16d8..6b351964850 100644 --- a/goal_src/jak2/levels/drill/drill-obs2.gc +++ b/goal_src/jak2/levels/drill/drill-obs2.gc @@ -69,18 +69,18 @@ ) ) ) - :trans (the-as (function none :behavior drill-flip-step) plat-trans) + :trans plat-trans :code (behavior () (ja-channel-push! 1 0) (ja :group! (-> self draw art-group data 3) :num! min) (sleep-code) ) - :post (the-as (function none :behavior drill-flip-step) plat-post) + :post plat-post ) (defstate swing-down (drill-flip-step) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior drill-flip-step) plat-event) + :event plat-event :enter (behavior () (process-entity-status! self (entity-perm-status bit-12) #f) ) @@ -93,22 +93,19 @@ ) :code (behavior () (logclear! (-> self root root-prim prim-core action) (collide-action rideable)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.75) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.75) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.75)) ) (go-virtual down) ) - :post (the-as (function none :behavior drill-flip-step) plat-post) + :post plat-post ) (defstate swing-up (drill-flip-step) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior drill-flip-step) plat-event) + :event plat-event :enter (behavior () (process-entity-status! self (entity-perm-status bit-12) #t) ) @@ -120,17 +117,14 @@ (plat-trans) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual up) ) - :post (the-as (function none :behavior drill-flip-step) plat-post) + :post plat-post ) (defmethod init-plat-collision! drill-flip-step ((obj drill-flip-step)) @@ -286,7 +280,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior drill-falling-door) sleep-code) + :code sleep-code ) (defstate hit (drill-falling-door) @@ -301,16 +295,7 @@ This commonly includes things such as: (until #f (when (!= (-> self hit-state) (-> self next-hit-state)) (ja-no-eval :group! (-> self draw art-group data (-> *drill-falling-door-anim-table* (-> self hit-state))) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> *drill-falling-door-anim-table* (-> self hit-state)))) - frames - num-frames - ) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -348,15 +333,10 @@ This commonly includes things such as: (process-entity-status! self (entity-perm-status bit-12) #t) (cond (arg0 - (ja :group! (-> self draw art-group data 6) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 6) :num! max) ) (else - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -365,7 +345,7 @@ This commonly includes things such as: ) (sleep-code) ) - :post (the-as (function none :behavior drill-falling-door) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -460,16 +440,13 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior drill-sliding-door) sleep-code) + :code sleep-code ) (defstate open (drill-sliding-door) :virtual #t :code (behavior () - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -592,10 +569,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -634,10 +608,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -645,7 +616,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-breakable-barrel) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -731,10 +702,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) (rand-vu-float-range 0.8 1.2)) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max (rand-vu-float-range 0.8 1.2)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max (rand-vu-float-range 0.8 1.2))) @@ -742,7 +710,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-metalhead-eggs) ja-post) + :post ja-post ) (defstate die (drill-metalhead-eggs) @@ -1131,10 +1099,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1142,7 +1107,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-bridge-shot) transform-post) + :post transform-post ) (defstate die (drill-bridge-shot) @@ -1198,24 +1163,19 @@ This commonly includes things such as: (-> gp-1 ppointer) ) ) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (suspend) (logior! (-> self mask) (process-mask sleep)) (suspend) 0 ) - :post (the-as (function none :behavior drill-bridge-shot) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -1299,10 +1259,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1310,7 +1267,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-drill) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/drill/drill-panel.gc b/goal_src/jak2/levels/drill/drill-panel.gc index 815fe65fc0d..181258b45a0 100644 --- a/goal_src/jak2/levels/drill/drill-panel.gc +++ b/goal_src/jak2/levels/drill/drill-panel.gc @@ -616,9 +616,7 @@ (when (not arg0) (spawn-explode-part self) (ja-no-eval :group! (get-art-by-name (-> self draw art-group) "break" art-joint-anim) - :num! (seek! - (the float (+ (-> (get-art-by-name (-> self draw art-group) "break" art-joint-anim) frames num-frames) -1)) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -627,11 +625,7 @@ (ja :num! (seek!)) ) ) - (ja :group! (get-art-by-name (-> self draw art-group) "break" art-joint-anim) - :num! (identity - (the float (+ (-> (get-art-by-name (-> self draw art-group) "break" art-joint-anim) frames num-frames) -1)) - ) - ) + (ja :group! (get-art-by-name (-> self draw art-group) "break" art-joint-anim) :num! max) (transform-post) (sleep-code) ) @@ -676,7 +670,7 @@ (deactivate (-> self child 0)) ) ) - :code (the-as (function none :behavior drill-control-panel) sleep-code) + :code sleep-code :post (behavior () (spawn-with-cspace (-> self part) (the-as cspace (-> self node-list data))) (sound-play "small-panel" :id (-> self idle-sound-id)) @@ -816,19 +810,14 @@ This commonly includes things such as: :code (behavior ((arg0 symbol)) (when (not arg0) (spawn-explode-part self) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 9) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 9) :num! max) (transform-post) (sleep-code) ) diff --git a/goal_src/jak2/levels/drill/drill-spool.gc b/goal_src/jak2/levels/drill/drill-spool.gc index ca63e1f88bd..23acc8004e2 100644 --- a/goal_src/jak2/levels/drill/drill-spool.gc +++ b/goal_src/jak2/levels/drill/drill-spool.gc @@ -854,7 +854,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior drill-wall) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -1130,7 +1130,7 @@ This commonly includes things such as: (suspend) 0 ) - :post (the-as (function none :behavior drill-crane) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/drill/drillmid-obs.gc b/goal_src/jak2/levels/drill/drillmid-obs.gc index bc958b81a5a..1cdb824562c 100644 --- a/goal_src/jak2/levels/drill/drillmid-obs.gc +++ b/goal_src/jak2/levels/drill/drillmid-obs.gc @@ -308,10 +308,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/drill/ginsu.gc b/goal_src/jak2/levels/drill/ginsu.gc index 59187e097a1..1bb4f4f1505 100644 --- a/goal_src/jak2/levels/drill/ginsu.gc +++ b/goal_src/jak2/levels/drill/ginsu.gc @@ -583,7 +583,7 @@ ) (ginsu-method-182 self) ) - :code (the-as (function none :behavior ginsu) sleep-code) + :code sleep-code ) (defstate hostile (ginsu) @@ -621,7 +621,7 @@ ) (ginsu-method-182 self) ) - :code (the-as (function none :behavior ginsu) sleep-code) + :code sleep-code :post (behavior () (let ((s5-0 (ginsu-method-181 self (new 'stack-no-clear 'vector))) (gp-0 (new-stack-vector0)) @@ -661,7 +661,7 @@ (defstate anticipate-attack (ginsu) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -698,7 +698,7 @@ ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior ginsu) sleep-code) + :code sleep-code :post (behavior () (let ((gp-0 (ginsu-method-181 self (new 'stack-no-clear 'vector)))) (set! (-> gp-0 y) 0.0) @@ -722,7 +722,7 @@ (defstate attack (ginsu) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (ginsu-method-183 self #t) @@ -769,8 +769,8 @@ (go-virtual circling) ) ) - :code (the-as (function none :behavior ginsu) sleep-code) - :post (the-as (function none :behavior ginsu) nav-enemy-chase-post) + :code sleep-code + :post nav-enemy-chase-post ) (defstate ambush (ginsu) @@ -815,8 +815,8 @@ (ja :num! (loop!)) ) ) - :code (the-as (function none :behavior ginsu) sleep-code) - :post (the-as (function none :behavior ginsu) enemy-simple-post) + :code sleep-code + :post enemy-simple-post ) (defbehavior ginsu-sounds-off ginsu () diff --git a/goal_src/jak2/levels/forest/fish.gc b/goal_src/jak2/levels/forest/fish.gc index c1d93c20201..97b7bd3328e 100644 --- a/goal_src/jak2/levels/forest/fish.gc +++ b/goal_src/jak2/levels/forest/fish.gc @@ -70,10 +70,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) 5.0) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 5.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 5.0)) @@ -81,7 +78,7 @@ ) #f ) - :post (the-as (function none :behavior minnow) ja-post) + :post ja-post ) (deftype fish (structure) @@ -119,7 +116,7 @@ (format #t "training-manager received event ~s~%" message) (format #t "event-from ~s~%" proc) ) - :code (the-as (function none :behavior fish-manager) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-448 (function vector vector float vector)) diff --git a/goal_src/jak2/levels/forest/forest-obs.gc b/goal_src/jak2/levels/forest/forest-obs.gc index 9c8fbcac3ce..79c290ce1f3 100644 --- a/goal_src/jak2/levels/forest/forest-obs.gc +++ b/goal_src/jak2/levels/forest/forest-obs.gc @@ -228,10 +228,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data 11) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -273,30 +270,21 @@ This commonly includes things such as: (let ((v1-5 (vector-inv-orient-by-quat! (new 'stack-no-clear 'vector) (-> self hit-dir) (-> self root quat)))) (cond ((< (-> v1-5 x) (-> v1-5 z)) - (ja-no-eval :group! (-> self draw art-group data 12) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((< (-> v1-5 x) 0.0) - (ja-no-eval :group! (-> self draw art-group data 13) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 13)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 13) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 14) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 14)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 14) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -333,18 +321,12 @@ This commonly includes things such as: (set! (-> gp-0 y) (lerp 20480.0 40960.0 f30-0)) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -379,7 +361,7 @@ This commonly includes things such as: (defstate dormant (forest-youngsamos) :virtual #t - :code (the-as (function none :behavior forest-youngsamos) sleep-code) + :code sleep-code ) (defun forest-youngsamos-bounce-reaction ((arg0 control-info) (arg1 collide-query) (arg2 vector) (arg3 vector)) diff --git a/goal_src/jak2/levels/forest/pegasus.gc b/goal_src/jak2/levels/forest/pegasus.gc index a2d0493522a..05043399a10 100644 --- a/goal_src/jak2/levels/forest/pegasus.gc +++ b/goal_src/jak2/levels/forest/pegasus.gc @@ -713,10 +713,7 @@ The faster it's moving the fast it flaps it's wings, etc (defstate pegasus-debug (pegasus) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((cam-dbg-vec (new 'stack-no-clear 'vector))) (let ((vec (new 'stack-no-clear 'vector))) @@ -748,7 +745,7 @@ The faster it's moving the fast it flaps it's wings, etc ) #f ) - :post (the-as (function none :behavior pegasus) ja-post) + :post ja-post ) (defstate die (pegasus) @@ -763,10 +760,7 @@ The faster it's moving the fast it flaps it's wings, etc (let ((event-result (send-event-function (handle->process (-> self incoming attacker-handle)) evt))) (-> self speed) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! pegasus-board-attack-pegasus-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim pegasus-board-attack-pegasus-ja) frames num-frames) -1)) 1.5) - :frame-num 0.0 - ) + (ja-no-eval :group! pegasus-board-attack-pegasus-ja :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (let ((frame-num (ja-aframe-num 0)) (speed (-> self speed)) @@ -835,7 +829,7 @@ The faster it's moving the fast it flaps it's wings, etc ) #f ) - :post (the-as (function none :behavior pegasus) enemy-simple-post) + :post enemy-simple-post ) (defbehavior pegasus-fly-code pegasus ((arg0 int)) @@ -997,7 +991,7 @@ The faster it's moving the fast it flaps it's wings, etc ) (defstate pegasus-tired (pegasus) - :event (the-as (function process int symbol event-message-block object :behavior pegasus) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((func (-> (method-of-type enemy flee) enter))) (if func @@ -1112,10 +1106,7 @@ The faster it's moving the fast it flaps it's wings, etc (let ((anim-group (ja-group))) (when (not (and anim-group (= anim-group pegasus-idle-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! pegasus-fly-to-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim pegasus-fly-to-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! pegasus-fly-to-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1164,14 +1155,7 @@ The faster it's moving the fast it flaps it's wings, etc (let ((anim-length (get-rand-float-range self 0.8 1.2))) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - anim-length - ) + :num! (seek! max anim-length) :frame-num 0.0 ) (until (ja-done? 0) @@ -1182,13 +1166,7 @@ The faster it's moving the fast it flaps it's wings, etc (suspend) (ja :num! (seek! max anim-length)) ) - (ja-no-eval :group! pegasus-idle-takeoff-in-air-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim pegasus-idle-takeoff-in-air-ja) frames num-frames) -1)) - anim-length - ) - :frame-num 0.0 - ) + (ja-no-eval :group! pegasus-idle-takeoff-in-air-ja :num! (seek! max anim-length) :frame-num 0.0) (until (ja-done? 0) (if (pegasus-calc-speed 61440.0 122880.0 204800.0 49152.0) (react-to-focus self) diff --git a/goal_src/jak2/levels/forest/predator.gc b/goal_src/jak2/levels/forest/predator.gc index d32dc02db1b..04ddceab382 100644 --- a/goal_src/jak2/levels/forest/predator.gc +++ b/goal_src/jak2/levels/forest/predator.gc @@ -876,10 +876,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! predator-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -888,12 +885,12 @@ ) #f ) - :post (the-as (function none :behavior predator) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate notice (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (go-virtual hostile) ) @@ -913,7 +910,7 @@ (defstate fire (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-2 *game-info*) @@ -940,10 +937,7 @@ (let ((gp-0 0)) (set! (-> self shoot-angle) (* 182.04445 (rand-vu-float-range -45.0 45.0))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! predator-shoot-guns0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-shoot-guns0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-shoot-guns0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 9.0 (ja-frame-num 0)) (zero? gp-0)) (set! gp-0 1) @@ -976,12 +970,12 @@ (label cfg-26) (go-virtual hide) ) - :post (the-as (function none :behavior predator) enemy-simple-post) + :post enemy-simple-post ) (defstate close-attack (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set-dangerous! self #t) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -1006,10 +1000,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! predator-close-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-close-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-close-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1018,10 +1009,7 @@ (set! (-> v1-25 speed) 0.0) ) 0 - (ja-no-eval :group! predator-close-attack-recover-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-close-attack-recover-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-close-attack-recover-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1031,12 +1019,12 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior predator) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate hidden (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1076,10 +1064,7 @@ (until #f (ja-channel-push! 1 (seconds 0.2)) (until (logtest? (-> self nav state flags) (nav-state-flag at-target)) - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1087,10 +1072,7 @@ ) (ja-channel-push! 1 (seconds 0.2)) (until (not (logtest? (-> self nav state flags) (nav-state-flag at-target))) - (ja-no-eval :group! predator-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1106,7 +1088,7 @@ (defstate hide (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (nav-enemy-method-166 self) @@ -1157,10 +1139,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1221,19 +1200,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 6.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 6.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1614,12 +1587,12 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior predator-manager) sleep-code) + :code sleep-code ) (defstate closed (predator-manager) :virtual #t - :code (the-as (function none :behavior predator-manager) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/forest/wren.gc b/goal_src/jak2/levels/forest/wren.gc index 59b37bf9cd7..780a120b9b7 100644 --- a/goal_src/jak2/levels/forest/wren.gc +++ b/goal_src/jak2/levels/forest/wren.gc @@ -157,10 +157,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) :code (behavior () (until #f - (ja-no-eval :group! wren-hop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-hop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-hop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -230,10 +227,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (get-point-in-path! (-> self path) (-> self move-dest) f0-0 'interp) ) (logior! (-> self flags) (wren-flags wrflags-1)) - (ja-no-eval :group! wren-peck-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-peck-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-peck-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -306,10 +300,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ) (ja-channel-push! 2 (seconds 0.3)) - (ja-no-eval :group! wren-glide-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-glide-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-glide-ja :num! (seek!) :frame-num 0.0) (let ((a0-4 (-> self skel root-channel 1))) (let ((f0-5 0.0)) (set! (-> a0-4 frame-interp 1) f0-5) @@ -358,10 +349,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (set! (-> self bob-level-seek) 0.0) (ja-channel-push! 1 (seconds 0.3)) (while (!= (-> self path-u) 1.0) - (ja-no-eval :group! wren-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc b/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc index 9f4c641c1ec..3be5d9b5da7 100644 --- a/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc +++ b/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc @@ -45,7 +45,7 @@ ) ) ) - :code (the-as (function none :behavior fort-elec-switch) sleep-code) + :code sleep-code ) (defstate play-hint (fort-elec-switch) @@ -408,7 +408,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior fort-fence) sleep-code) + :code sleep-code ) (defstate breaking (fort-fence) @@ -446,7 +446,7 @@ This commonly includes things such as: (suspend) 0 ) - :post (the-as (function none :behavior fort-fence) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/fortress/dump/fordumpb-obs.gc b/goal_src/jak2/levels/fortress/dump/fordumpb-obs.gc index cbf06eec695..2aaf6d30a9a 100644 --- a/goal_src/jak2/levels/fortress/dump/fordumpb-obs.gc +++ b/goal_src/jak2/levels/fortress/dump/fordumpb-obs.gc @@ -27,7 +27,7 @@ (defstate idle (fort-plat-orbit) :virtual #t - :trans (the-as (function none :behavior fort-plat-orbit) rider-trans) + :trans rider-trans :code (behavior () (until #f (let ((f30-0 (the float (ja-num-frames 0)))) @@ -50,7 +50,7 @@ ) #f ) - :post (the-as (function none :behavior fort-plat-orbit) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. @@ -175,7 +175,7 @@ This commonly includes things such as: (defstate idle (fort-plat-shuttle-plat) :virtual #t - :trans (the-as (function none :behavior fort-plat-shuttle-plat) rider-trans) + :trans rider-trans :code (behavior () (until (< 1.0 (-> self path-pos)) (suspend) @@ -275,7 +275,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior fort-plat-shuttle) sleep-code) + :code sleep-code ) (defstate idle (fort-plat-shuttle) @@ -290,7 +290,7 @@ This commonly includes things such as: (set! (-> self next-spawn-time) (get-timeframe-offset! (-> self sync) 0)) ) ) - :code (the-as (function none :behavior fort-plat-shuttle) sleep-code) + :code sleep-code ) (defmethod fort-plat-shuttle-method-22 fort-plat-shuttle ((obj fort-plat-shuttle)) diff --git a/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc b/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc index 4aa1a972f66..7c310dcce2c 100644 --- a/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc +++ b/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc @@ -83,7 +83,7 @@ ) ) ) - :code (the-as (function none :behavior fort-dump-bomb-a) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) ) @@ -254,7 +254,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior fort-missile-target) sleep-code) + :code sleep-code ) (defstate die (fort-missile-target) @@ -496,7 +496,7 @@ This commonly includes things such as: (go-virtual targets-active) ) ) - :code (the-as (function none :behavior fort-missile) sleep-code) + :code sleep-code ) (defstate targets-active (fort-missile) @@ -907,7 +907,7 @@ This commonly includes things such as: (defstate dormant (fort-missile) :virtual #t - :code (the-as (function none :behavior fort-missile) sleep-code) + :code sleep-code ) (defmethod deactivate fort-missile ((obj fort-missile)) diff --git a/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc b/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc index f40d9b3a6d6..67eda141ded 100644 --- a/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc +++ b/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc @@ -136,7 +136,7 @@ (logior! (-> self draw status) (draw-control-status no-draw)) (set! (-> self transition) 0.0) ) - :code (the-as (function none :behavior fort-roboscreen) sleep-code) + :code sleep-code ) (defstate active (fort-roboscreen) @@ -534,10 +534,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1119,7 +1116,7 @@ (defstate idle (fort-robotank-turret) :virtual #t :event robotank-turret-handler - :code (the-as (function none :behavior fort-robotank-turret) sleep-code) + :code sleep-code :post turret-post ) @@ -1146,10 +1143,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1213,19 +1207,13 @@ (dotimes (s5-2 gp-2) (let ((s4-1 (max 2 (min 4 (rand-vu-int-range 1 8))))) (dotimes (s3-2 s4-1) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (fort-robotank-turret-method-33 self) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/fortress/dump/fort-robotank.gc b/goal_src/jak2/levels/fortress/dump/fort-robotank.gc index 0c5c3406011..45068097e7e 100644 --- a/goal_src/jak2/levels/fortress/dump/fort-robotank.gc +++ b/goal_src/jak2/levels/fortress/dump/fort-robotank.gc @@ -690,7 +690,7 @@ (go-virtual moving) ) ) - :code (the-as (function none :behavior fort-robotank) sleep-code) + :code sleep-code :post fort-robotank-post ) @@ -718,7 +718,7 @@ ) ) ) - :code (the-as (function none :behavior fort-robotank) sleep-code) + :code sleep-code :post (behavior () (fort-robotank-post) ) @@ -910,7 +910,7 @@ (go-virtual moving) ) ) - :code (the-as (function none :behavior fort-robotank) sleep-code) + :code sleep-code :post fort-robotank-post ) @@ -934,7 +934,7 @@ (suspend) ) ) - :post (the-as (function none :behavior fort-robotank) pusher-post) + :post pusher-post ) (defmethod deactivate fort-robotank ((obj fort-robotank)) diff --git a/goal_src/jak2/levels/fortress/exit/forexita-obs.gc b/goal_src/jak2/levels/fortress/exit/forexita-obs.gc index e5747989c10..5965a72b441 100644 --- a/goal_src/jak2/levels/fortress/exit/forexita-obs.gc +++ b/goal_src/jak2/levels/fortress/exit/forexita-obs.gc @@ -39,18 +39,18 @@ (defstate plat-idle (fort-lift-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) + :event #f ) (defstate plat-anim-active (fort-lift-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) + :event #f :enter (behavior () (get-point-at-percent-along-path! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (set! (-> self last-val) 0.0) (set! (-> self sound-time) (get-timeframe-offset! (-> self sync) 0)) ) - :trans (the-as (function none :behavior fort-lift-plat) plat-trans) + :trans plat-trans :code (behavior () (until #f (let ((f30-0 (* (get-current-phase-no-mod (-> self sync)) (the float (+ (-> (ja-group) frames num-frames) -1))))) @@ -78,7 +78,7 @@ (defstate plat-path-active (fort-lift-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) + :event #f :enter (behavior () (let ((t9-0 (-> (method-of-type plat plat-path-active) enter))) (if t9-0 @@ -99,7 +99,7 @@ (set! (-> self last-val) (-> self path-pos)) (plat-trans) ) - :code (the-as (function none :behavior fort-lift-plat) sleep-code) + :code sleep-code :post (behavior () (when (< (-> self sound-time) (current-time)) (sound-stop (-> self sound-id)) @@ -257,7 +257,7 @@ otherwise, [[plat::34]] (defstate idle (fort-claw) :virtual #t - :code (the-as (function none :behavior fort-claw) sleep-code) + :code sleep-code :post (behavior () (let ((f30-0 (seek (-> self path-u) (-> self path-dest) (* 0.04 (seconds-per-frame))))) (set! (-> self path-u) f30-0) @@ -283,7 +283,7 @@ otherwise, [[plat::34]] (go-virtual idle) ) ) - :code (the-as (function none :behavior fort-claw) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/fortress/fort-turret.gc b/goal_src/jak2/levels/fortress/fort-turret.gc index c248d61334f..c2821e98df9 100644 --- a/goal_src/jak2/levels/fortress/fort-turret.gc +++ b/goal_src/jak2/levels/fortress/fort-turret.gc @@ -705,7 +705,7 @@ (defstate attack (fort-turret) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-turret) enemy-event-handler) + :event enemy-event-handler :exit (behavior () (set! (-> self flash-state) #f) ) @@ -729,10 +729,7 @@ ) :code (behavior () (sound-play "turret-up") - (ja-no-eval :group! fort-turret-rise-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fort-turret-rise-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! fort-turret-rise-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -753,10 +750,7 @@ (fort-turret-method-142 self #t gp-2) ) ) - (ja-no-eval :group! fort-turret-shoot-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fort-turret-shoot-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! fort-turret-shoot-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -792,7 +786,7 @@ (defstate sweep (fort-turret) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-turret) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) ) @@ -818,7 +812,7 @@ :code (behavior () (sleep-code) ) - :post (the-as (function none :behavior fort-turret) enemy-simple-post) + :post enemy-simple-post ) (defstate hostile (fort-turret) diff --git a/goal_src/jak2/levels/fortress/fortress-obs.gc b/goal_src/jak2/levels/fortress/fortress-obs.gc index 7a82890acfa..e20ba73b516 100644 --- a/goal_src/jak2/levels/fortress/fortress-obs.gc +++ b/goal_src/jak2/levels/fortress/fortress-obs.gc @@ -69,7 +69,7 @@ ) ) ) - :code (the-as (function none :behavior fort-trap-door) sleep-code) + :code sleep-code ) (defstate die (fort-trap-door) @@ -142,7 +142,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior fort-trap-door) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/fortress/prison/prison-obs.gc b/goal_src/jak2/levels/fortress/prison/prison-obs.gc index 333c7950a1a..f0681b783a3 100644 --- a/goal_src/jak2/levels/fortress/prison/prison-obs.gc +++ b/goal_src/jak2/levels/fortress/prison/prison-obs.gc @@ -405,7 +405,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior prsn-cell-door) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -468,10 +468,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -479,7 +476,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior prsn-vent-fan) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -516,16 +513,10 @@ This commonly includes things such as: (defstate idle (prsn-torture) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior prsn-torture) - dark-lightning-handler - ) + :event dark-lightning-handler :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc b/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc index 3912966ceed..7a35e8b99c4 100644 --- a/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc +++ b/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc @@ -52,7 +52,7 @@ ) ) ) - :code (the-as (function none :behavior fort-elec-button) sleep-code) + :code sleep-code ) (defmethod basebutton-method-33 fort-elec-button ((obj fort-elec-button)) diff --git a/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc b/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc index 50a66bc46d5..017ba9d3b96 100644 --- a/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc +++ b/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc @@ -28,8 +28,8 @@ (defstate idle (fort-twist-rail) :virtual #t - :trans (the-as (function none :behavior fort-twist-rail) rider-trans) - :code (the-as (function none :behavior fort-twist-rail) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (let ((f0-0 (get-norm! (-> self sync) 0))) (quaternion-rotate-y! (-> self root quat) (-> self init-quat) (+ -2730.6667 (* 5461.3335 f0-0))) @@ -193,7 +193,7 @@ This commonly includes things such as: (go-virtual die) ) ) - :code (the-as (function none :behavior fort-elec-belt-inst) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-1696 @@ -487,7 +487,7 @@ This commonly includes things such as: (set! (-> self next-spawn-time) (get-timeframe-offset! (-> self sync) 0)) ) ) - :code (the-as (function none :behavior fort-elec-belt) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch symbol vs none. diff --git a/goal_src/jak2/levels/gungame/gungame-obs.gc b/goal_src/jak2/levels/gungame/gungame-obs.gc index 8deb4dfce3c..946596a08e1 100644 --- a/goal_src/jak2/levels/gungame/gungame-obs.gc +++ b/goal_src/jak2/levels/gungame/gungame-obs.gc @@ -122,7 +122,7 @@ (defstate idle (training-path) :virtual #t - :code (the-as (function none :behavior training-path) sleep-code) + :code sleep-code :post (behavior () (when *display-path-marks* (let ((gp-0 add-debug-text-3d) @@ -1391,7 +1391,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior training-manager) sleep-code) + :code sleep-code :post (behavior () (send-event (handle->process (-> self hud-score)) 'force-show) (send-event (handle->process (-> self hud-goal)) 'force-show) @@ -2118,7 +2118,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior training-manager) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -2236,8 +2236,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior gungame-door) sleep-code) - :post (the-as (function none :behavior gungame-door) transform-post) + :code sleep-code + :post transform-post ) (defstate open (gungame-door) @@ -2279,10 +2279,7 @@ This commonly includes things such as: (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2295,7 +2292,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior gungame-door) transform-post) + :post transform-post ) (defmethod gungame-door-method-23 gungame-door ((obj gungame-door)) @@ -2417,7 +2414,7 @@ This commonly includes things such as: (label cfg-12) (go-virtual idle) ) - :post (the-as (function none :behavior gungame-door) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/hideout/hideout-obs.gc b/goal_src/jak2/levels/hideout/hideout-obs.gc index 958a0642e8f..b692a1056f2 100644 --- a/goal_src/jak2/levels/hideout/hideout-obs.gc +++ b/goal_src/jak2/levels/hideout/hideout-obs.gc @@ -140,10 +140,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -151,7 +148,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior hide-light) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/hiphog/hiphog-obs.gc b/goal_src/jak2/levels/hiphog/hiphog-obs.gc index 01dca5172b7..bb6225cb828 100644 --- a/goal_src/jak2/levels/hiphog/hiphog-obs.gc +++ b/goal_src/jak2/levels/hiphog/hiphog-obs.gc @@ -26,8 +26,8 @@ (defstate idle (hip-trophy-a) :virtual #t - :code (the-as (function none :behavior hip-trophy-a) sleep-code) - :post (the-as (function none :behavior hip-trophy-a) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -73,8 +73,8 @@ This commonly includes things such as: (defstate idle (hip-trophy-d) :virtual #t - :code (the-as (function none :behavior hip-trophy-d) sleep-code) - :post (the-as (function none :behavior hip-trophy-d) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -120,8 +120,8 @@ This commonly includes things such as: (defstate idle (hip-trophy-f) :virtual #t - :code (the-as (function none :behavior hip-trophy-f) sleep-code) - :post (the-as (function none :behavior hip-trophy-f) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -167,8 +167,8 @@ This commonly includes things such as: (defstate idle (hip-trophy-g) :virtual #t - :code (the-as (function none :behavior hip-trophy-g) sleep-code) - :post (the-as (function none :behavior hip-trophy-g) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -214,8 +214,8 @@ This commonly includes things such as: (defstate idle (hip-trophy-i) :virtual #t - :code (the-as (function none :behavior hip-trophy-i) sleep-code) - :post (the-as (function none :behavior hip-trophy-i) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -261,8 +261,8 @@ This commonly includes things such as: (defstate idle (hip-trophy-j) :virtual #t - :code (the-as (function none :behavior hip-trophy-j) sleep-code) - :post (the-as (function none :behavior hip-trophy-j) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -308,8 +308,8 @@ This commonly includes things such as: (defstate idle (hip-trophy-n) :virtual #t - :code (the-as (function none :behavior hip-trophy-n) sleep-code) - :post (the-as (function none :behavior hip-trophy-n) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -355,8 +355,8 @@ This commonly includes things such as: (defstate idle (hip-trophy-m) :virtual #t - :code (the-as (function none :behavior hip-trophy-m) sleep-code) - :post (the-as (function none :behavior hip-trophy-m) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/hiphog/hiphog-scenes.gc b/goal_src/jak2/levels/hiphog/hiphog-scenes.gc index 90b1bf6c9de..9d34c219ca4 100644 --- a/goal_src/jak2/levels/hiphog/hiphog-scenes.gc +++ b/goal_src/jak2/levels/hiphog/hiphog-scenes.gc @@ -96,8 +96,8 @@ This commonly includes things such as: (defstate hide (hip-whack-a-metal) :virtual #t - :enter (the-as (function none :behavior hip-whack-a-metal) #f) - :exit (the-as (function none :behavior hip-whack-a-metal) #f) + :enter #f + :exit #f :code (behavior () (ja-post) (sleep-code) @@ -173,7 +173,7 @@ This commonly includes things such as: (defstate idle (hip-mirror) :virtual #t - :code (the-as (function none :behavior hip-mirror) sleep-code) + :code sleep-code :post (behavior () (let* ((f0-0 (vector-vector-distance (math-camera-pos) (-> self root trans))) (f0-1 (lerp-scale 1.0 0.0 f0-0 40960.0 122880.0)) diff --git a/goal_src/jak2/levels/hiphog/whack.gc b/goal_src/jak2/levels/hiphog/whack.gc index c35cc0f8619..c13e5a4ef28 100644 --- a/goal_src/jak2/levels/hiphog/whack.gc +++ b/goal_src/jak2/levels/hiphog/whack.gc @@ -1601,10 +1601,7 @@ ) ) :code (behavior ((arg0 time-frame) (arg1 uint)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1618,10 +1615,7 @@ ) (ja-channel-push! 1 (seconds 0.05)) (sound-play "whack-down") - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2187,10 +2181,7 @@ (when (-> self dizzy?) (sound-play "whack-dizzy") (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (rand-vu-percent? 0.2) (let* ((gp-2 (get-process *default-dead-pool* lightning-tracker #x4000)) @@ -2260,10 +2251,7 @@ 9 :to *entity-pool* ) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (+! (-> self event-time) (- (current-time) (-> self clock old-frame-counter))) (suspend) @@ -2273,10 +2261,7 @@ (dotimes (v1-85 4) (set! (-> self slot-buffer v1-85) -1) ) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (+! (-> self event-time) (- (current-time) (-> self clock old-frame-counter))) (suspend) diff --git a/goal_src/jak2/levels/intro/intro-obs.gc b/goal_src/jak2/levels/intro/intro-obs.gc index 61117dab534..1f01e738daa 100644 --- a/goal_src/jak2/levels/intro/intro-obs.gc +++ b/goal_src/jak2/levels/intro/intro-obs.gc @@ -69,13 +69,7 @@ (ja-channel-set! 1) (let ((f30-0 (rand-vu-float-range 0.8 1.2))) (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -288,7 +282,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior metalhead-spawner) sleep-code) + :code sleep-code ) (defstate active (metalhead-spawner) @@ -415,10 +409,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -426,7 +417,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior vil-windmill-sail) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/mountain/canyon/mincan-obs.gc b/goal_src/jak2/levels/mountain/canyon/mincan-obs.gc index dd1a4d0b810..8373b570d45 100644 --- a/goal_src/jak2/levels/mountain/canyon/mincan-obs.gc +++ b/goal_src/jak2/levels/mountain/canyon/mincan-obs.gc @@ -76,10 +76,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -87,7 +84,7 @@ ) #f ) - :post (the-as (function none :behavior mincan-lighthouse-lens) ja-post) + :post ja-post ) (defstate erect (mincan-lighthouse-lens) @@ -95,10 +92,7 @@ :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -106,7 +100,7 @@ ) #f ) - :post (the-as (function none :behavior mincan-lighthouse-lens) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -177,10 +171,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -188,7 +179,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lighthouse) ja-post) + :post ja-post ) (defstate erect (mincan-lighthouse) @@ -196,10 +187,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -207,7 +195,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lighthouse) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -259,10 +247,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -270,7 +255,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lens) transform-post) + :post transform-post ) (defstate open (mincan-lens) @@ -278,10 +263,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -289,7 +271,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lens) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -397,10 +379,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -408,7 +387,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-cogs) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/mountain/mountain-obs.gc b/goal_src/jak2/levels/mountain/mountain-obs.gc index 3e5bacea9ee..6f2eecd6446 100644 --- a/goal_src/jak2/levels/mountain/mountain-obs.gc +++ b/goal_src/jak2/levels/mountain/mountain-obs.gc @@ -410,8 +410,8 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) - :post (the-as (function none :behavior mtn-dice) transform-post) + :code sleep-code + :post transform-post ) (defmethod mtn-dice-method-26 mtn-dice ((obj mtn-dice) (arg0 process-focusable) (arg1 touching-shapes-entry)) @@ -862,7 +862,7 @@ (when (and (zero? (-> self active)) (dice-wrong-way?)) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) + :code sleep-code :post (behavior () (rider-trans) (if (= (-> self active) 1) @@ -914,7 +914,7 @@ :trans (behavior () '() ) - :code (the-as (function none :behavior mtn-dice) sleep-code) + :code sleep-code :post (behavior () (rider-trans) (rider-post) @@ -991,7 +991,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -1023,8 +1023,8 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) - :post (the-as (function none :behavior mtn-dice) transform-post) + :code sleep-code + :post transform-post ) (defun dice-joint-callback ((arg0 draw-control) (arg1 cspace-array) (arg2 joint-control)) @@ -1527,13 +1527,13 @@ This commonly includes things such as: (defstate idle (mtn-plat-updown) :virtual #t - :code (the-as (function none :behavior mtn-plat-updown) sleep-code) - :post (the-as (function none :behavior mtn-plat-updown) ja-post) + :code sleep-code + :post ja-post ) (defstate active (mtn-plat-updown) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mtn-plat-updown) plat-event) + :event plat-event :trans (behavior () (set! (-> self path-pos) (get-norm! (-> self sync) 0)) (get-point-at-percent-along-path! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) @@ -1541,10 +1541,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1552,7 +1549,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mtn-plat-updown) plat-post) + :post plat-post ) (defmethod init-plat-collision! mtn-plat-updown ((obj mtn-plat-updown)) @@ -1675,7 +1672,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-plat-eject) sleep-code) + :code sleep-code ) (defstate eject (mtn-plat-eject) @@ -1685,7 +1682,7 @@ This commonly includes things such as: (ja-channel-push! 1 0) (ja-no-eval :group! (-> self draw art-group data 3) :num! (loop!) :frame-num 0.0) ) - :code (the-as (function none :behavior mtn-plat-eject) sleep-code) + :code sleep-code :post (behavior () (let ((gp-1 (vector-! (new 'stack-no-clear 'vector) (-> self dest-pos) (-> self root trans)))) (vector-normalize! gp-1 (* 0.25 (vector-length gp-1))) @@ -1768,8 +1765,8 @@ This commonly includes things such as: (defstate idle (mtn-plat-long) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mtn-plat-long) plat-event) - :trans (the-as (function none :behavior mtn-plat-long) plat-trans) + :event plat-event + :trans plat-trans :code (behavior () (until #f (let ((f0-1 (* (get-current-phase-no-mod (-> self sync)) (the float (+ (-> (ja-group) frames num-frames) -1)))) @@ -1786,7 +1783,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mtn-plat-long) plat-post) + :post plat-post ) (defmethod init-plat-collision! mtn-plat-long ((obj mtn-plat-long)) @@ -1878,7 +1875,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-gate) sleep-code) + :code sleep-code ) (defstate open (mtn-gate) @@ -1893,10 +1890,7 @@ This commonly includes things such as: (suspend) ) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1911,7 +1905,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior mtn-gate) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -2036,7 +2030,7 @@ This commonly includes things such as: (defstate idle (mtn-aval-rocks-shadow) :virtual #t - :code (the-as (function none :behavior mtn-aval-rocks-shadow) sleep-code) + :code sleep-code :post (behavior () (let ((s5-0 (-> (the-as process-drawable (-> self parent-ptr 0)) node-list data (-> self parent-joint))) (gp-0 (-> self draw shadow-ctrl)) @@ -2530,8 +2524,8 @@ This commonly includes things such as: ) -(defskelgroup skel-mtn-plat-return mtn-plat-return 0 4 - ((1 (meters 999999))) +(defskelgroup skel-mtn-plat-return mtn-plat-return mtn-plat-return-lod0-jg mtn-plat-return-idle-ja + ((mtn-plat-return-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4.8) ) @@ -2578,8 +2572,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-plat-return) sleep-code) - :post (the-as (function none :behavior mtn-plat-return) plat-post) + :code sleep-code + :post plat-post ) (defstate running (mtn-plat-return) @@ -2603,7 +2597,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior mtn-plat-return) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self path-pos) (-> self dest-pos) (* (-> self path-speed) (seconds-per-frame))) (get-point-at-percent-along-path! @@ -2645,8 +2639,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-plat-return) sleep-code) - :post (the-as (function none :behavior mtn-plat-return) plat-post) + :code sleep-code + :post plat-post ) ;; WARN: Return type mismatch object vs none. @@ -2730,7 +2724,7 @@ This commonly includes things such as: :trans (behavior () (plat-trans) ) - :code (the-as (function none :behavior mtn-plat-gap) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self path-pos) (-> self dest-pos) (* (-> self path-speed) (seconds-per-frame))) (get-point-at-percent-along-path! @@ -2763,8 +2757,8 @@ This commonly includes things such as: :trans (behavior () (plat-trans) ) - :code (the-as (function none :behavior mtn-plat-gap) sleep-code) - :post (the-as (function none :behavior mtn-plat-gap) plat-post) + :code sleep-code + :post plat-post ) (deftype mtn-button (process-drawable) @@ -2797,24 +2791,21 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-button) sleep-code) + :code sleep-code ) (defstate open (mtn-button) :virtual #t - :trans (the-as (function none :behavior mtn-button) rider-trans) + :trans rider-trans :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual waiting) ) - :post (the-as (function none :behavior mtn-button) rider-post) + :post rider-post ) (defstate waiting (mtn-button) @@ -2827,13 +2818,10 @@ This commonly includes things such as: ) ) :enter (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (transform-post) ) - :code (the-as (function none :behavior mtn-button) sleep-code) + :code sleep-code ) (defstate pressed (mtn-button) @@ -2845,19 +2833,14 @@ This commonly includes things such as: (script-eval (the-as pair gp-0) :vector (-> self root trans)) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 3) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 3) :num! max) (transform-post) (process-entity-status! self (entity-perm-status subtask-complete) #t) (sleep-code) @@ -2954,10 +2937,7 @@ This commonly includes things such as: :code (behavior () (add-process *gui-control* self (gui-channel art-load) (gui-action queue) "mountain-gear-res" -99.0 0) (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (update! (-> self sound)) (suspend) @@ -2966,12 +2946,12 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mtn-gear-device) ja-post) + :post ja-post ) (defstate idle-collapsed (mtn-gear-device) :virtual #t - :code (the-as (function none :behavior mtn-gear-device) transform-and-sleep-code) + :code transform-and-sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -3172,7 +3152,7 @@ This commonly includes things such as: (defstate rising (trans-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior trans-plat) plat-event) + :event plat-event :code (behavior () (get-point-at-percent-along-path! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (let ((f30-0 (-> self basetrans y)) @@ -3187,7 +3167,7 @@ This commonly includes things such as: ) (go-virtual waiting) ) - :post (the-as (function none :behavior trans-plat) plat-post) + :post plat-post ) (defstate waiting (trans-plat) diff --git a/goal_src/jak2/levels/mountain/mountain-obs2.gc b/goal_src/jak2/levels/mountain/mountain-obs2.gc index 7a593f764bb..cdf2f5db198 100644 --- a/goal_src/jak2/levels/mountain/mountain-obs2.gc +++ b/goal_src/jak2/levels/mountain/mountain-obs2.gc @@ -21,8 +21,8 @@ ) -(defskelgroup skel-mtn-iris-door mtn-iris-door 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-iris-door mtn-iris-door mtn-iris-door-lod0-jg mtn-iris-door-idle-ja + ((mtn-iris-door-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 13.5) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/mountain/mountain-scenes.gc b/goal_src/jak2/levels/mountain/mountain-scenes.gc index df800a2623e..187a130a6ff 100644 --- a/goal_src/jak2/levels/mountain/mountain-scenes.gc +++ b/goal_src/jak2/levels/mountain/mountain-scenes.gc @@ -1750,8 +1750,8 @@ This commonly includes things such as: ) -(defskelgroup skel-mtn-plat-buried mtn-plat-buried 0 4 - ((1 (meters 999999))) +(defskelgroup skel-mtn-plat-buried mtn-plat-buried mtn-plat-buried-lod0-jg mtn-plat-buried-idle-ja + ((mtn-plat-buried-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4.8) ) @@ -2913,8 +2913,8 @@ otherwise, [[plat::34]] (defstate idle (mtn-lens) :virtual #t - :code (the-as (function none :behavior mtn-lens) sleep-code) - :post (the-as (function none :behavior mtn-lens) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2951,8 +2951,8 @@ This commonly includes things such as: (defstate idle (mtn-lens-base) :virtual #t - :code (the-as (function none :behavior mtn-lens-base) sleep-code) - :post (the-as (function none :behavior mtn-lens-base) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2992,7 +2992,7 @@ This commonly includes things such as: (defstate idle (mtn-lens-floor) :virtual #t - :code (the-as (function none :behavior mtn-lens-floor) transform-and-sleep-code) + :code transform-and-sleep-code :post (behavior () (spawn-with-cspace (-> self part) (-> self node-list data 3)) ) @@ -3000,7 +3000,7 @@ This commonly includes things such as: (defstate idle-no-beam (mtn-lens-floor) :virtual #t - :code (the-as (function none :behavior mtn-lens-floor) transform-and-sleep-code) + :code transform-and-sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -3057,8 +3057,8 @@ This commonly includes things such as: (defstate idle (mtn-shard) :virtual #t - :code (the-as (function none :behavior mtn-shard) sleep-code) - :post (the-as (function none :behavior mtn-shard) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/mountain/rhino-wall.gc b/goal_src/jak2/levels/mountain/rhino-wall.gc index 8f5562e07b4..7fdbac1ff1c 100644 --- a/goal_src/jak2/levels/mountain/rhino-wall.gc +++ b/goal_src/jak2/levels/mountain/rhino-wall.gc @@ -104,7 +104,7 @@ ) (go-virtual broken) ) - :post (the-as (function none :behavior rhino-wall) transform-post) + :post transform-post ) (defstate broken (rhino-wall) diff --git a/goal_src/jak2/levels/mountain/rhino.gc b/goal_src/jak2/levels/mountain/rhino.gc index 858306543b9..9a71b718cbe 100644 --- a/goal_src/jak2/levels/mountain/rhino.gc +++ b/goal_src/jak2/levels/mountain/rhino.gc @@ -632,14 +632,7 @@ (gp-0 #t) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -667,14 +660,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -682,10 +668,7 @@ (ja :num! (seek! max f30-0)) ) (let ((gp-0 #t)) - (ja-no-eval :group! rhino-victory-hit2-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-hit2-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-hit2-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (when (and gp-0 (>= (ja-frame-num 0) 5.0)) (activate! *camera-smush-control* 819.2 37 600 1.0 0.1 (-> self clock)) @@ -897,10 +880,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.075)) - (ja-no-eval :group! rhino-victory-begin-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-begin-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-begin-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -915,10 +895,7 @@ (collide-action solid no-standon) ) (until #f - (ja-no-eval :group! rhino-victory-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-loop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -961,10 +938,7 @@ (set! (-> self attack-id) a0-29) ) (let ((gp-1 #t)) - (ja-no-eval :group! rhino-victory-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and gp-1 (>= (ja-frame-num 0) 12.0)) (activate! *camera-smush-control* 819.2 37 600 1.0 0.1 (-> self clock)) @@ -999,7 +973,7 @@ (defstate run-away (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (nav-enemy-method-166 self) @@ -1052,10 +1026,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.05)) (until #f - (ja-no-eval :group! rhino-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1196,7 +1167,7 @@ (defstate attack (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -1237,10 +1208,7 @@ :code (behavior () (let ((gp-0 #f)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! rhino-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-focus)) (set! gp-0 #t) @@ -1254,7 +1222,7 @@ ) ) ) - :post (the-as (function none :behavior rhino) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defmethod nav-enemy-method-142 rhino ((obj rhino) (arg0 nav-control)) @@ -1272,7 +1240,7 @@ (defstate stop-run (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((gp-0 (new 'stack-no-clear 'vector))) (new 'stack-no-clear 'vector) @@ -1328,10 +1296,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! rhino-skid-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-skid-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-skid-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self skid-speed) (fmax 0.0 (- (-> self skid-speed) (* 32768.0 (seconds-per-frame))))) (suspend) @@ -1364,10 +1329,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data v1-30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data v1-30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data v1-30) :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (set! (-> self skid-speed) (fmax 0.0 (- (-> self skid-speed) (* 32768.0 (seconds-per-frame))))) @@ -1394,12 +1356,12 @@ (go-virtual hostile) ) ) - :post (the-as (function none :behavior rhino) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate charge (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set-setting! 'sound-mode #f 0.0 1) (set-setting! 'sound-excitement 'abs 0.0 0) @@ -1446,27 +1408,18 @@ ) ) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! rhino-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! rhino-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! rhino-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1560,10 +1513,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1589,14 +1539,7 @@ ) (let ((f30-2 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-2 - ) + :num! (seek! max f30-2) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/goal_src/jak2/levels/nest/boss/metalkor-extras.gc b/goal_src/jak2/levels/nest/boss/metalkor-extras.gc index 43ad3123093..68e8e3d7453 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-extras.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-extras.gc @@ -39,7 +39,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (ja-post) (do-push-aways (-> self root)) @@ -99,7 +99,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (ja-post) (do-push-aways (-> self root)) @@ -208,7 +208,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -246,7 +246,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (ja-post) (do-push-aways (-> self root)) @@ -722,7 +722,7 @@ ) (metalkor-update-ik) ) - :code (the-as (function none :behavior metalkor-legs) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1439,7 +1439,7 @@ ) (update (-> self tail) self) ) - :code (the-as (function none :behavior metalkor-lowtorso) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1636,7 +1636,7 @@ (sound-play "warp-ring" :id (-> self spin-sound) :position (-> self root trans)) (set! (-> self spin-sound-playing) #t) ) - :code (the-as (function none :behavior rift-ring-ingame) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) (ja-post) @@ -1750,8 +1750,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior metalkor-spinner) sleep-code) - :post (the-as (function none :behavior metalkor-spinner) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (metalkor-spinner) @@ -1794,8 +1794,8 @@ This commonly includes things such as: (set! (-> self root scale y) (* 0.000009042245 f30-0)) ) ) - :code (the-as (function none :behavior metalkor-spinner) sleep-code) - :post (the-as (function none :behavior metalkor-spinner) ja-post) + :code sleep-code + :post ja-post ) (defstate shoot-out (metalkor-spinner) @@ -1857,8 +1857,8 @@ This commonly includes things such as: (quaternion-from-two-vectors! (-> self root quat) (new 'static 'vector :y -1.0) gp-2) ) ) - :code (the-as (function none :behavior metalkor-spinner) sleep-code) - :post (the-as (function none :behavior metalkor-spinner) ja-post) + :code sleep-code + :post ja-post ) (defskelgroup skel-nest-break-precipice nest-break-precipice nest-break-precipice-lod0-jg nest-break-precipice-idle-ja @@ -1884,7 +1884,7 @@ This commonly includes things such as: :enter (behavior () (ja-post) ) - :code (the-as (function none :behavior nest-break-precipice) sleep-code) + :code sleep-code ) (defstate die (nest-break-precipice) @@ -1893,7 +1893,7 @@ This commonly includes things such as: (cleanup-for-death self) (deactivate self) ) - :code (the-as (function none :behavior nest-break-precipice) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -1989,7 +1989,7 @@ This commonly includes things such as: (defstate idle (nestb-tail-bound) :virtual #t - :code (the-as (function none :behavior nestb-tail-bound) sleep-code) + :code sleep-code ) (defstate idle (metalkor-kid) @@ -1998,8 +1998,8 @@ This commonly includes things such as: (ja :num! (loop!)) (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 3))) ) - :code (the-as (function none :behavior metalkor-kid) sleep-code) - :post (the-as (function none :behavior metalkor-kid) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (metalkor-wings) @@ -2007,8 +2007,8 @@ This commonly includes things such as: :trans (behavior () (clone-anim-once (ppointer->handle (-> self parent)) #t (-> self prefix)) ) - :code (the-as (function none :behavior metalkor-wings) sleep-code) - :post (the-as (function none :behavior metalkor-wings) ja-post) + :code sleep-code + :post ja-post ) (defbehavior metalkor-distort-update metalkor-distort () @@ -2054,8 +2054,8 @@ This commonly includes things such as: (deactivate self) ) ) - :code (the-as (function none :behavior metalkor-distort) sleep-code) - :post (the-as (function none :behavior metalkor-distort) ja-post) + :code sleep-code + :post ja-post ) (defskelgroup skel-metalkor-rays metalkor-rays metalkor-rays-lod0-jg metalkor-rays-idle-ja @@ -2086,8 +2086,8 @@ This commonly includes things such as: (set-vector! (-> self draw color-emissive) f0-0 f0-0 f0-0 1.0) ) ) - :code (the-as (function none :behavior metalkor-rays) sleep-code) - :post (the-as (function none :behavior metalkor-rays) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2238,8 +2238,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior metalkor-explode) sleep-code) - :post (the-as (function none :behavior metalkor-explode) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (rift-occlude) @@ -2268,7 +2268,7 @@ This commonly includes things such as: (set-vector! (-> self draw color-emissive) f0-0 f0-0 f0-0 1.0) ) ) - :code (the-as (function none :behavior rift-occlude) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch process-drawable vs metalkor-bomb. @@ -2448,6 +2448,6 @@ This commonly includes things such as: (metalkor-bomb-ground-check) (metalkor-bomb-collide) ) - :code (the-as (function none :behavior metalkor-bomb) sleep-code) - :post (the-as (function none :behavior metalkor-bomb) ja-post) + :code sleep-code + :post ja-post ) diff --git a/goal_src/jak2/levels/nest/boss/metalkor-setup.gc b/goal_src/jak2/levels/nest/boss/metalkor-setup.gc index 260aff4ba72..7cc36e8a7ba 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-setup.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-setup.gc @@ -31,7 +31,7 @@ :bounds (static-spherem 0 0 0 40) ) -(defskelgroup skel-metalkor-kid kid kid-lod0-jg 19 +(defskelgroup skel-metalkor-kid kid kid-lod0-jg kid-idle-floating-ja ((kid-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :shadow kid-shadow-mg @@ -178,7 +178,7 @@ ) ) ) - :code (the-as (function none :behavior gem-tracker) sleep-code) + :code sleep-code ) (deftype flitter-gem-tracker (gem-tracker) diff --git a/goal_src/jak2/levels/nest/boss/metalkor-states.gc b/goal_src/jak2/levels/nest/boss/metalkor-states.gc index a8028347306..a6694c2acdf 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-states.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-states.gc @@ -1445,7 +1445,7 @@ (ja-channel-push! 1 (seconds 0.1)) (ja :group! (-> self draw art-group data 3) :num! min) ) - :code (the-as (function symbol none :behavior metalkor) sleep-code) + :code (the-as (function symbol object) sleep-code) ) (defstate explode (metalkor) @@ -1591,7 +1591,7 @@ ) (update! (-> self ring-cam-pos) 0.0) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1711,7 +1711,7 @@ ) (update! (-> self ring-cam-pos) 0.0) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1770,7 +1770,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1797,7 +1797,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1914,7 +1914,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1933,7 +1933,7 @@ (deactivate self) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2114,7 +2114,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2210,7 +2210,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2252,7 +2252,7 @@ (metalkor-walk-the-walk 53248.0 #f) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2311,7 +2311,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2355,7 +2355,7 @@ (metalkor-walk-the-walk 122880.0 #f) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2417,7 +2417,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2593,7 +2593,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2618,7 +2618,7 @@ (metalkor-go-next-stage) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code ) (defstate test (metalkor) @@ -2794,7 +2794,7 @@ (metalkor-common) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) diff --git a/goal_src/jak2/levels/nest/boss/nestb-scenes.gc b/goal_src/jak2/levels/nest/boss/nestb-scenes.gc index d89122b94e1..beac049c871 100644 --- a/goal_src/jak2/levels/nest/boss/nestb-scenes.gc +++ b/goal_src/jak2/levels/nest/boss/nestb-scenes.gc @@ -1628,10 +1628,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1639,7 +1636,7 @@ ) #f ) - :post (the-as (function none :behavior nest-gun-parts) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1684,10 +1681,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1695,7 +1689,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior nest-unbroken-rocks) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/nest/flying-spider.gc b/goal_src/jak2/levels/nest/flying-spider.gc index 387df7e6e2b..5ce9741fb17 100644 --- a/goal_src/jak2/levels/nest/flying-spider.gc +++ b/goal_src/jak2/levels/nest/flying-spider.gc @@ -169,10 +169,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! flying-spider-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -180,7 +177,7 @@ ) #f ) - :post (the-as (function none :behavior flying-spider) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ambush (flying-spider) @@ -206,10 +203,7 @@ :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! flying-spider-idle-flying-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-idle-flying-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-idle-flying-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -240,12 +234,9 @@ (defstate ambush-falling (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :code (behavior () - (ja-no-eval :group! flying-spider-drop-down-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-drop-down-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-drop-down-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -259,10 +250,7 @@ (set! (-> s5-0 y) 0.0) (vector-xz-normalize! s5-0 1.0) (forward-up-nopitch->quaternion gp-0 s5-0 *y-vector*) - (ja-no-eval :group! flying-spider-drop-down-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-drop-down-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-drop-down-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) (-> self root quat) gp-0 (* 2.0 (seconds-per-frame))) (suspend) @@ -283,7 +271,7 @@ (defstate hostile (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :trans (behavior () (let ((t9-0 (-> (method-of-type nav-enemy hostile) trans))) (if t9-0 @@ -305,7 +293,7 @@ (defstate turn-to-focus (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag37) (-> v1-0 enemy-flags)))) @@ -411,7 +399,7 @@ (defstate attack (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag37)))) @@ -436,10 +424,7 @@ :code (behavior () (until #f (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! flying-spider-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -490,34 +475,22 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! flying-spider-shoot-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-start-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-start-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) ) - (ja-no-eval :group! flying-spider-shoot-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-right-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-right-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) ) - (ja-no-eval :group! flying-spider-shoot-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-left-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-left-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) ) - (ja-no-eval :group! flying-spider-shoot-stop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-stop-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-stop-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) @@ -531,7 +504,7 @@ (defstate die (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (dispose! self) (set! (-> self state-time) (current-time)) @@ -542,14 +515,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -568,7 +534,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior flying-spider) enemy-simple-post) + :post enemy-simple-post ) (defmethod general-event-handler flying-spider ((obj flying-spider) (arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) diff --git a/goal_src/jak2/levels/nest/mammoth.gc b/goal_src/jak2/levels/nest/mammoth.gc index 7d8822fa464..39379c0934a 100644 --- a/goal_src/jak2/levels/nest/mammoth.gc +++ b/goal_src/jak2/levels/nest/mammoth.gc @@ -376,10 +376,7 @@ ) (ja-channel-push! 1 (seconds 0.1)) (until #f - (ja-no-eval :group! mammoth-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -387,7 +384,7 @@ ) #f ) - :post (the-as (function none :behavior mammoth) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate wait-to-walk (mammoth) @@ -412,10 +409,7 @@ (next-path-index) (set-nav-destination) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! mammoth-idle0-to-walk-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-idle0-to-walk-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-idle0-to-walk-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -467,10 +461,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data v1-20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data v1-20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data v1-20) :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -529,10 +520,7 @@ :code (behavior () (set-nav-destination) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! mammoth-walk-fire0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-walk-fire0-ja) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-walk-fire0-ja :num! (seek! max 0.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.8)) @@ -540,10 +528,7 @@ (until #f (mammoth-walk-check-end) (set-nav-destination) - (ja-no-eval :group! mammoth-walk0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-walk0-ja) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-walk0-ja :num! (seek! max 0.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.8)) @@ -631,10 +616,7 @@ (set! (-> (new 'stack-no-clear 'vector) quad) (-> a0-6 quad)) (vector+float*! (new 'stack-no-clear 'vector) a0-6 v1-7 (-> self turn-move-start)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) 0.6667) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max 0.6667) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -644,15 +626,7 @@ ) ) (when (!= (-> self turn-anim) -1) - (ja-no-eval :group! (-> self draw art-group data (-> self turn-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self turn-anim))) frames num-frames) -1) - ) - 0.6667 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self turn-anim)) :num! (seek! max 0.6667) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-xz-vel adjust-quat) 1.0 1.0 1.0) @@ -668,10 +642,7 @@ (set! (-> (new 'stack-no-clear 'vector) quad) (-> a0-23 quad)) (vector+float*! (new 'stack-no-clear 'vector) a0-23 v1-68 (-> self turn-move-end)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) 0.6667) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max 0.6667) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -691,26 +662,17 @@ :virtual #t :code (behavior () (set-nav-destination) - (ja-no-eval :group! mammoth-death-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-death-right-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-death-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! mammoth-death-right-fall-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-death-right-fall-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-death-right-fall-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! mammoth-death-right-fall-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-death-right-fall-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-death-right-fall-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/nest/mantis.gc b/goal_src/jak2/levels/nest/mantis.gc index 6a619ac94dc..57c34f62b0c 100644 --- a/goal_src/jak2/levels/nest/mantis.gc +++ b/goal_src/jak2/levels/nest/mantis.gc @@ -418,40 +418,28 @@ (until #f (let ((gp-0 (get-rand-int-range self 3 5))) (dotimes (s5-0 gp-0) - (ja-no-eval :group! mantis-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ) - (ja-no-eval :group! mantis-idle0-to-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-to-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-to-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (let ((gp-1 (get-rand-int self 3))) (dotimes (s5-1 gp-1) - (ja-no-eval :group! mantis-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ) - (ja-no-eval :group! mantis-idle1-to-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle1-to-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle1-to-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -459,7 +447,7 @@ ) #f ) - :post (the-as (function none :behavior mantis) nav-enemy-face-focus-post) + :post nav-enemy-face-focus-post ) (defstate ambush (mantis) @@ -561,15 +549,12 @@ (defstate ambush-crawling (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :code (behavior () (look-at-target! self (enemy-flag lock-focus)) (set! (-> self root trans y) (-> self base-height)) (ja-channel-push! 1 0) - (ja-no-eval :group! mantis-ground-crawl-out-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-ground-crawl-out-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-ground-crawl-out-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -580,12 +565,12 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior mantis) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate ambush-jumping (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -613,9 +598,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! mantis-ground-jump-out-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-ground-jump-out-ja) frames num-frames) -1))) - ) + (ja-no-eval :group! mantis-ground-jump-out-ja :num! (seek!)) (until #f (if (< (-> self base-height) (-> self root trans y)) (goto cfg-5) @@ -654,10 +637,7 @@ #f (label cfg-24) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! mantis-ground-jump-out-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-ground-jump-out-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-ground-jump-out-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -673,7 +653,7 @@ (label cfg-32) (go-virtual hostile) ) - :post (the-as (function none :behavior mantis) nav-enemy-falling-post) + :post nav-enemy-falling-post ) (defstate hostile (mantis) @@ -764,7 +744,7 @@ (defstate crawl (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (change-to (nav-mesh-from-res-tag (-> self entity) 'nav-mesh-actor 1) self) @@ -796,10 +776,7 @@ ) 0 (dotimes (gp-0 (get-rand-int-range self 1 2)) - (ja-no-eval :group! mantis-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -875,10 +852,7 @@ ) 0 (dotimes (gp-2 (get-rand-int-range self 3 5)) - (ja-no-eval :group! mantis-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -894,12 +868,12 @@ ) #f ) - :post (the-as (function none :behavior mantis) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate attack0 (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -924,10 +898,7 @@ (set! (-> v1-2 target-speed) 81920.0) ) 0 - (ja-no-eval :group! mantis-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -941,10 +912,7 @@ (set! (-> v1-34 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-attack0-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack0-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack0-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -960,12 +928,12 @@ 0 (go-hostile self) ) - :post (the-as (function none :behavior mantis) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate attack1 (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self attack-timer) (current-time)) @@ -982,10 +950,7 @@ (set! (-> v1-0 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-attack1-wind-up-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack1-wind-up-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack1-wind-up-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((a0-5 (handle->process (-> self focus handle)))) (if a0-5 @@ -1013,10 +978,7 @@ (set! (-> v1-41 target-speed) 286720.0) ) 0 - (ja-no-eval :group! mantis-attack1-go-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack1-go-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack1-go-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1030,10 +992,7 @@ (set! (-> v1-73 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-attack1-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack1-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack1-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1049,12 +1008,12 @@ 0 (go-hostile self) ) - :post (the-as (function none :behavior mantis) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate roll-right (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -1069,10 +1028,7 @@ ) 0 (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! mantis-roll-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-roll-right-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-roll-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1082,10 +1038,7 @@ (set! (-> v1-33 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-roll-right-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-roll-right-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-roll-right-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1118,7 +1071,7 @@ (defstate roll-left (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -1133,10 +1086,7 @@ ) 0 (ja-channel-push! 1 (seconds 0.067)) - (ja-no-eval :group! mantis-hop-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-hop-left-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-hop-left-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1146,10 +1096,7 @@ (set! (-> v1-34 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-hop-left-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-hop-left-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-hop-left-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1161,7 +1108,7 @@ (defstate hop-away (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (look-at-target! self (enemy-flag lock-focus)) @@ -1232,10 +1179,7 @@ ) ) (dotimes (gp-1 (get-rand-int-range self 2 4)) - (ja-no-eval :group! mantis-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1245,7 +1189,7 @@ #f ) ) - :post (the-as (function none :behavior mantis) nav-enemy-face-focus-post) + :post nav-enemy-face-focus-post ) (defmethod general-event-handler mantis ((obj mantis) (arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) diff --git a/goal_src/jak2/levels/nest/nest-obs.gc b/goal_src/jak2/levels/nest/nest-obs.gc index 709a45d087b..975da8a5baa 100644 --- a/goal_src/jak2/levels/nest/nest-obs.gc +++ b/goal_src/jak2/levels/nest/nest-obs.gc @@ -25,8 +25,8 @@ ) -(defskelgroup skel-nest-switch cas-switch 0 2 - ((1 (meters 999999))) +(defskelgroup skel-nest-switch cas-switch cas-switch-lod0-jg cas-switch-idle-ja + ((cas-switch-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 0 3.5) :origin-joint-index 3 ) @@ -59,9 +59,9 @@ ) ) ) - :trans (the-as (function none :behavior nest-switch) rider-trans) - :code (the-as (function none :behavior nest-switch) sleep-code) - :post (the-as (function none :behavior nest-switch) rider-post) + :trans rider-trans + :code sleep-code + :post rider-post ) (defstate down (nest-switch) @@ -116,7 +116,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (sleep-code) ) - :post (the-as (function none :behavior nest-switch) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. @@ -205,12 +205,12 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior nest-piston) sleep-code) + :code sleep-code ) (defstate up (nest-piston) :virtual #t - :trans (the-as (function none :behavior nest-piston) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 (current-time))) (until (>= (- (current-time) gp-0) (seconds 1)) @@ -225,7 +225,7 @@ This commonly includes things such as: (logior! (-> self mask) (process-mask actor-pause)) (sleep-code) ) - :post (the-as (function none :behavior nest-piston) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/nest/nest-scenes.gc b/goal_src/jak2/levels/nest/nest-scenes.gc index 041189f13b3..fda0f91b80f 100644 --- a/goal_src/jak2/levels/nest/nest-scenes.gc +++ b/goal_src/jak2/levels/nest/nest-scenes.gc @@ -165,7 +165,7 @@ ) ) ) - :code (the-as (function none :behavior canyon-lightning-thingy) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch process-drawable vs canyon-lightning-thingy. diff --git a/goal_src/jak2/levels/palace/boss/squid-extras.gc b/goal_src/jak2/levels/palace/boss/squid-extras.gc index 76e2b61ac2c..2e1ec384302 100644 --- a/goal_src/jak2/levels/palace/boss/squid-extras.gc +++ b/goal_src/jak2/levels/palace/boss/squid-extras.gc @@ -33,7 +33,7 @@ (ja :num! (loop!)) (ja-post) ) - :code (the-as (function none :behavior squid-driver) sleep-code) + :code sleep-code ) (defstate idle (squid-baron) @@ -56,7 +56,7 @@ :trans (behavior () (clone-anim-once (ppointer->handle (-> self parent)) #f "") ) - :code (the-as (function none :behavior squid-baron) sleep-code) + :code sleep-code ) (defstate test (squid-tentacle) @@ -71,7 +71,7 @@ (dotimes (v1-6 11) ) ) - :code (the-as (function none :behavior squid-tentacle) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -86,7 +86,7 @@ (ja-post) (go-virtual test) ) - :code (the-as (function none :behavior squid-tentacle) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -95,7 +95,7 @@ (defstate idle (squid-collision) :virtual #t - :code (the-as (function none :behavior squid-collision) sleep-code) + :code sleep-code ) (defstate impact (squid-grenade) @@ -413,7 +413,7 @@ (deactivate self) ) ) - :code (the-as (function none :behavior squid-whirlwind) sleep-code) + :code sleep-code ) (defmethod deactivate squid-whirlwind ((obj squid-whirlwind)) diff --git a/goal_src/jak2/levels/palace/boss/squid-setup.gc b/goal_src/jak2/levels/palace/boss/squid-setup.gc index 59ec7fb13ff..e5d49ae2fef 100644 --- a/goal_src/jak2/levels/palace/boss/squid-setup.gc +++ b/goal_src/jak2/levels/palace/boss/squid-setup.gc @@ -245,7 +245,7 @@ ) -(defskelgroup skel-squid squid squid-lod0-jg 3 +(defskelgroup skel-squid squid squid-lod0-jg squid-squid-idle-ja ((squid-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :shadow squid-shadow-mg @@ -268,7 +268,7 @@ :bounds (static-spherem 0 0 0 20) ) -(defskelgroup skel-squid-driver squid squid-driver-lod0-jg 55 +(defskelgroup skel-squid-driver squid squid-driver-lod0-jg squid-driver-squid-idle-ja ((squid-driver-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) ) @@ -1944,7 +1944,6 @@ This commonly includes things such as: ) ) -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 310] (defmethod move-to-spot squid ((obj squid) (arg0 vector) (arg1 symbol)) (local-vars (sv-656 vector) diff --git a/goal_src/jak2/levels/palace/boss/squid-states.gc b/goal_src/jak2/levels/palace/boss/squid-states.gc index 231dcfe3223..36b5b2be0ac 100644 --- a/goal_src/jak2/levels/palace/boss/squid-states.gc +++ b/goal_src/jak2/levels/palace/boss/squid-states.gc @@ -238,7 +238,7 @@ (debug-draw (-> self second-path)) (debug-draw (-> self third-path)) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -348,7 +348,7 @@ ) (remove-setting! 'point-of-interest) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) (defstate wait-around-corner (squid) @@ -366,7 +366,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) (defstate wait-beside-building (squid) @@ -381,7 +381,7 @@ (go-virtual fly-to-post) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) (defstate flee (squid) @@ -485,7 +485,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -668,7 +668,7 @@ (sound-play "squid-spin" :id (-> self spin-sound) :position (-> self root trans)) (set! (-> self spin-sound-playing) #t) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -780,7 +780,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -900,7 +900,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1034,7 +1034,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1102,7 +1102,7 @@ (set! (-> self traj-timer) (current-time)) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1364,7 +1364,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1537,7 +1537,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1606,7 +1606,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1638,7 +1638,7 @@ (when (>= (- (current-time) (-> self state-time)) (seconds 3)) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1679,5 +1679,5 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) diff --git a/goal_src/jak2/levels/palace/cable/palcab-obs.gc b/goal_src/jak2/levels/palace/cable/palcab-obs.gc index 82a015a4bd3..3a91b14f3d1 100644 --- a/goal_src/jak2/levels/palace/cable/palcab-obs.gc +++ b/goal_src/jak2/levels/palace/cable/palcab-obs.gc @@ -125,7 +125,7 @@ ) (rider-trans) ) - :code (the-as (function none :behavior pal-electric-fan) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-112 vector) (sv-128 vector) (sv-144 lightning-control)) (rlet ((vf0 :class vf) @@ -400,7 +400,7 @@ This commonly includes things such as: (set! (-> self sound-played? 0) #f) (set! (-> self sound-played? 1) #f) ) - :trans (the-as (function none :behavior pal-cable-nut) rider-trans) + :trans rider-trans :code (behavior () (until #f (let* ((f1-0 (* 6.0 (get-current-phase-no-mod (-> self sync)))) @@ -441,7 +441,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior pal-cable-nut) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. @@ -773,7 +773,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior pal-rot-gun) sleep-code) + :code sleep-code ) (defstate spin (pal-rot-gun) @@ -792,7 +792,7 @@ This commonly includes things such as: (set! (-> self gun-index) 0) 0 ) - :code (the-as (function none :behavior pal-rot-gun) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self spin-rate) (-> self spin-rate-final) (* 3640.889 (seconds-per-frame))) (quaternion-rotate-z! (-> self root quat) (-> self root quat) (* (-> self spin-rate) (seconds-per-frame))) @@ -861,7 +861,7 @@ This commonly includes things such as: (go-virtual idle) ) ) - :code (the-as (function none :behavior pal-rot-gun) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self spin-rate) 0.0 (* 3640.889 (seconds-per-frame))) (quaternion-rotate-z! (-> self root quat) (-> self root quat) (* (-> self spin-rate) (seconds-per-frame))) @@ -977,10 +977,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -988,7 +985,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior pal-windmill) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1049,16 +1046,13 @@ This commonly includes things such as: (go-virtual fall) ) ) - :code (the-as (function none :behavior pal-flip-step) sleep-code) + :code sleep-code ) (defstate fall (pal-flip-step) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -1070,7 +1064,7 @@ This commonly includes things such as: (defstate fallen (pal-flip-step) :virtual #t - :code (the-as (function none :behavior pal-flip-step) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/palace/pal-obs.gc b/goal_src/jak2/levels/palace/pal-obs.gc index f60923a7e72..0cf9e58641d 100644 --- a/goal_src/jak2/levels/palace/pal-obs.gc +++ b/goal_src/jak2/levels/palace/pal-obs.gc @@ -38,13 +38,13 @@ :enter (behavior () (logior! (-> self root root-prim prim-core action) (collide-action rideable)) ) - :trans (the-as (function none :behavior pal-falling-plat) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 2) :num! zero) (transform-post) (sleep-code) ) - :post (the-as (function none :behavior pal-falling-plat) rider-post) + :post rider-post ) (defstate fall (pal-falling-plat) @@ -70,28 +70,22 @@ :enter (behavior () (sound-play "pal-fall-plat") ) - :trans (the-as (function none :behavior pal-falling-plat) rider-trans) + :trans rider-trans :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (logclear! (-> self root root-prim prim-core action) (collide-action rideable)) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual idle) ) - :post (the-as (function none :behavior pal-falling-plat) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. @@ -279,10 +273,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -322,8 +313,8 @@ This commonly includes things such as: 0 (logior! (-> self draw status) (draw-control-status no-draw)) ) - :exit (the-as (function none :behavior pal-grind-ring-center) #f) - :trans (the-as (function none :behavior pal-grind-ring-center) #f) + :exit #f + :trans #f :code (behavior () (send-event (ppointer->process (-> self parent)) 'fall) (while (-> self child) @@ -331,7 +322,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior pal-grind-ring-center) #f) + :post #f ) (defmethod pal-grind-ring-center-method-29 pal-grind-ring-center ((obj pal-grind-ring-center)) @@ -424,10 +415,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -497,10 +485,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -508,7 +493,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior pal-grind-ring) transform-post) + :post transform-post ) (defmethod pal-grind-ring-method-29 pal-grind-ring ((obj pal-grind-ring)) @@ -616,9 +601,9 @@ This commonly includes things such as: (defstate die (pal-ent-glass) :virtual #t - :enter (the-as (function none :behavior pal-ent-glass) #f) - :exit (the-as (function none :behavior pal-ent-glass) #f) - :trans (the-as (function none :behavior pal-ent-glass) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (sound-play "glass-crash") (let ((v1-2 (-> self root root-prim))) @@ -632,7 +617,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior pal-ent-glass) #f) + :post #f ) (defstate idle (pal-ent-glass) @@ -664,7 +649,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior pal-ent-glass) sleep-code) + :code sleep-code :post (behavior () '() ) @@ -828,7 +813,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior palent-turret) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -971,9 +956,9 @@ This commonly includes things such as: (defstate die (pal-breakable-window) :virtual #t - :enter (the-as (function none :behavior pal-breakable-window) #f) - :exit (the-as (function none :behavior pal-breakable-window) #f) - :trans (the-as (function none :behavior pal-breakable-window) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -986,7 +971,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior pal-breakable-window) #f) + :post #f ) (defstate idle (pal-breakable-window) @@ -1017,7 +1002,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior pal-breakable-window) sleep-code) + :code sleep-code :post (behavior () '() ) diff --git a/goal_src/jak2/levels/palace/roof/palroof-obs.gc b/goal_src/jak2/levels/palace/roof/palroof-obs.gc index 1b815545279..5c8d8b44960 100644 --- a/goal_src/jak2/levels/palace/roof/palroof-obs.gc +++ b/goal_src/jak2/levels/palace/roof/palroof-obs.gc @@ -186,7 +186,7 @@ This commonly includes things such as: (pal-prong-small-collision) (transform-post) ) - :code (the-as (function none :behavior pal-prong) sleep-code) + :code sleep-code ) (defstate break-it (pal-prong) @@ -210,7 +210,7 @@ This commonly includes things such as: :trans (behavior () (go-virtual broken) ) - :code (the-as (function none :behavior pal-prong) sleep-code) + :code sleep-code ) (defstate idle (pal-prong) @@ -232,5 +232,5 @@ This commonly includes things such as: (spawn (-> self part) a1-0) ) ) - :code (the-as (function none :behavior pal-prong) sleep-code) + :code sleep-code ) diff --git a/goal_src/jak2/levels/palace/throne/palace-scenes.gc b/goal_src/jak2/levels/palace/throne/palace-scenes.gc index c9b81433266..71f595fd14a 100644 --- a/goal_src/jak2/levels/palace/throne/palace-scenes.gc +++ b/goal_src/jak2/levels/palace/throne/palace-scenes.gc @@ -28,10 +28,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -39,7 +36,7 @@ ) #f ) - :post (the-as (function none :behavior throne-throne) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/ruins/breakable-wall.gc b/goal_src/jak2/levels/ruins/breakable-wall.gc index 8bbeb2a00e1..d74471808b0 100644 --- a/goal_src/jak2/levels/ruins/breakable-wall.gc +++ b/goal_src/jak2/levels/ruins/breakable-wall.gc @@ -394,7 +394,7 @@ ) (go-virtual broken) ) - :post (the-as (function none :behavior ruins-breakable-wall) ja-post) + :post ja-post ) (defstate broken (ruins-breakable-wall) diff --git a/goal_src/jak2/levels/ruins/mechtest-obs.gc b/goal_src/jak2/levels/ruins/mechtest-obs.gc index 3c73b10c5d3..1cc5ba4ba5b 100644 --- a/goal_src/jak2/levels/ruins/mechtest-obs.gc +++ b/goal_src/jak2/levels/ruins/mechtest-obs.gc @@ -118,7 +118,7 @@ ) ) ) - :code (the-as (function none :behavior mechblock) sleep-code) + :code sleep-code :post (behavior () (ja-post) (carry-info-method-9 (-> self carry)) @@ -250,7 +250,7 @@ ) ) ) - :code (the-as (function none :behavior mechblock) sleep-code) + :code sleep-code :post (behavior () (ja-post) (carry-info-method-9 (-> self carry)) @@ -385,7 +385,7 @@ ) ) ) - :code (the-as (function none :behavior mechblock) sleep-code) + :code sleep-code :post (behavior () (vector-v++! (-> self root transv) (compute-acc-due-to-gravity (-> self root) (new-stack-vector0) 0.0)) (let ((v1-2 (new-stack-vector0)) diff --git a/goal_src/jak2/levels/ruins/pillar-collapse.gc b/goal_src/jak2/levels/ruins/pillar-collapse.gc index 338e84c8547..0dbcf20212b 100644 --- a/goal_src/jak2/levels/ruins/pillar-collapse.gc +++ b/goal_src/jak2/levels/ruins/pillar-collapse.gc @@ -132,23 +132,23 @@ (suspend) 0 ) - :post (the-as (function none :behavior ruins-pillar-collapse) transform-post) + :post transform-post ) (defstate bump (ruins-pillar-collapse) :virtual #t :event (-> (method-of-type ruins-pillar-collapse idle) event) - :trans (the-as (function none :behavior ruins-pillar-collapse) rider-trans) + :trans rider-trans :code (behavior () (go-virtual idle) ) - :post (the-as (function none :behavior ruins-pillar-collapse) rider-post) + :post rider-post ) (defstate hit (ruins-pillar-collapse) :virtual #t :event (-> (method-of-type ruins-pillar-collapse idle) event) - :trans (the-as (function none :behavior ruins-pillar-collapse) rider-trans) + :trans rider-trans :code (behavior () (+! (-> self hit-points) -1) (if (zero? (-> self hit-points)) @@ -156,7 +156,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior ruins-pillar-collapse) rider-post) + :post rider-post ) (defstate fall (ruins-pillar-collapse) @@ -195,7 +195,7 @@ ) ) ) - :trans (the-as (function none :behavior ruins-pillar-collapse) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (set! (-> self draw bounds z) 61440.0) (set! (-> self draw bounds w) 217088.0) @@ -226,7 +226,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior ruins-pillar-collapse) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/ruins/rapid-gunner.gc b/goal_src/jak2/levels/ruins/rapid-gunner.gc index 2581d8e8a21..68657bce1f6 100644 --- a/goal_src/jak2/levels/ruins/rapid-gunner.gc +++ b/goal_src/jak2/levels/ruins/rapid-gunner.gc @@ -651,14 +651,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -689,7 +682,7 @@ (defstate attack (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self predict-timer) (the-as uint (+ (current-time) 1))) @@ -814,14 +807,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! (-> self draw art-group data (-> self shoot-anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self shoot-anim-index))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self shoot-anim-index)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -869,7 +855,7 @@ (defstate hop (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self predict-timer) (the-as uint (current-time))) (let ((v1-2 self)) @@ -952,10 +938,7 @@ ) 0 (ja-channel-push! 2 (seconds 0.1)) - (ja-no-eval :group! rapid-gunner-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-idle-ja :num! (seek!) :frame-num 0.0) (let ((a0-17 (-> self skel root-channel 1))) (let ((f0-7 0.0)) (set! (-> a0-17 frame-interp 1) f0-7) @@ -995,7 +978,7 @@ (defstate hop-turn (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self predict-timer) (the-as uint (current-time))) (let ((v1-2 self)) @@ -1035,10 +1018,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! rapid-gunner-turn-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-turn-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-turn-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1068,7 +1048,7 @@ (defstate cool-down (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self shots-fired) (the-as uint 0)) @@ -1082,10 +1062,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! rapid-gunner-aim-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-aim-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-aim-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1101,7 +1078,7 @@ (defstate reload (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self predict-timer) (the-as uint (current-time))) (set! (-> self shots-fired) (the-as uint 0)) @@ -1117,10 +1094,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! rapid-gunner-reload-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-reload-ja) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-reload-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -1234,10 +1208,7 @@ ) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! rapid-gunner-aim-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-aim-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-aim-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1255,7 +1226,7 @@ (defstate spin-attack (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1291,10 +1262,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.135)) - (ja-no-eval :group! rapid-gunner-spin-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-spin-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-spin-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1348,7 +1316,7 @@ ) #f ) - :post (the-as (function none :behavior rapid-gunner) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defmethod nav-enemy-method-142 rapid-gunner ((obj rapid-gunner) (arg0 nav-control)) diff --git a/goal_src/jak2/levels/ruins/ruins-obs.gc b/goal_src/jak2/levels/ruins/ruins-obs.gc index 8d816aa6f0e..b508833da95 100644 --- a/goal_src/jak2/levels/ruins/ruins-obs.gc +++ b/goal_src/jak2/levels/ruins/ruins-obs.gc @@ -117,16 +117,10 @@ (defstate idle (sinking-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sinking-plat) - rigid-body-object-event-handler - ) + :event rigid-body-object-event-handler :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -170,17 +164,14 @@ ) ) ) - :code (the-as (function none :behavior beam) sleep-code) + :code sleep-code ) (defstate collapse (beam) :virtual #t :code (behavior () (sound-play "beam-slip") - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -189,7 +180,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior beam) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -247,7 +238,7 @@ and translate the platform via the `smush` (defstate fall (ruins-bridge) :virtual #t - :trans (the-as (function none :behavior ruins-bridge) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status subtask-complete) #t) (set! (-> self draw bounds y) -102400.0) diff --git a/goal_src/jak2/levels/ruins/ruins-scenes.gc b/goal_src/jak2/levels/ruins/ruins-scenes.gc index 906ff0377e4..ee6d4e284c4 100644 --- a/goal_src/jak2/levels/ruins/ruins-scenes.gc +++ b/goal_src/jak2/levels/ruins/ruins-scenes.gc @@ -1323,7 +1323,7 @@ The scale will be linearly-interpolated based on the distance from the camera" (defstate idle (flag) :virtual #t - :code (the-as (function none :behavior flag) sleep-code) + :code sleep-code :post (behavior () (ja :num! (loop!)) (let ((flag-scale (lerp-scale 1.0 2.5 (vector-vector-distance (camera-pos) (-> self root trans)) 81920.0 901120.0)) diff --git a/goal_src/jak2/levels/sewer/escort/jinx-bomb.gc b/goal_src/jak2/levels/sewer/escort/jinx-bomb.gc index 0156f1f79d5..13667a76f02 100644 --- a/goal_src/jak2/levels/sewer/escort/jinx-bomb.gc +++ b/goal_src/jak2/levels/sewer/escort/jinx-bomb.gc @@ -60,7 +60,7 @@ ) (sleep-code) ) - :post (the-as (function none :behavior jinx-bomb) ja-post) + :post ja-post ) (defstate explode (jinx-bomb) diff --git a/goal_src/jak2/levels/sewer/escort/jinx-states.gc b/goal_src/jak2/levels/sewer/escort/jinx-states.gc index 0465f18fe24..f95ad8130f7 100644 --- a/goal_src/jak2/levels/sewer/escort/jinx-states.gc +++ b/goal_src/jak2/levels/sewer/escort/jinx-states.gc @@ -32,10 +32,7 @@ (suspend) (ja-eval) ) - (ja-no-eval :group! (-> self draw art-group data 61) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 61)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 61) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -51,10 +48,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -68,10 +62,7 @@ ) ) (stop-looking-at-target! self) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -102,10 +93,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -168,10 +156,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -193,7 +178,7 @@ ) (ruffian-method-240 self) ) - :post (the-as (function none :behavior jinx) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate scared-idle (jinx) @@ -221,10 +206,7 @@ (suspend) (ja-eval) ) - (ja-no-eval :group! (-> self draw art-group data 61) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 61)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 61) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -240,10 +222,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -256,10 +235,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -292,10 +268,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -354,10 +327,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -379,7 +349,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior jinx) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate alert-idle (jinx) @@ -405,10 +375,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 60) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 60)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 60) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -439,10 +406,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (let ((a1-2 (-> self draw art-group data (-> *jinx-global-info* kick-anim (get-rand-int self 2))))) - (ja-no-eval :group! a1-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-2) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-2 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -545,10 +509,7 @@ (let ((gp-1 (-> self draw art-group data (-> *jinx-global-info* bomb-recoil-anim (get-rand-int self 2)))) (f30-0 (get-rand-float-range self 0.4 0.8)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -594,20 +555,14 @@ :virtual #t :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 0.5)) @@ -644,28 +599,23 @@ (vector<-matrix! gp-2 a1-5) (set! (-> gp-2 y) (+ -122.88 (-> self root gspot-pos y))) (quaternion-identity! s5-0) - (set! (-> self bomb-handle) - (ppointer->handle - (process-spawn - jinx-bomb - gp-2 - s5-0 - (-> self level) - (-> self bomb-fuse-delay) - (-> self bomb-func) - (logtest? (bot-flags bf23) (-> self bot-flags)) - :to self - ) - ) + (set! (-> self bomb-handle) (ppointer->handle (process-spawn + jinx-bomb + gp-2 + s5-0 + (-> self level) + (-> self bomb-fuse-delay) + (-> self bomb-func) + (logtest? (bot-flags bf23) (-> self bot-flags)) + :to self + ) + ) ) ) (send-event (handle->process (-> self master-handle)) 'notify 'jinx-bomb) (logior! (-> self bot-flags) (bot-flags bf21)) (setup-masks (-> self draw) 0 4096) - (ja-no-eval :group! (-> self draw art-group data 62) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) - :frame-num (ja-aframe 56.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek!) :frame-num (ja-aframe 56.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/sewer/gator.gc b/goal_src/jak2/levels/sewer/gator.gc index 60bd328de69..1a77f731a47 100644 --- a/goal_src/jak2/levels/sewer/gator.gc +++ b/goal_src/jak2/levels/sewer/gator.gc @@ -366,7 +366,7 @@ (defstate attack-forward (gator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior gator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((_self self)) @@ -451,14 +451,8 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num (ja-aframe 0.0 0)) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((target-pos (new 'stack-no-clear 'vector))) (let ((nav-state (-> self nav state))) @@ -473,7 +467,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior gator) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate pacing (gator) diff --git a/goal_src/jak2/levels/sewer/hosehead-fake.gc b/goal_src/jak2/levels/sewer/hosehead-fake.gc index 3b0628c3e2c..0aa2a0ae1c8 100644 --- a/goal_src/jak2/levels/sewer/hosehead-fake.gc +++ b/goal_src/jak2/levels/sewer/hosehead-fake.gc @@ -181,10 +181,7 @@ (ja-channel-push! 1 (seconds 0.17)) ) ) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -196,10 +193,7 @@ (ja-channel-push! 1 (seconds 0.17)) ) ) - (ja-no-eval :group! (-> self draw art-group data 37) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 37)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 37) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -207,10 +201,7 @@ ) ((= v1-0 2) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 13) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 13)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 13) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -218,10 +209,7 @@ ) ((= v1-0 3) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 14) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 14)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 14) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -229,10 +217,7 @@ ) ((= v1-0 4) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 21) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 21)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 21) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -240,10 +225,7 @@ ) ((= v1-0 5) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 35) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 35) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -251,10 +233,7 @@ ) (else (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -292,10 +271,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -309,7 +285,7 @@ (defstate die-fast (hosehead-fake) :virtual #t - :code (the-as (function none :behavior hosehead-fake) nothing) + :code nothing ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/sewer/hosehead.gc b/goal_src/jak2/levels/sewer/hosehead.gc index 867f33a83e4..b8b9d43a58c 100644 --- a/goal_src/jak2/levels/sewer/hosehead.gc +++ b/goal_src/jak2/levels/sewer/hosehead.gc @@ -933,7 +933,7 @@ (defstate idle-sentry (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy idle) enter) :exit (-> (method-of-type nav-enemy idle) exit) :trans (behavior () @@ -965,7 +965,7 @@ (defstate hostile-sentry (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (logior! (-> self skel status) (joint-control-status sync-math)) @@ -1059,10 +1059,7 @@ (ja-channel-push! 1 (seconds 0.01)) (set! (-> self fire-beam?) #t) (until #f - (ja-no-eval :group! hosehead-shoot-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-loop-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-loop-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1072,10 +1069,7 @@ #f (sound-stop (-> self lazer-sound)) (sound-stop (-> self lazer-sound2)) - (ja-no-eval :group! hosehead-shoot-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1258,7 +1252,7 @@ (defstate ambush (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -1333,10 +1327,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! hosehead-jump-down-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-jump-down-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-jump-down-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1356,25 +1347,22 @@ (defstate ambush-land (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! hosehead-jump-down-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-jump-down-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-jump-down-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-hostile self) ) - :post (the-as (function none :behavior hosehead) nav-enemy-falling-post) + :post nav-enemy-falling-post ) (defstate active-wall (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1397,10 +1385,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.05)) (until #f - (ja-no-eval :group! hosehead-idle-wall0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-idle-wall0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-idle-wall0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1409,7 +1394,7 @@ ) #f ) - :post (the-as (function none :behavior hosehead) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; WARN: Return type mismatch symbol vs none. @@ -1510,7 +1495,7 @@ (defstate notice-wall (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (local-vars (sv-688 vector)) (rlet ((acc :class vf) @@ -1608,10 +1593,7 @@ (set! (-> self come-from-notice) #t) (ja-channel-push! 1 (seconds 0.05)) (until #f - (ja-no-eval :group! hosehead-walk-wall-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-walk-wall-ja) frames num-frames) -1)) 1.5) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-walk-wall-ja :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (set! (-> self root trans y) (- (-> self root trans y) (* 36864.0 (seconds-per-frame)))) (hosehead-method-186 self) @@ -1680,7 +1662,7 @@ (defstate fire (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (rlet ((acc :class vf) (vf0 :class vf) @@ -1755,10 +1737,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (set! (-> self allow-head) #t) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! hosehead-shoot-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-start-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-start-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (hosehead-method-189 self) (suspend) @@ -1780,10 +1759,7 @@ (label cfg-13) (sound-stop (-> self lazer-sound)) (sound-stop (-> self lazer-sound2)) - (ja-no-eval :group! hosehead-shoot-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1801,7 +1777,7 @@ (defstate attack (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-2 *game-info*) @@ -1821,20 +1797,14 @@ (ja-channel-push! 1 (seconds 0.2)) (cond ((zero? (get-rand-int self 2)) - (ja-no-eval :group! hosehead-attack1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-attack1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-attack1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! hosehead-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-attack0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-attack0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1848,20 +1818,14 @@ (let ((v1-57 (get-rand-int self 4))) (cond ((zero? v1-57) - (ja-no-eval :group! hosehead-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-57 1) - (ja-no-eval :group! hosehead-idle2-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-idle2-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-idle2-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1871,7 +1835,7 @@ ) (go-hostile self) ) - :post (the-as (function none :behavior hosehead) enemy-simple-post) + :post enemy-simple-post ) (defstate hostile (hosehead) @@ -1937,7 +1901,7 @@ ) #f ) - :post (the-as (function none :behavior hosehead) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate notice (hosehead) @@ -1948,14 +1912,7 @@ (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (new 'stack-no-clear 'vector) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1986,10 +1943,7 @@ ) (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! hosehead-run1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-run1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-run1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/sewer/sewer-obs.gc b/goal_src/jak2/levels/sewer/sewer-obs.gc index d48bc284035..1fb064e666e 100644 --- a/goal_src/jak2/levels/sewer/sewer-obs.gc +++ b/goal_src/jak2/levels/sewer/sewer-obs.gc @@ -107,10 +107,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.02) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.02) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.02)) @@ -436,10 +433,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.02) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.02) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.02)) @@ -558,10 +552,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -708,10 +699,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.02) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.02) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.02)) @@ -817,8 +805,8 @@ This commonly includes things such as: ) -(defskelgroup skel-sew-light-switch sew-light-switch 0 2 - ((1 (meters 999999))) +(defskelgroup skel-sew-light-switch sew-light-switch sew-light-switch-lod0-jg sew-light-switch-idle-ja + ((sew-light-switch-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1.5) ) @@ -875,10 +863,7 @@ This commonly includes things such as: (sound-play "sew-light-switc") ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) diff --git a/goal_src/jak2/levels/sewer/sewer-obs2.gc b/goal_src/jak2/levels/sewer/sewer-obs2.gc index f26825c84d4..31aa4bcc3c2 100644 --- a/goal_src/jak2/levels/sewer/sewer-obs2.gc +++ b/goal_src/jak2/levels/sewer/sewer-obs2.gc @@ -254,7 +254,7 @@ For example for an elevator pre-compute the distance between the first and last ) ) ) - :code (the-as (function none :behavior sew-valve) transform-and-sleep) + :code transform-and-sleep ) (defstate turn (sew-valve) @@ -288,7 +288,7 @@ For example for an elevator pre-compute the distance between the first and last (go-virtual idle) ) ) - :code (the-as (function none :behavior sew-valve) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self spin-rate) 0.0 (* 81920.0 (seconds-per-frame))) (+! (-> self spin) (* (-> self spin-rate) (seconds-per-frame))) @@ -421,8 +421,8 @@ This commonly includes things such as: ) -(defskelgroup skel-sew-mar-statue sew-mar-statue 0 2 - ((1 (meters 999999))) +(defskelgroup skel-sew-mar-statue sew-mar-statue sew-mar-statue-lod0-jg sew-mar-statue-idle-ja + ((sew-mar-statue-lod0-mg (meters 999999))) :bounds (static-spherem 0 7.5 0 14.4) ) @@ -440,7 +440,7 @@ This commonly includes things such as: (defstate idle (sew-mar-statue-debris) :virtual #t - :code (the-as (function none :behavior sew-mar-statue-debris) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -505,7 +505,7 @@ This commonly includes things such as: (defstate idle (sew-mar-statue-debris-b) :virtual #t - :code (the-as (function none :behavior sew-mar-statue-debris-b) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -562,7 +562,7 @@ This commonly includes things such as: (setup-masks (-> self draw) 2 4) ) ) - :code (the-as (function none :behavior sew-mar-statue) sleep-code) + :code sleep-code ) (defstate hidden (sew-mar-statue) @@ -576,7 +576,7 @@ This commonly includes things such as: 0 (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior sew-mar-statue) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -654,7 +654,7 @@ and translate the platform via the `smush` (defstate fall (sew-catwalk) :virtual #t - :trans (the-as (function none :behavior sew-catwalk) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status subtask-complete) #t) (set! (-> self draw bounds y) -102400.0) @@ -835,7 +835,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior sew-mine) transform-and-sleep-code) + :code transform-and-sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) (let ((gp-0 (mod (-> *display* part-clock frame-counter) 100))) @@ -914,7 +914,10 @@ This commonly includes things such as: ) -(defskelgroup skel-sew-mine-a sew-mine-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 3)) +(defskelgroup skel-sew-mine-a sew-mine-a sew-mine-a-lod0-jg sew-mine-a-idle-ja + ((sew-mine-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 3) + ) ;; WARN: Return type mismatch object vs none. (defmethod init-from-entity! sew-mine-a ((obj sew-mine-a) (entity entity-actor)) @@ -966,7 +969,10 @@ This commonly includes things such as: ) -(defskelgroup skel-sew-mine-b sew-mine-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 2.5)) +(defskelgroup skel-sew-mine-b sew-mine-b sew-mine-b-lod0-jg sew-mine-b-idle-ja + ((sew-mine-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 2.5) + ) (defstate idle (sew-mine-b) :virtual #t @@ -1220,7 +1226,7 @@ This commonly includes things such as: (suspend) 0 ) - :post (the-as (function none :behavior sew-wall) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1351,16 +1357,16 @@ This commonly includes things such as: ) -(defskelgroup skel-sew-grill sew-grill 0 3 ((1 (meters 999999))) :bounds (static-spherem 0 3 0 7.5)) +(defskelgroup skel-sew-grill sew-grill sew-grill-lod0-jg sew-grill-idle-ja + ((sew-grill-lod0-mg (meters 999999))) + :bounds (static-spherem 0 3 0 7.5) + ) (defstate idle (sew-grill) :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1368,7 +1374,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior sew-grill) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1526,10 +1532,7 @@ This commonly includes things such as: (defstate waiting (sew-scare-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sew-scare-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self draw status) (draw-control-status no-draw)) @@ -1564,10 +1567,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1575,15 +1575,12 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior sew-scare-grunt) ja-post) + :post ja-post ) (defstate scare (sew-scare-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sew-scare-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logclear! (-> self draw status) (draw-control-status no-draw)) (let* ((actor (-> self grill-actor)) diff --git a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc index 55a65c0d4f0..6f3902ddd4e 100644 --- a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc +++ b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc @@ -230,7 +230,7 @@ (go-virtual jump) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) (defstate wait-for-pickup-training (hoverboard-training-manager) @@ -266,7 +266,7 @@ (go-virtual idle-training) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) (defstate wait-for-board (hoverboard-training-manager) @@ -277,7 +277,7 @@ (go-virtual wait-for-pickup) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) (defstate wait (hoverboard-training-manager) @@ -288,7 +288,7 @@ (go-virtual jump) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) (defstate jump (hoverboard-training-manager) @@ -1583,7 +1583,7 @@ This commonly includes things such as: (defstate open (skate-gate) :virtual #t - :code (the-as (function none :behavior skate-gate) sleep-code) + :code sleep-code ) (defmethod skate-gate-method-29 skate-gate ((obj skate-gate)) @@ -1792,7 +1792,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior skatea-floating-ring) sleep-code) + :code sleep-code :post (behavior () (rlet ((acc :class vf) (vf0 :class vf) diff --git a/goal_src/jak2/levels/stadium/stadium-obs.gc b/goal_src/jak2/levels/stadium/stadium-obs.gc index 14c7bebcce1..002814009eb 100644 --- a/goal_src/jak2/levels/stadium/stadium-obs.gc +++ b/goal_src/jak2/levels/stadium/stadium-obs.gc @@ -68,7 +68,7 @@ ) #f ) - :post (the-as (function none :behavior dummy-vehicle) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -172,10 +172,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -183,7 +180,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior gar-curtain) transform-post) + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -649,9 +646,9 @@ This commonly includes things such as: (defstate idle (rift-rider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rift-rider) #f) - :trans (the-as (function none :behavior rift-rider) #f) - :code (the-as (function none :behavior rift-rider) sleep-code) + :event #f + :trans #f + :code sleep-code ) (defstate defend-stadium-wait (rift-rider) @@ -666,8 +663,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior rift-rider) sleep-code) - :post (the-as (function none :behavior rift-rider) transform-post) + :code sleep-code + :post transform-post ) (defstate defend-stadium-move (rift-rider) @@ -717,7 +714,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior rift-rider) sleep-code) + :code sleep-code :post (behavior () (get-point-in-path! (-> self path) (-> self dest-pos) (-> self path-pos) 'interp) (+! (-> self dest-pos y) (-> self height)) @@ -800,7 +797,7 @@ This commonly includes things such as: (go-virtual defend-stadium-complete) ) ) - :code (the-as (function none :behavior rift-rider) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self height) 4096.0 (* 6144.0 (seconds-per-frame))) (get-point-in-path! (-> self path) (-> self dest-pos) (-> self path-pos) 'interp) @@ -1073,10 +1070,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1084,7 +1078,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior spotlight) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1494,14 +1488,7 @@ This commonly includes things such as: ) ) ) - (ja-no-eval :group! (-> self draw art-group data (-> self stand-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self stand-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self stand-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1598,12 +1585,7 @@ This commonly includes things such as: (send-event (handle->process (-> self hud)) 'force-show) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data (-> self raise-ship-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self raise-ship-anim))) frames num-frames) -1) - ) - 0.75 - ) + :num! (seek! max 0.75) :frame-num 0.0 ) (until (ja-done? 0) @@ -1811,14 +1793,7 @@ This commonly includes things such as: ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1828,16 +1803,7 @@ This commonly includes things such as: ) (vector-reset! (-> self root transv)) (set! (-> self falling?) #f) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-land-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-land-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-land-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1910,14 +1876,7 @@ This commonly includes things such as: (set! (-> gp-0 y) (lerp 20480.0 40960.0 f30-0)) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self death-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self death-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self death-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1925,14 +1884,7 @@ This commonly includes things such as: (if (-> self skel effect) (logior! (-> self skel effect flags) (effect-control-flag ecf1)) ) - (ja-no-eval :group! (-> self draw art-group data (-> self death-end-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self death-end-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self death-end-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2288,7 +2240,7 @@ This commonly includes things such as: :enter (behavior () (sound-play "stadium-shield") ) - :code (the-as (function none :behavior stadium-barrier) sleep-code) + :code sleep-code :post (behavior () (if (!= (-> self flashf) 0.0) (seek! (-> self flashf) 0.0 (* 8.0 (seconds-per-frame))) @@ -2603,7 +2555,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior stad-force-field) sleep-code) + :code sleep-code ) (defmethod run-logic? stad-force-field ((obj stad-force-field)) @@ -2777,10 +2729,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.25) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.25) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.25)) @@ -2876,10 +2825,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.25) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.25) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.25)) @@ -2965,7 +2911,7 @@ This commonly includes things such as: (defstate idle (brutter-balloon) :virtual #t - :code (the-as (function none :behavior brutter-balloon) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/stadium/stadium-race-obs.gc b/goal_src/jak2/levels/stadium/stadium-race-obs.gc index 523ad040338..a6bfe770e63 100644 --- a/goal_src/jak2/levels/stadium/stadium-race-obs.gc +++ b/goal_src/jak2/levels/stadium/stadium-race-obs.gc @@ -40,7 +40,7 @@ ) ) ) - :code (the-as (function none :behavior stdmb-race-hatch) sleep-code) + :code sleep-code :post (behavior () (cond ((!= (-> self tt) (-> self tt-target)) diff --git a/goal_src/jak2/levels/strip/chaincrate.gc b/goal_src/jak2/levels/strip/chaincrate.gc index db3e94dfb49..4b38dc85da3 100644 --- a/goal_src/jak2/levels/strip/chaincrate.gc +++ b/goal_src/jak2/levels/strip/chaincrate.gc @@ -179,13 +179,13 @@ (update-trans! (-> self sound) (-> self root trans)) (update! (-> self sound)) ) - :code (the-as (function none :behavior strip-chain-crate-slave) sleep-code) - :post (the-as (function none :behavior strip-chain-crate-slave) rider-post) + :code sleep-code + :post rider-post ) (defstate die-fast (strip-chain-crate-slave) :virtual #t - :code (the-as (function none :behavior strip-chain-crate-slave) nothing) + :code nothing ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/strip/strip-drop.gc b/goal_src/jak2/levels/strip/strip-drop.gc index 29fb36d448c..473198280dd 100644 --- a/goal_src/jak2/levels/strip/strip-drop.gc +++ b/goal_src/jak2/levels/strip/strip-drop.gc @@ -224,8 +224,8 @@ ) ) ) - :trans (the-as (function none :behavior strip-game-crate) rider-trans) - :code (the-as (function none :behavior strip-game-crate) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (let* ((f30-1 (* 333.14133 (cos (* 66.8053 (the float (mod (current-time) 981)))))) (f28-1 (* 358.62756 (cos (* 48.65331 (the float (mod (current-time) 1346)))))) @@ -249,7 +249,7 @@ (ja :group! (-> self draw art-group data 3) :num! min) (ja-post) ) - :code (the-as (function none :behavior strip-game-crate) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch vector vs none. @@ -409,8 +409,8 @@ ) ) ) - :code (the-as (function none :behavior crane) sleep-code) - :post (the-as (function none :behavior crane) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -643,7 +643,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior grunt-egg) sleep-code) + :code sleep-code :post (behavior () (if (nonzero? (-> self sound)) (update! (-> self sound)) diff --git a/goal_src/jak2/levels/strip/strip-obs.gc b/goal_src/jak2/levels/strip/strip-obs.gc index ede598721e8..d54e05dd72f 100644 --- a/goal_src/jak2/levels/strip/strip-obs.gc +++ b/goal_src/jak2/levels/strip/strip-obs.gc @@ -147,7 +147,7 @@ ) #f ) - :post (the-as (function none :behavior strip-hazard) transform-post) + :post transform-post ) (defmethod init-from-entity! strip-hazard ((obj strip-hazard) (arg0 entity-actor)) @@ -777,7 +777,7 @@ This commonly includes things such as: :exit (behavior () (remove-setting! 'entity-name) ) - :code (the-as (function none :behavior grenade-point) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) (when (< (-> self lightning-time) (current-time)) diff --git a/goal_src/jak2/levels/title/title-obs.gc b/goal_src/jak2/levels/title/title-obs.gc index d2ab020b943..f712f7fd1d9 100644 --- a/goal_src/jak2/levels/title/title-obs.gc +++ b/goal_src/jak2/levels/title/title-obs.gc @@ -1034,7 +1034,7 @@ ) ) ) - :code (the-as (function symbol none :behavior target) sleep-code) + :code (the-as (function symbol object) sleep-code) :post target-no-move-post ) diff --git a/goal_src/jak2/levels/tomb/monster-frog.gc b/goal_src/jak2/levels/tomb/monster-frog.gc index bf50bdf7672..f50946b87ba 100644 --- a/goal_src/jak2/levels/tomb/monster-frog.gc +++ b/goal_src/jak2/levels/tomb/monster-frog.gc @@ -188,10 +188,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -203,10 +200,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -236,19 +230,13 @@ (set! (-> v1-80 enemy-flags) (the-as enemy-flag (logclear (-> v1-80 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (ja-no-eval :group! monster-frog-hop-slow-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-start-ja) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-start-ja :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.4)) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-slow-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-end-ja) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-end-ja :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.4)) @@ -261,19 +249,13 @@ (defbehavior monster-frog-hop-fast-code monster-frog () (until #f (nav-enemy-method-166 self) - (ja-no-eval :group! monster-frog-hop-slow-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-slow-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -318,10 +300,7 @@ ) ) (logclear! (-> self draw status) (draw-control-status no-draw)) - (ja-no-eval :group! monster-frog-popup0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-popup0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-popup0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -332,7 +311,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior monster-frog) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate notice (monster-frog) @@ -341,18 +320,12 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (new 'stack-no-clear 'vector) - (ja-no-eval :group! monster-frog-notice0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-notice0-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-notice0-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! monster-frog-notice0-jump-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-notice0-jump-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-notice0-jump-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a0-7 (handle->process (-> self focus handle)))) (if a0-7 @@ -367,10 +340,7 @@ (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! monster-frog-notice0-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-notice0-land-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-notice0-land-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -387,19 +357,13 @@ (until #f (nav-enemy-method-165 self) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! monster-frog-hop-slow-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-start-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-start-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-slow-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -414,14 +378,7 @@ 0 (nav-enemy-method-167 self) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -431,14 +388,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -458,14 +408,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.6)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -482,12 +425,12 @@ (defstate pacing (monster-frog) :virtual #t - :code (the-as (function none :behavior monster-frog) monster-frog-hop-slow-code) + :code monster-frog-hop-slow-code ) (defstate circling (monster-frog) :virtual #t - :code (the-as (function none :behavior monster-frog) monster-frog-hop-slow-code) + :code monster-frog-hop-slow-code ) (defstate stare (monster-frog) @@ -593,13 +536,7 @@ ) 0 (ja-channel-push! 2 (seconds 0.01)) - (ja-no-eval :group! monster-frog-hop-small-start-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim monster-frog-hop-small-start-ja) frames num-frames) -1)) - f28-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-small-start-ja :num! (seek! max f28-1) :frame-num 0.0) (let ((a0-15 (-> self skel root-channel 1))) (set! (-> a0-15 frame-interp 1) f30-1) (set! (-> a0-15 frame-interp 0) f30-1) @@ -619,10 +556,7 @@ ) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-small-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-small-end-ja) frames num-frames) -1)) f28-1) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-small-end-ja :num! (seek! max f28-1) :frame-num 0.0) (let ((a0-21 (-> self skel root-channel 1))) (set! (-> a0-21 frame-interp 1) f30-1) (set! (-> a0-21 frame-interp 0) f30-1) @@ -657,17 +591,14 @@ (defstate turn (monster-frog) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior monster-frog) enemy-event-handler) + :event enemy-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag37) (-> v1-0 enemy-flags)))) ) 0 - (ja-no-eval :group! monster-frog-rotate-left-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-rotate-left-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-rotate-left-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -676,10 +607,7 @@ (set! (-> v1-26 enemy-flags) (the-as enemy-flag (logclear (-> v1-26 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (ja-no-eval :group! monster-frog-rotate-left-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-rotate-left-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-rotate-left-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -707,7 +635,7 @@ (defstate attack (monster-frog) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior monster-frog) enemy-event-handler) + :event enemy-event-handler :enter (behavior ((arg0 vector)) (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -754,10 +682,7 @@ :code (behavior ((arg0 vector)) (ja-channel-push! 1 (seconds 0.04)) (nav-enemy-method-166 self) - (ja-no-eval :group! monster-frog-attack0-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-attack0-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-attack0-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -769,12 +694,12 @@ ) (go-virtual attack-recover) ) - :post (the-as (function none :behavior monster-frog) nav-enemy-travel-post) + :post nav-enemy-travel-post ) (defstate attack-recover (monster-frog) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior monster-frog) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -787,10 +712,7 @@ 0 ) :code (behavior () - (ja-no-eval :group! monster-frog-attack0-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-attack0-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-attack0-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -802,10 +724,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -817,10 +736,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -829,7 +745,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior monster-frog) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defmethod enemy-method-77 monster-frog ((obj monster-frog) (arg0 (pointer float))) diff --git a/goal_src/jak2/levels/tomb/target-indax.gc b/goal_src/jak2/levels/tomb/target-indax.gc index 77455d09a1e..e53436ea62a 100644 --- a/goal_src/jak2/levels/tomb/target-indax.gc +++ b/goal_src/jak2/levels/tomb/target-indax.gc @@ -515,10 +515,7 @@ (let ((v1-2 (ja-group))) (cond ((and v1-2 (= v1-2 (-> self draw art-group data 421))) - (ja-no-eval :group! (-> self draw art-group data 422) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 422)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 422) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -528,10 +525,7 @@ ((let ((v1-32 (ja-group))) (and v1-32 (= v1-32 (-> self draw art-group data 437))) ) - (ja-no-eval :group! (-> self draw art-group data 442) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 442)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 442) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -544,10 +538,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 429) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 429)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 429) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -559,13 +550,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 415) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 415)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 415) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -655,13 +640,7 @@ ) ) (ja-channel-push! 1 (seconds 0.01)) - (ja-no-eval :group! (-> self draw art-group data 427) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 427)) frames num-frames) -1)) - 2.0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 427) :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) @@ -911,18 +890,12 @@ (cond ((and (and v1-3 (= v1-3 (-> self draw art-group data 418))) (< 0.6 (-> self control unknown-float35))) (ja-channel-push! 2 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 418) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 418)) frames num-frames) -1))) - :frame-num (ja-aframe 1.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 418) :num! (seek!) :frame-num (ja-aframe 1.0 0)) (ja :chan 1 :group! (-> self draw art-group data 424) :num! (chan 0)) ) (else (ja-channel-push! 2 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 418) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 418)) frames num-frames) -1))) - :frame-num (ja-aframe 5.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 418) :num! (seek!) :frame-num (ja-aframe 5.0 0)) (ja :chan 1 :group! (-> self draw art-group data 424) :num! (chan 0)) ) ) @@ -997,10 +970,7 @@ ) :code (behavior ((arg0 symbol)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 420) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 420)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 420) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1024,10 +994,7 @@ :code (behavior () (set! (-> self control mod-surface) *indax-bounce-mods*) (ja-channel-push! 1 (seconds 0.02)) - (ja-no-eval :group! (-> self draw art-group data 443) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 443)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 443) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-y-vel adjust-xz-vel) 1.0 1.0 2.0) @@ -1037,10 +1004,7 @@ (while (not (logtest? (-> self control status) (collide-status on-surface))) (suspend) ) - (ja-no-eval :group! (-> self draw art-group data 444) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 444)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 444) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1061,13 +1025,7 @@ (let ((gp-0 (-> self draw art-group data 421))) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -1365.3334) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! gp-0 - :num! (seek! - (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) - (-> self control current-surface align-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self control current-surface align-speed)) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -1111,13 +1069,7 @@ :code (behavior ((arg0 symbol)) (let ((gp-0 (-> self draw art-group data 428))) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! gp-0 - :num! (seek! - (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) - (-> self control current-surface align-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self control current-surface align-speed)) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -1163,7 +1115,7 @@ (set! (-> self control dynam gravity-length) 368640.0) (let ((gp-1 (-> self draw art-group data 437))) (ja-channel-push! 1 (seconds 0.02)) - (ja-no-eval :group! gp-1 :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)))) + (ja-no-eval :group! gp-1 :num! (seek!)) ) (target-start-attack) (target-danger-set! 'punch #f) @@ -1433,10 +1385,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 434) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 434)) frames num-frames) -1))) - :frame-num (ja-aframe f30-0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 434) :num! (seek!) :frame-num (ja-aframe f30-0 0)) ) (until (ja-done? 0) (let ((a1-8 (new 'stack-no-clear 'event-message-block))) @@ -1462,10 +1411,7 @@ (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 433) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 433)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 433) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1480,20 +1426,14 @@ (ja-channel-push! 1 (seconds 0.1)) (cond ((rand-vu-percent? 0.5) - (ja-no-eval :group! (-> self draw art-group data 436) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 436)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 436) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 435) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 435)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 435) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1508,10 +1448,7 @@ (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 435) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 435)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 435) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/tomb/tomb-baby-spider.gc b/goal_src/jak2/levels/tomb/tomb-baby-spider.gc index 78bb4cb517d..7cff3195179 100644 --- a/goal_src/jak2/levels/tomb/tomb-baby-spider.gc +++ b/goal_src/jak2/levels/tomb/tomb-baby-spider.gc @@ -172,14 +172,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -196,14 +189,7 @@ 0 (nav-enemy-method-167 self) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -213,14 +199,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -240,14 +219,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.05)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -280,26 +252,14 @@ ) ) ) - (ja-no-eval :group! tomb-baby-spider-notice-spin-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-notice-spin-ja) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-notice-spin-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-to-point-toward-point! (-> self root) gp-0 (* 1.8 (-> self nav max-rotation-rate)) (seconds 0.02)) (suspend) (ja :num! (seek! max f30-0)) ) ) - (ja-no-eval :group! tomb-baby-spider-notice-land-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-notice-land-ja) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-notice-land-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -311,10 +271,7 @@ (defstate attack (tomb-baby-spider) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior tomb-baby-spider) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (nav-enemy-method-166 self) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -358,28 +315,19 @@ ) 0 (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! tomb-baby-spider-attack0-start-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-attack0-start-ja) frames num-frames) -1)) - 0.8 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-attack0-start-ja :num! (seek! max 0.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.8)) ) (go-virtual attack-stop) ) - :post (the-as (function none :behavior tomb-baby-spider) nav-enemy-chase-post) + :post nav-enemy-chase-post ) (defstate attack-stop (tomb-baby-spider) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior tomb-baby-spider) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-0 (-> self nav))) (set! (-> v1-0 target-speed) 0.0) @@ -397,10 +345,7 @@ 0 ) :code (behavior () - (ja-no-eval :group! tomb-baby-spider-attack0-stop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-attack0-stop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-attack0-stop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -463,7 +408,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior tomb-baby-spider) nav-enemy-face-focus-post) + :post nav-enemy-face-focus-post ) (defstate hostile (tomb-baby-spider) diff --git a/goal_src/jak2/levels/tomb/tomb-beetle.gc b/goal_src/jak2/levels/tomb/tomb-beetle.gc index 8f588235cea..766899bd662 100644 --- a/goal_src/jak2/levels/tomb/tomb-beetle.gc +++ b/goal_src/jak2/levels/tomb/tomb-beetle.gc @@ -364,10 +364,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (until #f - (ja-no-eval :group! tomb-beetle-falling-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-falling-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-falling-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -391,10 +388,7 @@ (set! (-> self state-time) (current-time)) ) :code (behavior () - (ja-no-eval :group! tomb-beetle-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -409,22 +403,19 @@ (ja :num! (loop! f30-1)) ) ) - (ja-no-eval :group! tomb-beetle-flip-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-flip-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-flip-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual active) ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-falling-post) + :post nav-enemy-falling-post ) (defstate active (tomb-beetle) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-beetle) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -474,19 +465,13 @@ (f30-0 (rand-vu-float-range 1.8 1.2)) ) (dotimes (s5-0 gp-0) - (ja-no-eval :group! tomb-beetle-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-run0-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-run0-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) - (ja-no-eval :group! tomb-beetle-run1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-run1-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-run1-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -502,7 +487,7 @@ (defstate stand (tomb-beetle) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-beetle) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -523,10 +508,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! tomb-beetle-stand0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-stand0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-stand0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -534,7 +516,7 @@ ) #f ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate fly-away (tomb-beetle) @@ -591,10 +573,7 @@ ) ) (until #f - (ja-no-eval :group! tomb-beetle-stand0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-stand0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-stand0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (>= (current-time) (-> self state-timeout)) (goto cfg-20) @@ -618,10 +597,7 @@ (ja-eval) ) (until #f - (ja-no-eval :group! tomb-beetle-fly-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-fly-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-fly-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -682,14 +658,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 1.8 2.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -700,7 +669,7 @@ (send-event self 'death-end) (go-virtual explode) ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate explode (tomb-beetle) @@ -772,7 +741,7 @@ ) ) ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate go-to-door (tomb-beetle) @@ -886,10 +855,7 @@ (ja-eval) ) (until #f - (ja-no-eval :group! tomb-beetle-fly-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-fly-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-fly-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -937,7 +903,7 @@ (defstate key (tomb-beetle) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-beetle) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self draw shadow-ctrl))) (logclear! (-> v1-1 settings flags) (shadow-flags disable-draw)) @@ -959,12 +925,9 @@ ) ) ) - :trans (the-as (function none :behavior tomb-beetle) ja-post) + :trans ja-post :code (behavior () - (ja-no-eval :group! tomb-beetle-fly-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-fly-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-fly-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/tomb/tomb-boulder.gc b/goal_src/jak2/levels/tomb/tomb-boulder.gc index 46a37cf2647..2a2e238e912 100644 --- a/goal_src/jak2/levels/tomb/tomb-boulder.gc +++ b/goal_src/jak2/levels/tomb/tomb-boulder.gc @@ -272,7 +272,7 @@ (defstate idle (tomb-boulder-pillar) :virtual #t - :trans (the-as (function none :behavior tomb-boulder-pillar) rider-trans) + :trans rider-trans :code (behavior () (until #f ;; og:preserve-this manually patched @@ -1227,7 +1227,7 @@ This commonly includes things such as: (defstate idle (spider-eyes) :virtual #t - :code (the-as (function none :behavior spider-eyes) sleep-code) + :code sleep-code :post (behavior () (spider-eyes-method-21 self) (ja-post) diff --git a/goal_src/jak2/levels/tomb/tomb-obs.gc b/goal_src/jak2/levels/tomb/tomb-obs.gc index 1c179a57607..0b4b2c17018 100644 --- a/goal_src/jak2/levels/tomb/tomb-obs.gc +++ b/goal_src/jak2/levels/tomb/tomb-obs.gc @@ -40,7 +40,7 @@ (defstate plat-idle (tomb-plat-wall) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-plat-wall) plat-event) + :event plat-event :exit (behavior () (when (nonzero? (-> self sound-id)) (sound-stop (-> self sound-id)) @@ -97,10 +97,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -108,7 +105,7 @@ ) #f ) - :post (the-as (function none :behavior tomb-plat-wall) plat-post) + :post plat-post ) (defmethod base-plat-method-32 tomb-plat-wall ((obj tomb-plat-wall)) @@ -250,8 +247,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-stair-block-spikes) sleep-code) - :post (the-as (function none :behavior tomb-stair-block-spikes) transform-post) + :code sleep-code + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -460,9 +457,7 @@ This commonly includes things such as: :virtual #t :enter (behavior () (set! (-> self root trans y) (-> self initial-y)) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (transform-post) ) :trans (behavior () @@ -538,10 +533,7 @@ This commonly includes things such as: (drop-pool 1) (suspend) ) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (lift-pool 1) (drop-pool 0) @@ -556,7 +548,7 @@ This commonly includes things such as: ) (go-virtual sunk) ) - :post (the-as (function none :behavior tomb-stair-block) rider-post) + :post rider-post ) (defstate moving (tomb-stair-block) @@ -642,13 +634,7 @@ This commonly includes things such as: (set! (-> self camera-state) 1) (ja-channel-push! 1 (seconds 2)) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) - 0.125 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 0.125) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.125)) @@ -656,7 +642,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior tomb-stair-block) rider-post) + :post rider-post ) (defstate idle (tomb-stair-block) @@ -718,8 +704,8 @@ This commonly includes things such as: (drop-pool 1) (position-spikes 1500) ) - :code (the-as (function none :behavior tomb-stair-block) sleep-code) - :post (the-as (function none :behavior tomb-stair-block) transform-post) + :code sleep-code + :post transform-post ) (defstate wait-for-pools (tomb-stair-block) @@ -763,7 +749,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-stair-block) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -1428,12 +1414,12 @@ This commonly includes things such as: :enter (behavior () (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) + :code sleep-code ) (defstate run-intro (tomb-plat-return) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-plat-return) plat-event) + :event plat-event :enter (behavior () (process-entity-status! self (entity-perm-status subtask-complete) #t) (logclear! (-> self draw status) (draw-control-status no-draw)) @@ -1452,7 +1438,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) + :code sleep-code :post (behavior () (sound-play "tomb-plat-ret" :id (-> self sound-id) :position (-> self root trans)) (seek! (-> self path-pos) 1.0 (* 2.0 (seconds-per-frame) (-> self path-speed))) @@ -1502,8 +1488,8 @@ This commonly includes things such as: (go-virtual running) ) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) - :post (the-as (function none :behavior tomb-plat-return) plat-post) + :code sleep-code + :post plat-post ) (defstate running (tomb-plat-return) @@ -1530,7 +1516,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) + :code sleep-code :post (behavior () (sound-play "tomb-plat-ret" :id (-> self sound-id) :position (-> self root trans)) (seek! (-> self path-pos) (-> self dest-pos) (* (-> self path-speed) (seconds-per-frame))) @@ -1573,8 +1559,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) - :post (the-as (function none :behavior tomb-plat-return) plat-post) + :code sleep-code + :post plat-post ) ;; WARN: Return type mismatch process-drawable vs tomb-plat-return. @@ -1762,7 +1748,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-sphinx) sleep-code) + :code sleep-code ) (defstate active (tomb-sphinx) diff --git a/goal_src/jak2/levels/tomb/tomb-water.gc b/goal_src/jak2/levels/tomb/tomb-water.gc index 2cae289c1e4..89424a5928a 100644 --- a/goal_src/jak2/levels/tomb/tomb-water.gc +++ b/goal_src/jak2/levels/tomb/tomb-water.gc @@ -96,7 +96,7 @@ ) ) ) - :code (the-as (function none :behavior tomb-door) sleep-code) + :code sleep-code ) (defstate open (tomb-door) @@ -142,10 +142,7 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (-> self root quat) (transform-post) @@ -262,7 +259,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-beetle-door) sleep-code) + :code sleep-code :post (behavior () 0 ) @@ -311,10 +308,7 @@ This commonly includes things such as: ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -322,7 +316,7 @@ This commonly includes things such as: ) (sleep-code) ) - :post (the-as (function none :behavior tomb-beetle-door) ja-post) + :post ja-post ) (define tomb-beetle-door-offsets (new 'static 'inline-array vector 3 @@ -891,7 +885,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-plat-simon) sleep-code) + :code sleep-code ) (defstate appear (tomb-plat-simon) @@ -1010,7 +1004,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-plat-simon) sleep-code) + :code sleep-code ) (defstate idle (tomb-plat-simon) @@ -1033,7 +1027,7 @@ This commonly includes things such as: (send-event (handle->process (-> self button-handle)) 'untrigger) ) ) - :code (the-as (function none :behavior tomb-plat-simon) sleep-code) + :code sleep-code :post (behavior () (debug-draw (-> self path)) ) @@ -1192,7 +1186,7 @@ This commonly includes things such as: (set! (-> self move-rate) 122880.0) ) :trans tomb-simon-block-trans - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post (behavior () (if (>= (- (current-time) (-> self state-time)) (the int (* 300.0 (+ (* 0.1 (the float (-> self order))) (* 0.015 (the float (-> self my-idx)))))) @@ -1261,7 +1255,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1291,7 +1285,7 @@ This commonly includes things such as: ) ) :trans tomb-simon-block-trans - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1355,7 +1349,7 @@ This commonly includes things such as: ) (tomb-simon-block-trans) ) - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1395,7 +1389,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1411,12 +1405,9 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior tomb-simon-block) plat-trans) + :trans plat-trans :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1555,7 +1546,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-simon-button) sleep-code) + :code sleep-code ) (defstate open (tomb-simon-button) @@ -1565,20 +1556,15 @@ This commonly includes things such as: (set! (-> v1-2 user-int8 0) 1) ) ) - :trans (the-as (function none :behavior tomb-simon-button) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (cond (arg0 - (ja :group! (-> self draw art-group data 3) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 3) :num! max) ) (else (sound-play "simon-btn-open") - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1587,7 +1573,7 @@ This commonly includes things such as: ) (go-virtual waiting) ) - :post (the-as (function none :behavior tomb-simon-button) rider-post) + :post rider-post ) (defstate waiting (tomb-simon-button) @@ -1619,13 +1605,10 @@ This commonly includes things such as: ) ) :enter (behavior () - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (transform-post) ) - :code (the-as (function none :behavior tomb-simon-button) sleep-code) + :code sleep-code ) (defstate pressed (tomb-simon-button) @@ -1643,17 +1626,12 @@ This commonly includes things such as: ) (cond (arg0 - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (transform-post) ) (else (sound-play "simon-btn-press") - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -1673,10 +1651,7 @@ This commonly includes things such as: (defstate unpress (tomb-simon-button) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -1920,7 +1895,7 @@ This commonly includes things such as: :trans (behavior () 0 ) - :code (the-as (function none :behavior tomb-vibe) sleep-code) + :code sleep-code :post (behavior () (let* ((s5-0 *target*) (gp-0 (if (type? s5-0 process-focusable) @@ -2035,7 +2010,7 @@ This commonly includes things such as: (go-virtual idle) ) ) - :post (the-as (function none :behavior tomb-vibe) transform-post) + :post transform-post ) (defstate die (tomb-vibe) @@ -2046,9 +2021,7 @@ This commonly includes things such as: :code (behavior ((arg0 symbol)) (cond (arg0 - (ja :group! (-> self draw art-group data 5) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 5) :num! max) (transform-post) ) (else @@ -2082,10 +2055,7 @@ This commonly includes things such as: (-> gp-1 ppointer) ) ) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -2282,7 +2252,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-water-trap) sleep-code) + :code sleep-code ) (defstate running (tomb-water-trap) @@ -2612,7 +2582,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-smash-door) sleep-code) + :code sleep-code ) (defstate open (tomb-smash-door) @@ -2652,10 +2622,7 @@ This commonly includes things such as: ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -2668,10 +2635,7 @@ This commonly includes things such as: (defstate close (tomb-smash-door) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) diff --git a/goal_src/jak2/levels/tomb/widow-baron.gc b/goal_src/jak2/levels/tomb/widow-baron.gc index 54a62386bed..3c03969710c 100644 --- a/goal_src/jak2/levels/tomb/widow-baron.gc +++ b/goal_src/jak2/levels/tomb/widow-baron.gc @@ -209,7 +209,7 @@ ) ) -(defskelgroup skel-widow widow widow-lod0-jg 8 +(defskelgroup skel-widow widow widow-lod0-jg widow-drill-ja ((widow-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 12) :shadow widow-shadow-mg @@ -463,8 +463,8 @@ :trans (behavior () (baron-pod-method-21 self #f) ) - :code (the-as (function none :behavior baron-pod) sleep-code) - :post (the-as (function none :behavior baron-pod) transform-post) + :code sleep-code + :post transform-post ) ;; WARN: Return type mismatch object vs none. @@ -531,7 +531,7 @@ (deactivate self) ) ) - :code (the-as (function none :behavior tomb-boss-bridge) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/tomb/widow-extras.gc b/goal_src/jak2/levels/tomb/widow-extras.gc index bc1bebd62ce..405242c2066 100644 --- a/goal_src/jak2/levels/tomb/widow-extras.gc +++ b/goal_src/jak2/levels/tomb/widow-extras.gc @@ -155,8 +155,8 @@ (deactivate self) ) ) - :code (the-as (function none :behavior tomb-boss-catwalk) sleep-code) - :post (the-as (function none :behavior tomb-boss-catwalk) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (tomb-boss-catwalk) @@ -198,7 +198,7 @@ ) ) ) - :code (the-as (function none :behavior tomb-boss-catwalk) sleep-code) + :code sleep-code ) (defmethod tomb-boss-catwalk-method-22 tomb-boss-catwalk ((obj tomb-boss-catwalk) (arg0 vector) (arg1 int)) @@ -789,8 +789,8 @@ This commonly includes things such as: ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) transform-post) + :code sleep-code + :post transform-post ) (defstate back-atcha (widow-bomb) @@ -857,8 +857,8 @@ This commonly includes things such as: ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) transform-post) + :code sleep-code + :post transform-post ) (defstate explode (widow-bomb) @@ -901,8 +901,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) ja-post) + :code sleep-code + :post ja-post ) (defmethod widow-bomb-method-32 widow-bomb ((obj widow-bomb)) @@ -970,8 +970,8 @@ This commonly includes things such as: (widow-bomb-method-32 self) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) ja-post) + :code sleep-code + :post ja-post ) (defmethod widow-bomb-method-33 widow-bomb ((obj widow-bomb)) @@ -1170,7 +1170,7 @@ This commonly includes things such as: ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1475,13 +1475,11 @@ This commonly includes things such as: :virtual #t :enter (behavior () (set! (-> self draw bounds w) 36864.0) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (tomb-boss-pillar-shrink-collision) (ja-post) ) - :code (the-as (function none :behavior tomb-boss-pillar) sleep-code) + :code sleep-code ) (defstate break-it (tomb-boss-pillar) @@ -1509,8 +1507,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-boss-pillar) sleep-code) - :post (the-as (function none :behavior tomb-boss-pillar) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (tomb-boss-pillar) @@ -1563,7 +1561,7 @@ This commonly includes things such as: (set! (-> v1-2 user-object 1) (-> self segs-shot)) ) ) - :code (the-as (function none :behavior tomb-boss-pillar) sleep-code) + :code sleep-code ) (defmethod deactivate tomb-boss-pillar ((obj tomb-boss-pillar)) @@ -1684,13 +1682,11 @@ This commonly includes things such as: :virtual #t :enter (behavior () (set! (-> self draw bounds w) 36864.0) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (tomb-boss-firepot-shrink-collision) (ja-post) ) - :code (the-as (function none :behavior tomb-boss-firepot) sleep-code) + :code sleep-code ) (defstate break-it (tomb-boss-firepot) @@ -1742,8 +1738,8 @@ This commonly includes things such as: (go-virtual broken) ) ) - :code (the-as (function none :behavior tomb-boss-firepot) sleep-code) - :post (the-as (function none :behavior tomb-boss-firepot) ja-post) + :code sleep-code + :post ja-post ) (defstate idle (tomb-boss-firepot) @@ -1793,7 +1789,7 @@ This commonly includes things such as: ) 0 ) - :code (the-as (function none :behavior tomb-boss-firepot) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/tomb/widow-more-extras.gc b/goal_src/jak2/levels/tomb/widow-more-extras.gc index ee38c61c58a..f943c22a817 100644 --- a/goal_src/jak2/levels/tomb/widow-more-extras.gc +++ b/goal_src/jak2/levels/tomb/widow-more-extras.gc @@ -274,7 +274,7 @@ (set-vector! (-> self draw color-mult) f30-1 f30-1 f30-1 1.0) ) ) - :code (the-as (function none :behavior tomb-boss-debris) sleep-code) + :code sleep-code :post (behavior () (transform-post) (let ((a1-0 (new 'stack-no-clear 'overlaps-others-params))) @@ -466,7 +466,7 @@ (set! (-> self state-time) (+ (current-time) (the int (* 300.0 (rand-vu-float-range 0.1 0.5))))) ) ) - :code (the-as (function none :behavior cave-in-master) sleep-code) + :code sleep-code ) (defstate wait (cave-in-master) @@ -478,7 +478,7 @@ ) ) ) - :code (the-as (function none :behavior cave-in-master) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/under/centipede.gc b/goal_src/jak2/levels/under/centipede.gc index 4f1bfbf4837..b3d9a24f094 100644 --- a/goal_src/jak2/levels/under/centipede.gc +++ b/goal_src/jak2/levels/under/centipede.gc @@ -764,7 +764,7 @@ (set! (-> v1-5 prim-core collide-with) (-> self root backup-collide-with)) ) ) - :code (the-as (function none :behavior centipede) sleep-code) + :code sleep-code ) (defstate grab-cam (centipede) @@ -839,7 +839,7 @@ ) #f ) - :post (the-as (function none :behavior centipede) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defstate active (centipede) @@ -929,7 +929,7 @@ (go-virtual attack) ) ) - :code (the-as (function none :behavior centipede) sleep-code) + :code sleep-code :post (behavior () (centipede-method-188 self) (let ((a0-2 (handle->process (-> self focus handle)))) @@ -974,7 +974,7 @@ (react-to-focus self) ) ) - :code (the-as (function none :behavior centipede) sleep-code) + :code sleep-code :post (behavior () (centipede-method-188 self) (nav-enemy-method-176 self) @@ -1069,10 +1069,7 @@ :code (behavior () (local-vars (a1-5 event-message-block)) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! centipede-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centipede-attack0-ja) frames num-frames) -1)) 3.0) - :frame-num 0.0 - ) + (ja-no-eval :group! centipede-attack0-ja :num! (seek! max 3.0) :frame-num 0.0) (until (ja-done? 0) (centipede-method-186 self) (suspend) @@ -1081,10 +1078,7 @@ (if (not (-> self grabbed-focus?)) (go-virtual attack-failed) ) - (ja-no-eval :group! centipede-eat0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centipede-eat0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! centipede-eat0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/under/jellyfish.gc b/goal_src/jak2/levels/under/jellyfish.gc index 5a70f91db68..e8fe35bb277 100644 --- a/goal_src/jak2/levels/under/jellyfish.gc +++ b/goal_src/jak2/levels/under/jellyfish.gc @@ -391,7 +391,7 @@ (go-virtual stare) ) ) - :code (the-as (function none :behavior jellyfish) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (debug-draw (-> self path)) (hover-enemy-dest-post) @@ -467,7 +467,7 @@ (defstate threaten (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! *jellyfish-mech-reserved* #t) ) @@ -480,10 +480,7 @@ :code (behavior () (set! (-> self restart-fly-anims) #t) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! jellyfish-notice-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-notice-ja) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-notice-ja :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.4)) @@ -515,7 +512,7 @@ (defstate charge-attack (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! *jellyfish-mech-reserved* #t) (look-at-target! self (enemy-flag death-start)) @@ -556,19 +553,13 @@ ) ) :code (behavior () - (ja-no-eval :group! jellyfish-notice-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-notice-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-notice-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! jellyfish-notice-charge-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-notice-charge-loop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-notice-charge-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -601,7 +592,7 @@ (defstate grab-mech (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! *jellyfish-mech-reserved* #t) (set! (-> self attach-lerp) 0.0) @@ -653,10 +644,7 @@ (set-vector! (-> self grab-offset) 0.0 14336.0 0.0 0.0) (set! (-> self grab-start-pos quad) (-> self root trans quad)) (quaternion-copy! (-> self grab-start-quat) (-> self root quat)) - (ja-no-eval :group! jellyfish-grab-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-start-ja) frames num-frames) -1)) 1.2) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-start-ja :num! (seek! max 1.2) :frame-num 0.0) (until (ja-done? 0) (set! (-> self attach-lerp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 0.0 14.0)) (suspend) @@ -673,10 +661,7 @@ ) (set! (-> self grab-start-pos quad) (-> self root trans quad)) (quaternion-copy! (-> self grab-start-quat) (-> self root quat)) - (ja-no-eval :group! jellyfish-grab-attach-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-attach-ja) frames num-frames) -1)) 1.2) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-attach-ja :num! (seek! max 1.2) :frame-num 0.0) (until (ja-done? 0) (set! (-> self attach-lerp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 14.0 23.0)) (suspend) @@ -692,10 +677,7 @@ ) (let ((gp-3 *target*)) (dotimes (s5-2 2) - (ja-no-eval :group! jellyfish-grab-attach-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-attach-loop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-attach-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and gp-3 (focus-test? gp-3 mech) (not (logtest? (-> gp-3 focus-status) (focus-status dead ignore)))) (send-event @@ -718,10 +700,7 @@ (dotimes (gp-4 3) (initialize-chain-joints (-> self tentacles gp-4)) ) - (ja-no-eval :group! jellyfish-grab-detach-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-detach-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-detach-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self attach-lerp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 48.0 65.0)) (suspend) @@ -749,16 +728,13 @@ (defstate die (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (logclear! (-> self focus-status) (focus-status dangerous)) (enemy-method-52 self (-> self root transv)) (let ((gp-0 (current-time))) - (ja-no-eval :group! jellyfish-die-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-die-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-die-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((s5-0 (ja-group)) (f0-4 (ja-aframe-num 0)) @@ -794,12 +770,12 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior jellyfish) enemy-falling-post) + :post enemy-falling-post ) (defstate die-now (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (let ((v1-3 (-> self root root-prim))) @@ -808,10 +784,7 @@ ) 0 (logior! (-> self draw status) (draw-control-status no-draw)) - (ja-no-eval :group! jellyfish-die-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-die-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-die-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/under/pipe-grunt.gc b/goal_src/jak2/levels/under/pipe-grunt.gc index b51c894d5cc..5a8cba87ccd 100644 --- a/goal_src/jak2/levels/under/pipe-grunt.gc +++ b/goal_src/jak2/levels/under/pipe-grunt.gc @@ -46,7 +46,7 @@ (defstate ambush (pipe-grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior pipe-grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self enemy-flags) (enemy-flag chase-startup)) @@ -93,10 +93,7 @@ (ja-channel-push! 1 0) (until #f (let ((a1-2 (-> self draw art-group data (-> self charge-anim anim-index)))) - (ja-no-eval :group! a1-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-2) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-2 :num! (seek! max f30-0) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -106,5 +103,5 @@ ) #f ) - :post (the-as (function none :behavior pipe-grunt) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/goal_src/jak2/levels/under/sig5-course.gc b/goal_src/jak2/levels/under/sig5-course.gc index 51e730265f9..9ab332d1069 100644 --- a/goal_src/jak2/levels/under/sig5-course.gc +++ b/goal_src/jak2/levels/under/sig5-course.gc @@ -321,7 +321,7 @@ (defstate intro-shooting (sig-under) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig-under) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (move-to-point! (-> self root) (the-as vector (-> self sig5-course spots 0))) (quaternion-identity! (-> self root quat)) @@ -402,10 +402,7 @@ (logclear! (-> self bot-flags) (bot-flags bf18)) (let ((gp-3 (+ (current-time) (get-rand-int-range self 30 600)))) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (>= (current-time) gp-3) (goto cfg-27) @@ -420,7 +417,7 @@ ) #f ) - :post (the-as (function none :behavior sig-under) nav-enemy-simple-post) + :post nav-enemy-simple-post ) (defmethod alive? sig-under ((obj sig-under)) diff --git a/goal_src/jak2/levels/under/under-laser.gc b/goal_src/jak2/levels/under/under-laser.gc index f9f91bf443b..61cbffd56be 100644 --- a/goal_src/jak2/levels/under/under-laser.gc +++ b/goal_src/jak2/levels/under/under-laser.gc @@ -164,8 +164,8 @@ (set! (-> self root scale x) (lerp-scale 0.5 3.5 f0-3 32768.0 245760.0)) ) ) - :code (the-as (function none :behavior under-laser-shadow) sleep-code) - :post (the-as (function none :behavior under-laser-shadow) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -211,8 +211,8 @@ (vector+! (-> a0-1 trans) (-> a0-1 trans) (-> (the-as under-laser v1-0) slave-trans-offset)) ) ) - :code (the-as (function none :behavior under-laser-slave) sleep-code) - :post (the-as (function none :behavior under-laser-slave) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -296,7 +296,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior under-laser) sleep-code) + :code sleep-code ) (defstate idle (under-laser) @@ -322,7 +322,7 @@ ) (update-vol! (-> self sound) 1.0) ) - :code (the-as (function none :behavior under-laser) sleep-code) + :code sleep-code :post (behavior () (let ((f30-0 (get-norm! (-> self sync) 0))) (vector-lerp! (-> self root trans) (-> self zero-pos) (-> self one-pos) f30-0) diff --git a/goal_src/jak2/levels/under/under-obs.gc b/goal_src/jak2/levels/under/under-obs.gc index 1dde163072d..d1bf58811c2 100644 --- a/goal_src/jak2/levels/under/under-obs.gc +++ b/goal_src/jak2/levels/under/under-obs.gc @@ -306,7 +306,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior bubbler) sleep-code) + :code sleep-code ) (defstate idle (bubbler) @@ -355,7 +355,7 @@ ) ) ) - :code (the-as (function none :behavior bubbler) sleep-code) + :code sleep-code ) (defmethod deactivate bubbler ((obj bubbler)) @@ -448,8 +448,8 @@ This commonly includes things such as: ) (set! (-> self ridden) #f) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) (defstate idle-up (under-rise-plat) @@ -473,8 +473,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) (defstate going-down (under-rise-plat) @@ -500,8 +500,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) (defstate wait-down (under-rise-plat) @@ -522,8 +522,8 @@ This commonly includes things such as: ) (set! (-> self ridden) #f) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) (defstate idle-down (under-rise-plat) @@ -551,8 +551,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) (defstate going-up (under-rise-plat) @@ -585,8 +585,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) ;; WARN: Return type mismatch object vs none. @@ -701,8 +701,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-buoy-base) sleep-code) - :post (the-as (function none :behavior under-buoy-base) ja-post) + :code sleep-code + :post ja-post ) (defstate opened (under-buoy-base) @@ -710,8 +710,8 @@ This commonly includes things such as: :enter (behavior () (process-entity-status! self (entity-perm-status subtask-complete) #t) ) - :code (the-as (function none :behavior under-buoy-base) sleep-code) - :post (the-as (function none :behavior under-buoy-base) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -802,8 +802,8 @@ This commonly includes things such as: (set! (-> self root trans quad) (-> (the-as process-drawable v1-0) root trans quad)) ) ) - :code (the-as (function none :behavior under-buoy-chain) sleep-code) - :post (the-as (function none :behavior under-buoy-chain) ja-post) + :code sleep-code + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1014,16 +1014,13 @@ This commonly includes things such as: :enter (behavior () 0 ) - :code (the-as (function none :behavior under-buoy-plat) sleep-code) - :post (the-as (function none :behavior under-buoy-plat) ja-post) + :code sleep-code + :post ja-post ) (defstate running (under-buoy-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior under-buoy-plat) - rigid-body-object-event-handler - ) + :event rigid-body-object-event-handler :enter (behavior () (sound-play "break-chain") (send-event (ppointer->process (-> self base)) 'release) @@ -1031,10 +1028,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1280,7 +1274,7 @@ This commonly includes things such as: (deactivate self) ) ) - :code (the-as (function none :behavior under-mine) sleep-code) + :code sleep-code ) (defstate idle (under-mine) @@ -1363,7 +1357,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-mine) sleep-code) + :code sleep-code :post (behavior () (transform-post) (if *nav-network* @@ -1720,7 +1714,7 @@ For example for an elevator pre-compute the distance between the first and last (suspend) 0 ) - :post (the-as (function none :behavior under-break-door) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1843,10 +1837,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1854,7 +1845,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-a) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -1946,10 +1937,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1957,7 +1945,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-b) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2003,10 +1991,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2014,7 +1999,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-c) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. @@ -2060,10 +2045,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2071,7 +2053,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-d) ja-post) + :post ja-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/under/under-shoot-block.gc b/goal_src/jak2/levels/under/under-shoot-block.gc index dba209f33db..2351fd03e1d 100644 --- a/goal_src/jak2/levels/under/under-shoot-block.gc +++ b/goal_src/jak2/levels/under/under-shoot-block.gc @@ -1238,13 +1238,13 @@ :enter (behavior () (logclear! (-> self flags) (under-block-flags unbflags-0)) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) (defstate rise-up (under-block) :virtual #t :event under-block-event-handler - :trans (the-as (function none :behavior under-block) rider-trans) + :trans rider-trans :code (behavior () (logclear! (-> self flags) (under-block-flags unbflags-0)) (while (not (under-block-method-48 self (-> self col) (-> self row))) @@ -1272,7 +1272,7 @@ (defstate follow (under-block) :virtual #t :event under-block-event-handler - :trans (the-as (function none :behavior under-block) rider-trans) + :trans rider-trans :code (behavior () (logclear! (-> self flags) (under-block-flags unbflags-0)) (set! (-> self state-time) (current-time)) @@ -1300,7 +1300,7 @@ (logior! (-> self flags) (under-block-flags unbflags-0)) (under-block-method-41 self 'active) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) (defstate active (under-block) @@ -1316,7 +1316,7 @@ :trans (behavior () (under-block-method-45 self) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) (defstate flip (under-block) @@ -1535,7 +1535,7 @@ :trans (behavior () (under-block-method-45 self) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) (defstate victory (under-block) @@ -1569,7 +1569,7 @@ (logclear! (-> self flags) (under-block-flags unbflags-0)) (under-block-method-41 self 'beaten) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) (defstate fall (under-block) @@ -1657,7 +1657,7 @@ (defstate die-fast (under-block) :virtual #t - :code (the-as (function none :behavior under-block) nothing) + :code nothing ) ;; WARN: Return type mismatch collide-status vs none. @@ -2117,7 +2117,7 @@ ) 0 ) - :code (the-as (function none :behavior under-shoot-block) sleep-code) + :code sleep-code ) (defstate victory-locked (under-shoot-block) @@ -2143,7 +2143,7 @@ ) ) ) - :code (the-as (function none :behavior under-shoot-block) sleep-code) + :code sleep-code ) (defstate victory (under-shoot-block) @@ -2189,7 +2189,7 @@ (defstate beaten (under-shoot-block) :virtual #t :event under-shoot-block-event-handler - :code (the-as (function none :behavior under-shoot-block) sleep-code) + :code sleep-code ) (defmethod deactivate under-shoot-block ((obj under-shoot-block)) diff --git a/goal_src/jak2/levels/under/under-sig-obs.gc b/goal_src/jak2/levels/under/under-sig-obs.gc index 062e7edb2f5..58e7fb307dc 100644 --- a/goal_src/jak2/levels/under/under-sig-obs.gc +++ b/goal_src/jak2/levels/under/under-sig-obs.gc @@ -154,7 +154,7 @@ For example for an elevator pre-compute the distance between the first and last (go-virtual plat-path-active) ) ) - :code (the-as (function none :behavior under-plat-shoot) sleep-code) + :code sleep-code ) (defstate plat-path-active (under-plat-shoot) @@ -478,7 +478,7 @@ otherwise, [[plat::34]] ) ) ) - :code (the-as (function none :behavior under-break-floor) sleep-code) + :code sleep-code ) (defstate die (under-break-floor) @@ -524,7 +524,7 @@ otherwise, [[plat::34]] ) (cleanup-for-death self) ) - :post (the-as (function none :behavior under-break-floor) ja-post) + :post ja-post ) (defstate die-fast (under-break-floor) @@ -619,7 +619,7 @@ This commonly includes things such as: (defstate idle (under-break-wall) :virtual #t - :code (the-as (function none :behavior under-break-wall) sleep-code) + :code sleep-code ) (defstate die (under-break-wall) @@ -720,7 +720,7 @@ This commonly includes things such as: (defstate idle (under-break-bridge) :virtual #t - :code (the-as (function none :behavior under-break-bridge) sleep-code) + :code sleep-code ) (defstate broken (under-break-bridge) @@ -859,7 +859,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-int-door) sleep-code) + :code sleep-code ) (defstate open (under-int-door) @@ -868,10 +868,7 @@ This commonly includes things such as: (process-entity-status! self (entity-perm-status subtask-complete) #t) (sound-play "und-block-door") (logior! (-> self skel status) (joint-control-status sync-math)) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) 0.13) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 0.13) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.13)) @@ -879,12 +876,12 @@ This commonly includes things such as: (logclear! (-> self skel status) (joint-control-status sync-math)) (go-virtual idle-open) ) - :post (the-as (function none :behavior under-int-door) transform-post) + :post transform-post ) (defstate idle-open (under-int-door) :virtual #t - :code (the-as (function none :behavior under-int-door) sleep-code) + :code sleep-code ) ;; WARN: Return type mismatch object vs none. @@ -1003,13 +1000,13 @@ This commonly includes things such as: (defstate idle (under-plat-long) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior under-plat-long) plat-event) + :event plat-event :trans (behavior () (plat-trans) (vector-lerp! (-> self root trans) (-> self move-start) (-> self move-end) (get-norm! (-> self sync) 0)) ) - :code (the-as (function none :behavior under-plat-long) sleep-code) - :post (the-as (function none :behavior under-plat-long) plat-post) + :code sleep-code + :post plat-post ) (defmethod init-plat-collision! under-plat-long ((obj under-plat-long)) @@ -1145,7 +1142,7 @@ This commonly includes things such as: :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior under-plat-wall) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 #t)) (until #f @@ -1174,7 +1171,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-plat-wall) rider-post) + :post rider-post ) ;; WARN: Return type mismatch object vs none. @@ -1357,8 +1354,8 @@ This commonly includes things such as: (set! (-> self desired-volume) 1.0) (set! (-> self volume-seek-speed) (rand-vu-float-range 0.5 0.2)) ) - :code (the-as (function none :behavior under-pipe-growls) sleep-code) - :post (the-as (function none :behavior under-pipe-growls) under-pipe-growls-post) + :code sleep-code + :post under-pipe-growls-post ) (defstate block-puzzle (under-pipe-growls) @@ -1404,7 +1401,7 @@ This commonly includes things such as: (sound-play "grunt-notice" :vol 200 :position (target-pos 0)) (sleep-code) ) - :post (the-as (function none :behavior under-pipe-growls) under-pipe-growls-post) + :post under-pipe-growls-post ) (defstate block-puzzle-fade (under-pipe-growls) @@ -1419,8 +1416,8 @@ This commonly includes things such as: (go empty-state) ) ) - :code (the-as (function none :behavior under-pipe-growls) sleep-code) - :post (the-as (function none :behavior under-pipe-growls) under-pipe-growls-post) + :code sleep-code + :post under-pipe-growls-post ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/under/underb-master.gc b/goal_src/jak2/levels/under/underb-master.gc index 4e76f9ecf7a..5f5d0b9ad4f 100644 --- a/goal_src/jak2/levels/under/underb-master.gc +++ b/goal_src/jak2/levels/under/underb-master.gc @@ -57,10 +57,7 @@ ) (ja :num! (loop!)) (ja :chan 1 :num! (chan 0)) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -76,7 +73,7 @@ (defstate die-fast (under-warp) :virtual #t - :code (the-as (function none :behavior under-warp) nothing) + :code nothing ) (defmethod under-warp-method-22 under-warp ((obj under-warp)) @@ -439,7 +436,7 @@ (go-virtual big-room-player-under) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -457,7 +454,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -481,7 +478,7 @@ ) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -497,7 +494,7 @@ (go-virtual big-room-player-falling) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -529,7 +526,7 @@ ) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -551,7 +548,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -561,7 +558,7 @@ :enter (behavior () (go-virtual idle) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -740,7 +737,7 @@ ) ) ) - :code (the-as (function none :behavior under-locking) sleep-code) + :code sleep-code ) (defstate active (under-locking) @@ -840,7 +837,7 @@ ) ) ) - :code (the-as (function none :behavior under-locking) sleep-code) + :code sleep-code ) (defstate filling (under-locking) diff --git a/test/decompiler/reference/jak1/engine/anim/joint-exploder_REF.gc b/test/decompiler/reference/jak1/engine/anim/joint-exploder_REF.gc index c4ba145b6e0..b1819a69afd 100644 --- a/test/decompiler/reference/jak1/engine/anim/joint-exploder_REF.gc +++ b/test/decompiler/reference/jak1/engine/anim/joint-exploder_REF.gc @@ -617,7 +617,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior joint-exploder) ja-post) + :post ja-post ) ;; definition for method 23 of type joint-exploder diff --git a/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc index 1ca5abfbd36..a8cdf86278d 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc @@ -121,7 +121,7 @@ (rider-trans) ) ) - :code (the-as (function none :behavior basebutton) anim-loop) + :code anim-loop :post (behavior () (when (-> self move-to?) (set! (-> self move-to?) #f) @@ -149,7 +149,7 @@ :enter (behavior () (press! self #t) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! max (-> self anim-speed))) (until (ja-done? 0) @@ -234,7 +234,7 @@ :enter (behavior () (press! self #f) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! 0.0 (-> self anim-speed))) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak1/engine/common-obs/baseplat_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/baseplat_REF.gc index aceefa35130..fae82f4ad65 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/baseplat_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/baseplat_REF.gc @@ -260,7 +260,7 @@ eco-door-event-handler ) (go-virtual door-open) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -320,7 +320,7 @@ eco-door-event-handler ) (go-virtual door-closed) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) ;; definition for method 26 of type eco-door diff --git a/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc index 75ace00da18..d556af4cfb2 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc @@ -431,7 +431,7 @@ (go-virtual wait) ) ) - :code (the-as (function none :behavior eco-collectable) anim-loop) + :code anim-loop ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc index 598ac27b3e5..71492251fbe 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc @@ -712,7 +712,7 @@ (suspend) ) ) - :post (the-as (function none :behavior crate) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -725,7 +725,7 @@ ) (go-virtual wait) ) - :post (the-as (function none :behavior crate) crate-post) + :post crate-post ) ;; failed to figure out what this is: @@ -801,7 +801,7 @@ (suspend) ) ) - :post (the-as (function none :behavior crate) crate-post) + :post crate-post ) ;; failed to figure out what this is: @@ -1390,7 +1390,7 @@ (set! (-> self root-override trans y) (-> self base y)) ) ) - :post (the-as (function none :behavior crate-buzzer) #f) + :post #f ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc index cf2bf2d1c50..a28e2d06b6d 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc @@ -147,7 +147,7 @@ ;; failed to figure out what this is: (defstate die (process-hidden) :virtual #t - :code (the-as (function none :behavior process-hidden) nothing) + :code nothing ) ;; definition for method 11 of type process-hidden @@ -1330,7 +1330,7 @@ ) ) ) - :post (the-as (function none :behavior med-res-level) ja-post) + :post ja-post ) ;; definition for symbol *lev-string*, type string @@ -2020,7 +2020,7 @@ ) ) ) - :code (the-as (function none :behavior launcher) anim-loop) + :code anim-loop ) ;; failed to figure out what this is: @@ -2079,7 +2079,7 @@ ;; failed to figure out what this is: (defstate launcher-deactivated (launcher) - :code (the-as (function none :behavior launcher) anim-loop) + :code anim-loop ) ;; definition for method 11 of type launcher diff --git a/test/decompiler/reference/jak1/engine/common-obs/nav-enemy_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/nav-enemy_REF.gc index a5f62189472..1276f7cbd64 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/nav-enemy_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/nav-enemy_REF.gc @@ -851,7 +851,7 @@ nav-enemy-default-event-handler ) ) ) - :post (the-as (function none :behavior nav-enemy) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1328,10 +1328,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-die (nav-enemy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior nav-enemy) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :enter (behavior () (send-event (ppointer->process (-> self parent)) 'child-die) ) @@ -1360,10 +1357,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-fuel-cell (nav-enemy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior nav-enemy) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (ja-channel-set! 0) (clear-collide-with-as (-> self collide-info)) diff --git a/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc index 38c0640dc99..5d864e575ef 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc @@ -210,11 +210,11 @@ ;; failed to figure out what this is: (defstate orb-cache-top-activate (orb-cache-top) - :event (the-as (function process int symbol event-message-block object :behavior orb-cache-top) plat-event) + :event plat-event :exit (behavior () (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior orb-cache-top) plat-trans) + :trans plat-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status bit-3) #t) (calculate-pos self arg0) @@ -281,13 +281,13 @@ ) ) ) - :post (the-as (function none :behavior orb-cache-top) plat-post) + :post plat-post ) ;; failed to figure out what this is: (defstate orb-cache-top-complete (orb-cache-top) - :event (the-as (function process int symbol event-message-block object :behavior orb-cache-top) plat-event) - :trans (the-as (function none :behavior orb-cache-top) plat-trans) + :event plat-event + :trans plat-trans :code (behavior ((arg0 symbol)) (if (not arg0) (sound-play "close-orb-cash") @@ -297,7 +297,7 @@ (set! (-> self basetrans y) (+ 2048.0 (-> self root-pos))) (anim-loop) ) - :post (the-as (function none :behavior orb-cache-top) plat-post) + :post plat-post ) ;; definition for method 11 of type orb-cache-top diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc index 6212e96ab30..6fbc85c5492 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc @@ -144,7 +144,7 @@ ;; failed to figure out what this is: (defstate plat-button-pressed (plat-button) :virtual #t - :trans (the-as (function none :behavior plat-button) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek!)) (until (ja-done? 0) @@ -158,7 +158,7 @@ (go-virtual plat-button-move-upward) ) ) - :post (the-as (function none :behavior plat-button) rider-post) + :post rider-post ) ;; definition for function plat-button-camera-on @@ -248,8 +248,8 @@ (set! (-> self grab-player?) (not (process-release? *target*))) ) ) - :code (the-as (function none :behavior plat-button) anim-loop) - :post (the-as (function none :behavior plat-button) rider-post) + :code anim-loop + :post rider-post ) ;; failed to figure out what this is: @@ -319,8 +319,8 @@ (set! (-> self grab-player?) (not (process-release? *target*))) ) ) - :code (the-as (function none :behavior plat-button) anim-loop) - :post (the-as (function none :behavior plat-button) rider-post) + :code anim-loop + :post rider-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc index a07937f2f74..6019a656803 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc @@ -89,7 +89,7 @@ (update-transforms! (-> self root-override)) (anim-loop) ) - :post (the-as (function none :behavior plat-eco) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc index 9885a5a3492..ec03bc35cc6 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc @@ -212,7 +212,7 @@ ;; failed to figure out what this is: (defstate plat-idle (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :trans (behavior () (baseplat-method-20 self) ) @@ -240,7 +240,7 @@ ;; failed to figure out what this is: (defstate plat-path-active (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :exit (behavior () (sound-stop (-> self sound-id)) ) @@ -256,8 +256,8 @@ ) (plat-trans) ) - :code (the-as (function plat none :behavior plat) anim-loop) - :post (the-as (function none :behavior plat) plat-post) + :code (the-as (function plat object) anim-loop) + :post plat-post ) ;; definition for method 11 of type plat diff --git a/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc index 6c6c8640940..058e3a2f23c 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc @@ -321,7 +321,7 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -354,7 +354,7 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -374,14 +374,14 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate enter-playing (process-taskable) :virtual #t :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; definition for function process-taskable-play-anim-enter @@ -511,7 +511,7 @@ ;; failed to figure out what this is: (defstate play-accept (process-taskable) :virtual #t - :enter (the-as (function none :behavior process-taskable) process-taskable-play-anim-enter) + :enter process-taskable-play-anim-enter :exit process-taskable-play-anim-exit :trans (behavior () (process-taskable-play-anim-trans) @@ -524,13 +524,13 @@ ) (go-virtual enter-playing) ) - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate play-reject (process-taskable) :virtual #t - :enter (the-as (function none :behavior process-taskable) process-taskable-play-anim-enter) + :enter process-taskable-play-anim-enter :exit process-taskable-play-anim-exit :trans (behavior () (process-taskable-play-anim-trans) @@ -540,7 +540,7 @@ (process-taskable-play-anim-code (the-as art-joint-anim (get-art-elem self)) (get-reject-anim self #t)) (go-virtual release) ) - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -589,7 +589,7 @@ ((-> self cur-trans-hook)) ) :code process-taskable-anim-loop - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -623,7 +623,7 @@ ) ) ) - :enter (the-as (function none :behavior process-taskable) process-taskable-play-anim-enter) + :enter process-taskable-play-anim-enter :exit process-taskable-play-anim-exit :trans (behavior () (process-taskable-play-anim-trans) @@ -638,7 +638,7 @@ (process-taskable-play-anim-code (the-as art-joint-anim (get-art-elem self)) (play-anim! self #t)) (process-taskable-method-38 self) ) - :post (the-as (function none :behavior process-taskable) ja-post) + :post ja-post ) ;; definition for function process-taskable-clean-up-after-talking @@ -711,7 +711,7 @@ (defstate hidden (process-taskable) :virtual #t :event process-taskable-hide-handler - :enter (the-as (function none :behavior process-taskable) process-taskable-hide-enter) + :enter process-taskable-hide-enter :exit (behavior () (process-taskable-hide-exit (= (-> self next-state name) 'hidden)) ) @@ -723,7 +723,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior process-taskable) anim-loop) + :code anim-loop ) ;; definition for method 50 of type process-taskable @@ -743,7 +743,7 @@ (defstate hidden-other (process-taskable) :virtual #t :event process-taskable-hide-handler - :enter (the-as (function none :behavior process-taskable) process-taskable-hide-enter) + :enter process-taskable-hide-enter :exit (behavior () (process-taskable-hide-exit (= (-> self next-state name) 'hidden-other)) ) @@ -763,7 +763,7 @@ ) ) ) - :code (the-as (function none :behavior process-taskable) anim-loop) + :code anim-loop ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc index c60a05f8201..d78c459a3fd 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc @@ -571,6 +571,7 @@ ;; definition for function rigid-body-platform-event-handler ;; INFO: Used lq/sq +;; INFO: Return type mismatch vector vs object. (defbehavior rigid-body-platform-event-handler rigid-body-platform ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (case arg2 (('bonk) @@ -734,7 +735,7 @@ (suspend) ) ) - :post (the-as (function none :behavior rigid-body-platform) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -754,7 +755,7 @@ (suspend) ) ) - :post (the-as (function none :behavior rigid-body-platform) rigid-body-platform-post) + :post rigid-body-platform-post ) ;; definition for method 29 of type rigid-body-platform diff --git a/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc index 4f11806974d..24b4b376531 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc @@ -252,10 +252,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-idle (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf0)) @@ -314,16 +311,13 @@ nav-enemy-default-event-handler (logior! (-> self draw status) (draw-status hidden)) (anim-loop) ) - :post (the-as (function none :behavior sharkey) #f) + :post #f ) ;; failed to figure out what this is: (defstate nav-enemy-patrol (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (sharkey-notice-player?) (go-virtual nav-enemy-chase) @@ -362,10 +356,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-notice (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (go-virtual nav-enemy-chase) ) @@ -387,10 +378,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-attack (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) @@ -460,10 +448,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-chase (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (sound-stop (-> self sound-id)) ) @@ -552,10 +537,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stop-chase (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.17)) (loop @@ -576,10 +558,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stare (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) @@ -604,10 +583,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-victory (sharkey) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sharkey) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (dotimes (gp-0 3) diff --git a/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc index 9492e38c1b6..6b2f9cffaf7 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc @@ -56,7 +56,7 @@ ;; failed to figure out what this is: (defstate empty-state (process) - :code (the-as (function none :behavior process) nothing) + :code nothing ) ;; failed to figure out what this is: @@ -171,7 +171,7 @@ (set! (-> self blend) 0.0) (go-virtual idle) ) - :post (the-as (function none :behavior voicebox) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -185,7 +185,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior voicebox) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -212,7 +212,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior voicebox) ja-post) + :post ja-post ) ;; definition for function voicebox-init-by-other diff --git a/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc index 199c8b7de43..c94c19deb1c 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc @@ -1311,7 +1311,7 @@ :trans (behavior () (update! self) ) - :code (the-as (function none :behavior water-vol) anim-loop) + :code anim-loop ) ;; definition for method 24 of type water-vol diff --git a/test/decompiler/reference/jak1/engine/debug/viewer_REF.gc b/test/decompiler/reference/jak1/engine/debug/viewer_REF.gc index b0fb64698e0..1909cc12f79 100644 --- a/test/decompiler/reference/jak1/engine/debug/viewer_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/viewer_REF.gc @@ -52,7 +52,7 @@ ) ) ) - :post (the-as (function none :behavior viewer) ja-post) + :post ja-post ) ;; definition for symbol viewer-string, type string diff --git a/test/decompiler/reference/jak1/engine/game/powerups_REF.gc b/test/decompiler/reference/jak1/engine/game/powerups_REF.gc index 0d33286a2b2..bd3e8a4539a 100644 --- a/test/decompiler/reference/jak1/engine/game/powerups_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/powerups_REF.gc @@ -580,7 +580,7 @@ ) ) (let ((f0-8 (lerp-scale 60.0 90.0 (-> self control unknown-float01) 0.0 81920.0))) - (if (not (ja-group? (-> self draw art-group data 104))) + (if (not (ja-group? eichar-ice-stance-ja)) (set! f0-8 (* 0.75 f0-8)) ) (seek! (-> self control unknown-float141) f0-8 (* 100.0 (-> *display* seconds-per-frame))) diff --git a/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc b/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc index 4783686bbcf..4455ac226e7 100644 --- a/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc @@ -115,7 +115,7 @@ ) ) ) - :code (the-as (function none :behavior sidekick) looping-code) + :code looping-code :post (behavior () (let ((v1-0 'process-drawable-art-error) (a0-0 (-> self parent-override)) diff --git a/test/decompiler/reference/jak1/engine/target/target2_REF.gc b/test/decompiler/reference/jak1/engine/target/target2_REF.gc index 6603498cd4e..f6f94cfea92 100644 --- a/test/decompiler/reference/jak1/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target2_REF.gc @@ -995,7 +995,7 @@ ) ) (cond - ((ja-group? (-> self draw art-group data 83)) + ((ja-group? eichar-pole-jump-loop-ja) (while (not (-> self control unknown-int21)) (ja :num! (seek!)) (suspend) @@ -1010,7 +1010,7 @@ (ja-channel-push! 1 (seconds 0.15)) ) ) - (ja-no-eval :group! (-> self draw art-group data 80) :num! (seek!) :frame-num 0.0) + (ja-no-eval :group! eichar-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1022,7 +1022,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 80) :num! (seek!) :frame-num 0.0) + (ja-no-eval :group! eichar-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1037,7 +1037,7 @@ :event target-standard-event-handler :exit (-> target-pole-cycle exit) :code (behavior ((arg0 object) (arg1 object) (arg2 float)) - (ja-no-eval :group! (-> self draw art-group data 81) + (ja-no-eval :group! eichar-pole-flip-up-ja :num! (seek!) :frame-num (ja-aframe (+ 1.0 (fmin 17.0 (ja-aframe-num 0))) 0) ) @@ -1063,7 +1063,7 @@ :code (behavior ((arg0 float) (arg1 float)) (sound-play "jump") (send-event *camera* 'damp-up) - (ja :group! (-> self draw art-group data 83) :num! min) + (ja :group! eichar-pole-jump-loop-ja :num! min) (let ((f0-1 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) @@ -1089,7 +1089,7 @@ :event target-standard-event-handler :exit (-> target-pole-cycle exit) :code (behavior ((arg0 float) (arg1 float) (arg2 float)) - (ja-no-eval :group! (-> self draw art-group data 82) + (ja-no-eval :group! eichar-pole-flip-forward-ja :num! (seek! (ja-aframe (the-as float 16.0) 0)) :frame-num (ja-aframe (+ 1.0 (ja-aframe-num 0)) 0) ) diff --git a/test/decompiler/reference/jak1/engine/target/target_REF.gc b/test/decompiler/reference/jak1/engine/target/target_REF.gc index 7d1fa91a279..e59dfef5bf4 100644 --- a/test/decompiler/reference/jak1/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target_REF.gc @@ -711,7 +711,7 @@ ((and (ja-group? eichar-walk-ja) (= (-> self skel root-channel 0) (-> self skel channel))) (set! f28-0 (ja-aframe-num 0)) ) - ((ja-group? (-> self draw art-group data 102)) + ((ja-group? eichar-ice-skate-ja) (set! f28-0 (ja-aframe-num 0)) (ja-channel-push! 7 (seconds 0.1)) ) diff --git a/test/decompiler/reference/jak1/kernel/gkernel_REF.gc b/test/decompiler/reference/jak1/kernel/gkernel_REF.gc index b6806621555..1eacc2a6ad7 100644 --- a/test/decompiler/reference/jak1/kernel/gkernel_REF.gc +++ b/test/decompiler/reference/jak1/kernel/gkernel_REF.gc @@ -1361,7 +1361,7 @@ ;; failed to figure out what this is: (defstate dead-state (process) - :code (the-as (function none :behavior process) nothing) + :code nothing ) ;; definition for symbol entity-deactivate-handler, type (function process entity-actor none) diff --git a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc index 8395b5350b0..e543becc656 100644 --- a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc @@ -59,7 +59,7 @@ ) ) ) - :post (the-as (function none :behavior windmill-one) rider-post) + :post rider-post ) ;; definition for method 11 of type windmill-one @@ -339,7 +339,7 @@ (move-grottopole self 1.0) (go grottopole-idle) ) - :post (the-as (function none :behavior grottopole) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -353,7 +353,7 @@ (move-grottopole self -1.0) (go grottopole-idle) ) - :post (the-as (function none :behavior grottopole) transform-post) + :post transform-post ) ;; definition for method 11 of type grottopole @@ -599,10 +599,7 @@ ;; failed to figure out what this is: (defstate ecoventrock-break (ecoventrock) - :event (the-as - (function process int symbol event-message-block object :behavior ecoventrock) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :enter (behavior ((arg0 symbol)) (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -871,7 +868,7 @@ ) (deactivate self) ) - :post (the-as (function none :behavior flying-rock) ja-post) + :post ja-post ) ;; definition for function flying-rock-init-by-other @@ -1261,7 +1258,7 @@ ) ) ) - :post (the-as (function none :behavior flutflutegg) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1326,7 +1323,7 @@ (go flutflutegg-break #f) ) ) - :post (the-as (function none :behavior flutflutegg) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1381,7 +1378,7 @@ (suspend) ) ) - :post (the-as (function none :behavior flutflutegg) ja-post) + :post ja-post ) ;; definition for method 11 of type flutflutegg @@ -1513,7 +1510,7 @@ ) ) ) - :post (the-as (function none :behavior harvester) ja-post) + :post ja-post ) ;; definition for method 11 of type harvester diff --git a/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc b/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc index 416f550e258..755e4944af1 100644 --- a/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc @@ -418,7 +418,7 @@ (set! (-> self draw bounds w) 20480.0) (go-virtual fallen) ) - :post (the-as (function none :behavior beach-rock) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -444,7 +444,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior beach-rock) ja-post) + :post ja-post ) ;; definition for method 11 of type beach-rock diff --git a/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc b/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc index 28fbcedbb63..c8e4cf787bb 100644 --- a/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc @@ -211,10 +211,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-idle (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (set! (-> self draw force-lod) -1) ) @@ -278,10 +275,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-patrol (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (lurkercrab-invulnerable) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf6)) @@ -352,10 +346,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-notice (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-chase) ) @@ -364,10 +355,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-chase (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (lurkercrab-invulnerable) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf6)) @@ -437,10 +425,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stop-chase (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -449,10 +434,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stare (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -461,10 +443,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-victory (lurkercrab) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (ja-channel-push! 1 (seconds 0.075)) @@ -479,10 +458,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate lurkercrab-pushed (lurkercrab) - :event (the-as - (function process int symbol event-message-block object :behavior lurkercrab) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (set! (-> self orient) #t) ) diff --git a/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc b/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc index 3a0c8ef0fe6..992ebc19cf8 100644 --- a/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc @@ -31,10 +31,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-notice (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.17)) @@ -51,10 +48,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-chase (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (cond ((ja-group? lurkerpuppy-jump-land-ja) @@ -90,10 +84,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stare (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 1456355.5) (set! (-> self turn-time) (seconds 0.1)) @@ -135,10 +126,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-give-up (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 218453.33) (set! (-> self turn-time) (seconds 0.5)) @@ -168,10 +156,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-attack (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (sound-play "head-butt") (go-virtual nav-enemy-victory) @@ -181,10 +166,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-victory (lurkerpuppy) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior lurkerpuppy) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-travel)) ) @@ -206,7 +188,7 @@ nav-enemy-default-event-handler ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior lurkerpuppy) nav-enemy-face-player-post) + :post nav-enemy-face-player-post ) ;; definition for symbol *lurkerpuppy-nav-enemy-info*, type nav-enemy-info diff --git a/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc b/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc index 4ef3f95021b..40b52590c16 100644 --- a/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc @@ -486,10 +486,7 @@ lurkerworm-default-post-behavior ;; failed to figure out what this is: (defstate lurkerworm-die (lurkerworm) - :event (the-as - (function process int symbol event-message-block object :behavior lurkerworm) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (let ((v1-3 (-> self root-override root-prim))) diff --git a/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc b/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc index 462c7ac976c..adc03e1b495 100644 --- a/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc @@ -866,7 +866,7 @@ (ja-channel-set! 0) (anim-loop) ) - :post (the-as (function none :behavior pelican) ja-post) + :post ja-post ) ;; definition for method 11 of type pelican diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc index a7bdf55b7ba..0751a6acd66 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc @@ -108,7 +108,7 @@ ) ) ) - :post (the-as (function none :behavior citb-arm-section) ja-post) + :post ja-post ) ;; definition for method 20 of type citb-arm-section @@ -173,7 +173,7 @@ ;; failed to figure out what this is: (defstate idle (citb-arm) :virtual #t - :trans (the-as (function none :behavior citb-arm) rider-trans) + :trans rider-trans :post (behavior () (if (logtest? (-> self draw status) (draw-status hidden)) (clear-collide-with-as (-> self root-override)) @@ -476,7 +476,7 @@ ) ) ) - :trans (the-as (function none :behavior citb-disc) rider-trans) + :trans rider-trans :code (behavior () (loop (update! (-> self sound)) @@ -490,7 +490,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-disc) rider-post) + :post rider-post ) ;; definition for method 20 of type citb-disc @@ -1045,7 +1045,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-robotboss) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1172,7 +1172,7 @@ ) (go citb-coil-broken) ) - :post (the-as (function none :behavior citb-coil) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1188,7 +1188,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-coil) ja-post) + :post ja-post ) ;; definition for method 11 of type citb-coil @@ -1263,7 +1263,7 @@ ) ) ) - :post (the-as (function none :behavior citb-hose) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1278,7 +1278,7 @@ ) (go citb-hose-idle) ) - :post (the-as (function none :behavior citb-hose) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1294,7 +1294,7 @@ ) (anim-loop) ) - :post (the-as (function none :behavior citb-hose) ja-post) + :post ja-post ) ;; definition for method 11 of type citb-hose @@ -1557,7 +1557,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-generator) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1609,7 +1609,7 @@ (sound-play "sagecage-open") (go citb-generator-broken) ) - :post (the-as (function none :behavior citb-generator) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc index 922519378d9..1b03af2435b 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc @@ -118,7 +118,7 @@ ) ) ) - :trans (the-as (function none :behavior citb-sagecage) rider-trans) + :trans rider-trans :code (behavior () (loop (cond diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc index 4fe51446340..ee4dd20986e 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc @@ -101,7 +101,7 @@ (suspend) ) ) - :post (the-as (function none :behavior drop-plat) ja-post) + :post ja-post ) ;; definition for function drop-plat-set-fade diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc index 9781cfab044..05a8d3963a2 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc @@ -69,8 +69,8 @@ (go-virtual citb-base-plat-active) ) ) - :code (the-as (function none :behavior citb-base-plat) anim-loop) - :post (the-as (function none :behavior citb-base-plat) ja-post) + :code anim-loop + :post ja-post ) ;; failed to figure out what this is: @@ -85,8 +85,8 @@ ) (rider-trans) ) - :code (the-as (function none :behavior citb-base-plat) anim-loop) - :post (the-as (function none :behavior citb-base-plat) rider-post) + :code anim-loop + :post rider-post ) ;; definition for method 21 of type citb-base-plat @@ -342,7 +342,7 @@ ) ) ) - :trans (the-as (function none :behavior citb-stair-plat) #f) + :trans #f :code (behavior () (logior! (-> self draw status) (draw-status hidden)) (while (not (-> self rise)) @@ -373,13 +373,13 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-stair-plat) #f) + :post #f ) ;; failed to figure out what this is: (defstate citb-base-plat-active (citb-stair-plat) :virtual #t - :trans (the-as (function none :behavior citb-stair-plat) #f) + :trans #f :code (behavior () (set! (-> self root-override trans y) (-> self rise-height)) (suspend) @@ -387,7 +387,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (anim-loop) ) - :post (the-as (function none :behavior citb-stair-plat) ja-post) + :post ja-post ) ;; definition for method 22 of type citb-stair-plat @@ -542,16 +542,13 @@ :code (behavior () (anim-loop) ) - :post (the-as (function none :behavior citb-chain-plat) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate rigid-body-platform-float (citb-chain-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior citb-chain-plat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -588,12 +585,12 @@ :code (behavior () (anim-loop) ) - :post (the-as (function none :behavior citb-chain-plat) rigid-body-platform-post) + :post rigid-body-platform-post ) ;; failed to figure out what this is: (defstate citb-chain-plat-settle (citb-chain-plat) - :trans (the-as (function none :behavior citb-chain-plat) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'quaternion)) @@ -621,7 +618,7 @@ (suspend) (go-virtual rigid-body-platform-idle) ) - :post (the-as (function none :behavior citb-chain-plat) rider-post) + :post rider-post ) ;; definition for method 30 of type citb-chain-plat @@ -709,7 +706,7 @@ ;; failed to figure out what this is: (defstate citb-base-plat-active (citb-rotatebox) :virtual #t - :trans (the-as (function none :behavior citb-rotatebox) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) @@ -972,7 +969,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-firehose) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -998,7 +995,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-firehose) ja-post) + :post ja-post ) ;; definition for function citb-firehose-blast-particles @@ -1056,7 +1053,7 @@ ) (go citb-firehose-active) ) - :post (the-as (function none :behavior citb-firehose) transform-post) + :post transform-post ) ;; definition for method 11 of type citb-firehose @@ -1162,7 +1159,7 @@ ;; failed to figure out what this is: (defstate citb-exit-plat-rise (citb-exit-plat) - :trans (the-as (function none :behavior citb-exit-plat) rider-trans) + :trans rider-trans :code (behavior () (logclear! (-> self draw status) (draw-status hidden)) (restore-collide-with-as (-> self root-override)) @@ -1178,7 +1175,7 @@ (suspend) ) ) - :post (the-as (function none :behavior citb-exit-plat) rider-post) + :post rider-post ) ;; definition for function citb-exit-plat-move-player @@ -1217,7 +1214,7 @@ (citb-exit-plat-move-player gp-0) ) ) - :post (the-as (function none :behavior citb-exit-plat) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1234,7 +1231,7 @@ (citb-exit-plat-move-player gp-0) ) ) - :post (the-as (function none :behavior citb-exit-plat) transform-post) + :post transform-post ) ;; definition for method 26 of type citb-exit-plat diff --git a/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc b/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc index 2cf7f87f454..4d997d0f8c3 100644 --- a/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc @@ -481,7 +481,7 @@ battlecontroller-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior battlecontroller) #f) + :post #f ) ;; failed to figure out what this is: @@ -553,7 +553,7 @@ battlecontroller-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior battlecontroller) #f) + :post #f ) ;; definition for function battlecontroller-special-contents? @@ -596,10 +596,7 @@ battlecontroller-default-event-handler ;; failed to figure out what this is: (defstate battlecontroller-die (battlecontroller) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior battlecontroller) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (sound-play "money-pickup" :pitch -1.5 :position #f) (battlecontroller-battle-end) @@ -663,7 +660,7 @@ battlecontroller-default-event-handler ) (process-entity-status! self (entity-perm-status dead) #t) ) - :post (the-as (function none :behavior battlecontroller) #f) + :post #f ) ;; definition for method 7 of type battlecontroller diff --git a/test/decompiler/reference/jak1/levels/common/launcherdoor_REF.gc b/test/decompiler/reference/jak1/levels/common/launcherdoor_REF.gc index 65540cb6c5e..57928619233 100644 --- a/test/decompiler/reference/jak1/levels/common/launcherdoor_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/launcherdoor_REF.gc @@ -104,7 +104,7 @@ ) ) ) - :post (the-as (function none :behavior launcherdoor) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -140,7 +140,7 @@ (suspend) ) ) - :post (the-as (function none :behavior launcherdoor) ja-post) + :post ja-post ) ;; definition for method 11 of type launcherdoor diff --git a/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc index 2afa83d3646..ae9b7462001 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc @@ -427,7 +427,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior green-eco-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -565,15 +565,12 @@ (suspend) ) ) - :post (the-as (function none :behavior green-eco-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate green-eco-lurker-appear-land (green-eco-lurker) - :event (the-as - (function process int symbol event-message-block object :behavior green-eco-lurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (activate! *camera-smush-control* 409.6 37 150 1.0 0.99) (sound-play "blob-land" :pitch (nav-enemy-rnd-float-range -1.0 1.0)) @@ -600,7 +597,7 @@ (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior green-eco-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/finalboss/light-eco_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/light-eco_REF.gc index 1e81f31a2b4..f296adf82ba 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/light-eco_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/light-eco_REF.gc @@ -450,7 +450,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-child) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -497,7 +497,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-child) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -518,7 +518,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-child) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -664,7 +664,6 @@ ) ;; definition for function light-eco-mother-default-event-handler -;; INFO: Return type mismatch object vs int. (defbehavior light-eco-mother-default-event-handler light-eco-mother ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (the-as int @@ -711,7 +710,7 @@ ) (go light-eco-mother-active) ) - :post (the-as (function none :behavior light-eco-mother) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -728,7 +727,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior light-eco-mother) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -750,7 +749,7 @@ (suspend) ) ) - :post (the-as (function none :behavior light-eco-mother) ja-post) + :post ja-post ) ;; definition for method 10 of type light-eco-mother diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc index 5fa83b529cc..1675f456f6d 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc @@ -263,7 +263,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ecoclaw) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -277,7 +277,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ecoclaw) ja-post) + :post ja-post ) ;; definition for method 11 of type ecoclaw @@ -337,7 +337,7 @@ ) ) ) - :trans (the-as (function none :behavior silodoor) rider-trans) + :trans rider-trans :code (behavior () (loop (when (not (movie?)) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc index a3a575adbec..1211c9e6b63 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc @@ -331,7 +331,7 @@ ) (deactivate self) ) - :post (the-as (function none :behavior darkecobomb) ja-post) + :post ja-post ) ;; definition for function darkecobomb-handler @@ -418,7 +418,7 @@ ) ) ) - :post (the-as (function none :behavior darkecobomb) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -448,7 +448,7 @@ ) ) ) - :post (the-as (function none :behavior darkecobomb) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -479,7 +479,7 @@ ) ) ) - :post (the-as (function none :behavior darkecobomb) transform-post) + :post transform-post ) ;; definition for function darkecobomb-init-by-other @@ -569,7 +569,7 @@ ) ) ) - :post (the-as (function none :behavior greenshot) transform-post) + :post transform-post ) ;; definition for function greenshot-init-by-other @@ -762,7 +762,7 @@ (suspend) ) ) - :post (the-as (function none :behavior redshot) transform-post) + :post transform-post ) ;; definition for function redshot-handler @@ -792,7 +792,7 @@ (suspend) ) ) - :post (the-as (function none :behavior redshot) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -817,7 +817,7 @@ (suspend) ) ) - :post (the-as (function none :behavior redshot) transform-post) + :post transform-post ) ;; definition for function redshot-init-by-other @@ -914,7 +914,7 @@ (suspend) ) ) - :post (the-as (function none :behavior yellowshot) transform-post) + :post transform-post ) ;; definition for function yellowshot-init-by-other diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc index 484c7e6aed6..33d370fe4dc 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc @@ -596,7 +596,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -851,7 +851,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; definition for function robotboss-yellowshot @@ -1219,7 +1219,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1272,7 +1272,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1312,7 +1312,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; definition of type redshot-launch-info @@ -1754,7 +1754,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1801,7 +1801,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1854,7 +1854,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1895,7 +1895,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; definition for function robotboss-greenshot @@ -2154,7 +2154,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -2202,7 +2202,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -2263,7 +2263,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -2303,7 +2303,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; definition for function robotboss-blue-beam @@ -2688,7 +2688,7 @@ ) ) ) - :post (the-as (function none :behavior robotboss) transform-post) + :post transform-post ) ;; definition for method 11 of type robotboss diff --git a/test/decompiler/reference/jak1/levels/firecanyon/firecanyon-obs_REF.gc b/test/decompiler/reference/jak1/levels/firecanyon/firecanyon-obs_REF.gc index 6aae5108e27..fc975f37f35 100644 --- a/test/decompiler/reference/jak1/levels/firecanyon/firecanyon-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/firecanyon/firecanyon-obs_REF.gc @@ -138,7 +138,7 @@ ) ) ) - :post (the-as (function none :behavior balloon) ja-post) + :post ja-post ) ;; definition for method 11 of type balloon diff --git a/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc b/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc index ffa7ef8725e..c9be0932d59 100644 --- a/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc +++ b/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc @@ -238,7 +238,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior flutflut) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/jungle/bouncer_REF.gc b/test/decompiler/reference/jak1/levels/jungle/bouncer_REF.gc index 42c727de5a8..c17559e2ad1 100644 --- a/test/decompiler/reference/jak1/levels/jungle/bouncer_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/bouncer_REF.gc @@ -106,7 +106,7 @@ ) ) ) - :post (the-as (function none :behavior springbox) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -120,7 +120,7 @@ ) (go bouncer-wait) ) - :post (the-as (function none :behavior springbox) transform-post) + :post transform-post ) ;; definition for method 11 of type springbox diff --git a/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc b/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc index 616257cf104..315cd277b5b 100644 --- a/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc @@ -991,7 +991,7 @@ ) ) ) - :post (the-as (function none :behavior fisher-fish) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1476,8 +1476,8 @@ ) (spool-push *art-control* "fisher-reject" 0 self -99.0) ) - :code (the-as (function none :behavior fisher) process-taskable-anim-loop) - :post (the-as (function none :behavior fisher) ja-post) + :code process-taskable-anim-loop + :post ja-post ) ;; definition for function fisher-spawn-ambient diff --git a/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc b/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc index 672f51d8a13..2075562decf 100644 --- a/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc @@ -126,10 +126,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-idle (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (loop @@ -152,10 +149,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-patrol (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :trans (behavior () (if (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) ((-> (method-of-type nav-enemy nav-enemy-patrol) trans)) @@ -204,16 +198,13 @@ nav-enemy-default-event-handler (hopper-do-jump) ) ) - :post (the-as (function none :behavior hopper) nav-enemy-jump-post) + :post nav-enemy-jump-post ) ;; failed to figure out what this is: (defstate nav-enemy-notice (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-chase) ) @@ -222,10 +213,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-chase (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :trans (behavior () (if (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) @@ -269,16 +257,13 @@ nav-enemy-default-event-handler (hopper-do-jump) ) ) - :post (the-as (function none :behavior hopper) nav-enemy-jump-post) + :post nav-enemy-jump-post ) ;; failed to figure out what this is: (defstate nav-enemy-stop-chase (hopper) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior hopper) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-stare) ) diff --git a/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc b/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc index c030e2c93e8..05304a7fa97 100644 --- a/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc @@ -1358,7 +1358,7 @@ (suspend) ) ) - :post (the-as (function none :behavior periscope) ja-post) + :post ja-post ) ;; definition for function target-close-to-point? @@ -1948,7 +1948,7 @@ ) ) ) - :post (the-as (function none :behavior reflector-mirror) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc index 32387760b95..7fb59b2c267 100644 --- a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc @@ -145,7 +145,7 @@ ) ) ) - :post (the-as (function none :behavior towertop) ja-post) + :post ja-post ) ;; definition for method 11 of type towertop @@ -205,7 +205,7 @@ ) ) ) - :trans (the-as (function none :behavior lurkerm-tall-sail) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max (* 0.5 (-> self speed))) :frame-num 0.0) @@ -220,7 +220,7 @@ ) ) ) - :post (the-as (function none :behavior lurkerm-tall-sail) rider-post) + :post rider-post ) ;; definition for method 11 of type lurkerm-tall-sail @@ -309,7 +309,7 @@ ) ) ) - :trans (the-as (function none :behavior lurkerm-short-sail) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max (* 0.5 (-> self speed))) :frame-num 0.0) @@ -324,7 +324,7 @@ ) ) ) - :post (the-as (function none :behavior lurkerm-short-sail) rider-post) + :post rider-post ) ;; definition for method 11 of type lurkerm-short-sail @@ -436,7 +436,7 @@ ) ) ) - :trans (the-as (function none :behavior lurkerm-piston) rider-trans) + :trans rider-trans :code (behavior () (loop (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max (-> self speed)) :frame-num 0.0) @@ -451,7 +451,7 @@ ) ) ) - :post (the-as (function none :behavior lurkerm-piston) rider-post) + :post rider-post ) ;; definition for method 11 of type lurkerm-piston @@ -785,7 +785,7 @@ (suspend) ) ) - :post (the-as (function none :behavior precurbridge) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -793,7 +793,7 @@ :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior precurbridge) rider-trans) + :trans rider-trans :code (behavior () (process-entity-status! self (entity-perm-status complete) #t) (sound-play "blue-eco-on" :position (the-as symbol (-> self root-override trans))) @@ -807,7 +807,7 @@ ) (go precurbridge-active #f) ) - :post (the-as (function none :behavior precurbridge) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -826,7 +826,7 @@ ) ) ) - :trans (the-as (function none :behavior precurbridge) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (set! (-> self draw bounds w) 81920.0) (when arg0 @@ -859,7 +859,7 @@ (suspend) ) ) - :post (the-as (function none :behavior precurbridge) rider-post) + :post rider-post ) ;; definition for method 11 of type precurbridge @@ -1147,7 +1147,7 @@ (suspend) ) ) - :post (the-as (function none :behavior maindoor) ja-post) + :post ja-post ) ;; definition for method 11 of type maindoor @@ -1282,7 +1282,7 @@ ;; failed to figure out what this is: (defstate jngpusher-idle (jngpusher) - :trans (the-as (function none :behavior jngpusher) rider-trans) + :trans rider-trans :code (behavior () (loop (ja :num-func num-func-identity @@ -1302,7 +1302,7 @@ (suspend) ) ) - :post (the-as (function none :behavior jngpusher) rider-post) + :post rider-post ) ;; definition for method 11 of type jngpusher diff --git a/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc b/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc index 25e7074c7de..b209d05684d 100644 --- a/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc @@ -39,10 +39,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-patrol (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (set! (-> self target-speed) (-> self nav-info walk-travel-speed)) ) @@ -102,10 +99,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-notice (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-chase) ) @@ -114,10 +108,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-chase (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) (if (and *target* (>= 8192.0 (vector-vector-distance (-> self collide-info trans) (-> *target* control trans)))) @@ -129,10 +120,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stop-chase (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -141,10 +129,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stare (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -153,10 +138,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-give-up (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (go-virtual nav-enemy-patrol) ) @@ -165,10 +147,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-attack (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! junglefish-chomp-ja :num! (seek!) :frame-num 0.0) @@ -178,16 +157,13 @@ nav-enemy-default-event-handler ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior junglefish) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate nav-enemy-victory (junglefish) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior junglefish) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (ja-no-eval :group! junglefish-swim-ja :num! (seek! max 2.0) :frame-num 0.0) diff --git a/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc b/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc index 86bd255b95f..fc29ee2d181 100644 --- a/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc @@ -424,7 +424,7 @@ junglesnake-default-event-handler ) (go junglesnake-tracking) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -486,7 +486,7 @@ junglesnake-default-event-handler ) ) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -553,7 +553,7 @@ junglesnake-default-event-handler ) (go junglesnake-tracking) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -596,15 +596,12 @@ junglesnake-default-event-handler (set-vector! (-> self root-override scale) 1.0 1.0 1.0 1.0) (go junglesnake-sleeping) ) - :post (the-as (function none :behavior junglesnake) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate junglesnake-die (junglesnake) - :event (the-as - (function process int symbol event-message-block object :behavior junglesnake) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (clear-collide-with-as (-> self root-override)) @@ -616,7 +613,7 @@ junglesnake-default-event-handler ) (cleanup-for-death self) ) - :post (the-as (function none :behavior junglesnake) ja-post) + :post ja-post ) ;; definition for method 23 of type junglesnake diff --git a/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc index 48d4275f8c9..c2334344240 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc @@ -218,7 +218,7 @@ (update-transforms! (-> self root-override)) (anim-loop) ) - :post (the-as (function none :behavior eggtop) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -303,7 +303,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior eggtop) rider-post) + :post rider-post ) ;; definition for method 11 of type eggtop diff --git a/test/decompiler/reference/jak1/levels/jungleb/plant-boss_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/plant-boss_REF.gc index 03a381025f1..c57153c7bf2 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/plant-boss_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/plant-boss_REF.gc @@ -307,7 +307,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -329,7 +329,7 @@ ) (go plant-boss-arm-idle) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -397,7 +397,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -424,7 +424,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -463,7 +463,7 @@ ) (go plant-boss-back-arms-idle) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -489,7 +489,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -515,7 +515,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -537,7 +537,7 @@ ) (go plant-boss-vine-idle) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -561,7 +561,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -584,7 +584,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -599,7 +599,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-arm) ja-post) + :post ja-post ) ;; definition for function plant-boss-arm-init @@ -763,7 +763,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss-leaf) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -778,7 +778,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.1)) @@ -820,7 +820,7 @@ ) (go plant-boss-leaf-open-idle #f) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -844,7 +844,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (local-vars (v1-19 symbol)) (set! (-> self state-object) arg0) @@ -868,7 +868,7 @@ ) (go plant-boss-leaf-close) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -887,7 +887,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (case (-> self side) @@ -910,7 +910,7 @@ ) (go plant-boss-leaf-open-idle (-> self state-object)) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -922,7 +922,7 @@ ) ) ) - :trans (the-as (function none :behavior plant-boss-leaf) rider-trans) + :trans rider-trans :code (behavior () (case (-> self side) ((1) @@ -944,7 +944,7 @@ ) (go plant-boss-leaf-idle #f) ) - :post (the-as (function none :behavior plant-boss-leaf) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -955,7 +955,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plant-boss-leaf) ja-post) + :post ja-post ) ;; definition for function plant-boss-leaf-init @@ -1033,7 +1033,7 @@ ) ) ) - :post (the-as (function none :behavior plant-boss) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1123,7 +1123,7 @@ (set! (-> self snap-count) 0) (go plant-boss-reset 0) ) - :post (the-as (function none :behavior plant-boss) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1495,9 +1495,9 @@ (send-event *camera* 'change-state cam-lookat 0) (logior! (-> self skel status) (janim-status inited)) (ja-channel-push! 2 (seconds 0.1)) - (ja :group! (-> self draw art-group data 18) :num! (identity (ja-aframe f30-1 0))) + (ja :group! plant-boss-main-plant-boss-kill-ja :num! (identity (ja-aframe f30-1 0))) (ja :chan 1 - :group! (-> self draw art-group data 19) + :group! plant-boss-main-plant-boss-kill-close-ja :num! (identity (ja-aframe f30-1 0)) :frame-interp (-> self interp) ) @@ -1779,7 +1779,7 @@ ;; failed to figure out what this is: (defstate plant-boss-dead-bounce (plant-boss) :event plant-boss-generic-event-handler - :trans (the-as (function none :behavior plant-boss) rider-trans) + :trans rider-trans :code (behavior ((arg0 float)) (let ((v1-2 (-> self entity extra perm))) (if (and (< 0.3 arg0) (and (not (handle->process (-> self money))) (< (-> v1-2 user-int8 1) 5))) @@ -1805,7 +1805,7 @@ ) (go plant-boss-dead-idle) ) - :post (the-as (function none :behavior plant-boss) rider-post) + :post rider-post ) ;; definition for method 11 of type plant-boss diff --git a/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc index cd2274af79b..c3abaff6b69 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc @@ -59,7 +59,7 @@ ) ) ) - :trans (the-as (function none :behavior plat-flip) rider-trans) + :trans rider-trans :code (behavior () (local-vars (f30-0 float) (f30-1 float)) (let ((gp-0 #f)) @@ -111,7 +111,7 @@ ) ) ) - :post (the-as (function none :behavior plat-flip) rider-post) + :post rider-post ) ;; definition for method 11 of type plat-flip diff --git a/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc b/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc index c96bbc9950d..031f6c85472 100644 --- a/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc +++ b/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc @@ -451,7 +451,7 @@ (go energydoor-closed-till-task) ) ) - :post (the-as (function none :behavior energydoor) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -507,7 +507,7 @@ ) (go energydoor-opened) ) - :post (the-as (function none :behavior energydoor) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -684,7 +684,7 @@ ) ) ) - :post (the-as (function none :behavior energybase) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -708,7 +708,7 @@ ) ) ) - :post (the-as (function none :behavior energybase) ja-post) + :post ja-post ) ;; definition for method 11 of type energybase @@ -898,7 +898,7 @@ ) ) ) - :post (the-as (function none :behavior energyball) rider-post) + :post rider-post ) ;; definition for function energyball-init @@ -1001,7 +1001,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1050,7 +1050,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1079,7 +1079,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1145,7 +1145,7 @@ ) ) ) - :post (the-as (function none :behavior energyarm) rider-post) + :post rider-post ) ;; definition for function energyarm-init @@ -1306,7 +1306,7 @@ ) ) ) - :post (the-as (function none :behavior energyhub) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1384,7 +1384,7 @@ ) ) ) - :post (the-as (function none :behavior energyhub) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1457,7 +1457,7 @@ ) ) ) - :post (the-as (function none :behavior energyhub) ja-post) + :post ja-post ) ;; definition for method 11 of type energyhub @@ -1537,7 +1537,7 @@ ) ) ) - :post (the-as (function none :behavior energylava) ja-post) + :post ja-post ) ;; definition for method 11 of type energylava diff --git a/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc b/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc index 8cbf550402b..6ebac18490b 100644 --- a/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc @@ -39,7 +39,7 @@ ) ) ) - :post (the-as (function none :behavior lavabase) ja-post) + :post ja-post ) ;; definition for method 11 of type lavabase @@ -90,7 +90,7 @@ ) ) ) - :post (the-as (function none :behavior lavafall) ja-post) + :post ja-post ) ;; definition for method 11 of type lavafall @@ -141,7 +141,7 @@ ) ) ) - :post (the-as (function none :behavior lavashortcut) ja-post) + :post ja-post ) ;; definition for method 11 of type lavashortcut @@ -692,7 +692,7 @@ (suspend) ) ) - :post (the-as (function none :behavior darkecobarrel-mover) pusher-post) + :post pusher-post ) ;; definition for function darkecobarrel-mover-init-by-other @@ -908,7 +908,7 @@ ) ) ) - :post (the-as (function none :behavior lavafallsewera) ja-post) + :post ja-post ) ;; definition for method 11 of type lavafallsewera @@ -958,7 +958,7 @@ ) ) ) - :post (the-as (function none :behavior lavafallsewerb) ja-post) + :post ja-post ) ;; definition for method 11 of type lavafallsewerb @@ -1193,7 +1193,7 @@ ) ) ) - :post (the-as (function none :behavior chainmine) ja-post) + :post ja-post ) ;; definition for method 11 of type chainmine @@ -1381,7 +1381,7 @@ ) ) ) - :post (the-as (function none :behavior lavaballoon) transform-post) + :post transform-post ) ;; definition for method 11 of type lavaballoon @@ -1511,7 +1511,7 @@ ) ) ) - :post (the-as (function none :behavior lavayellowtarp) ja-post) + :post ja-post ) ;; definition for method 11 of type lavayellowtarp diff --git a/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc b/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc index 7183cf71df4..fa03fcb3578 100644 --- a/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc @@ -361,7 +361,7 @@ baby-spider-default-event-handler ) (go baby-spider-resume) ) - :post (the-as (function none :behavior baby-spider) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -662,10 +662,7 @@ baby-spider-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-die (baby-spider) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior baby-spider) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :enter (behavior () (let ((v1-0 (-> self event-death))) (if v1-0 diff --git a/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc b/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc index 295d920eaa6..9150334fabd 100644 --- a/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc @@ -551,10 +551,7 @@ ;; failed to figure out what this is: (defstate dark-crystal-spawn-fuel-cell (dark-crystal) - :event (the-as - (function process int symbol event-message-block object :behavior dark-crystal) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (clear-collide-with-as (-> self root-override)) diff --git a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc index a42a8daf440..cc6f867b7c2 100644 --- a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc @@ -666,7 +666,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -718,7 +718,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -760,7 +760,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -817,7 +817,7 @@ ) (go driller-lurker-patrol) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -881,7 +881,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -924,7 +924,7 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -958,15 +958,12 @@ ) ) ) - :post (the-as (function none :behavior driller-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate driller-lurker-die (driller-lurker) - :event (the-as - (function process int symbol event-message-block object :behavior driller-lurker) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (shut-down! (-> self neck)) (logclear! (-> self mask) (process-mask actor-pause)) @@ -983,7 +980,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior driller-lurker) ja-post) + :post ja-post ) ;; definition for method 7 of type driller-lurker diff --git a/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc b/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc index 50e296e8d41..145ee8dab45 100644 --- a/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc @@ -414,7 +414,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior gnawer-falling-segment) ja-post) + :post ja-post ) ;; definition for function gnawer-falling-segment-init-by-other @@ -1004,7 +1004,7 @@ ) ) ) - :post (the-as (function none :behavior gnawer) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1023,7 +1023,7 @@ (quaternion-identity! (-> self root-override quat)) (go gnawer-wait-to-run) ) - :post (the-as (function none :behavior gnawer) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1138,7 +1138,7 @@ (ja :group! gnawer-run-ja :num! min) ) ) - :post (the-as (function none :behavior gnawer) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1180,7 +1180,7 @@ ) (go gnawer-dying-give-pickups) ) - :post (the-as (function none :behavior gnawer) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc index 282892d97d9..62873ec037d 100644 --- a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc @@ -179,7 +179,7 @@ ) ) ) - :post (the-as (function none :behavior cavecrusher) ja-post) + :post ja-post ) ;; definition for method 11 of type cavecrusher @@ -340,7 +340,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior cavetrapdoor) pusher-post) + :post pusher-post ) ;; definition for method 11 of type cavetrapdoor @@ -757,7 +757,7 @@ (suspend) ) ) - :post (the-as (function none :behavior cavespatula) rider-post) + :post rider-post ) ;; definition for method 11 of type cavespatula @@ -880,7 +880,7 @@ (suspend) ) ) - :post (the-as (function none :behavior cavespatulatwo) rider-post) + :post rider-post ) ;; definition for method 11 of type cavespatulatwo diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc index 85d0204e011..823dd7d5757 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc @@ -274,7 +274,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider-egg) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -343,7 +343,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider-egg) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -390,7 +390,7 @@ 0 (go mother-spider-egg-die-exit) ) - :post (the-as (function none :behavior mother-spider-egg) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -422,7 +422,7 @@ ) (go mother-spider-egg-die-exit) ) - :post (the-as (function none :behavior mother-spider-egg) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -462,7 +462,7 @@ ) (go mother-spider-egg-die-exit) ) - :post (the-as (function none :behavior mother-spider-egg) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc index d7136376d98..b3ab6336330 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc @@ -156,7 +156,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider-leg) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -167,7 +167,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mother-spider) ja-post) + :post ja-post ) ;; definition for function mother-spider-leg-init-by-other @@ -976,7 +976,7 @@ (ja :group! mother-spider-lowering-ja :num! min) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1014,7 +1014,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1110,7 +1110,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1145,7 +1145,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1220,7 +1220,7 @@ (go mother-spider-traveling (the-as uint 2)) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1280,7 +1280,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1326,7 +1326,7 @@ ) (go mother-spider-birthing) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; definition for method 20 of type mother-spider @@ -1444,7 +1444,7 @@ ) ) ) - :post (the-as (function none :behavior mother-spider) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1497,7 +1497,7 @@ ) (go mother-spider-die-wait-for-children) ) - :post (the-as (function none :behavior mother-spider) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1522,7 +1522,7 @@ ) (go mother-spider-die-wait-for-children) ) - :post (the-as (function none :behavior mother-spider) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc b/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc index 7e9b0d31a55..5774c7cd19c 100644 --- a/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc @@ -126,7 +126,7 @@ ) (go spiderwebs-idle) ) - :post (the-as (function none :behavior spiderwebs) transform-post) + :post transform-post ) ;; definition for method 11 of type spiderwebs diff --git a/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc b/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc index 099527b331a..039c1bd2d0c 100644 --- a/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc @@ -33,10 +33,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-idle (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (and (and *target* (>= (-> self enemy-info idle-distance) (vector-vector-distance (-> self collide-info trans) (-> *target* control trans)) @@ -57,16 +54,13 @@ nav-enemy-default-event-handler ) (anim-loop) ) - :post (the-as (function none :behavior babak-with-cannon) #f) + :post #f ) ;; failed to figure out what this is: (defstate nav-enemy-patrol (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.1)) (let ((f30-0 (- (-> (target-pos 0) y) (-> self collide-info trans y)))) @@ -98,10 +92,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate babak-run-to-cannon (babak) - :event (the-as - (function process int symbol event-message-block object :behavior babak) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self nav destination-pos quad) (-> self entity extra trans quad)) @@ -185,10 +176,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate babak-with-cannon-jump-onto-cannon (babak-with-cannon) - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :exit (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate enable-travel)) ) @@ -253,15 +241,12 @@ nav-enemy-default-event-handler ) (go babak-with-cannon-shooting) ) - :post (the-as (function none :behavior babak-with-cannon) nav-enemy-jump-post) + :post nav-enemy-jump-post ) ;; failed to figure out what this is: (defstate babak-with-cannon-jump-off-cannon (babak-with-cannon) - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-jump-event-handler - ) + :event nav-enemy-jump-event-handler :exit (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate enable-travel)) ) @@ -286,15 +271,12 @@ nav-enemy-default-event-handler ) (go-virtual nav-enemy-jump-land) ) - :post (the-as (function none :behavior babak-with-cannon) nav-enemy-jump-post) + :post nav-enemy-jump-post ) ;; failed to figure out what this is: (defstate babak-with-cannon-shooting (babak-with-cannon) - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (let ((v1-2 (entity-actor-lookup (-> self entity) 'alt-actor 0))) @@ -334,10 +316,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-die (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (if (and *target* (= (-> *target* current-level name) 'beach)) (spool-push *art-control* "beachcam-cannon" 0 self -1.0) @@ -356,10 +335,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-fuel-cell (babak-with-cannon) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior babak-with-cannon) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (ja-channel-set! 0) (clear-collide-with-as (-> self collide-info)) diff --git a/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc index 824263a6c39..c821711a7b5 100644 --- a/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc @@ -832,7 +832,7 @@ ;; failed to figure out what this is: (defstate balloonlurker-die (balloonlurker) - :event (the-as (function process int symbol event-message-block object :behavior balloonlurker) #f) + :event #f :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self vulnerable) #f) @@ -943,10 +943,7 @@ ;; failed to figure out what this is: (defstate balloonlurker-pilot-die (balloonlurker-pilot) - :event (the-as - (function process int symbol event-message-block object :behavior balloonlurker-pilot) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (process-spawn part-tracker diff --git a/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc index 2a07bde3469..74fba02f6d9 100644 --- a/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc @@ -170,10 +170,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-idle (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :exit (behavior () (bonelurker-set-large-bounds-sphere) ) @@ -186,10 +183,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-patrol (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.2)) ((the-as (function none :behavior bonelurker) (-> (method-of-type nav-enemy nav-enemy-patrol) code))) @@ -199,20 +193,14 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-notice (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (-> (method-of-type nav-enemy nav-enemy-notice) code) ) ;; failed to figure out what this is: (defstate nav-enemy-chase (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) (if (and (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags navenmf6))) @@ -290,20 +278,14 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-stop-chase (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (-> (method-of-type nav-enemy nav-enemy-stop-chase) code) ) ;; failed to figure out what this is: (defstate nav-enemy-stare (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 524288.0) (set! (-> self turn-time) (seconds 0.2)) @@ -352,10 +334,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-give-up (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (set! (-> self rotate-speed) 524288.0) (set! (-> self turn-time) (seconds 0.1)) @@ -405,10 +384,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-victory (bonelurker) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bonelurker) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (-> (method-of-type nav-enemy nav-enemy-victory) code) ) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc index 484b6cd9c1e..6d4d736b405 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc @@ -223,7 +223,7 @@ (suspend) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) ;; failed to figure out what this is: @@ -258,7 +258,7 @@ ) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) ;; failed to figure out what this is: @@ -374,7 +374,7 @@ ) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) ;; failed to figure out what this is: @@ -414,17 +414,17 @@ ) ) ) - :post (the-as (function none :behavior keg) keg-post) + :post keg-post ) ;; failed to figure out what this is: (defstate keg-die (keg) - :event (the-as (function process int symbol event-message-block object :behavior keg) #f) + :event #f :code (behavior () (sound-stop (-> self sound-id)) (cleanup-for-death self) ) - :post (the-as (function none :behavior keg) transform-post) + :post transform-post ) ;; definition for function keg-init-by-other @@ -506,7 +506,7 @@ (suspend) ) ) - :post (the-as (function none :behavior keg-conveyor) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -572,7 +572,7 @@ ) ) ) - :post (the-as (function none :behavior keg-conveyor-paddle) transform-post) + :post transform-post ) ;; definition for function keg-conveyor-paddle-init-by-other diff --git a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc index 74b64e0ee75..b4cd85f5c5c 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc @@ -1094,7 +1094,7 @@ (suspend) ) ) - :post (the-as (function none :behavior boatpaddle) ja-post) + :post ja-post ) ;; definition for method 11 of type boatpaddle @@ -1166,7 +1166,7 @@ (suspend) ) ) - :post (the-as (function none :behavior windturbine) ja-post) + :post ja-post ) ;; definition for method 11 of type windturbine @@ -1277,13 +1277,13 @@ (suspend) ) ) - :post (the-as (function none :behavior mis-bone-bridge) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate mis-bone-bridge-bump (mis-bone-bridge) :event mis-bone-bridge-event-handler - :trans (the-as (function none :behavior mis-bone-bridge) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) @@ -1292,13 +1292,13 @@ ) (go mis-bone-bridge-idle) ) - :post (the-as (function none :behavior mis-bone-bridge) rider-post) + :post rider-post ) ;; failed to figure out what this is: (defstate mis-bone-bridge-hit (mis-bone-bridge) :event mis-bone-bridge-event-handler - :trans (the-as (function none :behavior mis-bone-bridge) rider-trans) + :trans rider-trans :code (behavior () (+! (-> self hit-points) -1) (if (zero? (-> self hit-points)) @@ -1311,12 +1311,12 @@ ) (go mis-bone-bridge-idle) ) - :post (the-as (function none :behavior mis-bone-bridge) rider-post) + :post rider-post ) ;; failed to figure out what this is: (defstate mis-bone-bridge-fall (mis-bone-bridge) - :trans (the-as (function none :behavior mis-bone-bridge) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status complete) #t) (when (not arg0) @@ -1344,7 +1344,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mis-bone-bridge) rider-post) + :post rider-post ) ;; definition for method 11 of type mis-bone-bridge @@ -1460,8 +1460,8 @@ ) ) ) - :code (the-as (function none :behavior breakaway) anim-loop) - :post (the-as (function none :behavior breakaway) transform-post) + :code anim-loop + :post transform-post ) ;; definition for function actor-wait-for-period @@ -1498,7 +1498,7 @@ ) ) ) - :post (the-as (function none :behavior breakaway) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1519,7 +1519,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior breakaway) rider-post) + :post rider-post ) ;; definition for method 20 of type breakaway @@ -1745,16 +1745,13 @@ (suspend) ) ) - :post (the-as (function none :behavior bone-platform) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate rigid-body-platform-float (bone-platform) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior bone-platform) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :trans (behavior () (-> self entity extra trans y) (cond @@ -1782,7 +1779,7 @@ (suspend) ) ) - :post (the-as (function none :behavior bone-platform) rigid-body-platform-post) + :post rigid-body-platform-post ) ;; definition for method 30 of type bone-platform @@ -2047,15 +2044,12 @@ ) ) ) - :code (the-as (function none :behavior boat-fuelcell) anim-loop) + :code anim-loop ) ;; failed to figure out what this is: (defstate boat-fuelcell-spawn (boat-fuelcell) - :event (the-as - (function process int symbol event-message-block object :behavior boat-fuelcell) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (process-drawable-birth-fuel-cell (the-as entity #f) (the-as vector #f) #f) (when (and *target* (-> self play-cutscene?)) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc index 180e73b4763..e73811c774d 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc @@ -74,7 +74,7 @@ (suspend) ) ) - :post (the-as (function none :behavior teetertotter) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -128,7 +128,7 @@ ) (go teetertotter-idle) ) - :post (the-as (function none :behavior teetertotter) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -141,7 +141,7 @@ ) (go teetertotter-idle) ) - :post (the-as (function none :behavior teetertotter) rider-post) + :post rider-post ) ;; definition for method 11 of type teetertotter diff --git a/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc index f151ff93ee7..c3b4bd26d91 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc @@ -52,7 +52,7 @@ (suspend) ) ) - :post (the-as (function none :behavior silostep) ja-post) + :post ja-post ) ;; definition for function misty-camera-view @@ -105,7 +105,7 @@ (send-to-all-after (-> self link) 'trigger-rise) (go silostep-rise #f) ) - :post (the-as (function none :behavior silostep) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -128,7 +128,7 @@ (suspend) ) ) - :post (the-as (function none :behavior silostep) #f) + :post #f ) ;; definition for method 11 of type silostep diff --git a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc index 9d10e105136..57bf5c9b675 100644 --- a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc @@ -878,7 +878,7 @@ ) (ja-channel-set! 0) ) - :post (the-as (function none :behavior mistycannon-missile) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -970,7 +970,7 @@ (kill-and-free-particles (-> self part2)) (deactivate self) ) - :post (the-as (function none :behavior mistycannon-missile) ja-post) + :post ja-post ) ;; definition for function mistycannon-collision-reaction @@ -1365,7 +1365,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) ;; definition of type quadratic-solution @@ -1583,7 +1583,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1655,7 +1655,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1776,7 +1776,7 @@ ) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1800,7 +1800,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) - :trans (the-as (function none :behavior mistycannon) rider-trans) + :trans rider-trans :code (behavior () (loop (suspend) @@ -1810,7 +1810,7 @@ ) ) ) - :post (the-as (function none :behavior mistycannon) rider-post) + :post rider-post ) ;; definition for method 11 of type mistycannon diff --git a/test/decompiler/reference/jak1/levels/misty/muse_REF.gc b/test/decompiler/reference/jak1/levels/misty/muse_REF.gc index 693bb6f52ba..1dca49a42c3 100644 --- a/test/decompiler/reference/jak1/levels/misty/muse_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/muse_REF.gc @@ -216,10 +216,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate muse-idle (muse) - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :trans (behavior () (seek! (-> self sprint-distance) 61440.0 (* 8192.0 (-> *display* seconds-per-frame))) (if (and *target* (>= 102400.0 (vector-vector-distance (-> self collide-info trans) (-> *target* control trans)))) @@ -250,16 +247,13 @@ nav-enemy-default-event-handler ) ) ) - :post (the-as (function none :behavior muse) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate nav-enemy-chase (muse) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -327,10 +321,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-jump (muse) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () ((-> (method-of-type nav-enemy nav-enemy-jump) enter)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags standing-jump)) @@ -341,10 +332,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate nav-enemy-jump-land (muse) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior muse) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-no-eval :num! (seek!)) (ja-channel-push! 1 (seconds 0.075)) @@ -360,7 +348,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate muse-caught (muse) - :event (the-as (function process int symbol event-message-block object :behavior muse) #f) + :event #f :trans (behavior () (spool-push *art-control* (-> self anim name) 0 self -1.0) ) diff --git a/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc index 2244491563b..df721054945 100644 --- a/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc @@ -615,7 +615,7 @@ ;; failed to figure out what this is: (defstate quicksandlurker-idle (quicksandlurker) - :event (the-as (function process int symbol event-message-block object :behavior quicksandlurker) #f) + :event #f :enter (behavior () (logior! (-> self draw status) (draw-status hidden)) ) @@ -634,7 +634,7 @@ (suspend) ) ) - :post (the-as (function none :behavior quicksandlurker) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -916,10 +916,7 @@ ;; failed to figure out what this is: (defstate quicksandlurker-die (quicksandlurker) - :event (the-as - (function process int symbol event-message-block object :behavior quicksandlurker) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (ja-channel-push! 1 (seconds 0.2)) diff --git a/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc b/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc index efc64fdfeea..6ff91926906 100644 --- a/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc @@ -162,7 +162,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plunger-lurker) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -218,7 +218,7 @@ (suspend) ) ) - :post (the-as (function none :behavior plunger-lurker) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -247,7 +247,7 @@ ) ) ) - :post (the-as (function none :behavior plunger-lurker) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -788,7 +788,7 @@ ) ) ) - :post (the-as (function none :behavior flying-lurker) ja-post) + :post ja-post ) ;; definition for function flying-lurker-handler @@ -1013,7 +1013,7 @@ ) ) ) - :post (the-as (function none :behavior flying-lurker) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1238,7 +1238,7 @@ ) ) ) - :post (the-as (function none :behavior flying-lurker) ja-post) + :post ja-post ) ;; definition for method 11 of type flying-lurker diff --git a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc index 4c7efefb9b3..5f0d60c5a44 100644 --- a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc @@ -536,16 +536,13 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-plat) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate rigid-body-platform-float (ogre-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior ogre-plat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :trans (behavior () (cond ((or (not *target*) (< (-> self info idle-distance) @@ -570,7 +567,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-plat) rigid-body-platform-post) + :post rigid-body-platform-post ) ;; definition for method 30 of type ogre-plat @@ -1063,7 +1060,7 @@ ) (go ogre-bridge-activated) ) - :post (the-as (function none :behavior ogre-bridge) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1090,7 +1087,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-bridge) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1128,7 +1125,7 @@ ) (go ogre-bridge-idle) ) - :post (the-as (function none :behavior ogre-bridge) rider-post) + :post rider-post ) ;; definition for symbol *ogre-bridge-joint-array*, type (array uint8) @@ -1459,7 +1456,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogre-lava) #f) + :post #f ) ;; failed to figure out what this is: @@ -1644,7 +1641,7 @@ (cleanup-for-death self) (deactivate self) ) - :post (the-as (function none :behavior shortcut-boulder) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc b/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc index 34be2e759b9..3f0e3989e63 100644 --- a/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc @@ -150,7 +150,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ogreboss-missile) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -329,7 +329,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ogreboss-missile) ja-post) + :post ja-post ) ;; definition of type ogreboss-missile-init-data @@ -571,7 +571,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) ;; definition for function ogreboss-super-boulder-impact-effect @@ -639,7 +639,7 @@ ) (go ogreboss-super-boulder-land) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -650,7 +650,7 @@ (ogreboss-super-boulder-play-hit-anim) (go ogreboss-super-boulder-land) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -666,7 +666,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ogreboss-super-boulder) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1211,7 +1211,7 @@ (ogreboss-reset-camera) (ogreboss-idle-loop) ) - :post (the-as (function none :behavior ogreboss) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1253,7 +1253,7 @@ (set-setting! 'music 'ogreboss 0.0 0) (go ogreboss-wait-for-player) ) - :post (the-as (function none :behavior ogreboss) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1271,7 +1271,7 @@ :code (behavior () (ogreboss-idle-loop) ) - :post (the-as (function none :behavior ogreboss) ja-post) + :post ja-post ) ;; definition for function ogreboss-debug-adjust-difficulty @@ -1967,7 +1967,7 @@ (set! (-> self bridge-assembled) #f) (go ogreboss-stage1) ) - :post (the-as (function none :behavior ogreboss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1991,7 +1991,7 @@ ) (go ogreboss-stage1) ) - :post (the-as (function none :behavior ogreboss) transform-post) + :post transform-post ) ;; definition for function ogreboss-trigger-steps @@ -2040,10 +2040,7 @@ ;; failed to figure out what this is: (defstate ogreboss-dead (ogreboss) - :event (the-as - (function process int symbol event-message-block object :behavior ogreboss) - process-drawable-fuel-cell-handler - ) + :event process-drawable-fuel-cell-handler :code (behavior () (remove-setting! 'music) (ogreboss-reset-camera) diff --git a/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc index 8d83c7646b8..fe57f7160f3 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc @@ -59,7 +59,7 @@ ) ;; failed to figure out what this is: -(defskelgroup *racer-sg* racer racer-geo-jg 3 +(defskelgroup *racer-sg* racer racer-geo-jg racer-racer-idle-ja ((racer-geo-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.5) :shadow racer-shadow-mg @@ -140,7 +140,7 @@ (case (current-status gp-0) (((task-status need-reward-speech)) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! racer-racer-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (ja-post) @@ -226,7 +226,7 @@ :exit (-> (method-of-type racer wait-for-start) exit) :code (behavior () (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! racer-racer-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) 0.0 @@ -270,7 +270,7 @@ ) ) ) - :post (the-as (function none :behavior racer) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -280,7 +280,7 @@ (case message (('draw) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! racer-racer-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (transform-post) diff --git a/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc b/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc index 72d356ef237..433817fdc47 100644 --- a/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc +++ b/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc @@ -114,7 +114,7 @@ ) ) ) - :post (the-as (function none :behavior spider-egg) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -155,7 +155,7 @@ (suspend) ) ) - :post (the-as (function none :behavior spider-egg) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -214,7 +214,7 @@ (suspend) ) ) - :post (the-as (function none :behavior spider-egg) ja-post) + :post ja-post ) ;; definition for method 11 of type spider-egg diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc index e2ef3c6b872..20c40a0c559 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc @@ -535,7 +535,7 @@ ) ) ) - :post (the-as (function none :behavior fleeing-nav-enemy) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; definition for symbol *lightning-mole-hole*, type vector @@ -656,7 +656,7 @@ (set! (-> self speed-adjust) 1.0) ) :code lightning-mole-run-code - :post (the-as (function none :behavior lightning-mole) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -857,14 +857,14 @@ ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior lightning-mole) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate nav-enemy-stop-chase (lightning-mole) :virtual #t :code lightning-mole-run-code - :post (the-as (function none :behavior lightning-mole) fleeing-nav-enemy-chase-post) + :post fleeing-nav-enemy-chase-post ) ;; failed to figure out what this is: @@ -932,7 +932,7 @@ ((-> (method-of-type fleeing-nav-enemy nav-enemy-chase) trans)) ) :code lightning-mole-run-code - :post (the-as (function none :behavior lightning-mole) fleeing-nav-enemy-chase-post) + :post fleeing-nav-enemy-chase-post ) ;; definition for method 43 of type lightning-mole @@ -1290,7 +1290,7 @@ (suspend) ) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1307,7 +1307,7 @@ (logior! (-> self draw status) (draw-status hidden)) (go peeper-wait) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1354,7 +1354,7 @@ ) (go peeper-up) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1387,7 +1387,7 @@ (go peeper-down) ) ) - :post (the-as (function none :behavior peeper) ja-post) + :post ja-post ) ;; definition for method 11 of type peeper diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc index 580ae6606a4..097b7652af6 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc @@ -172,7 +172,7 @@ ;; failed to figure out what this is: (defstate pusher-idle (pusher) - :trans (the-as (function none :behavior pusher) rider-trans) + :trans rider-trans :code (behavior () (loop (let ((f0-0 -1.0)) @@ -190,7 +190,7 @@ (suspend) ) ) - :post (the-as (function none :behavior pusher) rider-post) + :post rider-post ) ;; definition for method 11 of type pusher @@ -213,7 +213,7 @@ ;; failed to figure out what this is: (defstate gorge-pusher-idle (gorge-pusher) - :trans (the-as (function none :behavior gorge-pusher) rider-trans) + :trans rider-trans :code (behavior () (loop (if (task-closed? (game-task rolling-race) (task-status need-introduction)) @@ -223,7 +223,7 @@ (suspend) ) ) - :post (the-as (function none :behavior gorge-pusher) rider-post) + :post rider-post ) ;; definition for method 11 of type gorge-pusher @@ -364,7 +364,7 @@ ) (go dark-plant-idle) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -399,7 +399,7 @@ ) ) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -415,7 +415,7 @@ ) (go dark-plant-gone) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -470,7 +470,7 @@ ) ) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -492,7 +492,7 @@ ) (go dark-plant-idle) ) - :post (the-as (function none :behavior dark-plant) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -616,7 +616,7 @@ ) ) ) - :post (the-as (function none :behavior happy-plant) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -687,7 +687,7 @@ (restore-collide-with-as (-> self root-override)) (go happy-plant-opened) ) - :post (the-as (function none :behavior happy-plant) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -719,7 +719,7 @@ ) ) ) - :post (the-as (function none :behavior happy-plant) ja-post) + :post ja-post ) ;; definition for method 11 of type happy-plant @@ -951,7 +951,7 @@ ) ) ) - :post (the-as (function none :behavior rolling-start) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -977,7 +977,7 @@ ) ) ) - :post (the-as (function none :behavior rolling-start) ja-post) + :post ja-post ) ;; definition for function rolling-start-init-by-other @@ -1155,7 +1155,7 @@ ;; failed to figure out what this is: (defstate gorge-abort-idle (gorge-abort) - :trans (the-as (function none :behavior gorge-abort) gorge-trans) + :trans gorge-trans :code (behavior () (loop (suspend) @@ -1179,7 +1179,7 @@ ;; failed to figure out what this is: (defstate gorge-finish-idle (gorge-finish) - :trans (the-as (function none :behavior gorge-finish) gorge-trans) + :trans gorge-trans :code (behavior () (loop (suspend) @@ -1491,7 +1491,7 @@ (send-event (handle->process (-> self start-banner)) 'unbreak) (remove-setting! 'sound-flava) ) - :trans (the-as (function none :behavior gorge-start) gorge-trans) + :trans gorge-trans :code (behavior () (set! (-> self state-time) (-> *display* game-frame-counter)) (loop @@ -1509,7 +1509,7 @@ ;; failed to figure out what this is: (defstate gorge-start-ready (gorge-start) - :trans (the-as (function none :behavior gorge-start) gorge-trans) + :trans gorge-trans :code (behavior () (loop (suspend) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc index 811ee2c80b2..a14dc92a385 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc @@ -948,7 +948,7 @@ ) ) ) - :post (the-as (function none :behavior race-ring) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc index 4e99746e42a..3a0921b8ccc 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc @@ -3,7 +3,7 @@ ;; failed to figure out what this is: (defstate fuel-cell-spline-slider (fuel-cell) - :trans (the-as (function none :behavior fuel-cell) hide-hud-quick) + :trans hide-hud-quick :code (behavior ((arg0 handle) (arg1 float) (arg2 float)) (logclear! (-> self mask) (process-mask actor-pause)) (ja :group! (-> self draw art-group data 2)) @@ -344,7 +344,7 @@ ) ) ) - :post (the-as (function none :behavior robber) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -357,10 +357,7 @@ ;; failed to figure out what this is: (defstate robber-die (robber) - :event (the-as - (function process int symbol event-message-block object :behavior robber) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior () (let ((gp-0 #t)) (when (robber-task-complete?) @@ -422,7 +419,7 @@ ) (go robber-dead) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -458,7 +455,7 @@ (suspend) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -513,7 +510,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -582,7 +579,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -610,7 +607,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -653,7 +650,7 @@ (go robber-flee) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -680,7 +677,7 @@ ) ) ) - :post (the-as (function none :behavior robber) transform-post) + :post transform-post ) ;; definition for method 11 of type robber diff --git a/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc b/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc index af0dca86cf4..4034190050d 100644 --- a/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc @@ -864,7 +864,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; failed to figure out what this is: @@ -888,7 +888,7 @@ (go-virtual nav-enemy-idle) ) ) - :post (the-as (function none :behavior ice-cube) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -932,16 +932,16 @@ ;; failed to figure out what this is: (defstate nav-enemy-notice (ice-cube) :virtual #t - :enter (the-as (function none :behavior ice-cube) #f) - :exit (the-as (function none :behavior ice-cube) #f) - :trans (the-as (function none :behavior ice-cube) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (nav-enemy-method-57 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (logclear! (-> self mask) (process-mask actor-pause)) (go ice-cube-face-player) ) - :post (the-as (function none :behavior ice-cube) #f) + :post #f ) ;; failed to figure out what this is: @@ -1032,7 +1032,7 @@ ) (go ice-cube-become-mean) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1058,7 +1058,7 @@ ) (go ice-cube-mean-turn-to-charge) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 54 of type ice-cube @@ -1169,7 +1169,7 @@ ) (go ice-cube-mean-charge) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1327,7 +1327,7 @@ (ja :chan 1 :num! (chan 0) :frame-interp (-> self anim-blend)) ) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1360,7 +1360,7 @@ ) (go ice-cube-tired) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1403,7 +1403,7 @@ ) ) ) - :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc index e240670d7f2..141b08c0ac0 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc @@ -184,7 +184,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-ball-shadow) ja-post) + :post ja-post ) ;; definition for function snow-ball-shadow-init-by-other @@ -468,7 +468,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-ball-roller) transform-post) + :post transform-post ) ;; definition for function snow-ball-roller-init-by-other diff --git a/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc index 38452811e11..c4b1e538c59 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc @@ -235,7 +235,7 @@ (stop! (-> self sound)) (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior snow-bumper) rider-trans) + :trans rider-trans :code (behavior () (local-vars (sv-16 symbol)) (logclear! (-> self mask) (process-mask actor-pause)) @@ -266,7 +266,7 @@ ) (go snow-bumper-inactive-idle) ) - :post (the-as (function none :behavior snow-bumper) rider-post) + :post rider-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc index ca99af058d8..1634996253f 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc @@ -359,7 +359,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior snow-bunny) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -390,8 +390,8 @@ ;; failed to figure out what this is: (defstate nav-enemy-patrol (snow-bunny) :virtual #t - :enter (the-as (function none :behavior snow-bunny) #f) - :trans (the-as (function none :behavior snow-bunny) #f) + :enter #f + :trans #f :code (behavior () (go-virtual snow-bunny-nav-resume) ) @@ -492,7 +492,7 @@ ) ) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 51 of type snow-bunny @@ -662,7 +662,7 @@ (go-virtual snow-bunny-patrol-hop) ) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-jump-post) + :post nav-enemy-jump-post ) ;; failed to figure out what this is: @@ -679,7 +679,7 @@ (snow-bunny-method-76 self #t) (set-vector! (-> self collide-info transv) 0.0 (nav-enemy-rnd-float-range 102400.0 131072.0) 0.0 1.0) ) - :exit (the-as (function none :behavior snow-bunny) #f) + :exit #f :trans (behavior () (nav-enemy-method-58 self) ) @@ -726,19 +726,19 @@ ) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate nav-enemy-chase (snow-bunny) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior snow-bunny) #f) - :exit (the-as (function none :behavior snow-bunny) #f) - :trans (the-as (function none :behavior snow-bunny) #f) + :event #f + :exit #f + :trans #f :code (behavior () (go-virtual snow-bunny-chase-hop) ) - :post (the-as (function none :behavior snow-bunny) #f) + :post #f ) ;; definition for method 52 of type snow-bunny @@ -857,7 +857,7 @@ ) (go-virtual snow-bunny-chase-hop) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-jump-post) + :post nav-enemy-jump-post ) ;; failed to figure out what this is: @@ -1071,7 +1071,7 @@ ) (go-virtual snow-bunny-retreat-hop) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-jump-post) + :post nav-enemy-jump-post ) ;; failed to figure out what this is: @@ -1111,7 +1111,7 @@ ) ) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1153,5 +1153,5 @@ ) (go-virtual snow-bunny-retreat-hop) ) - :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc index 23142ad0442..8972165060c 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc @@ -348,7 +348,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior snow-button) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -366,7 +366,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-button) rider-trans) + :trans rider-trans :code (behavior () (send-to-all-after (-> self link) 'untrigger) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -380,7 +380,7 @@ ) (go snow-button-up-idle) ) - :post (the-as (function none :behavior snow-button) rider-post) + :post rider-post ) ;; definition for method 11 of type snow-button @@ -660,8 +660,8 @@ ) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) rider-post) + :code anim-loop + :post rider-post ) ;; failed to figure out what this is: @@ -791,8 +791,8 @@ ) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) rider-post) + :code anim-loop + :post rider-post ) ;; failed to figure out what this is: @@ -822,8 +822,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) ;; failed to figure out what this is: @@ -845,8 +845,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) ;; failed to figure out what this is: @@ -876,8 +876,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) ;; failed to figure out what this is: @@ -899,8 +899,8 @@ (plat-trans) (baseplat-method-20 self) ) - :code (the-as (function none :behavior flutflut-plat) anim-loop) - :post (the-as (function none :behavior flutflut-plat) plat-post) + :code anim-loop + :post plat-post ) ;; definition of type flutflut-plat-small diff --git a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc index e2b97f6fc0c..640f2ec078d 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc @@ -367,7 +367,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-eggtop) rider-trans) + :trans rider-trans :code (behavior () (process-spawn part-tracker @@ -434,7 +434,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-eggtop) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -582,7 +582,7 @@ ) ) ) - :post (the-as (function none :behavior snowpusher) pusher-post) + :post pusher-post ) ;; definition for method 11 of type snowpusher @@ -693,7 +693,7 @@ ) ) ) - :trans (the-as (function none :behavior snow-spatula) plat-trans) + :trans plat-trans :code (behavior () (let ((f28-0 0.0) (gp-0 1) @@ -729,7 +729,7 @@ ) ) ) - :post (the-as (function none :behavior snow-spatula) plat-post) + :post plat-post ) ;; definition for method 11 of type snow-spatula @@ -1058,7 +1058,7 @@ ) ) ) - :post (the-as (function none :behavior snow-fort-gate) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1317,7 +1317,7 @@ ) (go snow-gears-halt) ) - :post (the-as (function none :behavior snow-gears) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1344,7 +1344,7 @@ ) (go snow-gears-stopped) ) - :post (the-as (function none :behavior snow-gears) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1454,7 +1454,7 @@ (process-entity-status! self (entity-perm-status bit-3) #f) (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior snow-switch) rider-trans) + :trans rider-trans :code (behavior () (local-vars (v1-1 symbol)) (until v1-1 @@ -1513,7 +1513,7 @@ ) ) ) - :post (the-as (function none :behavior snow-switch) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1705,7 +1705,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-log) rider-trans) + :trans rider-trans :code (behavior () (activate! *camera-smush-control* 819.2 37 150 1.0 0.99) (ja-channel-push! 1 0) @@ -1723,12 +1723,12 @@ ) (go snow-log-active) ) - :post (the-as (function none :behavior snow-log) rider-post) + :post rider-post ) ;; failed to figure out what this is: (defstate snow-log-active (snow-log) - :trans (the-as (function none :behavior snow-log) rider-trans) + :trans rider-trans :code (behavior () (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) @@ -1760,7 +1760,7 @@ ) ) ) - :post (the-as (function none :behavior snow-log) rider-post) + :post rider-post ) ;; definition for method 11 of type snow-log @@ -1876,7 +1876,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #f) ) - :trans (the-as (function none :behavior snow-log-button) rider-trans) + :trans rider-trans :code (behavior () (sound-play "prec-button1") (loop @@ -1911,7 +1911,7 @@ (suspend) ) ) - :post (the-as (function none :behavior snow-log-button) rider-post) + :post rider-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc index b68d7a16fe3..a4ad30a1342 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc @@ -1340,7 +1340,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior ram-boss) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1455,7 +1455,7 @@ (suspend) ) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1472,7 +1472,7 @@ (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go ram-boss-nav-start) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1604,7 +1604,7 @@ (defstate nav-enemy-attack (ram-boss) :virtual #t :event ram-boss-on-ground-event-handler - :trans (the-as (function none :behavior ram-boss) #f) + :trans #f :code (behavior () (go ram-boss-tracking) ) @@ -1762,7 +1762,7 @@ ) ) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1784,7 +1784,7 @@ ) (go ram-boss-tracking) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1806,15 +1806,15 @@ ) (go ram-boss-tracking) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate nav-enemy-victory (ram-boss) :virtual #t :event ram-boss-on-ground-event-handler - :enter (the-as (function none :behavior ram-boss) #f) - :exit (the-as (function none :behavior ram-boss) #f) + :enter #f + :exit #f :trans (behavior () (when *target* (let ((f0-0 (vector-vector-distance (target-pos 0) (-> self collide-info trans)))) @@ -1839,7 +1839,7 @@ ) (go-virtual nav-enemy-attack) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1888,7 +1888,7 @@ ) (go ram-boss-tracking) ) - :post (the-as (function none :behavior ram-boss) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc index 5ad8785d51a..b853f2868bf 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc @@ -251,7 +251,7 @@ ) ) ) - :post (the-as (function none :behavior ram) rider-post) + :post rider-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc b/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc index e2e87a0a285..7b8c50be674 100644 --- a/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc @@ -275,7 +275,7 @@ (suspend) ) ) - :post (the-as (function none :behavior yeti-slave) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; failed to figure out what this is: @@ -293,7 +293,7 @@ (go-virtual nav-enemy-idle) ) ) - :post (the-as (function none :behavior yeti-slave) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -304,7 +304,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior yeti-slave) transform-post) + :post transform-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc index a91a96544f2..01bee5ac4ad 100644 --- a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc @@ -259,7 +259,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior bully-broken-cage) ja-post) + :post ja-post ) ;; definition for function bully-broken-cage-init-by-other @@ -775,7 +775,7 @@ (suspend) ) ) - :post (the-as (function none :behavior bully) transform-post) + :post transform-post ) ;; definition for method 7 of type bully diff --git a/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc b/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc index 59d2a9d25ae..ffebaf4f766 100644 --- a/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc @@ -305,7 +305,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior double-lurker-top) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -352,7 +352,7 @@ (nav-control-method-27 (-> self nav)) (go double-lurker-top-resume) ) - :post (the-as (function none :behavior double-lurker-top) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -618,7 +618,7 @@ :code (behavior () 0 ) - :post (the-as (function none :behavior double-lurker) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -797,7 +797,7 @@ ) (go double-lurker-resume) ) - :post (the-as (function none :behavior double-lurker) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 52 of type double-lurker @@ -867,7 +867,7 @@ ) (go double-lurker-resume) ) - :post (the-as (function none :behavior double-lurker) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -944,7 +944,7 @@ ) (go double-lurker-resume) ) - :post (the-as (function none :behavior double-lurker) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc index 6b17fc21f98..df41320d4af 100644 --- a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc @@ -35,7 +35,7 @@ ;; failed to figure out what this is: (defstate floating-launcher-idle (floating-launcher) - :event (the-as (function process int symbol event-message-block object :behavior floating-launcher) plat-event) + :event plat-event :trans (behavior () (plat-trans) (when (< (vector-xz-length (vector-! (new 'stack-no-clear 'vector) (target-pos 0) (-> self root-override trans))) @@ -57,13 +57,13 @@ (suspend) ) ) - :post (the-as (function none :behavior floating-launcher) plat-post) + :post plat-post ) ;; failed to figure out what this is: (defstate floating-launcher-lowering (floating-launcher) - :event (the-as (function process int symbol event-message-block object :behavior floating-launcher) plat-event) - :trans (the-as (function none :behavior floating-launcher) plat-trans) + :event plat-event + :trans plat-trans :code (behavior () (let ((a0-1 (entity-actor-lookup (-> self entity) 'alt-actor 0))) (if a0-1 @@ -84,15 +84,15 @@ (update-transforms! (-> self launcher 0 root-override)) (go floating-launcher-ready) ) - :post (the-as (function none :behavior floating-launcher) plat-post) + :post plat-post ) ;; failed to figure out what this is: (defstate floating-launcher-ready (floating-launcher) - :event (the-as (function process int symbol event-message-block object :behavior floating-launcher) plat-event) - :trans (the-as (function none :behavior floating-launcher) plat-trans) - :code (the-as (function none :behavior floating-launcher) plat-code) - :post (the-as (function none :behavior floating-launcher) plat-post) + :event plat-event + :trans plat-trans + :code plat-code + :post plat-post ) ;; definition for method 11 of type floating-launcher diff --git a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc index bc62d4b6916..c7e39abb5db 100644 --- a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc @@ -197,7 +197,7 @@ (transform-post) (go helix-slide-door-idle-closed) ) - :post (the-as (function none :behavior helix-slide-door) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -307,7 +307,7 @@ ;; failed to figure out what this is: (defstate helix-button-activate (helix-button) - :trans (the-as (function none :behavior helix-button) rider-trans) + :trans rider-trans :code (behavior () (local-vars (v1-7 symbol)) (let ((a0-1 (handle->process (-> self fcell-handle)))) @@ -451,12 +451,12 @@ ) (go helix-button-idle-down) ) - :post (the-as (function none :behavior helix-button) rider-post) + :post rider-post ) ;; failed to figure out what this is: (defstate helix-button-quick-activate (helix-button) - :trans (the-as (function none :behavior helix-button) rider-trans) + :trans rider-trans :code (behavior () (let ((a1-0 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-0 from) self) @@ -531,7 +531,7 @@ ) (go helix-button-idle-down) ) - :post (the-as (function none :behavior helix-button) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -660,7 +660,7 @@ (suspend) ) ) - :post (the-as (function none :behavior helix-water) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -711,7 +711,7 @@ (suspend) ) ) - :post (the-as (function none :behavior helix-water) ja-post) + :post ja-post ) ;; definition for method 7 of type helix-water diff --git a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc index d57403ec331..82ad275f300 100644 --- a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc @@ -250,7 +250,7 @@ (suspend) ) ) - :post (the-as (function none :behavior orbit-plat-bottom) ja-post) + :post ja-post ) ;; definition for method 7 of type orbit-plat-bottom @@ -326,7 +326,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 0)) (ja-no-eval :num! (seek! 0.0)) @@ -379,7 +379,7 @@ ) ) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) ;; definition for method 28 of type orbit-plat @@ -415,7 +415,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 0)) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -446,13 +446,13 @@ ) (go orbit-plat-idle) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) ;; failed to figure out what this is: (defstate orbit-plat-riding (orbit-plat) - :event (the-as (function process int symbol event-message-block object :behavior orbit-plat) plat-event) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :event plat-event + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 1)) (ja-no-eval :num! (seek!)) @@ -481,7 +481,7 @@ ) ) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) ;; definition for function get-rotate-point! @@ -534,7 +534,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 2)) (set! (-> self is-reset?) #f) @@ -579,7 +579,7 @@ ) (b! #t cfg-3 :delay (nop!)) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) ;; definition for method 27 of type orbit-plat @@ -744,7 +744,7 @@ ) ) ) - :trans (the-as (function none :behavior orbit-plat) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self plat-status) (the-as uint 3)) (logclear! (-> self nav flags) (nav-control-flags navcf19)) @@ -777,7 +777,7 @@ (set! (-> self is-reset?) #t) (go orbit-plat-idle) ) - :post (the-as (function none :behavior orbit-plat) plat-post) + :post plat-post ) ;; failed to figure out what this is: @@ -800,7 +800,7 @@ ) ) ) - :post (the-as (function none :behavior orbit-plat) ja-post) + :post ja-post ) ;; definition for method 11 of type orbit-plat diff --git a/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc b/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc index d029ff1060b..d8d845c7ea9 100644 --- a/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc @@ -722,7 +722,7 @@ (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior puffer) ja-post) + :post ja-post ) ;; definition for method 21 of type puffer diff --git a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc index b8525dfe5bf..01ac6e0054f 100644 --- a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc @@ -163,7 +163,7 @@ (suspend) ) ) - :post (the-as (function none :behavior qbert-plat) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -267,7 +267,7 @@ 0 ) ) - :post (the-as (function none :behavior qbert-plat) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -279,7 +279,7 @@ (suspend) ) ) - :post (the-as (function none :behavior qbert-plat) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc b/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc index b0f493d9186..07db4fa6584 100644 --- a/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc @@ -74,7 +74,7 @@ ) ) ) - :code (the-as (function none :behavior shover) anim-loop) + :code anim-loop ) ;; definition for method 11 of type shover diff --git a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc index 2da6e755f86..efc555fe5d6 100644 --- a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc @@ -362,7 +362,7 @@ (suspend) ) ) - :post (the-as (function none :behavior square-platform) plat-post) + :post plat-post ) ;; failed to figure out what this is: @@ -377,7 +377,7 @@ ) ) ) - :trans (the-as (function none :behavior square-platform) plat-trans) + :trans plat-trans :code (behavior () (set! (-> self pos-u) 1.0) (loop @@ -385,7 +385,7 @@ (suspend) ) ) - :post (the-as (function none :behavior square-platform) plat-post) + :post plat-post ) ;; failed to figure out what this is: @@ -427,7 +427,7 @@ (suspend) ) ) - :post (the-as (function none :behavior square-platform) plat-post) + :post plat-post ) ;; definition for method 10 of type square-platform diff --git a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc index 0c0ed2f7b48..cc8acc26e6a 100644 --- a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc @@ -678,7 +678,7 @@ ;; failed to figure out what this is: (defstate steam-cap-idle (steam-cap) - :trans (the-as (function none :behavior steam-cap) rider-trans) + :trans rider-trans :code (behavior () (loop (steam-cap-method-20 self) @@ -686,7 +686,7 @@ (suspend) ) ) - :post (the-as (function none :behavior steam-cap) rider-post) + :post rider-post ) ;; definition for method 7 of type steam-cap diff --git a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc index 528d4b68b3d..41bcd7e1c0b 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc @@ -256,7 +256,7 @@ (suspend) ) ) - :post (the-as (function none :behavior blue-eco-charger-orb) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -338,7 +338,7 @@ ) ) ) - :post (the-as (function none :behavior blue-eco-charger-orb) ja-post) + :post ja-post ) ;; definition for function blue-eco-charger-orb-init-by-other @@ -428,7 +428,7 @@ (suspend) ) ) - :post (the-as (function none :behavior blue-eco-charger) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -474,7 +474,7 @@ (suspend) ) ) - :post (the-as (function none :behavior blue-eco-charger) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -513,7 +513,7 @@ (blue-eco-charger-method-21 self #f) (go blue-eco-charger-idle) ) - :post (the-as (function none :behavior blue-eco-charger) ja-post) + :post ja-post ) ;; definition for method 11 of type blue-eco-charger @@ -745,7 +745,7 @@ (suspend) ) ) - :post (the-as (function none :behavior exit-chamber) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc index 49387c150d6..8dc345ad117 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc @@ -238,7 +238,7 @@ ) ) ) - :post (the-as (function none :behavior sunkenfisha) ja-post) + :post ja-post ) ;; definition for method 26 of type sunkenfisha diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc index 62430c3889f..4ec5668e29c 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc @@ -401,7 +401,7 @@ ) ) ) - :post (the-as (function none :behavior seaweed) ja-post) + :post ja-post ) ;; definition for method 11 of type seaweed diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc index 14812bae9f4..d12e350eb91 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc @@ -192,7 +192,7 @@ ) ) ) - :post (the-as (function none :behavior sunken-water) ja-post) + :post ja-post ) ;; definition for method 25 of type sunken-water diff --git a/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc b/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc index b0c8ecfbc9b..d7dfcdae24b 100644 --- a/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc @@ -985,7 +985,7 @@ (go-virtual slide-control-ride) ) ) - :code (the-as (function none :behavior slide-control) anim-loop) + :code anim-loop ) ;; failed to figure out what this is: @@ -1040,7 +1040,7 @@ ) ) ) - :code (the-as (function none :behavior slide-control) anim-loop) + :code anim-loop ) ;; definition for method 11 of type slide-control diff --git a/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc index ae8501298b2..2cdc0d431d4 100644 --- a/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc @@ -76,7 +76,7 @@ :enter (behavior () (sound-play "wall-plat") ) - :trans (the-as (function none :behavior wall-plat) rider-trans) + :trans rider-trans :code (behavior () (restore-collide-with-as (-> self root-override)) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -92,7 +92,7 @@ ) ) ) - :post (the-as (function none :behavior wall-plat) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -128,7 +128,7 @@ :enter (behavior () (sound-play "wall-plat") ) - :trans (the-as (function none :behavior wall-plat) rider-trans) + :trans rider-trans :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (loop @@ -143,7 +143,7 @@ ) ) ) - :post (the-as (function none :behavior wall-plat) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -162,7 +162,7 @@ :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior wall-plat) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 #f)) (loop @@ -193,7 +193,7 @@ ) ) ) - :post (the-as (function none :behavior wall-plat) rider-post) + :post rider-post ) ;; definition for method 11 of type wall-plat diff --git a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc index e33703404f5..cab7e099a3c 100644 --- a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc @@ -143,7 +143,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat) plat-trans) + :trans plat-trans :code (behavior () (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) (loop @@ -153,7 +153,7 @@ (suspend) ) ) - :post (the-as (function none :behavior wedge-plat) plat-post) + :post plat-post ) ;; failed to figure out what this is: @@ -169,7 +169,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat) plat-trans) + :trans plat-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (ja-aframe 60.0 0)) @@ -206,7 +206,7 @@ ) (go wedge-plat-idle) ) - :post (the-as (function none :behavior wedge-plat) plat-post) + :post plat-post ) ;; definition for method 11 of type wedge-plat @@ -317,7 +317,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat-outer) plat-trans) + :trans plat-trans :code (behavior () (loop (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) @@ -327,7 +327,7 @@ (suspend) ) ) - :post (the-as (function none :behavior wedge-plat-outer) plat-post) + :post plat-post ) ;; failed to figure out what this is: @@ -342,7 +342,7 @@ ) ) ) - :trans (the-as (function none :behavior wedge-plat-outer) plat-trans) + :trans plat-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (ja-aframe 60.0 0)) @@ -379,7 +379,7 @@ ) (go wedge-plat-outer-idle) ) - :post (the-as (function none :behavior wedge-plat-outer) plat-post) + :post plat-post ) ;; definition for method 11 of type wedge-plat-outer diff --git a/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc b/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc index 541e705ed82..f332f28e686 100644 --- a/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc @@ -354,8 +354,8 @@ ) ) ) - :code (the-as (function none :behavior whirlpool) anim-loop) - :post (the-as (function none :behavior whirlpool) ja-post) + :code anim-loop + :post ja-post ) ;; definition for method 10 of type whirlpool diff --git a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc index 64be4bbda5a..380f3252402 100644 --- a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc @@ -108,7 +108,7 @@ (suspend) ) ) - :post (the-as (function none :behavior billy-snack) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -129,7 +129,7 @@ ) ) ) - :post (the-as (function none :behavior billy-snack) ja-post) + :post ja-post ) ;; definition for function billy-snack-init-by-other @@ -185,7 +185,7 @@ :enter (behavior () (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior billy-rat) nav-enemy-common-post) + :post nav-enemy-common-post ) ;; failed to figure out what this is: @@ -223,15 +223,12 @@ (logclear! (-> self nav flags) (nav-control-flags navcf19)) (go-virtual nav-enemy-chase) ) - :post (the-as (function none :behavior billy-rat) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate billy-rat-salivate (billy-rat) - :event (the-as - (function process int symbol event-message-block object :behavior billy-rat) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.075)) (dotimes (gp-0 1) @@ -253,7 +250,7 @@ (go-virtual nav-enemy-chase) ) ) - :post (the-as (function none :behavior billy-rat) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -616,7 +613,7 @@ ) (spool-push *art-control* "billy-reject" 0 self -99.0) ) - :code (the-as (function none :behavior billy) process-taskable-anim-loop) + :code process-taskable-anim-loop :post (behavior () (ja-post) ) diff --git a/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc b/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc index 503a5330fa0..21879b9bbe3 100644 --- a/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc @@ -993,10 +993,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-idle (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self notice-time) 0) 0 @@ -1017,15 +1014,12 @@ nav-enemy-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior kermit) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate kermit-patrol (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode flex-blend)) @@ -1064,10 +1058,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-notice (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set-mode! (-> self neck) (joint-mod-handler-mode look-at)) ) @@ -1085,10 +1076,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-give-up (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set-mode! (-> self neck) (joint-mod-handler-mode flex-blend)) ) @@ -1100,10 +1088,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-chase-new-position (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self miss-count) 0) @@ -1158,10 +1143,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-chase (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode look-at)) @@ -1218,10 +1200,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-attack (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.17)) (set! (-> self tongue-control forward-scale-control) 0.0) @@ -1273,10 +1252,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-tongue-stuck (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self miss-count) 0) (set! (-> self tongue-control forward-scale-control) 1.0) @@ -1344,10 +1320,7 @@ nav-enemy-default-event-handler ;; failed to figure out what this is: (defstate kermit-retract-tongue (kermit) - :event (the-as - (function process int symbol event-message-block object :behavior kermit) - nav-enemy-default-event-handler - ) + :event nav-enemy-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self charged-up) #f) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc index 5ba154d374c..b7635a3c224 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc @@ -300,7 +300,7 @@ swamp-bat-slave-event-handler ) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-post) + :post swamp-bat-slave-post ) ;; failed to figure out what this is: @@ -331,7 +331,7 @@ swamp-bat-slave-event-handler ) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-post) + :post swamp-bat-slave-post ) ;; failed to figure out what this is: @@ -359,7 +359,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-path-post) + :post swamp-bat-slave-path-post ) ;; failed to figure out what this is: @@ -377,7 +377,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-path-post) + :post swamp-bat-slave-path-post ) ;; failed to figure out what this is: @@ -408,15 +408,12 @@ swamp-bat-slave-event-handler ) ) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-path-post) + :post swamp-bat-slave-path-post ) ;; failed to figure out what this is: (defstate swamp-bat-slave-die (swamp-bat-slave) - :event (the-as - (function process int symbol event-message-block object :behavior swamp-bat-slave) - process-drawable-death-event-handler - ) + :event process-drawable-death-event-handler :code (behavior ((arg0 handle)) (ja-channel-push! 1 (seconds 0.07)) (let ((gp-0 (new-stack-vector0))) @@ -436,7 +433,7 @@ swamp-bat-slave-event-handler ) (cleanup-for-death self) ) - :post (the-as (function none :behavior swamp-bat-slave) swamp-bat-slave-post) + :post swamp-bat-slave-post ) ;; definition for function swamp-bat-slave-init-by-other @@ -599,7 +596,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat) #f) + :post #f ) ;; definition for function swamp-bat-launch-slave @@ -636,7 +633,7 @@ swamp-bat-slave-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-bat) #f) + :post #f ) ;; definition for method 11 of type swamp-bat diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc index 8b0d8365801..aba5efaeacf 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc @@ -317,7 +317,7 @@ ) (go swamp-spike-gate-down) ) - :post (the-as (function none :behavior swampgate) swamp-spike-post) + :post swamp-spike-post ) ;; failed to figure out what this is: @@ -326,7 +326,7 @@ (process-entity-status! self (entity-perm-status complete) #t) (cleanup-for-death self) ) - :post (the-as (function none :behavior swampgate) swamp-spike-post) + :post swamp-spike-post ) ;; definition for method 20 of type swamp-spike @@ -461,7 +461,7 @@ ) ) ) - :trans (the-as (function none :behavior balance-plat) rider-trans) + :trans rider-trans :code (behavior () (loop (let ((f30-0 (* -0.025 (+ (-> self y-offset) (-> self y-travel)))) @@ -501,7 +501,7 @@ (suspend) ) ) - :post (the-as (function none :behavior balance-plat) rider-post) + :post rider-post ) ;; definition for method 11 of type balance-plat @@ -670,7 +670,7 @@ (cleanup-for-death self) (deactivate self) ) - :post (the-as (function none :behavior swamp-rock) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -838,16 +838,13 @@ (suspend) ) ) - :post (the-as (function none :behavior tar-plat) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate rigid-body-platform-float (tar-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior tar-plat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :trans (behavior () (cond ((or (not *target*) (< (-> self info idle-distance) @@ -874,7 +871,7 @@ (suspend) ) ) - :post (the-as (function none :behavior tar-plat) rigid-body-platform-post) + :post rigid-body-platform-post ) ;; definition for method 30 of type tar-plat diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc index 891f7de7cbd..92c97b9cf57 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc @@ -793,7 +793,7 @@ (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest-dummy) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -816,7 +816,7 @@ ) (go swamp-rat-nest-dummy-idle) ) - :post (the-as (function none :behavior swamp-rat-nest-dummy) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -830,12 +830,12 @@ ) (go swamp-rat-nest-dummy-idle) ) - :post (the-as (function none :behavior swamp-rat-nest-dummy) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate swamp-rat-nest-dummy-die (swamp-rat-nest-dummy) - :event (the-as (function process int symbol event-message-block object :behavior swamp-rat-nest-dummy) #f) + :event #f :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self parent-process 0 dummy) (the-as (pointer swamp-rat-nest-dummy) #f)) @@ -1013,7 +1013,7 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) ;; failed to figure out what this is: @@ -1047,7 +1047,7 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) ;; failed to figure out what this is: @@ -1071,12 +1071,12 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) ;; failed to figure out what this is: (defstate swamp-rat-nest-victory (swamp-rat-nest) - :event (the-as (function process int symbol event-message-block object :behavior swamp-rat-nest) #f) + :event #f :code (behavior () (let ((gp-0 (the-as (pointer process-tree) (-> self child-process)))) (while gp-0 @@ -1095,7 +1095,7 @@ swamp-rat-nest-default-event-handler ) (go swamp-rat-nest-active) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) ;; failed to figure out what this is: @@ -1109,7 +1109,7 @@ swamp-rat-nest-default-event-handler (suspend) ) ) - :post (the-as (function none :behavior swamp-rat-nest) #f) + :post #f ) ;; definition for method 11 of type swamp-rat-nest diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc index fa2196a7486..6495591d99b 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc @@ -385,7 +385,7 @@ swamp-rat-default-event-handler (go-virtual nav-enemy-idle) ) ) - :post (the-as (function none :behavior swamp-rat) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for symbol *swamp-rat-nav-enemy-info*, type nav-enemy-info diff --git a/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc index 5db52dceb94..b8654246665 100644 --- a/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc @@ -800,8 +800,8 @@ (set-setting! 'allow-progress #f 0.0 0) ) :exit (-> target-title exit) - :trans (the-as (function none :behavior target) hide-hud-quick) - :code (the-as (function none :behavior target) anim-loop) + :trans hide-hud-quick + :code anim-loop :post target-no-move-post ) @@ -860,6 +860,6 @@ ) ) ) - :code (the-as (function none :behavior target) anim-loop) + :code anim-loop :post target-no-move-post ) diff --git a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc index e405759b3bf..741c180ab73 100644 --- a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc @@ -781,7 +781,7 @@ ) ) ) - :post (the-as (function none :behavior scarecrow-a) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -857,7 +857,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior scarecrow-a) ja-post) + :post ja-post ) ;; definition for method 11 of type scarecrow-a @@ -923,7 +923,7 @@ ) ) ) - :post (the-as (function none :behavior scarecrow-b) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1002,7 +1002,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior scarecrow-b) ja-post) + :post ja-post ) ;; definition for method 11 of type scarecrow-b diff --git a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc index 23a550d4246..4222e538e65 100644 --- a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc @@ -1007,10 +1007,7 @@ ;; failed to figure out what this is: (defstate fishermans-boat-docked-village (fishermans-boat) - :event (the-as - (function process int symbol event-message-block object :behavior fishermans-boat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) @@ -1120,10 +1117,7 @@ ;; failed to figure out what this is: (defstate fishermans-boat-docked-misty (fishermans-boat) - :event (the-as - (function process int symbol event-message-block object :behavior fishermans-boat) - rigid-body-platform-event-handler - ) + :event rigid-body-platform-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) ) diff --git a/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc b/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc index 5cc36e8e781..a0845faefcd 100644 --- a/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc @@ -317,8 +317,8 @@ (logclear! (-> self draw status) (draw-status do-not-check-distance)) ) ) - :code (the-as (function none :behavior windmill-sail) anim-loop) - :post (the-as (function none :behavior windmill-sail) ja-post) + :code anim-loop + :post ja-post ) ;; definition for method 11 of type windmill-sail @@ -389,8 +389,8 @@ (quaternion*! (-> self root-override quat) (-> self root-override quat) (-> self orig-quat)) (quaternion-normalize! (-> self root-override quat)) ) - :code (the-as (function none :behavior sagesail) anim-loop) - :post (the-as (function none :behavior sagesail) ja-post) + :code anim-loop + :post ja-post ) ;; definition for method 11 of type sagesail @@ -495,8 +495,8 @@ (quaternion*! (-> self root quat) (-> self root quat) (-> self orig-quat)) (quaternion-normalize! (-> self root quat)) ) - :code (the-as (function none :behavior windspinner) anim-loop) - :post (the-as (function none :behavior windspinner) ja-post) + :code anim-loop + :post ja-post ) ;; definition for method 11 of type windspinner @@ -555,7 +555,7 @@ (suspend) ) ) - :post (the-as (function none :behavior mayorgears) ja-post) + :post ja-post ) ;; definition for method 11 of type mayorgears @@ -608,8 +608,8 @@ (draw-eco-beam (-> self reflector-trans) (-> self next-reflector-trans)) ) ) - :code (the-as (function none :behavior reflector-middle) anim-loop) - :post (the-as (function none :behavior reflector-middle) ja-post) + :code anim-loop + :post ja-post ) ;; definition for method 11 of type reflector-middle @@ -656,7 +656,7 @@ ;; failed to figure out what this is: (defstate reflector-end-idle (reflector-end) - :code (the-as (function none :behavior reflector-end) anim-loop) + :code anim-loop ) ;; definition for method 11 of type reflector-end @@ -737,7 +737,7 @@ (suspend) ) ) - :post (the-as (function none :behavior starfish) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -767,7 +767,7 @@ ) ) ) - :post (the-as (function none :behavior starfish) nav-enemy-patrol-post) + :post nav-enemy-patrol-post ) ;; definition for symbol *starfish-nav-enemy-info*, type nav-enemy-info @@ -911,7 +911,7 @@ (suspend) ) ) - :post (the-as (function none :behavior villa-starfish) #f) + :post #f ) ;; definition for method 11 of type villa-starfish @@ -957,7 +957,7 @@ (suspend) ) ) - :post (the-as (function none :behavior village-fish) #f) + :post #f ) ;; definition for method 11 of type village-fish @@ -1088,7 +1088,7 @@ (suspend) ) ) - :post (the-as (function none :behavior hutlamp) ja-post) + :post ja-post ) ;; definition for method 11 of type hutlamp @@ -1133,8 +1133,8 @@ ;; failed to figure out what this is: (defstate idle (revcycleprop) :virtual #t - :code (the-as (function none :behavior revcycleprop) anim-loop) - :post (the-as (function none :behavior revcycleprop) ja-post) + :code anim-loop + :post ja-post ) ;; definition for method 11 of type revcycleprop @@ -1177,8 +1177,8 @@ ;; failed to figure out what this is: (defstate idle (revcycle) :virtual #t - :code (the-as (function none :behavior revcycle) anim-loop) - :post (the-as (function none :behavior revcycle) ja-post) + :code anim-loop + :post ja-post ) ;; definition for method 11 of type revcycle diff --git a/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc b/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc index 443b7e7e13e..e8d94385dd0 100644 --- a/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc @@ -548,7 +548,7 @@ yakow-default-event-handler ) ) ) - :post (the-as (function none :behavior yakow) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -602,7 +602,7 @@ yakow-default-event-handler (* (-> *YAKOW-bank* acceleration) (-> *display* seconds-per-frame)) ) ) - :code (the-as (function vector none :behavior yakow) yakow-blend-walk-run) + :code (the-as (function vector object) yakow-blend-walk-run) :post (behavior () (nav-control-method-19 (-> self nav) @@ -666,7 +666,7 @@ yakow-default-event-handler ;; failed to figure out what this is: (defstate yakow-graze-kicked (yakow) - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :code (behavior () (ja-no-eval :group! yakow-kicked-in-place-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) @@ -726,7 +726,7 @@ yakow-default-event-handler ;; failed to figure out what this is: (defstate yakow-kicked (yakow) - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (if (-> self grazing) @@ -795,7 +795,7 @@ yakow-default-event-handler ;; failed to figure out what this is: (defstate yakow-die (yakow) - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :code (behavior () (let ((v1-1 (-> self root-override root-prim))) (set! (-> v1-1 collide-with) (collide-kind)) diff --git a/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc b/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc index 3e55cbf06bb..044404571f9 100644 --- a/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc @@ -970,7 +970,7 @@ ) (go swamp-tetherrock-hide) ) - :post (the-as (function none :behavior swamp-tetherrock) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1041,7 +1041,7 @@ (suspend) ) ) - :post (the-as (function none :behavior swamp-tetherrock) transform-post) + :post transform-post ) ;; definition for method 11 of type swamp-tetherrock @@ -1138,7 +1138,7 @@ (suspend) ) ) - :post (the-as (function none :behavior precursor-arm) transform-post) + :post transform-post ) ;; definition for function precursor-arm-slip @@ -1253,7 +1253,7 @@ (suspend) ) ) - :post (the-as (function none :behavior precursor-arm) transform-post) + :post transform-post ) ;; definition for method 11 of type precursor-arm @@ -1607,7 +1607,7 @@ (set! (-> self draw force-lod) 0) 0 ) - :trans (the-as (function none :behavior swamp-blimp) blimp-trans) + :trans blimp-trans :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (let ((gp-0 (new 'stack-no-clear 'quaternion))) @@ -1632,7 +1632,7 @@ ) ) ) - :post (the-as (function none :behavior swamp-blimp) transform-post) + :post transform-post ) ;; definition for function swamp-blimp-setup @@ -1730,7 +1730,7 @@ ) ) ) - :trans (the-as (function none :behavior swamp-blimp) blimp-trans) + :trans blimp-trans :code (behavior () (ja :group! swamp-blimp-idle-ja) (loop @@ -1766,7 +1766,7 @@ (suspend) ) ) - :post (the-as (function none :behavior swamp-blimp) transform-post) + :post transform-post ) ;; definition for method 11 of type swamp-blimp diff --git a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc index 202717ca85d..be29b4b68db 100644 --- a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc @@ -750,7 +750,7 @@ ) ) ) - :post (the-as (function none :behavior fireboulder) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -769,7 +769,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (logclear! (-> self skel status) (janim-status spool)) ) - :trans (the-as (function none :behavior fireboulder) fireboulder-hover-stuff) + :trans fireboulder-hover-stuff :code (behavior ((arg0 handle)) (clone-anim arg0 3 #t "") (format 0 "ERROR: fireboulder-be-clone ended~%") @@ -828,7 +828,7 @@ ) ) ) - :post (the-as (function none :behavior fireboulder) ja-post) + :post ja-post ) ;; definition for method 11 of type fireboulder @@ -932,7 +932,7 @@ ) ) ) - :post (the-as (function none :behavior ceilingflag) ja-post) + :post ja-post ) ;; definition for method 11 of type ceilingflag @@ -1048,7 +1048,7 @@ ) (go exit-chamber-dummy-wait-to-appear) ) - :post (the-as (function none :behavior exit-chamber-dummy) ja-post) + :post ja-post ) ;; definition for method 11 of type exit-chamber-dummy @@ -1582,7 +1582,7 @@ ) (go ogreboss-village2-idle) ) - :post (the-as (function none :behavior ogreboss-village2) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1658,7 +1658,7 @@ ) ) ) - :post (the-as (function none :behavior ogreboss-village2) ja-post) + :post ja-post ) ;; definition for method 11 of type ogreboss-village2 diff --git a/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc b/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc index 288837e7b4a..a49f8504b86 100644 --- a/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc @@ -54,7 +54,7 @@ ) ) ) - :trans (the-as (function none :behavior minecartsteel) rider-trans) + :trans rider-trans :code (behavior () (ja-channel-set! 1) (ja :group! (-> self anim)) @@ -69,7 +69,7 @@ (suspend) ) ) - :post (the-as (function none :behavior minecartsteel) rider-post) + :post rider-post ) ;; definition for function minecartsteel-initialize-by-other diff --git a/test/decompiler/reference/jak1/levels/village3/miners_REF.gc b/test/decompiler/reference/jak1/levels/village3/miners_REF.gc index 2cdf7ef6e6f..7fe31f8ff99 100644 --- a/test/decompiler/reference/jak1/levels/village3/miners_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/miners_REF.gc @@ -2,7 +2,9 @@ (in-package goal) ;; definition for function miners-anim-loop -(defbehavior miners-anim-loop minershort () +;; INFO: Return type mismatch none vs object. +;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 47] +(defbehavior miners-anim-loop process-taskable () (when (!= (ja-group) (get-art-elem self)) (ja-channel-push! 1 (seconds 0.2)) (ja :group! (get-art-elem self)) @@ -14,8 +16,7 @@ (process-taskable-method-43 self) ) ) - (the-as none 0) - (none) + 0 ) ;; definition of type minertall @@ -116,7 +117,7 @@ (set! (-> self will-talk) #f) ((-> (method-of-type process-taskable idle) trans)) ) - :code (the-as (function none :behavior minertall) miners-anim-loop) + :code miners-anim-loop ) ;; definition for method 11 of type minertall @@ -653,7 +654,7 @@ ) ) ) - :post (the-as (function none :behavior cavegem) ja-post) + :post ja-post ) ;; definition for method 11 of type cavegem @@ -665,3 +666,7 @@ (go (method-of-object obj idle)) (none) ) + + + + diff --git a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc index c6da23cb610..80ba95d3a86 100644 --- a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc @@ -507,7 +507,7 @@ ) ) ) - :post (the-as (function none :behavior gondolacables) ja-post) + :post ja-post ) ;; definition for method 11 of type gondolacables diff --git a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc index a10bdf0a9a7..e67da98b04c 100644 --- a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc @@ -423,7 +423,7 @@ ;; failed to figure out what this is: (defstate hidden (warp-gate) :virtual #t - :code (the-as (function none :behavior warp-gate) anim-loop) + :code anim-loop ) ;; definition for function warp-gate-init-by-other diff --git a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc index df4fb08c58c..231c3391317 100644 --- a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc @@ -1226,6 +1226,7 @@ ;; definition for function enemy-init-by-other ;; INFO: Used lq/sq +;; WARN: Return type mismatch object vs none. (defbehavior enemy-init-by-other enemy ((arg0 process-drawable) (arg1 enemy-init-by-other-params)) (let ((a1-1 (-> arg1 entity))) (if a1-1 @@ -2329,7 +2330,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag victory)) (logior! (-> self root nav-flags) (nav-flags has-root-sphere)) ) - :code (the-as (function none :behavior enemy) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2348,7 +2349,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior enemy) sleep-code) + :code sleep-code :post (behavior () (if (and (nonzero? (-> self draw)) (logtest? (-> self draw status) (draw-control-status on-screen))) (set! (-> self last-draw-time) (current-time)) @@ -2457,14 +2458,7 @@ This commonly includes things such as: (gp-0 (new 'stack-no-clear 'vector)) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2562,10 +2556,7 @@ This commonly includes things such as: (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2589,14 +2580,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -3004,14 +2988,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -3634,14 +3611,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -3710,10 +3680,7 @@ This commonly includes things such as: ) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -3746,7 +3713,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die-fast (enemy) :virtual #t - :code (the-as (function none :behavior enemy) nothing) + :code nothing ) ;; failed to figure out what this is: @@ -3765,10 +3732,7 @@ This commonly includes things such as: (let ((s4-0 (-> gp-0 data s5-0))) (when (and s4-0 (= (-> s4-0 type) art-joint-anim)) (ja-channel-set! 1) - (ja-no-eval :group! s4-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3780,7 +3744,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior enemy) transform-post) + :post transform-post ) ;; definition for function ja-group-index? diff --git a/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc b/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc index f9880369989..0096ab3bed9 100644 --- a/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc +++ b/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc @@ -544,5 +544,5 @@ ;; failed to figure out what this is: (defstate exit (talker) :virtual #t - :code (the-as (function none :behavior talker) nothing) + :code nothing ) diff --git a/test/decompiler/reference/jak2/engine/anim/fma-sphere_REF.gc b/test/decompiler/reference/jak2/engine/anim/fma-sphere_REF.gc index 37d96e37876..4d14aa54217 100644 --- a/test/decompiler/reference/jak2/engine/anim/fma-sphere_REF.gc +++ b/test/decompiler/reference/jak2/engine/anim/fma-sphere_REF.gc @@ -148,7 +148,7 @@ ) ) ) - :code (the-as (function none :behavior fma-sphere) sleep-code) + :code sleep-code ) ;; definition for function fma-sphere-init-by-other diff --git a/test/decompiler/reference/jak2/engine/anim/joint-exploder_REF.gc b/test/decompiler/reference/jak2/engine/anim/joint-exploder_REF.gc index ca59425d17c..e32e0e8b88e 100644 --- a/test/decompiler/reference/jak2/engine/anim/joint-exploder_REF.gc +++ b/test/decompiler/reference/jak2/engine/anim/joint-exploder_REF.gc @@ -733,7 +733,7 @@ (ja :num! (loop!)) ) ) - :post (the-as (function none :behavior joint-exploder) ja-post) + :post ja-post ) ;; definition for method 23 of type joint-exploder diff --git a/test/decompiler/reference/jak2/engine/common_objs/base-plat_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/base-plat_REF.gc index c15c2d36ca6..bc2582ce9aa 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/base-plat_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/base-plat_REF.gc @@ -310,7 +310,7 @@ eco-door-event-handler ) (go-virtual door-open) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -379,7 +379,7 @@ eco-door-event-handler ) (go-virtual door-closed) ) - :post (the-as (function none :behavior eco-door) transform-post) + :post transform-post ) ;; definition for method 24 of type eco-door diff --git a/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc index 74c17e151f0..2f62a7dc50d 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc @@ -140,7 +140,7 @@ (rider-trans) ) ) - :code (the-as (function none :behavior basebutton) sleep-code) + :code sleep-code :post (behavior () (when (logtest? (-> self button-status) (button-status button-status-2)) (logclear! (-> self button-status) (button-status button-status-2)) @@ -167,7 +167,7 @@ :enter (behavior () (press! self #t) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! max (-> self anim-speed))) (until (ja-done? 0) @@ -255,7 +255,7 @@ :enter (behavior () (press! self #f) ) - :trans (the-as (function none :behavior basebutton) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :num! (seek! 0.0 (-> self anim-speed))) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc index 4f98b884f25..d98ab7fd5dc 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc @@ -92,7 +92,7 @@ ) ) ) - :code (the-as (function none :behavior blocking-plane) sleep-code) + :code sleep-code ) ;; definition for method 21 of type blocking-plane diff --git a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc index ef1079acaef..5b71993b239 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc @@ -869,7 +869,7 @@ (go-virtual wait) ) ) - :code (the-as (function none :behavior collectable) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1947,8 +1947,8 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior gem) #f) - :code (the-as (function none :behavior gem) sleep-code) + :trans #f + :code sleep-code :post (behavior () (let ((gp-0 #t)) (vector-v++! (-> self root transv) (compute-acc-due-to-gravity (-> self root) (new-stack-vector0) 0.0)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc index 9c4033b1296..05f2bbfaa9a 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc @@ -428,7 +428,7 @@ and return it as well. Otherwise, set it to `0`" ;; failed to figure out what this is: (defstate idle (conveyor) :virtual #t - :code (the-as (function none :behavior conveyor) sleep-code) + :code sleep-code :post (behavior () (conveyor-method-27 self) (if (nonzero? (-> self sound)) @@ -547,10 +547,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc index 3541b96a779..11f89c95c9b 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc @@ -686,7 +686,7 @@ ) #f ) - :post (the-as (function none :behavior crate) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -703,7 +703,7 @@ ) ) ) - :code (the-as (function none :behavior crate) sleep-code) + :code sleep-code :post (behavior () (ja-post) (carry-info-method-9 (-> self carry)) @@ -757,7 +757,7 @@ ) ) ) - :code (the-as (function none :behavior crate) sleep-code) + :code sleep-code :post (behavior () (vector-v++! (-> self root transv) diff --git a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc index 625b69c4c26..7eea1e3efa6 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc @@ -557,9 +557,9 @@ do so. ) ) ) - :trans (the-as (function none :behavior elevator) plat-trans) - :code (the-as (function none :behavior elevator) sleep-code) - :post (the-as (function none :behavior elevator) plat-post) + :trans plat-trans + :code sleep-code + :post plat-post ) ;; failed to figure out what this is: @@ -605,7 +605,7 @@ do so. (go-virtual running) ) ) - :code (the-as (function none :behavior elevator) sleep-code) + :code sleep-code :post (behavior () (logclear! (-> self elevator-status) (elevator-status waiting-to-descend)) (debug-draw (-> self path)) @@ -768,8 +768,8 @@ do so. ) (plat-trans) ) - :code (the-as (function none :behavior elevator) sleep-code) - :post (the-as (function none :behavior elevator) plat-post) + :code sleep-code + :post plat-post ) ;; definition for method 39 of type elevator diff --git a/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc index bbed3651b9b..f6710a91077 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc @@ -336,7 +336,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (process-hidden) :virtual #t - :code (the-as (function none :behavior process-hidden) nothing) + :code nothing ) ;; definition for method 11 of type process-hidden @@ -2052,7 +2052,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior med-res-level) ja-post) + :post ja-post ) ;; definition for method 11 of type med-res-level @@ -2723,7 +2723,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior launcher) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2787,7 +2787,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate deactivated (launcher) :virtual #t - :code (the-as (function none :behavior launcher) sleep-code) + :code sleep-code ) ;; definition for method 11 of type launcher diff --git a/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc index e3d726a97f4..cb516752c0a 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc @@ -110,7 +110,7 @@ otherwise, [[plat::34]] ;; failed to figure out what this is: (defstate plat-idle (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :trans (behavior () (execute-effects self) ) @@ -139,7 +139,7 @@ otherwise, [[plat::34]] ;; failed to figure out what this is: (defstate plat-path-active (plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) + :event plat-event :exit (behavior () (sound-stop (-> self sound-id)) ) @@ -153,10 +153,7 @@ otherwise, [[plat::34]] ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -164,7 +161,7 @@ otherwise, [[plat::34]] ) #f ) - :post (the-as (function none :behavior plat) plat-post) + :post plat-post ) ;; definition for method 11 of type plat @@ -315,7 +312,7 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior drop-plat) plat-trans) + :trans plat-trans :code (behavior () (add-process *gui-control* self (gui-channel art-load) (gui-action queue) (-> self anim name) -99.0 0) (until #f @@ -331,7 +328,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drop-plat) plat-post) + :post plat-post ) ;; failed to figure out what this is: @@ -355,7 +352,7 @@ This commonly includes things such as: :exit (behavior () (ja-abort-spooled-anim (-> self anim) (the-as art-joint-anim #f) -1) ) - :trans (the-as (function none :behavior drop-plat) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status subtask-complete) #t) (let ((v1-1 (-> self root root-prim))) @@ -377,5 +374,5 @@ This commonly includes things such as: (suspend) 0 ) - :post (the-as (function none :behavior drop-plat) rider-post) + :post rider-post ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc index 42902dce705..61da09a06a1 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc @@ -548,7 +548,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p ;; definition for function projectile-bounce-falling-post ;; INFO: Used lq/sq ;; WARN: Return type mismatch int vs none. -(defbehavior projectile-bounce-falling-post projectile-bounce ((arg0 projectile-bounce)) +(defbehavior projectile-bounce-falling-post projectile-bounce () (let ((gp-0 (-> self root)) (s4-0 (new 'stack-no-clear 'collide-query)) (s5-0 (new 'stack-no-clear 'vector)) @@ -574,18 +574,15 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p ;; failed to figure out what this is: (defstate sitting (projectile-bounce) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior projectile-bounce) - projectile-event-handler - ) + :event projectile-event-handler :trans (behavior () (noop self) (if (>= (- (current-time) (-> self spawn-time)) (-> self timeout)) (go-virtual impact) ) ) - :code (the-as (function none :behavior projectile-bounce) sleep-code) - :post (the-as (function none :behavior projectile-bounce) projectile-bounce-falling-post) + :code sleep-code + :post projectile-bounce-falling-post ) ;; definition for method 41 of type projectile-bounce diff --git a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc index 5257570068c..1d5c1467e09 100644 --- a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc @@ -1578,7 +1578,7 @@ ) ) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Move node" "" "") (nav-graph-editor-method-28 self) @@ -1600,7 +1600,7 @@ ) (nav-graph-editor-method-41 self) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Move plane" "Snap to node" "") (nav-graph-editor-method-28 self) @@ -1623,7 +1623,7 @@ (go-virtual adjust-plane) ) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (format *stdcon* "~0K") (let ((t9-1 format) @@ -1719,7 +1719,7 @@ ) ) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Dest node/pos" "" "Cancel") (nav-graph-editor-method-28 self) @@ -1758,7 +1758,7 @@ (set! (-> self edge-src) -1) (set! (-> self edge-dst) -1) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Create edge" "" "Delete edge") (nav-graph-editor-method-28 self) @@ -1775,7 +1775,7 @@ :exit (behavior () (set! (-> self edge-visibility) -1) ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Add node" "Remove Node" "Exit") (nav-graph-editor-method-28 self) @@ -1810,7 +1810,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1835,7 +1835,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1863,7 +1863,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1891,7 +1891,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-34 self) @@ -1960,7 +1960,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (cond ((>= (-> self selected-index) 0) @@ -2013,7 +2013,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Edge visibility" "" "Closest Node/Edge") (nav-graph-editor-method-28 self) @@ -2027,7 +2027,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-28 self) (nav-graph-editor-method-41 self) @@ -2120,7 +2120,7 @@ :enter (behavior () '() ) - :code (the-as (function none :behavior nav-graph-editor) sleep-code) + :code sleep-code :post (behavior () (nav-graph-editor-method-29 self "Move node" "Delete node/edge" "Create edge(s)") (nav-graph-editor-method-28 self) diff --git a/test/decompiler/reference/jak2/engine/debug/viewer_REF.gc b/test/decompiler/reference/jak2/engine/debug/viewer_REF.gc index c15e9c3a3e3..b47a05833ae 100644 --- a/test/decompiler/reference/jak2/engine/debug/viewer_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/viewer_REF.gc @@ -58,7 +58,7 @@ ) #f ) - :post (the-as (function none :behavior viewer) ja-post) + :post ja-post ) ;; definition for symbol viewer-string, type string diff --git a/test/decompiler/reference/jak2/engine/game/game-save_REF.gc b/test/decompiler/reference/jak2/engine/game/game-save_REF.gc index 748d4644660..cdc8091981b 100644 --- a/test/decompiler/reference/jak2/engine/game/game-save_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/game-save_REF.gc @@ -2044,7 +2044,7 @@ auto-save-post (format #t "got buffer #x~X~%" (-> self buffer base)) (go-virtual get-card) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2099,7 +2099,7 @@ auto-save-post ) ) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2144,7 +2144,7 @@ auto-save-post ) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2177,7 +2177,7 @@ auto-save-post (label cfg-10) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2235,7 +2235,7 @@ auto-save-post ) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2300,7 +2300,7 @@ auto-save-post (label cfg-18) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2383,7 +2383,7 @@ auto-save-post (sleep-code) (go-virtual done) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2494,7 +2494,7 @@ auto-save-post ) ) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; failed to figure out what this is: @@ -2526,7 +2526,7 @@ auto-save-post (send-event (handle->process (-> self notify)) 'notify 'done (mc-status-code ok) gp-0) ) ) - :post (the-as (function none :behavior auto-save) auto-save-post) + :post auto-save-post ) ;; definition for function auto-save-command diff --git a/test/decompiler/reference/jak2/engine/game/idle-control_REF.gc b/test/decompiler/reference/jak2/engine/game/idle-control_REF.gc index c6e4fd3e0ff..7181c80483f 100644 --- a/test/decompiler/reference/jak2/engine/game/idle-control_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/idle-control_REF.gc @@ -122,18 +122,7 @@ (ja :group! (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim)) :num! min) (return #f) ) - (ja :group! (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim))) - frames - num-frames - ) - -1 - ) - ) - ) - ) + (ja :group! (-> (the-as process-drawable self) draw art-group data (-> s4-0 anim)) :num! (seek!)) (cond ((ja-done? 0) (+! (-> obj counter) 1) @@ -177,7 +166,3 @@ 0 (none) ) - - - - diff --git a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc index fe8ae8e5e48..848a6a8be19 100644 --- a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc @@ -268,7 +268,7 @@ or collectable items on the ground (jetboard / weapon upgrades / etc)" ) ) ) - :code (the-as (function none :behavior task-arrow) sleep-code) + :code sleep-code :post (behavior () (draw-arrow self) ) diff --git a/test/decompiler/reference/jak2/engine/load/loader_REF.gc b/test/decompiler/reference/jak2/engine/load/loader_REF.gc index be31a776381..72b490ae243 100644 --- a/test/decompiler/reference/jak2/engine/load/loader_REF.gc +++ b/test/decompiler/reference/jak2/engine/load/loader_REF.gc @@ -1062,7 +1062,7 @@ (cond (s5-8 (ja-channel-set! 1) - (ja-no-eval :group! s5-8 :num! (seek! (the float (+ (-> s5-8 frames num-frames) -1))) :frame-num 0.0) + (ja-no-eval :group! s5-8 :num! (seek!) :frame-num 0.0) (when (zero? (-> gp-0 part)) (str-play-async (-> gp-0 anim name) (-> gp-0 sid)) (set! (-> *art-control* active-stream) (-> gp-0 anim name)) diff --git a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc index 4bf64692c16..6f1ec6f46dc 100644 --- a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc @@ -1670,7 +1670,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy idle) enter))) (if t9-0 @@ -1694,7 +1694,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate dormant (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy dormant) enter))) (if t9-0 @@ -1717,14 +1717,14 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate dormant-aware (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy dormant) enter) ) ;; failed to figure out what this is: (defstate active (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy active) enter))) (if t9-0 @@ -1752,14 +1752,7 @@ This commonly includes things such as: (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1776,14 +1769,7 @@ This commonly includes things such as: 0 (nav-enemy-method-167 self) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1793,14 +1779,7 @@ This commonly includes things such as: ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1820,14 +1799,7 @@ This commonly includes things such as: (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.6)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1846,7 +1818,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate notice (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy notice) enter))) (if t9-0 @@ -1888,14 +1860,7 @@ This commonly includes things such as: (gp-0 (new 'stack-no-clear 'vector)) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1915,7 +1880,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate hostile (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy hostile) enter))) (if t9-0 @@ -1975,7 +1940,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate stop-chase (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((a1-0 (new 'stack-no-clear 'vector))) @@ -2055,7 +2020,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate stare (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy stare) enter))) (if t9-0 @@ -2174,10 +2139,7 @@ This commonly includes things such as: (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2192,7 +2154,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate taunt (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy stare) enter)) (let ((gp-0 (handle->process (-> self focus handle)))) @@ -2238,14 +2200,7 @@ This commonly includes things such as: ) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info taunt-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info taunt-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2261,7 +2216,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate pacing (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (look-at-target! self (enemy-flag lock-focus)) @@ -2369,10 +2324,7 @@ This commonly includes things such as: ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2397,7 +2349,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate circling (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (look-at-target! self (enemy-flag lock-focus)) @@ -2480,10 +2432,7 @@ This commonly includes things such as: ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -2535,7 +2484,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate flee (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy flee) enter))) (if t9-0 @@ -2574,7 +2523,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate victory (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy victory) enter))) (if t9-0 @@ -2599,7 +2548,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate hit (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy hit) enter))) (if t9-0 @@ -2622,14 +2571,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2692,7 +2634,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy die) enter))) (if t9-0 @@ -2716,7 +2658,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die-falling (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type enemy die-falling) enter))) (if t9-0 @@ -2930,7 +2872,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate directed (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag victory)) ((-> (method-of-type nav-enemy idle) enter)) @@ -2960,7 +2902,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate debug-control (nav-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) + :event enemy-event-handler :code (behavior () (let ((v1-0 *nav-enemy-debug-control-info*)) (set! (-> v1-0 steering) 0.0) @@ -2968,16 +2910,7 @@ This commonly includes things such as: ) (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/engine/physics/rigid-body-queue_REF.gc b/test/decompiler/reference/jak2/engine/physics/rigid-body-queue_REF.gc index 9feeda724f8..976fd73f04c 100644 --- a/test/decompiler/reference/jak2/engine/physics/rigid-body-queue_REF.gc +++ b/test/decompiler/reference/jak2/engine/physics/rigid-body-queue_REF.gc @@ -260,7 +260,7 @@ (set! (-> self queue count) 0) 0 ) - :code (the-as (function none :behavior rigid-body-queue-manager) sleep-code) + :code sleep-code :post (behavior () (local-vars (a0-3 int) (a0-5 int)) (let* ((v1-1 (-> *perf-stats* data 17)) diff --git a/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc b/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc index 58f7a3d1e7a..6e59d783be6 100644 --- a/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc +++ b/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc @@ -1532,8 +1532,8 @@ This commonly includes things such as: (go-virtual active) ) ) - :code (the-as (function none :behavior rigid-body-object) sleep-code) - :post (the-as (function none :behavior rigid-body-object) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1550,7 +1550,7 @@ This commonly includes things such as: (go-virtual idle) ) ) - :code (the-as (function none :behavior rigid-body-object) sleep-code) + :code sleep-code :post (behavior () (rigid-body-object-method-37 self) ) diff --git a/test/decompiler/reference/jak2/engine/process-drawable/process-drawable_REF.gc b/test/decompiler/reference/jak2/engine/process-drawable/process-drawable_REF.gc index 2a16bcdcb00..cfd09edb190 100644 --- a/test/decompiler/reference/jak2/engine/process-drawable/process-drawable_REF.gc +++ b/test/decompiler/reference/jak2/engine/process-drawable/process-drawable_REF.gc @@ -560,7 +560,7 @@ ;; failed to figure out what this is: (defstate empty-state (process) - :code (the-as (function none :behavior process) nothing) + :code nothing ) ;; failed to figure out what this is: @@ -627,7 +627,7 @@ ;; failed to figure out what this is: (defstate process-drawable-idle (process-drawable) - :code (the-as (function none :behavior process-drawable) sleep-code) + :code sleep-code :post ja-post ) @@ -1725,7 +1725,7 @@ ;; definition for function sleep-code ;; WARN: new jak 2 until loop case, check carefully -(defbehavior sleep-code process-drawable () +(defbehavior sleep-code process () (until #f (logior! (-> self mask) (process-mask sleep-code)) (suspend) diff --git a/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc b/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc index 274e983c969..274b6f58c5f 100644 --- a/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc +++ b/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc @@ -116,7 +116,7 @@ Seen take in - `true-func` which takes no args TODO - seems fishy ) ) ) - :code (the-as (function none :behavior process-taskable) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/engine/process-drawable/simple-focus_REF.gc b/test/decompiler/reference/jak2/engine/process-drawable/simple-focus_REF.gc index 92df758b68e..f750aa79582 100644 --- a/test/decompiler/reference/jak2/engine/process-drawable/simple-focus_REF.gc +++ b/test/decompiler/reference/jak2/engine/process-drawable/simple-focus_REF.gc @@ -55,7 +55,7 @@ ) ) ) - :code (the-as (function none :behavior simple-focus) sleep-code) + :code sleep-code ) ;; definition for function simple-focus-init-by-other diff --git a/test/decompiler/reference/jak2/engine/process-drawable/simple-nav-sphere_REF.gc b/test/decompiler/reference/jak2/engine/process-drawable/simple-nav-sphere_REF.gc index a19618be2f8..1590d89919c 100644 --- a/test/decompiler/reference/jak2/engine/process-drawable/simple-nav-sphere_REF.gc +++ b/test/decompiler/reference/jak2/engine/process-drawable/simple-nav-sphere_REF.gc @@ -86,7 +86,7 @@ ) ) ) - :code (the-as (function none :behavior simple-nav-sphere) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -101,7 +101,7 @@ (move-to-point! (-> self root) gp-0) ) ) - :code (the-as (function none :behavior simple-nav-sphere) sleep-code) + :code sleep-code ) ;; definition for function simple-nav-sphere-init-by-other diff --git a/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc b/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc index cc99c9304df..b911231530e 100644 --- a/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc @@ -651,13 +651,7 @@ (let ((v1-10 (ja-group))) (when (and v1-10 (= v1-10 (-> self draw art-group data 170))) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 190) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 190)) frames num-frames) -1)) - 1.8 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 190) :num! (seek! max 1.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.8)) @@ -1019,10 +1013,7 @@ (case arg2 (('hit) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 158) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 158)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 158) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1437,10 +1428,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 154) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 154)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 154) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1480,10 +1468,7 @@ :exit target-board-exit :trans target-board-jump-trans :code (behavior ((arg0 vector) (arg1 float)) - (ja-no-eval :group! (-> self draw art-group data 188) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 188)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 188) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (jump-hit-ground-stuck?) (< 31.0 (ja-aframe-num 0))) (go target-board-hit-ground) @@ -1612,10 +1597,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 181) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 181)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 181) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1632,10 +1614,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 182) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 182)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 182) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1650,10 +1629,7 @@ ) (cond (gp-0 - (ja-no-eval :group! (-> self draw art-group data 159) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 159)) frames num-frames) -1))) - :frame-num (ja-aframe 15.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 159) :num! (seek!) :frame-num (ja-aframe 15.0 0)) (until (ja-done? 0) (if (jump-hit-ground-stuck?) (go target-board-hit-ground) @@ -1663,10 +1639,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 178) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 178)) frames num-frames) -1))) - :frame-num (ja-aframe 10.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 178) :num! (seek!) :frame-num (ja-aframe 10.0 0)) (until (ja-done? 0) (if (jump-hit-ground-stuck?) (go target-board-hit-ground) @@ -1772,10 +1745,7 @@ (add-to-trick-list (-> self board) (board-tricks board-method) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-method")) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 174) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 174)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 174) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1794,10 +1764,7 @@ (add-to-trick-list (-> self board) (board-tricks board-nosegrab) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-nosegrab")) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 173) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 173)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 173) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1825,13 +1792,7 @@ (cond ((and v1-121 (= v1-121 (-> self draw art-group data 183))) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 184) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 184)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 184) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -1841,13 +1802,7 @@ (and v1-151 (= v1-151 (-> self draw art-group data 185))) ) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 186) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 186)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 186) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -1930,31 +1885,19 @@ (add-to-trick-list (-> self board) (board-tricks board-kickflip) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-kickflip")) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 175) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 175)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 175) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (send-event (ppointer->process (-> self sidekick)) 'matrix #f) - (ja-no-eval :group! (-> self draw art-group data 192) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 192)) frames num-frames) -1)) - 1.05 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 192) :num! (seek! max 1.05) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.05)) ) (send-event (ppointer->process (-> self sidekick)) 'matrix 'board) - (ja-no-eval :group! (-> self draw art-group data 193) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 193)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 193) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1964,13 +1907,7 @@ (add-to-trick-list (-> self board) (board-tricks board-board-spin) 500.0) (set! (-> self board unknown-sound-id01) (sound-play "board-boardspin")) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 176) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 176)) frames num-frames) -1)) - 0.95 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 176) :num! (seek! max 0.95) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.95)) @@ -2035,13 +1972,7 @@ (and v1-18 (= v1-18 (-> self draw art-group data 183))) ) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 184) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 184)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 184) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -2051,13 +1982,7 @@ (and v1-48 (= v1-48 (-> self draw art-group data 185))) ) (ja-channel-push! 1 (seconds 0.08)) - (ja-no-eval :group! (-> self draw art-group data 186) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 186)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 186) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -2614,13 +2539,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 170) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 170)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 170) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (when (logtest? (-> self control status) (collide-status on-surface)) (set! (-> self board turn-anim-duck-vel) 0.0) @@ -2671,10 +2590,7 @@ (set! (-> self neck flex-blend) 0.0) (set! (-> self control unknown-vector37 quad) (-> self control trans quad)) (set! (-> self control unknown-vector39 quad) (-> self control quat quad)) - (ja :group! s4-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja :group! s4-0 :num! (seek!) :frame-num 0.0) (until #f (let* ((s3-0 (handle->process arg0)) (s4-1 (if (type? s3-0 process-focusable) @@ -2847,13 +2763,7 @@ ) ((-> self control unknown-spool-anim00) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 191) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 191)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 191) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/test/decompiler/reference/jak2/engine/target/board/board-util_REF.gc b/test/decompiler/reference/jak2/engine/target/board/board-util_REF.gc index ee2b3fd1f2e..f42c7ffa703 100644 --- a/test/decompiler/reference/jak2/engine/target/board/board-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/board-util_REF.gc @@ -110,15 +110,10 @@ (ja-channel-push! 1 (seconds 0.1)) (cond (arg0 - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) ) (else - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -178,10 +173,7 @@ :code (behavior () (set! (-> self draw shadow) (-> self shadow-backup)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc b/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc index a8e8ecc8d4f..20711eafe6a 100644 --- a/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc @@ -451,7 +451,6 @@ ) ;; definition for function target-board-handler -;; WARN: Return type mismatch none vs object. (defbehavior target-board-handler target ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (local-vars (v0-0 object) (a0-10 uint)) (cond @@ -805,12 +804,12 @@ (defbehavior target-board-falling-anim-trans target () (let ((v1-2 (ja-group))) (cond - ((not (and v1-2 (= v1-2 (-> self draw art-group data 156)))) + ((not (and v1-2 (= v1-2 jakb-board-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.33)) - (ja :group! (-> self draw art-group data 156)) + (ja :group! jakb-board-jump-loop-ja) ) ((let ((v1-11 (ja-group))) - (and v1-11 (= v1-11 (-> self draw art-group data 156))) + (and v1-11 (= v1-11 jakb-board-jump-loop-ja)) ) (ja :num! (loop!)) ) diff --git a/test/decompiler/reference/jak2/engine/target/gun/gun-dark-shot_REF.gc b/test/decompiler/reference/jak2/engine/target/gun/gun-dark-shot_REF.gc index b4570f99ba5..bcb46d7bf99 100644 --- a/test/decompiler/reference/jak2/engine/target/gun/gun-dark-shot_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/gun/gun-dark-shot_REF.gc @@ -577,7 +577,7 @@ ) ) ) - :code (the-as (function none :behavior gun-dark-shot) sleep-code) + :code sleep-code ) ;; definition for function gun-dark-shot-init-fizzle diff --git a/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc b/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc index 23346c49eaf..b8484b61953 100644 --- a/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc @@ -551,10 +551,7 @@ (ja-channel-set! 1) (set! (-> self read-scale) #f) (until #f - (ja-no-eval :group! (-> self draw art-group data 12) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -629,120 +626,84 @@ (set! (-> self gun-type) (the-as pickup-type a0-5)) (cond ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 2)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 3)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 4)) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-red)) (= a0-5 1)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-red)) (= a0-5 3)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-red)) (= a0-5 4)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 1)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 2)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 4)) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 1)) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 2)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) ) ) ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 3)) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) diff --git a/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc index d7b4046978a..424052eeda3 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc @@ -389,7 +389,7 @@ ;; failed to figure out what this is: (defstate mech-lunge (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -417,13 +417,7 @@ (let ((gp-0 (new 'stack-no-clear 'matrix))) (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat)) (set! (-> gp-0 vector 1 quad) (-> self root trans quad)) - (ja-no-eval :group! (-> self draw art-group data 48) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 48)) frames num-frames) -1)) - 0.769 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 48) :num! (seek! max 0.769) :frame-num 0.0) (until (ja-done? 0) (let ((s5-0 *grunt-mech-info*)) (grunt-mech-info-method-10 s5-0) @@ -446,7 +440,7 @@ ) (go-virtual mech-hold) ) - :post (the-as (function none :behavior grunt-mech) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for function grunt-mech-hold-post @@ -602,7 +596,7 @@ ;; failed to figure out what this is: (defstate mech-hold (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -625,10 +619,7 @@ ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 49) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 49)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 49) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -719,13 +710,7 @@ ) (when (= (get-rand-int self 4) 3) (ja-channel-push! 1 (seconds 0.13)) - (ja-no-eval :group! (-> self draw art-group data 50) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 50)) frames num-frames) -1)) - 0.090909 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 50) :num! (seek! max 0.090909) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.090909)) @@ -742,7 +727,7 @@ ;; failed to figure out what this is: (defstate mech-dismount (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self root root-prim prim-core collide-as) (collide-spec)) @@ -784,10 +769,7 @@ (quaternion-look-at! (the-as quaternion (-> gp-0 vector 2)) (-> gp-0 vector 1) *up-vector*) (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat)) (set! (-> gp-0 vector 1 quad) (-> self root trans quad)) - (ja-no-eval :group! (-> self draw art-group data 54) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 54)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 54) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f30-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 33.0 41.0))) (quaternion-slerp! @@ -815,10 +797,7 @@ ) 0 (logclear! (-> self nav state flags) (nav-state-flag at-target)) - (ja-no-eval :group! (-> self draw art-group data 55) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 55)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 55) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -826,13 +805,13 @@ (ja-channel-push! 1 (seconds 0.13)) (go-virtual mech-post-circling) ) - :post (the-as (function none :behavior grunt-mech) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate mech-post-circling (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type grunt circling) enter)) (set! (-> self state-timeout) (+ (current-time) (get-rand-int-range self 750 1200))) @@ -891,7 +870,7 @@ ;; failed to figure out what this is: (defstate mech-pre-circling (grunt-mech) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type grunt-mech mech-post-circling) enter)) (set! (-> self state-timeout) (+ (current-time) (get-rand-int-range self 900 1800))) diff --git a/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc index 5f6490fca82..5837b4a736e 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc @@ -439,11 +439,8 @@ ) (ja-channel-push! 1 (seconds 0.1)) (if (zero? arg0) - (ja-no-eval :group! s5-0 :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-0) frames num-frames) -1)))) - (ja-no-eval :group! s5-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-0) frames num-frames) -1))) - :frame-num (ja-aframe 10.0 0) - ) + (ja-no-eval :group! s5-0 :num! (seek!)) + (ja-no-eval :group! s5-0 :num! (seek!) :frame-num (ja-aframe 10.0 0)) ) ) (-> self mech walk-anim-leg) @@ -1246,10 +1243,7 @@ ) ) ) - (ja-no-eval :group! gp-5 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-5) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-5 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) @@ -1330,10 +1324,7 @@ (set! (-> self alt-cam-pos quad) (-> self control trans quad)) (set! (-> self post-hook) target-no-move-post) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 70) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self control transv quad) (the-as uint128 0)) (vector-seek! @@ -1577,10 +1568,7 @@ (cond (gp-0 (ja-channel-push! 1 (seconds 0.01)) - (ja-no-eval :group! (-> self draw art-group data 347) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 347)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 347) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1734,9 +1722,7 @@ ) ) (ja-channel-push! 2 (seconds 0.1)) - (ja :group! (-> self draw art-group data 337) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 337)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 337) :num! max) (let ((a0-19 (-> self skel root-channel 1))) (set! (-> a0-19 frame-interp 1) f30-0) (set! (-> a0-19 frame-interp 0) f30-0) @@ -2592,10 +2578,7 @@ ) (set! (-> self mech mech-scale quad) (-> self control scale quad)) (set! (-> self mech stick-off) (the-as basic #t)) - (ja-no-eval :group! (-> self draw art-group data 350) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 350)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 350) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 70.0 80.0)))) (let ((f28-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 70.0 80.0))) @@ -2646,10 +2629,7 @@ (send-event *camera* 'set-dist #f #f) (set! (-> self neck flex-blend) 0.0) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 349) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 349)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 349) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (< 51.0 (ja-aframe-num 0)) (logior! (-> self state-flags) (state-flags sf6)) diff --git a/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc index 7cae6461f96..1d4819a90c4 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc @@ -205,7 +205,7 @@ ) #f ) - :post (the-as (function none :behavior mech) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc b/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc index ec233ae84b0..8e78d2f9f68 100644 --- a/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc @@ -247,7 +247,7 @@ ) ) ) - :code (the-as (function none :behavior sidekick) looping-code) + :code looping-code :post (behavior () (when (not (and (-> (ppointer->process (-> self parent)) next-state) (= (-> (ppointer->process (-> self parent)) next-state name) 'process-drawable-art-error) @@ -406,7 +406,7 @@ (the-as shadow-geo (if (or (and (movie?) (-> self shadow-in-movie?)) (logtest? (focus-status indax) (-> self parent 0 focus-status))) - (-> self draw art-group data 3) + daxter-shadow-mg ) ) ) diff --git a/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc b/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc index aca425ff4e1..47d82659cee 100644 --- a/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc @@ -7,20 +7,18 @@ ((using-gun? self) (case (-> self gun gun-type) (((pickup-type eco-red) (pickup-type eco-dark)) - (-> self draw art-group data 277) + jakb-gun-jump-land-ja ) (else - (-> self draw art-group data 278) + jakb-gun-jump-land-side-ja ) ) ) (else (let ((v1-9 (ja-group))) - (if (or (and v1-9 (= v1-9 (-> self draw art-group data 394))) - (and (focus-test? self dark) (nonzero? (-> self darkjak))) - ) - (-> self draw art-group data 395) - (-> self draw art-group data 24) + (if (or (and v1-9 (= v1-9 jakb-darkjak-jump-ja)) (and (focus-test? self dark) (nonzero? (-> self darkjak)))) + jakb-darkjak-jump-land-ja + jakb-jump-land-ja ) ) ) @@ -35,11 +33,11 @@ (new 'stack 'ground-tween-info) (let ((v1-4 (ja-group))) (cond - ((and v1-4 (or (= v1-4 (-> self draw art-group data 94)) (= v1-4 (-> self draw art-group data 95)))) + ((and v1-4 (or (= v1-4 jakb-wade-shallow-walk-ja) (= v1-4 jakb-wade-deep-walk-ja))) (set! gp-0 45) ) ((let ((v1-11 (ja-group))) - (and v1-11 (= v1-11 (-> self draw art-group data 61))) + (and v1-11 (= v1-11 jakb-roll-flip-ja)) ) ((lambda :behavior target () @@ -50,7 +48,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 285)) + (the-as art-joint-anim jakb-gun-roll-flip-land-ja) 0.0 0 30 @@ -62,7 +60,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 285)) + (the-as art-joint-anim jakb-gun-roll-flip-land-ja) 0.0 0 30 @@ -72,17 +70,14 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek! (ja-aframe 48.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-roll-flip-land-ja :num! (seek! (ja-aframe 48.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 48.0 0))) ) (ja-channel-push! 1 (seconds 0.05)) (let ((gp-2 (target-land-anim))) - (ja-no-eval :group! gp-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-2) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! gp-2 :num! (seek!) :frame-num (ja-aframe 64.0 0)) ) (until (ja-done? 0) (ja-blend-eval) @@ -91,18 +86,12 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 62) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-roll-flip-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 55.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 55.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -114,11 +103,10 @@ ) ) ((let ((v1-18 (ja-group))) - (and v1-18 - (or (= v1-18 (-> self draw art-group data 40)) - (= v1-18 (-> self draw art-group data 248)) - (= v1-18 (-> self draw art-group data 250)) - ) + (and v1-18 (or (= v1-18 jakb-attack-from-stance-ja) + (= v1-18 jakb-gun-attack-from-stance-ja) + (= v1-18 jakb-gun-attack-from-stance-blue-ja) + ) ) ) ((lambda :behavior target @@ -126,20 +114,20 @@ (set! (-> self control mod-surface) *attack-end-mods*) (let* ((v1-3 (ja-group)) (a1-0 (cond - ((and v1-3 (= v1-3 (-> self draw art-group data 248))) - (-> self draw art-group data 249) + ((and v1-3 (= v1-3 jakb-gun-attack-from-stance-ja)) + jakb-gun-attack-from-stance-end-ja ) (else (let ((v1-10 (ja-group))) (cond - ((and v1-10 (= v1-10 (-> self draw art-group data 250))) - (-> self draw art-group data 251) + ((and v1-10 (= v1-10 jakb-gun-attack-from-stance-blue-ja)) + jakb-gun-attack-from-stance-blue-end-ja ) ((rand-vu-percent? 0.3) - (-> self draw art-group data 42) + jakb-attack-from-stance-alt-end-ja ) (else - (-> self draw art-group data 41) + jakb-attack-from-stance-end-ja ) ) ) @@ -147,10 +135,7 @@ ) ) ) - (ja-no-eval :group! a1-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (when (nonzero? (-> self gun track-target-hold-time)) @@ -171,14 +156,11 @@ (label cfg-23) (set! (-> self control mod-surface) *walk-mods*) (let ((v1-57 (ja-group))) - (when (and (and v1-57 (= v1-57 (-> self draw art-group data 249))) + (when (and (and v1-57 (= v1-57 jakb-gun-attack-from-stance-end-ja)) (and (using-gun? self) (= (-> self gun gun-type) (pickup-type eco-yellow))) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 270) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 270)) frames num-frames) -1))) - :frame-num (ja-aframe 5.0 0) - ) + (ja-no-eval :group! jakb-gun-front-to-side-hop-ja :num! (seek!) :frame-num (ja-aframe 5.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -190,31 +172,25 @@ ) ) ((let ((v1-25 (ja-group))) - (and v1-25 (= v1-25 (-> self draw art-group data 399))) + (and v1-25 (= v1-25 jakb-darkjak-attack-spin-ja)) ) - (ja-no-eval :group! (-> self draw art-group data 400) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 400)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-attack-spin-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-55 (ja-group))) - (and v1-55 (= v1-55 (-> self draw art-group data 71))) + (and v1-55 (= v1-55 jakb-smack-surface-ja)) ) - (ja-no-eval :group! (-> self draw art-group data 72) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 72)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-smack-surface-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-85 (ja-group))) - (and v1-85 (= v1-85 (-> self draw art-group data 412))) + (and v1-85 (= v1-85 jakb-darkjak-get-on-fast-ja)) ) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) @@ -222,10 +198,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 396) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 396)) frames num-frames) -1))) - :frame-num (ja-aframe 15.0 0) - ) + (ja-no-eval :group! jakb-darkjak-stance-ja :num! (seek!) :frame-num (ja-aframe 15.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -233,12 +206,12 @@ (set! gp-0 0) ) ((let ((v1-125 (ja-group))) - (and v1-125 (or (= v1-125 (-> self draw art-group data 48)) - (= v1-125 (-> self draw art-group data 402)) - (= v1-125 (-> self draw art-group data 409)) - (= v1-125 (-> self draw art-group data 404)) - (= v1-125 (-> self draw art-group data 406)) - (= v1-125 (-> self draw art-group data 413)) + (and v1-125 (or (= v1-125 jakb-attack-punch-ja) + (= v1-125 jakb-darkjak-attack-combo1-ja) + (= v1-125 jakb-darkjak-attack-combo1b-ja) + (= v1-125 jakb-darkjak-attack-combo2-ja) + (= v1-125 jakb-darkjak-attack-combo3-ja) + (= v1-125 jakb-darkjak-attack-combo3c-ja) ) ) ) @@ -248,40 +221,40 @@ (set! (-> self control mod-surface) *walk-no-turn-mods*) (let* ((v1-5 (ja-group)) (a1-0 (cond - ((and v1-5 (= v1-5 (-> self draw art-group data 402))) + ((and v1-5 (= v1-5 jakb-darkjak-attack-combo1-ja)) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 403) + jakb-darkjak-attack-combo1-end-ja ) ((let ((v1-14 (ja-group))) - (and v1-14 (= v1-14 (-> self draw art-group data 409))) + (and v1-14 (= v1-14 jakb-darkjak-attack-combo1b-ja)) ) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 410) + jakb-darkjak-attack-combo1b-end-ja ) ((let ((v1-23 (ja-group))) - (and v1-23 (= v1-23 (-> self draw art-group data 404))) + (and v1-23 (= v1-23 jakb-darkjak-attack-combo2-ja)) ) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 405) + jakb-darkjak-attack-combo2-end-ja ) ((let ((v1-32 (ja-group))) - (and v1-32 (= v1-32 (-> self draw art-group data 406))) + (and v1-32 (= v1-32 jakb-darkjak-attack-combo3-ja)) ) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 407) + jakb-darkjak-attack-combo3-end-ja ) (else (let ((v1-41 (ja-group))) (cond - ((and v1-41 (= v1-41 (-> self draw art-group data 413))) + ((and v1-41 (= v1-41 jakb-darkjak-attack-combo3c-ja)) (logior! (-> self state-flags) (state-flags lleg-still)) - (-> self draw art-group data 414) + jakb-darkjak-attack-combo3c-end-ja ) ((rand-vu-percent? 0.3) - (-> self draw art-group data 50) + jakb-attack-punch-alt-end-ja ) (else - (-> self draw art-group data 49) + jakb-attack-punch-end-ja ) ) ) @@ -289,10 +262,7 @@ ) ) ) - (ja-no-eval :group! a1-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (seek! (-> self control bend-target) 0.0 (seconds-per-frame)) @@ -308,15 +278,12 @@ ) ) ((let ((v1-132 (ja-group))) - (and v1-132 (= v1-132 (-> self draw art-group data 273))) + (and v1-132 (= v1-132 jakb-gun-attack-butt-ja)) ) (set! (-> self control bend-target) (-> self control bend-amount)) (set! (-> self control mod-surface) *walk-no-turn-mods*) - (let ((a1-18 (-> self draw art-group data 274))) - (ja-no-eval :group! a1-18 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-18) frames num-frames) -1))) - :frame-num 0.0 - ) + (let ((a1-18 jakb-gun-attack-butt-end-ja)) + (ja-no-eval :group! a1-18 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (seek! (-> self control bend-target) 0.0 (seconds-per-frame)) @@ -328,15 +295,12 @@ (rot->dir-targ! (-> self control)) ) ((let ((v1-166 (ja-group))) - (and v1-166 (= v1-166 (-> self draw art-group data 275))) + (and v1-166 (= v1-166 jakb-gun-attack-butt-blue-ja)) ) (set! (-> self control bend-target) (-> self control bend-amount)) (set! (-> self control mod-surface) *walk-no-turn-mods*) - (let ((a1-21 (-> self draw art-group data 276))) - (ja-no-eval :group! a1-21 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-21) frames num-frames) -1))) - :frame-num 0.0 - ) + (let ((a1-21 jakb-gun-attack-butt-blue-end-ja)) + (ja-no-eval :group! a1-21 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (seek! (-> self control bend-target) 0.0 (seconds-per-frame)) @@ -348,18 +312,18 @@ (rot->dir-targ! (-> self control)) ) ((let ((v1-200 (ja-group))) - (and (and v1-200 (or (= v1-200 (-> self draw art-group data 277)) (= v1-200 (-> self draw art-group data 278)))) + (and (and v1-200 (or (= v1-200 jakb-gun-jump-land-ja) (= v1-200 jakb-gun-jump-land-side-ja))) (not (using-gun? self)) ) ) (set! gp-0 60) ) ((let ((v1-208 (ja-group))) - (and v1-208 (or (= v1-208 (-> self draw art-group data 20)) - (= v1-208 (-> self draw art-group data 21)) - (= v1-208 (-> self draw art-group data 302)) - (= v1-208 (-> self draw art-group data 59)) - (= v1-208 (-> self draw art-group data 282)) + (and v1-208 (or (= v1-208 jakb-duck-stance-ja) + (= v1-208 jakb-duck-walk-ja) + (= v1-208 jakb-gun-duck-walk-ja) + (= v1-208 jakb-duck-roll-ja) + (= v1-208 jakb-gun-duck-roll-ja) ) ) ) @@ -369,10 +333,7 @@ ) (else (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! 0.0 1.2) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - ) + (ja-no-eval :group! jakb-stance-to-duck-ja :num! (seek! 0.0 1.2) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0 1.2)) @@ -382,15 +343,15 @@ ) ) ((let ((v1-240 (ja-group))) - (or (and (and v1-240 (or (= v1-240 (-> self draw art-group data 12)) (= v1-240 (-> self draw art-group data 392)))) + (or (and (and v1-240 (or (= v1-240 jakb-walk-ja) (= v1-240 jakb-darkjak-walk-ja))) (begin (set! gp-0 45) (< 0.5 (-> self skel root-channel 6 frame-interp (-> self skel active-frame-interp)))) (not (using-gun? self)) ) (let ((v1-253 (ja-group))) - (and v1-253 (or (= v1-253 (-> self draw art-group data 17)) - (= v1-253 (-> self draw art-group data 18)) - (= v1-253 (-> self draw art-group data 43)) - (= v1-253 (-> self draw art-group data 44)) + (and v1-253 (or (= v1-253 jakb-run-squash-ja) + (= v1-253 jakb-run-squash-weak-ja) + (= v1-253 jakb-attack-from-stance-run-end-ja) + (= v1-253 jakb-attack-from-stance-run-alt-end-ja) ) ) ) @@ -399,10 +360,7 @@ (cond ((and (rand-vu-percent? 0.3) (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-run-to-stance-fast-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -410,22 +368,21 @@ ) (else (let* ((v1-288 (ja-group)) - (f30-1 - (cond - ((and v1-288 (or (= v1-288 (-> self draw art-group data 12)) (= v1-288 (-> self draw art-group data 392)))) - (let ((f0-65 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) - (- f0-65 (* (the float (the int (/ f0-65 50.0))) 50.0)) + (f30-1 (cond + ((and v1-288 (or (= v1-288 jakb-walk-ja) (= v1-288 jakb-darkjak-walk-ja))) + (let ((f0-65 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) + (- f0-65 (* (the float (the int (/ f0-65 50.0))) 50.0)) + ) + ) + (else + 0.0 + ) + ) ) - ) - (else - 0.0 - ) - ) - ) ) (set! gp-0 45) (ja-channel-push! 1 (the-as time-frame gp-0)) - (ja :group! (-> self draw art-group data 4) :num! (identity (ja-aframe f30-1 0))) + (ja :group! jakb-run-to-stance-loop-ja :num! (identity (ja-aframe f30-1 0))) ) (dotimes (s5-1 3) (until (ja-done? 0) @@ -434,25 +391,19 @@ ) (ja :num-func num-func-identity :frame-num 0.0) ) - (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (ja-aframe 82.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek! (ja-aframe 82.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 82.0 0))) ) (when (not (and (focus-test? self dark) (nonzero? (-> self darkjak)))) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (ja-aframe 142.0 0)) - :frame-num (ja-aframe 82.0 0) - ) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek! (ja-aframe 142.0 0)) :frame-num (ja-aframe 82.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 142.0 0))) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num (ja-aframe 142.0 0) - ) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek!) :frame-num (ja-aframe 142.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -462,7 +413,7 @@ ) ) ((let ((v1-378 (ja-group))) - (and (and v1-378 (= v1-378 (-> self draw art-group data 12))) (>= (-> self control ctrl-xz-vel) 5734.4)) + (and (and v1-378 (= v1-378 jakb-walk-ja)) (>= (-> self control ctrl-xz-vel) 5734.4)) ) (set! gp-0 45) ) @@ -472,15 +423,15 @@ (go target-gun-stance) ) (let ((v1-395 (ja-group))) - (if (not (and (and v1-395 (= v1-395 (-> self draw art-group data 5))) (= (ja-group-size) 1))) + (if (not (and (and v1-395 (= v1-395 jakb-stance-loop-ja)) (= (ja-group-size) 1))) (ja-channel-push! 1 (the-as time-frame gp-0)) ) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (if (and (focus-test? self dark) (nonzero? (-> self darkjak))) - (ja :group! (-> self draw art-group data 396)) - (ja :group! (-> self draw art-group data 5)) + (ja :group! jakb-darkjak-stance-ja) + (ja :group! jakb-stance-loop-ja) ) (until #f (suspend) @@ -498,32 +449,25 @@ (defbehavior target-stance-push target ((arg0 int)) (let ((v1-2 (ja-group))) (cond - ((or (and (and v1-2 (= v1-2 (-> self draw art-group data 12))) + ((or (and (and v1-2 (= v1-2 jakb-walk-ja)) (< 0.5 (-> self skel root-channel 6 frame-interp (-> self skel active-frame-interp))) ) (let ((v1-14 (ja-group))) - (and v1-14 - (or (= v1-14 (-> self draw art-group data 17)) - (= v1-14 (-> self draw art-group data 18)) - (= v1-14 (-> self draw art-group data 43)) - (= v1-14 (-> self draw art-group data 44)) - ) + (and v1-14 (or (= v1-14 jakb-run-squash-ja) + (= v1-14 jakb-run-squash-weak-ja) + (= v1-14 jakb-attack-from-stance-run-end-ja) + (= v1-14 jakb-attack-from-stance-run-alt-end-ja) + ) ) ) ) (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-run-to-stance-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-run-to-stance-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -531,11 +475,11 @@ (ja-channel-push! arg0 (seconds 0.15)) ) ((let ((v1-68 (ja-group))) - (and (and v1-68 (or (= v1-68 (-> self draw art-group data 28)) - (= v1-68 (-> self draw art-group data 24)) - (= v1-68 (-> self draw art-group data 277)) - (= v1-68 (-> self draw art-group data 278)) - (= v1-68 (-> self draw art-group data 395)) + (and (and v1-68 (or (= v1-68 jakb-jump-short-land-ja) + (= v1-68 jakb-jump-land-ja) + (= v1-68 jakb-gun-jump-land-ja) + (= v1-68 jakb-gun-jump-land-side-ja) + (= v1-68 jakb-darkjak-jump-land-ja) ) ) (not (ja-max? 0)) @@ -549,7 +493,7 @@ (ja-channel-push! arg0 (seconds 0.075)) ) ((let ((v1-84 (ja-group))) - (not (and (and v1-84 (= v1-84 (-> self draw art-group data 5))) (= (ja-group-size) 1))) + (not (and (and v1-84 (= v1-84 jakb-stance-loop-ja)) (= (ja-group-size) 1))) ) (ja-channel-push! arg0 (seconds 0.075)) ) @@ -563,27 +507,22 @@ (defbehavior target-falling-anim target ((arg0 int) (arg1 time-frame)) (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 27)) - (= v1-2 (-> self draw art-group data 51)) - (= v1-2 (-> self draw art-group data 267)) - ) + ((and v1-2 + (or (= v1-2 jakb-jump-loop-ja) (= v1-2 jakb-attack-uppercut-ja) (= v1-2 jakb-gun-attack-upperbutt-ja)) ) ) ((let ((v1-8 (ja-group))) - (and v1-8 (or (= v1-8 (-> self draw art-group data 33)) (= v1-8 (-> self draw art-group data 34)))) + (and v1-8 (or (= v1-8 jakb-edge-grab-stance0-ja) (= v1-8 jakb-edge-grab-stance1-ja))) ) (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 39) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-edge-grab-off-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-37 (ja-group))) - (and v1-37 (= v1-37 (-> self draw art-group data 39))) + (and v1-37 (= v1-37 jakb-edge-grab-off-ja)) ) (until (ja-done? 0) (suspend) @@ -594,14 +533,14 @@ (else (let ((v1-52 (ja-group))) (cond - ((and v1-52 (= v1-52 (-> self draw art-group data 61))) + ((and v1-52 (= v1-52 jakb-roll-flip-ja)) (let ((s5-0 (current-time))) (while (or (= arg0 -1) (< (- (current-time) s5-0) arg0)) (when (>= (- (current-time) s5-0) (seconds 0.01)) (let ((v1-62 (ja-group))) - (when (not (and v1-62 (= v1-62 (-> self draw art-group data 27)))) + (when (not (and v1-62 (= v1-62 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja :group! (-> self draw art-group data 27) :num! min) + (ja :group! jakb-jump-loop-ja :num! min) ) ) ) @@ -623,7 +562,7 @@ ) (suspend) (let ((v1-74 (ja-group))) - (if (and v1-74 (= v1-74 (-> self draw art-group data 27))) + (if (and v1-74 (= v1-74 jakb-jump-loop-ja)) (ja :num! (loop!)) (ja :num! (seek!)) ) @@ -634,7 +573,7 @@ ) (else (ja-channel-push! 1 arg1) - (ja :group! (-> self draw art-group data 27)) + (ja :group! jakb-jump-loop-ja) (while (!= (-> self skel root-channel 0) (-> self skel channel)) (suspend) ) @@ -644,13 +583,13 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (let ((s5-1 (current-time))) (while (or (= arg0 -1) (and (< (- (current-time) s5-1) arg0) (not (logtest? (-> self control status) (collide-status on-surface)))) ) (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) ) #f @@ -661,19 +600,19 @@ (defbehavior target-falling-anim-trans target () (let ((v1-2 (ja-group))) (cond - ((not (and v1-2 (or (= v1-2 (-> self draw art-group data 27)) - (= v1-2 (-> self draw art-group data 24)) - (= v1-2 (-> self draw art-group data 277)) - (= v1-2 (-> self draw art-group data 278)) + ((not (and v1-2 (or (= v1-2 jakb-jump-loop-ja) + (= v1-2 jakb-jump-land-ja) + (= v1-2 jakb-gun-jump-land-ja) + (= v1-2 jakb-gun-jump-land-side-ja) ) ) ) (ja-channel-push! 1 (seconds 0.33)) - (ja :group! (-> self draw art-group data 27)) + (ja :group! jakb-jump-loop-ja) ) ((and (logtest? (-> self control status) (collide-status on-surface)) (let ((v1-15 (ja-group))) - (and (not (and v1-15 (= v1-15 (-> self draw art-group data 24)))) + (and (not (and v1-15 (= v1-15 jakb-jump-land-ja))) (not (logtest? (-> self control status) (collide-status on-water))) ) ) @@ -682,15 +621,13 @@ (set! (-> self skel root-channel 0 frame-group) (the-as art-joint-anim (target-land-anim))) ) ((let ((v1-23 (ja-group))) - (and v1-23 (= v1-23 (-> self draw art-group data 27))) + (and v1-23 (= v1-23 jakb-jump-loop-ja)) ) (ja :num! (loop!)) ) ((let ((v1-33 (ja-group))) - (and v1-33 (or (= v1-33 (-> self draw art-group data 24)) - (= v1-33 (-> self draw art-group data 277)) - (= v1-33 (-> self draw art-group data 278)) - ) + (and v1-33 + (or (= v1-33 jakb-jump-land-ja) (= v1-33 jakb-gun-jump-land-ja) (= v1-33 jakb-gun-jump-land-side-ja)) ) ) (ja :num! (seek!)) @@ -722,54 +659,42 @@ ) (let ((v1-6 (ja-group))) (cond - ((and v1-6 (= v1-6 (-> self draw art-group data 22))) + ((and v1-6 (= v1-6 jakb-turn-around-ja)) (set! f26-0 1.0) (ja-channel-push! 7 (seconds 0.05)) ) ((let ((v1-12 (ja-group))) - (and v1-12 (or (= v1-12 (-> self draw art-group data 59)) (= v1-12 (-> self draw art-group data 282)))) + (and v1-12 (or (= v1-12 jakb-duck-roll-ja) (= v1-12 jakb-gun-duck-roll-ja))) ) (ja-channel-push! 7 (seconds 0.075)) (set! f26-0 1.0) ) ((let ((v1-19 (ja-group))) - (and v1-19 (= v1-19 (-> self draw art-group data 40))) + (and v1-19 (= v1-19 jakb-attack-from-stance-ja)) ) ((lambda :behavior target () (let ((f30-0 (fmax 0.8 (fmin 1.0 (* 0.000048828126 (-> self control ctrl-xz-vel)))))) (cond ((and (rand-vu-percent? 0.3) (< 20480.0 (-> self control ctrl-xz-vel))) - (ja-no-eval :group! (-> self draw art-group data 42) :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) + (ja-no-eval :group! jakb-attack-from-stance-alt-end-ja :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 29.0 0) f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 44) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-stance-run-alt-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 41) :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) + (ja-no-eval :group! jakb-attack-from-stance-end-ja :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 29.0 0) f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 43) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 43)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-stance-run-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -785,21 +710,21 @@ (set! f24-0 30.0) ) ((let ((v1-27 (ja-group))) - (and v1-27 (or (= v1-27 (-> self draw art-group data 408)) (= v1-27 (-> self draw art-group data 411)))) + (and v1-27 (or (= v1-27 jakb-darkjak-get-off-ja) (= v1-27 jakb-darkjak-bomb-end-ja))) ) (set! f26-0 1.0) (ja-channel-push! 7 (seconds 0.3)) ) ((let ((v1-33 (ja-group))) - (and v1-33 (or (= v1-33 (-> self draw art-group data 48)) - (= v1-33 (-> self draw art-group data 49)) - (= v1-33 (-> self draw art-group data 273)) - (= v1-33 (-> self draw art-group data 275)) - (= v1-33 (-> self draw art-group data 403)) - (= v1-33 (-> self draw art-group data 410)) - (= v1-33 (-> self draw art-group data 405)) - (= v1-33 (-> self draw art-group data 407)) - (= v1-33 (-> self draw art-group data 414)) + (and v1-33 (or (= v1-33 jakb-attack-punch-ja) + (= v1-33 jakb-attack-punch-end-ja) + (= v1-33 jakb-gun-attack-butt-ja) + (= v1-33 jakb-gun-attack-butt-blue-ja) + (= v1-33 jakb-darkjak-attack-combo1-end-ja) + (= v1-33 jakb-darkjak-attack-combo1b-end-ja) + (= v1-33 jakb-darkjak-attack-combo2-end-ja) + (= v1-33 jakb-darkjak-attack-combo3-end-ja) + (= v1-33 jakb-darkjak-attack-combo3c-end-ja) ) ) ) @@ -808,11 +733,7 @@ (ja-channel-push! 7 (seconds 0.15)) ) ((let ((v1-40 (ja-group))) - (and (and v1-40 (or (= v1-40 (-> self draw art-group data 12)) - (= v1-40 (-> self draw art-group data 261)) - (= v1-40 (-> self draw art-group data 392)) - ) - ) + (and (and v1-40 (or (= v1-40 jakb-walk-ja) (= v1-40 jakb-gun-walk-side-ja) (= v1-40 jakb-darkjak-walk-ja))) (= (ja-group-size) 7) ) ) @@ -828,25 +749,23 @@ (ja-channel-push! 7 (seconds 0.1)) ) ((let ((v1-55 (ja-group))) - (and v1-55 (= v1-55 (-> self draw art-group data 94))) + (and v1-55 (= v1-55 jakb-wade-shallow-walk-ja)) ) (set! f24-0 (ja-aframe-num 0)) (ja-channel-push! 7 (seconds 0.05)) ) ((let ((v1-60 (ja-group))) (and (or (and v1-60 - (or (= v1-60 (-> self draw art-group data 27)) - (= v1-60 (-> self draw art-group data 61)) - (= v1-60 (-> self draw art-group data 47)) - (= v1-60 (-> self draw art-group data 51)) - (= v1-60 (-> self draw art-group data 267)) - (= v1-60 (-> self draw art-group data 54)) + (or (= v1-60 jakb-jump-loop-ja) + (= v1-60 jakb-roll-flip-ja) + (= v1-60 jakb-attack-from-jump-end-ja) + (= v1-60 jakb-attack-uppercut-ja) + (= v1-60 jakb-gun-attack-upperbutt-ja) + (= v1-60 jakb-flop-down-land-ja) ) ) (let ((v1-66 (ja-group))) - (and (and v1-66 (or (= v1-66 (-> self draw art-group data 23)) (= v1-66 (-> self draw art-group data 394)))) - (< 30.0 (ja-aframe-num 0)) - ) + (and (and v1-66 (or (= v1-66 jakb-jump-ja) (= v1-66 jakb-darkjak-jump-ja))) (< 30.0 (ja-aframe-num 0))) ) ) (< 12288.0 (-> self control ctrl-xz-vel)) @@ -858,41 +777,38 @@ (f30-0 (-> self control ground-impact-vel)) ) (let ((v1-7 (ja-group))) - (if (and v1-7 (or (= v1-7 (-> self draw art-group data 61)) (= v1-7 (-> self draw art-group data 47)))) + (if (and v1-7 (or (= v1-7 jakb-roll-flip-ja) (= v1-7 jakb-attack-from-jump-end-ja))) (ja-channel-push! 1 (seconds 0.05)) (ja-channel-set! 1) ) ) (cond - ((< (if (= gp-0 (-> self draw art-group data 23)) + ((< (if (= gp-0 jakb-jump-ja) 77824.0 102400.0 ) f30-0 ) - (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek! (ja-aframe 3.0 0) 1.00001) :frame-num 0.0) + (ja-no-eval :group! jakb-run-squash-ja :num! (seek! (ja-aframe 3.0 0) 1.00001) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 1.00001)) ) ) - ((< (if (= gp-0 (-> self draw art-group data 23)) + ((< (if (= gp-0 jakb-jump-ja) 61440.0 102400.0 ) f30-0 ) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (ja-aframe 3.0 0) 1.00001) - :frame-num (ja-aframe -1.0 0) - ) + (ja-no-eval :group! jakb-run-squash-ja :num! (seek! (ja-aframe 3.0 0) 1.00001) :frame-num (ja-aframe -1.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 1.00001)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek! (ja-aframe 4.0 0) 1.00001) :frame-num 0.0) + (ja-no-eval :group! jakb-run-squash-weak-ja :num! (seek! (ja-aframe 4.0 0) 1.00001) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 4.0 0) 1.00001)) @@ -904,21 +820,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 262)) - 16.0 - 90 - 60 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-run-blue-ja) 16.0 90 60 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 299)) + (the-as art-joint-anim jakb-gun-front-run-ja) 16.0 90 60 @@ -945,7 +852,7 @@ (set! f26-0 1.0) ) ((let ((v1-78 (ja-group))) - (and v1-78 (or (= v1-78 (-> self draw art-group data 23)) (= v1-78 (-> self draw art-group data 394)))) + (and v1-78 (or (= v1-78 jakb-jump-ja) (= v1-78 jakb-darkjak-jump-ja))) ) (ja-channel-push! 7 (seconds 0.05)) (set! s5-0 #t) @@ -953,7 +860,7 @@ (else (let ((v1-84 (ja-group))) (cond - ((and v1-84 (= v1-84 (-> self draw art-group data 71))) + ((and v1-84 (= v1-84 jakb-smack-surface-ja)) (ja-channel-push! 7 (seconds 0.15)) ) ((and (focus-test? self dark) (nonzero? (-> self darkjak))) @@ -970,7 +877,7 @@ ) (set! (-> self skel root-channel 3 command) (joint-control-command push)) (set! (-> self skel root-channel 6 command) (joint-control-command stack)) - (ja :group! (-> self draw art-group data 12)) + (ja :group! jakb-walk-ja) (let ((f24-1 (ja-aframe f24-0 0))) (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) @@ -980,11 +887,7 @@ (set! (-> s4-0 frame-interp 0) f0-3) ) (set! (-> s4-0 dist) 12288.0) - (joint-control-channel-group-eval! - s4-0 - (the-as art-joint-anim (-> self draw art-group data 392)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-0 (the-as art-joint-anim jakb-darkjak-walk-ja) num-func-identity) (set! (-> s4-0 frame-num) f24-1) ) ) @@ -997,11 +900,7 @@ (set! (-> s4-1 frame-interp 0) f0-5) ) (set! (-> s4-1 dist) 12288.0) - (joint-control-channel-group-eval! - s4-1 - (the-as art-joint-anim (-> self draw art-group data 261)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-1 (the-as art-joint-anim jakb-gun-walk-side-ja) num-func-identity) (set! (-> s4-1 frame-num) f24-1) ) ) @@ -1012,11 +911,7 @@ (set! (-> s4-2 frame-interp 0) f0-7) ) (set! (-> s4-2 dist) (-> *TARGET-bank* walk-cycle-dist)) - (joint-control-channel-group-eval! - s4-2 - (the-as art-joint-anim (-> self draw art-group data 12)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-2 (the-as art-joint-anim jakb-walk-ja) num-func-identity) (set! (-> s4-2 frame-num) f24-1) ) ) @@ -1027,11 +922,7 @@ (set! (-> s4-3 frame-interp 0) f0-9) ) (set! (-> s4-3 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (joint-control-channel-group-eval! - s4-3 - (the-as art-joint-anim (-> self draw art-group data 14)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-3 (the-as art-joint-anim jakb-walk-down-ja) num-func-identity) (set! (-> s4-3 frame-num) f24-1) ) (let ((s4-4 (-> self skel root-channel 2))) @@ -1040,11 +931,7 @@ (set! (-> s4-4 frame-interp 0) f0-11) ) (set! (-> s4-4 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (joint-control-channel-group-eval! - s4-4 - (the-as art-joint-anim (-> self draw art-group data 16)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-4 (the-as art-joint-anim jakb-walk-left-ja) num-func-identity) (set! (-> s4-4 frame-num) f24-1) ) (let ((s4-5 (-> self skel root-channel 4))) @@ -1053,11 +940,7 @@ (set! (-> s4-5 frame-interp 0) f0-13) ) (set! (-> s4-5 dist) (-> *TARGET-bank* run-down-cycle-dist)) - (joint-control-channel-group-eval! - s4-5 - (the-as art-joint-anim (-> self draw art-group data 9)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-5 (the-as art-joint-anim jakb-run-down-ja) num-func-identity) (set! (-> s4-5 frame-num) f24-1) ) (let ((s4-6 (-> self skel root-channel 5))) @@ -1066,11 +949,7 @@ (set! (-> s4-6 frame-interp 0) f0-15) ) (set! (-> s4-6 dist) (-> *TARGET-bank* run-side-cycle-dist)) - (joint-control-channel-group-eval! - s4-6 - (the-as art-joint-anim (-> self draw art-group data 11)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-6 (the-as art-joint-anim jakb-run-left-ja) num-func-identity) (set! (-> s4-6 frame-num) f24-1) ) (cond @@ -1081,11 +960,7 @@ (set! (-> s4-7 frame-interp 0) f0-17) ) (set! (-> s4-7 dist) 27033.6) - (joint-control-channel-group-eval! - s4-7 - (the-as art-joint-anim (-> self draw art-group data 393)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-7 (the-as art-joint-anim jakb-darkjak-run-ja) num-func-identity) (set! (-> s4-7 frame-num) f24-1) ) ) @@ -1096,11 +971,7 @@ (set! (-> s4-8 frame-interp 0) f0-19) ) (set! (-> s4-8 dist) (-> *TARGET-bank* run-cycle-dist)) - (joint-control-channel-group-eval! - s4-8 - (the-as art-joint-anim (-> self draw art-group data 299)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-8 (the-as art-joint-anim jakb-gun-front-run-ja) num-func-identity) (set! (-> s4-8 frame-num) f24-1) ) ) @@ -1111,11 +982,7 @@ (set! (-> s4-9 frame-interp 0) f0-21) ) (set! (-> s4-9 dist) (-> *TARGET-bank* run-cycle-dist)) - (joint-control-channel-group-eval! - s4-9 - (the-as art-joint-anim (-> self draw art-group data 7)) - num-func-identity - ) + (joint-control-channel-group-eval! s4-9 (the-as art-joint-anim jakb-run-ja) num-func-identity) (set! (-> s4-9 frame-num) f24-1) ) ) @@ -1181,7 +1048,7 @@ (set! (-> v1-228 frame-interp 0) f0-48) ) (set! (-> v1-228 dist) (-> *TARGET-bank* walk-up-cycle-dist)) - (set! (-> v1-228 frame-group) (the-as art-joint-anim (-> self draw art-group data 13))) + (set! (-> v1-228 frame-group) (the-as art-joint-anim jakb-walk-up-ja)) ) (let ((v1-231 (-> self skel root-channel 4))) (let ((f0-50 (fabs f30-0))) @@ -1189,7 +1056,7 @@ (set! (-> v1-231 frame-interp 0) f0-50) ) (set! (-> v1-231 dist) (-> *TARGET-bank* run-up-cycle-dist)) - (set! (-> v1-231 frame-group) (the-as art-joint-anim (-> self draw art-group data 8))) + (set! (-> v1-231 frame-group) (the-as art-joint-anim jakb-run-up-ja)) ) ) (else @@ -1199,7 +1066,7 @@ (set! (-> v1-234 frame-interp 0) f0-53) ) (set! (-> v1-234 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (set! (-> v1-234 frame-group) (the-as art-joint-anim (-> self draw art-group data 14))) + (set! (-> v1-234 frame-group) (the-as art-joint-anim jakb-walk-down-ja)) ) (let ((v1-237 (-> self skel root-channel 4))) (let ((f0-55 (fabs f30-0))) @@ -1207,7 +1074,7 @@ (set! (-> v1-237 frame-interp 0) f0-55) ) (set! (-> v1-237 dist) (-> *TARGET-bank* run-down-cycle-dist)) - (set! (-> v1-237 frame-group) (the-as art-joint-anim (-> self draw art-group data 9))) + (set! (-> v1-237 frame-group) (the-as art-joint-anim jakb-run-down-ja)) ) ) ) @@ -1219,7 +1086,7 @@ (set! (-> v1-240 frame-interp 0) f0-59) ) (set! (-> v1-240 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-240 frame-group) (the-as art-joint-anim (-> self draw art-group data 15))) + (set! (-> v1-240 frame-group) (the-as art-joint-anim jakb-walk-right-ja)) ) (let ((v1-243 (-> self skel root-channel 5))) (let ((f0-61 (fabs f28-0))) @@ -1227,7 +1094,7 @@ (set! (-> v1-243 frame-interp 0) f0-61) ) (set! (-> v1-243 dist) (-> *TARGET-bank* run-side-cycle-dist)) - (set! (-> v1-243 frame-group) (the-as art-joint-anim (-> self draw art-group data 10))) + (set! (-> v1-243 frame-group) (the-as art-joint-anim jakb-run-right-ja)) ) ) (else @@ -1237,7 +1104,7 @@ (set! (-> v1-246 frame-interp 0) f0-64) ) (set! (-> v1-246 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-246 frame-group) (the-as art-joint-anim (-> self draw art-group data 16))) + (set! (-> v1-246 frame-group) (the-as art-joint-anim jakb-walk-left-ja)) ) (let ((v1-249 (-> self skel root-channel 5))) (let ((f0-66 (fabs f28-0))) @@ -1245,7 +1112,7 @@ (set! (-> v1-249 frame-interp 0) f0-66) ) (set! (-> v1-249 dist) (-> *TARGET-bank* run-side-cycle-dist)) - (set! (-> v1-249 frame-group) (the-as art-joint-anim (-> self draw art-group data 11))) + (set! (-> v1-249 frame-group) (the-as art-joint-anim jakb-run-left-ja)) ) ) ) @@ -1286,7 +1153,7 @@ (if (using-gun? self) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 288)) + (the-as art-joint-anim jakb-gun-flop-down-land-ja) 0.0 0 30 @@ -1297,14 +1164,14 @@ ) (ja-channel-set! 1) (let ((s5-0 (-> self skel root-channel 0))) - (set! (-> s5-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 54))) + (set! (-> s5-0 frame-group) (the-as art-joint-anim jakb-flop-down-land-ja)) (set! (-> s5-0 param 0) - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 54)) frames num-frames) -1)) + (the float (+ (-> (the-as art-joint-anim jakb-flop-down-land-ja) frames num-frames) -1)) ) (let ((f30-1 (seek f30-0 1.0 (* 0.5 (seconds-per-frame))))) (set! (-> s5-0 param 1) f30-1) (set! (-> s5-0 frame-num) 0.0) - (joint-control-channel-group! s5-0 (the-as art-joint-anim (-> self draw art-group data 54)) num-func-seek!) + (joint-control-channel-group! s5-0 (the-as art-joint-anim jakb-flop-down-land-ja) num-func-seek!) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! @@ -1385,10 +1252,10 @@ ((logtest? (water-flags swimming) (-> self water flags)) ) ((let ((v1-5 (ja-group))) - (and v1-5 (or (= v1-5 (-> self draw art-group data 52)) - (= v1-5 (-> self draw art-group data 53)) - (= v1-5 (-> self draw art-group data 55)) - (= v1-5 (-> self draw art-group data 56)) + (and v1-5 (or (= v1-5 jakb-flop-down-ja) + (= v1-5 jakb-flop-down-loop-ja) + (= v1-5 jakb-moving-flop-down-ja) + (= v1-5 jakb-moving-flop-down-loop-ja) ) ) ) @@ -1397,13 +1264,9 @@ ((and (= (-> self control ground-pat material) (pat-material ice)) (< 16384.0 (-> self control ctrl-xz-vel))) ) ((let ((v1-20 (ja-group))) - (or (and v1-20 (or (= v1-20 (-> self draw art-group data 27)) - (= v1-20 (-> self draw art-group data 394)) - (= v1-20 (-> self draw art-group data 58)) - ) - ) + (or (and v1-20 (or (= v1-20 jakb-jump-loop-ja) (= v1-20 jakb-darkjak-jump-ja) (= v1-20 jakb-flop-jump-ja))) (let ((v1-26 (ja-group))) - (and (and v1-26 (= v1-26 (-> self draw art-group data 23))) + (and (and v1-26 (= v1-26 jakb-jump-ja)) (or (>= (ja-aframe-num 0) 38.0) (and (focus-test? self dark) (nonzero? (-> self darkjak)))) ) ) @@ -1412,20 +1275,15 @@ (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.02)) (let ((a1-4 (target-land-anim))) - (ja-no-eval :group! a1-4 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-4) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-4 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (let ((v1-46 (ja-group))) - (if (or (and (and v1-46 (or (= v1-46 (-> self draw art-group data 277)) (= v1-46 (-> self draw art-group data 278)))) + (if (or (and (and v1-46 (or (= v1-46 jakb-gun-jump-land-ja) (= v1-46 jakb-gun-jump-land-side-ja))) (not (using-gun? self)) ) (let ((v1-53 (ja-group))) - (and (and v1-53 (= v1-53 (-> self draw art-group data 24))) - (and (>= (ja-aframe-num 0) 60.0) (using-gun? self)) - ) + (and (and v1-53 (= v1-53 jakb-jump-land-ja)) (and (>= (ja-aframe-num 0) 60.0) (using-gun? self))) ) ) (goto cfg-78) @@ -1437,37 +1295,26 @@ (label cfg-78) ) ((let ((v1-70 (ja-group))) - (and (and v1-70 (or (= v1-70 (-> self draw art-group data 23)) (= v1-70 (-> self draw art-group data 394)))) + (and (and v1-70 (or (= v1-70 jakb-jump-ja) (= v1-70 jakb-darkjak-jump-ja))) (>= (ja-aframe-num 0) 35.0) (not (using-gun? self)) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-128 (ja-group))) - (and v1-128 - (or (= v1-128 (-> self draw art-group data 23)) - (= v1-128 (-> self draw art-group data 30)) - (= v1-128 (-> self draw art-group data 394)) - ) - ) + (and v1-128 (or (= v1-128 jakb-jump-ja) (= v1-128 jakb-duck-high-jump-ja) (= v1-128 jakb-darkjak-jump-ja))) ) ((lambda :behavior target () @@ -1475,10 +1322,7 @@ (ja-channel-set! 1) (cond ((using-gun? self) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (ja-aframe 41.0 0)) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek! (ja-aframe 41.0 0)) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 41.0 0))) @@ -1487,10 +1331,7 @@ (ja-channel-push! 1 (seconds 0.1)) (case (-> self gun gun-type) (((pickup-type eco-red) (pickup-type eco-dark)) - (ja-no-eval :group! (-> self draw art-group data 277) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 277)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (if (not (using-gun? self)) @@ -1501,10 +1342,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 278) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 278)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-side-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (if (not (using-gun? self)) @@ -1518,18 +1356,12 @@ (label cfg-19) ) (else - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek!) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1542,35 +1374,26 @@ ) ((let ((v1-134 (ja-group))) (and v1-134 - (or (= v1-134 (-> self draw art-group data 66)) - (= v1-134 (-> self draw art-group data 65)) - (= v1-134 (-> self draw art-group data 67)) - ) + (or (= v1-134 jakb-hit-from-front-ja) (= v1-134 jakb-hit-from-front-alt1-ja) (= v1-134 jakb-hit-from-back-ja)) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let* ((v1-142 (ja-group)) - (f30-0 (if (and v1-142 (= v1-142 (-> self draw art-group data 67))) + (f30-0 (if (and v1-142 (= v1-142 jakb-hit-from-back-ja)) 24576.0 -24576.0 ) ) ) (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek!) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (set-forward-vel f30-0) (suspend) (ja :num! (seek!)) ) ) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1578,16 +1401,16 @@ ) ((let ((v1-195 (ja-group))) (and v1-195 - (or (= v1-195 (-> self draw art-group data 23)) - (= v1-195 (-> self draw art-group data 394)) - (= v1-195 (-> self draw art-group data 45)) - (= v1-195 (-> self draw art-group data 46)) - (= v1-195 (-> self draw art-group data 47)) - (= v1-195 (-> self draw art-group data 54)) - (= v1-195 (-> self draw art-group data 51)) - (= v1-195 (-> self draw art-group data 267)) - (= v1-195 (-> self draw art-group data 279)) - (= v1-195 (-> self draw art-group data 171)) + (or (= v1-195 jakb-jump-ja) + (= v1-195 jakb-darkjak-jump-ja) + (= v1-195 jakb-attack-from-jump-ja) + (= v1-195 jakb-attack-from-jump-loop-ja) + (= v1-195 jakb-attack-from-jump-end-ja) + (= v1-195 jakb-flop-down-land-ja) + (= v1-195 jakb-attack-uppercut-ja) + (= v1-195 jakb-gun-attack-upperbutt-ja) + (= v1-195 jakb-gun-attack-upperbutt-blue-ja) + (= v1-195 jakb-board-get-off-ja) ) ) ) @@ -1597,10 +1420,7 @@ (ja-channel-push! 1 (seconds 0.04)) (cond ((using-gun? self) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (ja-aframe 41.0 0)) - :frame-num (ja-aframe 38.0 0) - ) + (ja-no-eval :group! jakb-jump-short-land-ja :num! (seek! (ja-aframe 41.0 0)) :frame-num (ja-aframe 38.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 41.0 0))) @@ -1609,10 +1429,7 @@ (ja-channel-push! 1 (seconds 0.1)) (case (-> self gun gun-type) (((pickup-type eco-red) (pickup-type eco-dark)) - (ja-no-eval :group! (-> self draw art-group data 277) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 277)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -1620,10 +1437,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 278) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 278)) frames num-frames) -1))) - :frame-num (ja-aframe 64.0 0) - ) + (ja-no-eval :group! jakb-gun-jump-land-side-ja :num! (seek!) :frame-num (ja-aframe 64.0 0)) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -1633,20 +1447,14 @@ ) ) ((and (focus-test? self dark) (nonzero? (-> self darkjak))) - (ja-no-eval :group! (-> self draw art-group data 395) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 395)) frames num-frames) -1))) - :frame-num (ja-aframe 42.0 0) - ) + (ja-no-eval :group! jakb-darkjak-jump-land-ja :num! (seek!) :frame-num (ja-aframe 42.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num (ja-aframe 42.0 0) - ) + (ja-no-eval :group! jakb-jump-land-ja :num! (seek!) :frame-num (ja-aframe 42.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1662,22 +1470,19 @@ ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 323) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 323)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 323) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-232 (ja-group))) - (and v1-232 (or (= v1-232 (-> self draw art-group data 24)) - (= v1-232 (-> self draw art-group data 277)) - (= v1-232 (-> self draw art-group data 278)) + (and v1-232 (or (= v1-232 jakb-jump-land-ja) + (= v1-232 jakb-gun-jump-land-ja) + (= v1-232 jakb-gun-jump-land-side-ja) (= v1-232 (-> self draw art-group data 323)) - (= v1-232 (-> self draw art-group data 331)) - (= v1-232 (-> self draw art-group data 342)) + (= v1-232 jakb-mech-jump-land-ja) + (= v1-232 jakb-mech-carry-jump-land-ja) ) ) ) @@ -1690,37 +1495,28 @@ ) ((let ((v1-248 (ja-group))) (and v1-248 - (or (= v1-248 (-> self draw art-group data 328)) - (= v1-248 (-> self draw art-group data 330)) - (= v1-248 (-> self draw art-group data 348)) - ) + (or (= v1-248 jakb-mech-jump-ja) (= v1-248 jakb-mech-jump-loop-ja) (= v1-248 jakb-mech-hit-front-ja)) ) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.017)) - (ja-no-eval :group! (-> self draw art-group data 331) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 331)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-mech-jump-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((let ((v1-279 (ja-group))) - (and v1-279 (or (= v1-279 (-> self draw art-group data 340)) (= v1-279 (-> self draw art-group data 341)))) + (and v1-279 (or (= v1-279 jakb-mech-carry-jump-ja) (= v1-279 jakb-mech-carry-jump-loop-ja))) ) (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let ((v1-286 (ja-group))) - (if (and v1-286 (= v1-286 (-> self draw art-group data 341))) + (if (and v1-286 (= v1-286 jakb-mech-carry-jump-loop-ja)) (ja-channel-set! 1) (ja-channel-push! 1 (seconds 0.04)) ) ) - (ja-no-eval :group! (-> self draw art-group data 342) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 342)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-mech-carry-jump-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1739,7 +1535,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 0.0 30 30 @@ -1751,7 +1547,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 3.0 30 30 @@ -1766,10 +1562,7 @@ (set! (-> self control unknown-float42) 0.0) (ja-channel-push! 1 (seconds 0.075)) (set! (-> self control unknown-sound-id01) (sound-play "spin-kick")) - (ja-no-eval :group! (-> self draw art-group data 45) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 45)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-jump-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-quat) 1.0 1.0 1.0) @@ -1777,7 +1570,7 @@ (ja :num! (seek!)) ) (set! (-> self control unknown-sound-id01) (sound-play "spin-kick")) - (ja :group! (-> self draw art-group data 46) :num! min) + (ja :group! jakb-attack-from-jump-loop-ja :num! min) (let ((f30-0 -393216.0)) (let ((f0-11 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) @@ -1797,10 +1590,7 @@ (set! f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) ) - (ja-no-eval :group! (-> self draw art-group data 47) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 47)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-attack-from-jump-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (cond ((< (ja-aframe-num 0) 32.0) @@ -1838,27 +1628,21 @@ ;; WARN: new jak 2 until loop case, check carefully (defbehavior target-edge-grab-anim target ((arg0 float)) (ja-channel-push! 1 (seconds 0.15)) - (ja :group! (-> self draw art-group data 35) :num! min) + (ja :group! jakb-falling-to-edge-grab-ja :num! min) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-set! 1) (until #f - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-edge-grab-stance0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (can-play-stance-amibent?) (suspend) (ja :num! (seek!)) ) (+! (-> self anim-seed) 1) - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-edge-grab-stance1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (can-play-stance-amibent?) (suspend) diff --git a/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc b/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc index 6015a7195ad..6bc877b3ca1 100644 --- a/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc @@ -327,9 +327,7 @@ ) ) (ja-channel-push! 2 (seconds 0.1)) - (ja :group! (-> self draw art-group data 319) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 319)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 319) :num! max) (let ((a0-16 (-> self skel root-channel 1))) (set! (-> a0-16 frame-interp 1) f30-0) (set! (-> a0-16 frame-interp 0) f30-0) @@ -573,7 +571,7 @@ (ja-no-eval :group! (-> self draw art-group data 322) :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) diff --git a/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc b/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc index 9cc1eb93fbf..e90fb7e33ef 100644 --- a/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc @@ -336,10 +336,7 @@ (cond ((task-node-open? (game-task-node city-help-kid-battle)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 390) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 390)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-get-on-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 10.0 25.0)) (set-setting! 'bg-a 'abs (* 0.45 (-> self darkjak-interp)) 0) @@ -349,7 +346,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 412) :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-get-on-fast-ja :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 5.0 15.0)) (set-setting! 'bg-a 'abs (* 0.45 (-> self darkjak-interp)) 0) @@ -454,7 +451,7 @@ (go target-swim-stance) ) ((let ((v1-10 (ja-group))) - (not (and v1-10 (= v1-10 (-> self draw art-group data 412)))) + (not (and v1-10 (= v1-10 jakb-darkjak-get-on-fast-ja))) ) (let ((gp-0 0)) (while (not (logtest? (-> self control status) (collide-status on-surface))) @@ -475,7 +472,7 @@ (else (let ((v1-30 (ja-group))) (cond - ((and v1-30 (= v1-30 (-> self draw art-group data 412))) + ((and v1-30 (= v1-30 jakb-darkjak-get-on-fast-ja)) (ja-no-eval :num! (seek! 0.0)) (while (not (ja-done? 0)) (seek! (-> self darkjak-interp) 0.0 (* 2.0 (seconds-per-frame))) @@ -485,18 +482,14 @@ (ja-channel-push! 1 (seconds 0.1)) ) ((let ((v1-43 (ja-group))) - (and v1-43 - (or (= v1-43 (-> self draw art-group data 401)) - (= v1-43 (-> self draw art-group data 416)) - (= v1-43 (-> self draw art-group data 417)) - (= v1-43 (-> self draw art-group data 418)) - ) + (and v1-43 (or (= v1-43 jakb-darkjak-bomb-pre-ja) + (= v1-43 jakb-darkjak-bomb-ja) + (= v1-43 jakb-darkjak-bomb-loop-ja) + (= v1-43 jakb-darkjak-bomb-land-ja) + ) ) ) - (ja-no-eval :group! (-> self draw art-group data 411) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 411)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 1.0 0.0 (ja-aframe-num 0) 90.0 115.0)) (if (and (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) @@ -515,7 +508,7 @@ ) ) ((let ((v1-88 (ja-group))) - (and v1-88 (= v1-88 (-> self draw art-group data 411))) + (and v1-88 (= v1-88 jakb-darkjak-bomb-end-ja)) ) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) @@ -537,10 +530,7 @@ ) (else (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 408) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 408)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-get-off-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 1.0 0.0 (ja-aframe-num 0) 10.0 60.0)) (if (and (>= (ja-aframe-num 0) 24.0) @@ -558,10 +548,7 @@ (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 415) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 415)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-get-off-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self darkjak-interp) (lerp-scale 1.0 0.0 (ja-aframe-num 0) 10.0 60.0)) (if (and (>= (ja-aframe-num 0) 24.0) @@ -624,17 +611,17 @@ (let ((gp-1 (cond ((zero? (-> self control unknown-word000)) (set! (-> self control unknown-word000) 1) - (-> self draw art-group data 402) + jakb-darkjak-attack-combo1-ja ) (else (set! (-> self control unknown-word000) 0) - (-> self draw art-group data 409) + jakb-darkjak-attack-combo1b-ja ) ) ) ) (ja-channel-push! 1 (seconds 0.02)) - (ja-no-eval :group! gp-1 :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)))) + (ja-no-eval :group! gp-1 :num! (seek!)) ) (target-start-attack) (target-danger-set! 'punch #f) @@ -646,7 +633,7 @@ (t9-6 a0-8 a1-4 - (if (and v1-33 (= v1-33 (-> self draw art-group data 402))) + (if (and v1-33 (= v1-33 jakb-darkjak-attack-combo1-ja)) 22 18 ) @@ -713,17 +700,13 @@ (target-danger-set! 'punch #f) (let ((v1-18 (ja-group))) (cond - ((and v1-18 (or (= v1-18 (-> self draw art-group data 402)) (= v1-18 (-> self draw art-group data 409)))) + ((and v1-18 (or (= v1-18 jakb-darkjak-attack-combo1-ja) (= v1-18 jakb-darkjak-attack-combo1b-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 404) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 404)) frames num-frames) -1))) - ) + (ja-no-eval :group! jakb-darkjak-attack-combo2-ja :num! (seek!)) ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 413) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 413)) frames num-frames) -1))) - ) + (ja-no-eval :group! jakb-darkjak-attack-combo3c-ja :num! (seek!)) ) ) ) @@ -759,7 +742,7 @@ ((and (nonzero? sv-32) (>= sv-16 -40960.0) (let ((v1-84 (ja-group))) - (not (and (and v1-84 (= v1-84 (-> self draw art-group data 406))) (>= (ja-aframe-num 0) 77.0))) + (not (and (and v1-84 (= v1-84 jakb-darkjak-attack-combo3-ja)) (>= (ja-aframe-num 0) 77.0))) ) (send-event (handle->process (-> self control unknown-combo-tracker00 target)) 'combo) ) @@ -844,36 +827,36 @@ (let ((gp-2 (ja-group)) (f30-2 (ja-aframe-num 0)) ) - (if (or (and (= gp-2 (-> self draw art-group data 402)) + (if (or (and (= gp-2 jakb-darkjak-attack-combo1-ja) (>= f30-2 11.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 402)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo1-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= gp-2 (-> self draw art-group data 409)) + (and (= gp-2 jakb-darkjak-attack-combo1b-ja) (>= f30-2 11.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 409)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo1b-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= gp-2 (-> self draw art-group data 404)) + (and (= gp-2 jakb-darkjak-attack-combo2-ja) (>= f30-2 49.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 404)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo2-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= gp-2 (-> self draw art-group data 406)) + (and (= gp-2 jakb-darkjak-attack-combo3-ja) (or (and (>= f30-2 62.0) (>= 77.0 f30-2)) (and (>= f30-2 82.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 406)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo3-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) ) ) - (and (= gp-2 (-> self draw art-group data 413)) + (and (= gp-2 jakb-darkjak-attack-combo3c-ja) (>= f30-2 62.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 413)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo3c-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) @@ -943,9 +926,9 @@ (let ((gp-4 (ja-group)) (f0-53 (ja-aframe-num 0)) ) - (if (and (= gp-4 (-> self draw art-group data 406)) + (if (and (= gp-4 jakb-darkjak-attack-combo3-ja) (>= f0-53 80.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 406)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-darkjak-attack-combo3-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) @@ -1043,7 +1026,7 @@ (when (and (= (-> block param 0) 'bomb) (logtest? (process-mask enemy) (-> (the-as process v1-1) mask)) (let ((v1-7 (ja-group))) - (and v1-7 (= v1-7 (-> self draw art-group data 418))) + (and v1-7 (= v1-7 jakb-darkjak-bomb-land-ja)) ) (>= (ja-aframe-num 0) 35.0) (not (-> self darkjak clock-on)) @@ -1118,10 +1101,7 @@ (set! sv-20 1.0) (ja-channel-push! 1 (seconds 0.15)) (when (jump-hit-ground-stuck?) - (ja-no-eval :group! (-> self draw art-group data 401) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 401)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-pre-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self alt-cam-pos x) (-> self control trans x)) (set! (-> self alt-cam-pos z) (-> self control trans z)) @@ -1133,10 +1113,7 @@ (set-setting! 'music-volume 'rel 0.0 0) (set-setting! 'sfx-volume 'rel 0.0 0) (set-setting! 'ambient-volume 'rel 0.0 0) - (ja-no-eval :group! (-> self draw art-group data 416) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 416)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-y-vel) 1.0 1.0 1.0) @@ -1146,10 +1123,7 @@ (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 417) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 417)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-bomb-loop-ja :num! (seek!) :frame-num 0.0) (let ((f30-0 (the float (target-time-to-ground)))) (until v1-100 (set! (-> self alt-cam-pos x) (-> self control trans x)) @@ -1202,7 +1176,7 @@ (suspend) ) (set-forward-vel 0.0) - (ja-no-eval :group! (-> self draw art-group data 418) :num! (seek! (ja-aframe 35.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-bomb-land-ja :num! (seek! (ja-aframe 35.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 35.0 0))) @@ -1425,7 +1399,7 @@ (remove-setting! 'music-volume) (remove-setting! 'sfx-volume) (remove-setting! 'ambient-volume) - (ja-no-eval :group! (-> self draw art-group data 411) :num! (seek! (ja-aframe 90.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-bomb-end-ja :num! (seek! (ja-aframe 90.0 0)) :frame-num 0.0) (until (ja-done? 0) (target-darkjak-bomb-collide (the-as float (& sv-16)) sv-20) (suspend) @@ -1786,33 +1760,32 @@ ) ) ) - (set! (-> self control mod-surface) - (new 'static 'surface - :name 'uppercut - :turnv 524288.0 - :tiltv 32768.0 - :tiltvv 262144.0 - :transv-max 32768.0 - :target-speed 32768.0 - :fric 0.2 - :nonlin-fric-dist 1.0 - :slip-factor 1.0 - :slide-factor 1.0 - :slope-up-factor 1.0 - :slope-down-factor 1.0 - :slope-slip-angle 1.0 - :impact-fric 1.0 - :bend-factor 1.0 - :bend-speed 1.0 - :alignv 1.0 - :slope-up-traction 1.0 - :align-speed 1.0 - :turnvf 15.0 - :tiltvf 150.0 - :tiltvvf 15.0 - :mode 'air - :flags (surface-flag air attack spin gun-off laser-hide) - ) + (set! (-> self control mod-surface) (new 'static 'surface + :name 'uppercut + :turnv 524288.0 + :tiltv 32768.0 + :tiltvv 262144.0 + :transv-max 32768.0 + :target-speed 32768.0 + :fric 0.2 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :turnvf 15.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :mode 'air + :flags (surface-flag air attack spin gun-off laser-hide) + ) ) (set! sv-64 0) (set! sv-72 (current-time)) @@ -1827,8 +1800,8 @@ (set! sv-104 a0-33) ) (ja-channel-push! 2 (seconds 0.05)) - (ja :group! (-> self draw art-group data 419)) - (ja :chan 1 :group! (-> self draw art-group data 420)) + (ja :group! jakb-darkjak-attack-ice-loop-ja) + (ja :chan 1 :group! jakb-darkjak-attack-ice-loop2-ja) (while (or (< sv-64 sv-48) (< (- (current-time) sv-80) (seconds 1.5))) (let ((v1-77 (new-stack-vector0))) (let ((f0-8 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) @@ -1874,10 +1847,7 @@ ) (set! (-> self control mod-surface) *double-jump-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 421) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 421)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-darkjak-attack-ice-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (compute-alignment! (-> self align)) @@ -1953,7 +1923,7 @@ (set-setting! 'string-spline-accel-player 'abs (meters 0.035) 0) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 412) :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-darkjak-get-on-fast-ja :num! (seek! (ja-aframe 17.0 0)) :frame-num 0.0) (until (ja-done? 0) (cond (gp-2 diff --git a/test/decompiler/reference/jak2/engine/target/target-death_REF.gc b/test/decompiler/reference/jak2/engine/target/target-death_REF.gc index 9ed96d59163..d40beb43c7f 100644 --- a/test/decompiler/reference/jak2/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-death_REF.gc @@ -385,7 +385,7 @@ ) ) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 5)) + (ja :group! jakb-stance-loop-ja) (suspend) (logior! (-> self control status) (collide-status on-surface on-ground touch-surface)) (when (-> self mode-cache) @@ -767,12 +767,12 @@ (cond ((= v1-0 'back) (let ((v1-3 (ja-group))) - (when (not (and v1-3 (= v1-3 (-> self draw art-group data 67)))) + (when (not (and v1-3 (= v1-3 jakb-hit-from-back-ja))) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 290)) + (the-as art-joint-anim jakb-gun-hit-from-back-ja) 0.0 0 30 @@ -782,32 +782,29 @@ ) ) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 67) :num! min) + (ja :group! jakb-hit-from-back-ja :num! min) ) ) ) ((= v1-0 'lava) (let ((v1-19 (ja-group))) - (when (not (and v1-19 (= v1-19 (-> self draw art-group data 64)))) + (when (not (and v1-19 (= v1-19 jakb-hit-elec-ja))) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 64) :num! min) + (ja :group! jakb-hit-elec-ja :num! min) ) ) ) ((or (= v1-0 'up) (= v1-0 'up-forward) (= v1-0 'lava)) (let ((v1-28 (ja-group))) - (when (not (and v1-28 (= v1-28 (-> self draw art-group data 68)))) + (when (not (and v1-28 (= v1-28 jakb-hit-up-ja))) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 68) :num! min) + (ja :group! jakb-hit-up-ja :num! min) ) ) ) ((or (= v1-0 'air) (= v1-0 'jump)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-jump-ja :num! (seek!) :frame-num 0.0) (when (= (-> arg0 angle) 'air) (sound-play "smack-surface") (do-effect (-> self skel effect) 'group-smack-surface 0.0 6) @@ -816,20 +813,17 @@ ) ((= v1-0 'shove) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 71) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 71)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-smack-surface-ja :num! (seek!) :frame-num 0.0) (sound-play "smack-surface") ) ((rand-vu-percent? 0.5) (let ((v1-77 (ja-group))) - (when (not (and v1-77 (= v1-77 (-> self draw art-group data 65)))) + (when (not (and v1-77 (= v1-77 jakb-hit-from-front-alt1-ja))) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 289)) + (the-as art-joint-anim jakb-gun-hit-from-front-ja) 0.0 0 30 @@ -839,18 +833,18 @@ ) ) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 65) :num! min) + (ja :group! jakb-hit-from-front-alt1-ja :num! min) ) ) ) (else (let ((v1-93 (ja-group))) - (when (not (and v1-93 (= v1-93 (-> self draw art-group data 66)))) + (when (not (and v1-93 (= v1-93 jakb-hit-from-front-ja))) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 289)) + (the-as art-joint-anim jakb-gun-hit-from-front-ja) 0.0 0 30 @@ -860,7 +854,7 @@ ) ) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 66) :num! min) + (ja :group! jakb-hit-from-front-ja :num! min) ) ) ) @@ -1136,16 +1130,7 @@ (set! (-> self control mod-surface) *turn-around-mods*) (set! (-> self post-hook) target-no-stick-post) (if (using-gun? self) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 297)) - 0.0 - 30 - 0 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-hit-elec-ja) 0.0 30 0 1.0 0.0 #f) ) (let ((v1-141 (new-stack-vector0))) (let ((f0-31 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) @@ -1168,10 +1153,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 64) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 64)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-hit-elec-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((v1-157 (new-stack-vector0)) (f0-39 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) @@ -1366,7 +1348,7 @@ (set! (-> self control mod-surface) *neutral-mods*) (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 69) :num! (seek! (ja-aframe 30.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-deatha-ja :num! (seek! (ja-aframe 30.0 0)) :frame-num 0.0) (until (ja-done? 0) (if arg0 (gui-control-method-12 @@ -1436,7 +1418,7 @@ (set! (-> self post-hook) (lambda () (target-death-anim-trans) (target-no-stick-post) (none))) (ja-play-spooled-anim gp-2 - (the-as art-joint-anim (-> self draw art-group data 5)) + (the-as art-joint-anim jakb-stance-loop-ja) (the-as art-joint-anim #f) (the-as (function process-drawable symbol) false-func) ) @@ -1561,7 +1543,7 @@ (when (and a0-0 (= (-> *setting-control* user-current spooling) (process->ppointer self))) (ja-abort-spooled-anim a0-0 (the-as art-joint-anim #f) -1) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 5) :num! min) + (ja :group! jakb-stance-loop-ja :num! min) ) ) (logclear! (-> self focus-status) (focus-status dead hit)) @@ -1753,10 +1735,7 @@ ) (set-vector! (-> self control transv) 0.0 65502.96 0.0 1.0) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 66) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 66)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-hit-from-front-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (b! (not (and (logtest? (-> self control status) (collide-status on-surface)) @@ -1799,10 +1778,7 @@ ) 0 (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-painful-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self control transv quad) (the-as uint128 0)) (vector-seek! @@ -1927,7 +1903,7 @@ ) (target-falling-anim 30 (seconds 0.33)) (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 32) :num! (loop! 0.5) :frame-num 0.0) + (ja-no-eval :group! jakb-launch-jump-loop-ja :num! (loop! 0.5) :frame-num 0.0) (let ((gp-1 (current-time))) (until (>= (- (current-time) gp-1) (seconds 0.8)) (when (and (logtest? (-> self control status) (collide-status on-surface)) (!= (-> self control cur-pat event) 2)) @@ -1957,7 +1933,7 @@ ) ) ) - (ja :group! (-> self draw art-group data 32) :num! (loop! 0.5)) + (ja :group! jakb-launch-jump-loop-ja :num! (loop! 0.5)) (suspend) ) ) @@ -1968,10 +1944,7 @@ (set! (-> self post-hook) target-no-move-post) (set! (-> self control transv quad) (the-as uint128 0)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-painful-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (vector-seek! (-> self draw color-mult) *identity-vector* (seconds-per-frame)) (suspend) @@ -2038,10 +2011,7 @@ (set! (-> self control dynam gravity-max) 6144.0) (set! (-> self control dynam gravity-length) 6144.0) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 89) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 89)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-swim-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (< (+ -10240.0 (-> self water height)) (-> self control trans y)) (seek! (-> self control trans y) (+ -10240.0 (-> self water height)) (* 81920.0 (seconds-per-frame))) @@ -2050,22 +2020,13 @@ (ja :num! (seek!)) ) (dotimes (gp-1 1) - (ja-no-eval :group! (-> self draw art-group data 90) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 90)) frames num-frames) -1)) - 0.75 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-swim-loop-ja :num! (seek! max 0.75) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.75)) ) ) - (ja-no-eval :group! (-> self draw art-group data 91) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 91)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-swim-end-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -2077,10 +2038,7 @@ ((or (= v1-50 'target-hit-ground-hard) (= v1-50 'smush)) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 70) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-death-painful-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2096,7 +2054,7 @@ (set! (-> self control mod-surface) *neutral-mods*) (set! (-> self post-hook) target-no-move-post) (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 67) :num! min) + (ja :group! jakb-hit-from-back-ja :num! min) (while (not (-> self control unknown-spool-anim00)) (suspend) (ja :num! (loop!)) @@ -2115,23 +2073,17 @@ ) (suspend) ) - (if (or (> gp-0 0) (let ((v1-14 (ja-group))) - (and v1-14 (or (= v1-14 (-> self draw art-group data 23)) - (= v1-14 (-> self draw art-group data 27)) - (= v1-14 (-> self draw art-group data 30)) - ) - ) - ) + (if (or (> gp-0 0) + (let ((v1-14 (ja-group))) + (and v1-14 (or (= v1-14 jakb-jump-ja) (= v1-14 jakb-jump-loop-ja) (= v1-14 jakb-duck-high-jump-ja))) + ) ) (target-hit-ground-anim #f (are-still?)) ) ) (target-stance-push 1) (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-stance-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (-> self control unknown-spool-anim00) (return #f) diff --git a/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc b/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc index ce52adbc098..d081f4c2abe 100644 --- a/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc @@ -248,7 +248,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 229)) + (the-as art-joint-anim jakb-pilot-gun-yellow-takeout-ja) 0.0 0 15 @@ -260,7 +260,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 198)) + (the-as art-joint-anim jakb-pilot-gun-red-takeout-ja) 0.0 0 15 @@ -272,7 +272,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 230)) + (the-as art-joint-anim jakb-pilot-gun-blue-takeout-ja) 0.0 0 15 @@ -284,7 +284,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 231)) + (the-as art-joint-anim jakb-pilot-gun-dark-takeout-ja) 0.0 0 15 @@ -300,7 +300,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 265)) + (the-as art-joint-anim jakb-gun-yellow-takeout-ja) 0.0 0 15 @@ -312,7 +312,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 263)) + (the-as art-joint-anim jakb-gun-red-takeout-ja) 0.0 0 15 @@ -324,7 +324,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 266)) + (the-as art-joint-anim jakb-gun-blue-takeout-ja) 0.0 0 15 @@ -336,7 +336,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 264)) + (the-as art-joint-anim jakb-gun-dark-takeout-ja) 0.0 0 15 @@ -391,7 +391,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 229)) + (the-as art-joint-anim jakb-pilot-gun-yellow-takeout-ja) 0.0 10 0 @@ -404,7 +404,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 198)) + (the-as art-joint-anim jakb-pilot-gun-red-takeout-ja) 0.0 10 0 @@ -417,7 +417,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 230)) + (the-as art-joint-anim jakb-pilot-gun-blue-takeout-ja) 0.0 10 0 @@ -430,7 +430,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 231)) + (the-as art-joint-anim jakb-pilot-gun-dark-takeout-ja) 0.0 10 0 @@ -450,7 +450,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 265)) + (the-as art-joint-anim jakb-gun-yellow-takeout-ja) 0.0 10 0 @@ -463,7 +463,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 263)) + (the-as art-joint-anim jakb-gun-red-takeout-ja) 0.0 10 0 @@ -476,7 +476,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 266)) + (the-as art-joint-anim jakb-gun-blue-takeout-ja) 14.0 10 0 @@ -489,7 +489,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 264)) + (the-as art-joint-anim jakb-gun-dark-takeout-ja) 0.0 10 0 @@ -727,7 +727,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-164 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 225)) + (the-as art-joint-anim jakb-pilot-gun-red-dark-ja) 0.0 30 19 @@ -739,7 +739,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-164 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 225)) + (the-as art-joint-anim jakb-pilot-gun-red-dark-ja) 0.0 30 0 @@ -751,7 +751,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-164 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 19 @@ -763,7 +763,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-164 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 0 @@ -775,7 +775,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-164 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 19 @@ -787,7 +787,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-164 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 0 @@ -799,7 +799,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-164 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 228)) + (the-as art-joint-anim jakb-pilot-gun-yellow-blue-ja) 0.0 30 19 @@ -811,7 +811,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-164 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 228)) + (the-as art-joint-anim jakb-pilot-gun-yellow-blue-ja) 0.0 30 0 @@ -823,7 +823,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-164 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 19 @@ -835,7 +835,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-164 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 19 @@ -847,7 +847,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-164 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 227)) + (the-as art-joint-anim jakb-pilot-gun-red-blue-ja) 0.0 30 0 @@ -859,7 +859,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-164 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 226)) + (the-as art-joint-anim jakb-pilot-gun-red-yellow-ja) 0.0 30 0 @@ -878,7 +878,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 30 19 @@ -888,7 +888,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -902,7 +902,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 30 19 @@ -912,7 +912,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -926,7 +926,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -936,7 +936,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 270)) + (the-as art-joint-anim jakb-gun-front-to-side-hop-ja) 0.0 19 19 @@ -950,7 +950,7 @@ (if (rand-vu-percent? 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 269)) + (the-as art-joint-anim jakb-gun-transformation-twirl-ja) 0.0 19 19 @@ -960,7 +960,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 270)) + (the-as art-joint-anim jakb-gun-front-to-side-hop-ja) 0.0 19 19 @@ -973,7 +973,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-227 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 19 19 @@ -985,7 +985,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-227 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 268)) + (the-as art-joint-anim jakb-gun-side-to-front-hop-ja) 0.0 19 19 @@ -997,7 +997,7 @@ ((and (= s5-0 (pickup-type eco-red)) (= v1-227 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 271)) + (the-as art-joint-anim jakb-gun-front-to-blue-hop-ja) 0.0 19 19 @@ -1009,7 +1009,7 @@ ((and (= s5-0 (pickup-type eco-dark)) (= v1-227 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 271)) + (the-as art-joint-anim jakb-gun-front-to-blue-hop-ja) 0.0 19 19 @@ -1021,7 +1021,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-227 2)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 272)) + (the-as art-joint-anim jakb-gun-blue-to-front-hop-ja) 0.0 19 19 @@ -1033,7 +1033,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-227 4)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 272)) + (the-as art-joint-anim jakb-gun-blue-to-front-hop-ja) 0.0 19 19 @@ -1045,7 +1045,7 @@ ((and (= s5-0 (pickup-type eco-yellow)) (= v1-227 3)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 271)) + (the-as art-joint-anim jakb-gun-front-to-blue-hop-ja) 0.0 30 19 @@ -1057,7 +1057,7 @@ ((and (= s5-0 (pickup-type eco-blue)) (= v1-227 1)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 252)) + (the-as art-joint-anim jakb-gun-blue-to-yellow-ja) 0.0 19 19 @@ -1416,7 +1416,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 220)) + (the-as art-joint-anim jakb-pilot-gun-yellow-idle-ja) 0.0 arg0 0 @@ -1428,7 +1428,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 221)) + (the-as art-joint-anim jakb-pilot-gun-blue-idle-ja) 0.0 arg0 0 @@ -1440,7 +1440,7 @@ (((pickup-type eco-red)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 218)) + (the-as art-joint-anim jakb-pilot-gun-red-idle-ja) 0.0 arg0 0 @@ -1452,7 +1452,7 @@ (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 219)) + (the-as art-joint-anim jakb-pilot-gun-dark-idle-ja) 0.0 arg0 0 @@ -1468,7 +1468,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 254)) + (the-as art-joint-anim jakb-gun-stance-yellow-ja) 0.0 arg0 0 @@ -1484,7 +1484,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 255)) + (the-as art-joint-anim jakb-gun-stance-blue-ja) 0.0 arg0 0 @@ -1494,21 +1494,12 @@ ) ) (((pickup-type eco-red)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 244)) - 0.0 - arg0 - 0 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-stance-ja) 0.0 arg0 0 1.0 0.0 #f) ) (((pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 253)) + (the-as art-joint-anim jakb-gun-stance-dark-ja) 0.0 arg0 0 @@ -1911,16 +1902,16 @@ (let ((v1-3 (-> self gun gun-type))) (set! (-> self skel top-anim base-anim) (cond ((= v1-3 (pickup-type eco-yellow)) - (-> self draw art-group data 220) + jakb-pilot-gun-yellow-idle-ja ) ((= v1-3 (pickup-type eco-red)) - (-> self draw art-group data 218) + jakb-pilot-gun-red-idle-ja ) ((= v1-3 (pickup-type eco-blue)) - (-> self draw art-group data 221) + jakb-pilot-gun-blue-idle-ja ) (else - (-> self draw art-group data 219) + jakb-pilot-gun-dark-idle-ja ) ) ) @@ -1933,13 +1924,11 @@ ((= v1-14 (pickup-type eco-yellow)) (let ((v1-17 (ja-group))) (cond - ((and (and v1-17 (or (= v1-17 self) (= v1-17 (-> self draw art-group data 261)))) - (< (-> self gun top-anim-low-high) 0.5) - ) + ((and (and v1-17 (or (= v1-17 self) (= v1-17 jakb-gun-walk-side-ja))) (< (-> self gun top-anim-low-high) 0.5)) (let ((s5-0 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 299) - (-> self draw art-group data 298) + jakb-gun-front-run-ja + jakb-gun-front-walk-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -1951,18 +1940,18 @@ gp-0 ) ((< (-> self gun top-anim-low-high) 0.5) - (-> self draw art-group data 245) + jakb-gun-stance-yellow-low-ja ) (else (when (and (>= (- (current-time) (-> self gun fire-time)) (seconds 1.5)) (let ((v1-50 (-> self skel top-anim frame-group))) - (or (= v1-50 (-> self draw art-group data 247)) (= v1-50 (-> self draw art-group data 254))) + (or (= v1-50 jakb-gun-yellow-highlow-ja) (= v1-50 jakb-gun-stance-yellow-ja)) ) ) (seek! (-> self gun top-anim-low-high) 0.0 (* 6.0 (seconds-per-frame))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 247)) + (the-as art-joint-anim jakb-gun-yellow-highlow-ja) 0.0 0 60 @@ -1974,7 +1963,7 @@ #f ) ) - (-> self draw art-group data 254) + jakb-gun-stance-yellow-ja ) ) ) @@ -1982,11 +1971,11 @@ ((= v1-14 (pickup-type eco-red)) (let ((v1-67 (ja-group))) (cond - ((and v1-67 (or (= v1-67 self) (= v1-67 (-> self draw art-group data 12)))) + ((and v1-67 (or (= v1-67 self) (= v1-67 jakb-walk-ja))) (let ((s5-1 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 299) - (-> self draw art-group data 298) + jakb-gun-front-run-ja + jakb-gun-front-walk-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -1998,23 +1987,23 @@ gp-0 ) ((< (-> self gun top-anim-low-high) 0.5) - (-> self draw art-group data 244) + jakb-gun-stance-ja ) (else (when (and (or (>= (- (current-time) (-> self gun fire-time)) (seconds 2.5)) (and (< 4096.0 (-> self control ctrl-xz-vel)) (>= (- (current-time) (-> self gun fire-time)) (seconds 1.25))) ) (let ((v1-104 (-> self skel top-anim frame-group))) - (or (= v1-104 (-> self draw art-group data 294)) - (= v1-104 (-> self draw art-group data 295)) - (= v1-104 (-> self draw art-group data 244)) + (or (= v1-104 jakb-gun-stance-red-sideways-ja) + (= v1-104 jakb-gun-red-from-sideways-ja) + (= v1-104 jakb-gun-stance-ja) ) ) ) (seek! (-> self gun top-anim-low-high) 0.0 (* 6.0 (seconds-per-frame))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 295)) + (the-as art-joint-anim jakb-gun-red-from-sideways-ja) 0.0 0 30 @@ -2023,7 +2012,7 @@ #f ) ) - (-> self draw art-group data 294) + jakb-gun-stance-red-sideways-ja ) ) ) @@ -2031,13 +2020,13 @@ ((= v1-14 (pickup-type eco-blue)) (let ((v1-119 (ja-group))) (cond - ((and (and v1-119 (or (= v1-119 self) (= v1-119 (-> self draw art-group data 261)))) + ((and (and v1-119 (or (= v1-119 self) (= v1-119 jakb-gun-walk-side-ja))) (and (< (-> self gun top-anim-low-high) 0.5) (>= (- (current-time) (-> self gun fire-time)) (seconds 0.2))) ) (let ((s5-2 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 262) - (-> self draw art-group data 303) + jakb-gun-run-blue-ja + jakb-gun-walk-blue-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -2049,18 +2038,18 @@ gp-0 ) (else - (-> self draw art-group data 255) + jakb-gun-stance-blue-ja ) ) ) ) ((let ((v1-150 (ja-group))) - (and v1-150 (or (= v1-150 self) (= v1-150 (-> self draw art-group data 12)))) + (and v1-150 (or (= v1-150 self) (= v1-150 jakb-walk-ja))) ) (let ((s5-3 (get-channel (-> self skel top-anim) 0))) (set! gp-0 (if (< 0.9 (-> self control unknown-float002)) - (-> self draw art-group data 299) - (-> self draw art-group data 298) + jakb-gun-front-run-ja + jakb-gun-front-walk-ja ) ) (set! (-> self skel top-anim base-anim-blend) 0.1) @@ -2072,7 +2061,7 @@ gp-0 ) (else - (-> self draw art-group data 253) + jakb-gun-stance-dark-ja ) ) ) @@ -2100,10 +2089,10 @@ (set! (-> self gun gun-pos scale quad) (-> self control scale quad)) (when (and (using-gun? self) (and (focus-test? self edge-grab) (let ((v1-18 (ja-group))) - (and v1-18 (or (= v1-18 (-> self draw art-group data 27)) - (= v1-18 (-> self draw art-group data 35)) - (= v1-18 (-> self draw art-group data 33)) - (= v1-18 (-> self draw art-group data 34)) + (and v1-18 (or (= v1-18 jakb-jump-loop-ja) + (= v1-18 jakb-falling-to-edge-grab-ja) + (= v1-18 jakb-edge-grab-stance0-ja) + (= v1-18 jakb-edge-grab-stance1-ja) ) ) ) @@ -2155,18 +2144,18 @@ ) ((handle->process (-> self gun charge-active?)) (cond - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 259)) (>= (-> v1-24 frame-num) 8.5)) + ((and (= (-> v1-24 frame-group) jakb-gun-dark-fire-ja) (>= (-> v1-24 frame-num) 8.5)) (set! (-> v1-24 frame-num) 5.0) ) - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 224)) (>= (-> v1-24 frame-num) 8.0)) + ((and (= (-> v1-24 frame-group) jakb-pilot-gun-dark-fire-ja) (>= (-> v1-24 frame-num) 8.0)) (set! (-> v1-24 frame-num) 3.0) ) ) ) - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 259)) (< (-> v1-24 frame-num) 9.0)) + ((and (= (-> v1-24 frame-group) jakb-gun-dark-fire-ja) (< (-> v1-24 frame-num) 9.0)) (set! (-> v1-24 frame-num) 10.0) ) - ((and (= (-> v1-24 frame-group) (-> self draw art-group data 224)) (< (-> v1-24 frame-num) 9.0)) + ((and (= (-> v1-24 frame-group) jakb-pilot-gun-dark-fire-ja) (< (-> v1-24 frame-num) 9.0)) (set! (-> v1-24 frame-num) 9.0) ) ) @@ -2178,60 +2167,60 @@ (let ((v1-35 (-> self skel top-anim frame-group)) (f0-13 (-> self skel top-anim frame-num)) ) - (and (not (or (= v1-35 (-> self draw art-group data 263)) - (= v1-35 (-> self draw art-group data 266)) - (= v1-35 (-> self draw art-group data 265)) - (= v1-35 (-> self draw art-group data 264)) - (and (-> self draw art-group data 198) - (or (= v1-35 (-> self draw art-group data 198)) - (= v1-35 (-> self draw art-group data 230)) - (= v1-35 (-> self draw art-group data 229)) - (= v1-35 (-> self draw art-group data 231)) - (= v1-35 (-> self draw art-group data 225)) - (= v1-35 (-> self draw art-group data 226)) - (= v1-35 (-> self draw art-group data 227)) - (= v1-35 (-> self draw art-group data 228)) + (and (not (or (= v1-35 jakb-gun-red-takeout-ja) + (= v1-35 jakb-gun-blue-takeout-ja) + (= v1-35 jakb-gun-yellow-takeout-ja) + (= v1-35 jakb-gun-dark-takeout-ja) + (and jakb-pilot-gun-red-takeout-ja + (or (= v1-35 jakb-pilot-gun-red-takeout-ja) + (= v1-35 jakb-pilot-gun-blue-takeout-ja) + (= v1-35 jakb-pilot-gun-yellow-takeout-ja) + (= v1-35 jakb-pilot-gun-dark-takeout-ja) + (= v1-35 jakb-pilot-gun-red-dark-ja) + (= v1-35 jakb-pilot-gun-red-yellow-ja) + (= v1-35 jakb-pilot-gun-red-blue-ja) + (= v1-35 jakb-pilot-gun-yellow-blue-ja) ) ) - (and (= v1-35 (-> self draw art-group data 274)) (>= 6.8 f0-13)) - (or (and (= v1-35 (-> self draw art-group data 276)) (>= 6.8 f0-13)) - (= v1-35 (-> self draw art-group data 293)) - (= v1-35 (-> self draw art-group data 296)) - (= v1-35 (-> self draw art-group data 269)) - (= v1-35 (-> self draw art-group data 270)) - (= v1-35 (-> self draw art-group data 268)) - (= v1-35 (-> self draw art-group data 272)) - (= v1-35 (-> self draw art-group data 271)) - (= v1-35 (-> self draw art-group data 289)) - (= v1-35 (-> self draw art-group data 290)) + (and (= v1-35 jakb-gun-attack-butt-end-ja) (>= 6.8 f0-13)) + (or (and (= v1-35 jakb-gun-attack-butt-blue-end-ja) (>= 6.8 f0-13)) + (= v1-35 jakb-gun-dark-fire-twirl-ja) + (= v1-35 jakb-gun-yellow-fire-twirl-ja) + (= v1-35 jakb-gun-transformation-twirl-ja) + (= v1-35 jakb-gun-front-to-side-hop-ja) + (= v1-35 jakb-gun-side-to-front-hop-ja) + (= v1-35 jakb-gun-blue-to-front-hop-ja) + (= v1-35 jakb-gun-front-to-blue-hop-ja) + (= v1-35 jakb-gun-hit-from-front-ja) + (= v1-35 jakb-gun-hit-from-back-ja) ) ) ) (let ((v1-40 (-> self skel top-anim frame-group-push))) - (not (or (= v1-40 (-> self draw art-group data 263)) - (= v1-40 (-> self draw art-group data 266)) - (= v1-40 (-> self draw art-group data 265)) - (= v1-40 (-> self draw art-group data 264)) - (and (-> self draw art-group data 198) - (or (= v1-40 (-> self draw art-group data 198)) - (= v1-40 (-> self draw art-group data 230)) - (= v1-40 (-> self draw art-group data 229)) - (= v1-40 (-> self draw art-group data 231)) - (= v1-40 (-> self draw art-group data 225)) - (= v1-40 (-> self draw art-group data 226)) - (= v1-40 (-> self draw art-group data 227)) - (= v1-40 (-> self draw art-group data 228)) + (not (or (= v1-40 jakb-gun-red-takeout-ja) + (= v1-40 jakb-gun-blue-takeout-ja) + (= v1-40 jakb-gun-yellow-takeout-ja) + (= v1-40 jakb-gun-dark-takeout-ja) + (and jakb-pilot-gun-red-takeout-ja + (or (= v1-40 jakb-pilot-gun-red-takeout-ja) + (= v1-40 jakb-pilot-gun-blue-takeout-ja) + (= v1-40 jakb-pilot-gun-yellow-takeout-ja) + (= v1-40 jakb-pilot-gun-dark-takeout-ja) + (= v1-40 jakb-pilot-gun-red-dark-ja) + (= v1-40 jakb-pilot-gun-red-yellow-ja) + (= v1-40 jakb-pilot-gun-red-blue-ja) + (= v1-40 jakb-pilot-gun-yellow-blue-ja) ) ) - (= v1-40 (-> self draw art-group data 293)) - (= v1-40 (-> self draw art-group data 296)) - (= v1-40 (-> self draw art-group data 269)) - (= v1-40 (-> self draw art-group data 270)) - (= v1-40 (-> self draw art-group data 268)) - (= v1-40 (-> self draw art-group data 272)) - (= v1-40 (-> self draw art-group data 271)) - (= v1-40 (-> self draw art-group data 289)) - (= v1-40 (-> self draw art-group data 290)) + (= v1-40 jakb-gun-dark-fire-twirl-ja) + (= v1-40 jakb-gun-yellow-fire-twirl-ja) + (= v1-40 jakb-gun-transformation-twirl-ja) + (= v1-40 jakb-gun-front-to-side-hop-ja) + (= v1-40 jakb-gun-side-to-front-hop-ja) + (= v1-40 jakb-gun-blue-to-front-hop-ja) + (= v1-40 jakb-gun-front-to-blue-hop-ja) + (= v1-40 jakb-gun-hit-from-front-ja) + (= v1-40 jakb-gun-hit-from-back-ja) ) ) ) @@ -2320,14 +2309,14 @@ (>= (- (current-time) (-> self gun gun-get-on-time)) (seconds 0.1)) (let ((v1-110 (-> self skel top-anim frame-targ))) (or (not v1-110) - (= v1-110 (-> self draw art-group data 304)) - (= v1-110 (-> self draw art-group data 300)) - (= v1-110 (-> self draw art-group data 305)) - (= v1-110 (-> self draw art-group data 301)) - (= v1-110 (-> self draw art-group data 299)) - (= v1-110 (-> self draw art-group data 298)) - (= v1-110 (-> self draw art-group data 262)) - (= v1-110 (-> self draw art-group data 303)) + (= v1-110 jakb-gun-side-jump-ja) + (= v1-110 jakb-gun-front-jump-ja) + (= v1-110 jakb-gun-side-jump-land-ja) + (= v1-110 jakb-gun-front-jump-land-ja) + (= v1-110 jakb-gun-front-run-ja) + (= v1-110 jakb-gun-front-walk-ja) + (= v1-110 jakb-gun-run-blue-ja) + (= v1-110 jakb-gun-walk-blue-ja) (logtest? (surface-flag gun-fast-exit) (-> self control current-surface flags)) ) ) @@ -2363,14 +2352,14 @@ (cond ((focus-test? self pilot-riding) (let ((v1-15 (get-channel (-> self skel top-anim) 0))) - (when (not (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 206)) - (and v1-15 (= (-> v1-15 frame-group) (-> self draw art-group data 206))) + (when (not (or (= (-> self skel top-anim frame-group) jakb-pilot-gun-blue-fire-ja) + (and v1-15 (= (-> v1-15 frame-group) jakb-pilot-gun-blue-fire-ja)) ) ) (if (< 4096.0 (-> self control ctrl-xz-vel)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 207)) + (the-as art-joint-anim jakb-pilot-gun-blue-fire-single-ja) 1.0 9 9 @@ -2380,7 +2369,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 207)) + (the-as art-joint-anim jakb-pilot-gun-blue-fire-single-ja) 1.0 6 6 @@ -2394,14 +2383,14 @@ ) (else (let ((v1-32 (get-channel (-> self skel top-anim) 0))) - (when (not (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 257)) - (and v1-32 (= (-> v1-32 frame-group) (-> self draw art-group data 257))) + (when (not (or (= (-> self skel top-anim frame-group) jakb-gun-blue-fire-ja) + (and v1-32 (= (-> v1-32 frame-group) jakb-gun-blue-fire-ja)) ) ) (if (< 4096.0 (-> self control ctrl-xz-vel)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 258)) + (the-as art-joint-anim jakb-gun-blue-fire-single-ja) 1.0 9 9 @@ -2411,7 +2400,7 @@ ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 258)) + (the-as art-joint-anim jakb-gun-blue-fire-single-ja) 1.0 6 6 @@ -2431,7 +2420,7 @@ ((focus-test? self pilot-riding) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 223)) + (the-as art-joint-anim jakb-pilot-gun-yellow-fire-ja) 0.0 15 0 @@ -2443,7 +2432,7 @@ ((< (-> self gun top-anim-low-high) 0.5) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 246)) + (the-as art-joint-anim jakb-gun-yellow-fire-low-ja) 0.0 15 0 @@ -2454,16 +2443,7 @@ (set! (-> self gun top-anim-low-high) 1.0) ) (else - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 260)) - 0.0 - 0 - 0 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-yellow-fire-ja) 0.0 0 0 1.0 0.0 #f) ) ) (target-gun-fire-yellow) @@ -2479,7 +2459,7 @@ ((focus-test? self pilot-riding) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 222)) + (the-as art-joint-anim jakb-pilot-gun-red-fire-ja) 0.0 15 0 @@ -2494,7 +2474,7 @@ ((< 0.5 (-> self gun top-anim-low-high)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 292)) + (the-as art-joint-anim jakb-gun-red-fire-from-sideways-ja) 0.0 0 15 @@ -2507,7 +2487,7 @@ ((and (rand-vu-percent? 0.2) (< (- (current-time) (-> self gun fire-time)) (seconds 2))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 293)) + (the-as art-joint-anim jakb-gun-dark-fire-twirl-ja) 0.0 0 15 @@ -2519,12 +2499,12 @@ #f ) ) - ((and (or (rand-vu-percent? 0.2) (= (-> self skel top-anim frame-targ) (-> self draw art-group data 256))) + ((and (or (rand-vu-percent? 0.2) (= (-> self skel top-anim frame-targ) jakb-gun-red-fire-ja)) (< (- (current-time) (-> self gun fire-time)) (seconds 2)) ) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 291)) + (the-as art-joint-anim jakb-gun-red-fire-to-sideways-ja) 0.0 0 15 @@ -2537,7 +2517,7 @@ ((logtest? (-> self game features) (game-feature gun-upgrade-speed)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 309)) + (the-as art-joint-anim jakb-gun-red-fire-fast-ja) 0.0 0 15 @@ -2547,16 +2527,7 @@ ) ) (else - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 256)) - 1.0 - 0 - 15 - f30-0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-red-fire-ja) 1.0 0 15 f30-0 0.0 #f) ) ) ) @@ -2566,17 +2537,7 @@ (if (focus-test? self pilot-riding) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 224)) - 0.0 - 0 - 15 - 1.0 - 0.0 - #f - ) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 259)) + (the-as art-joint-anim jakb-pilot-gun-dark-fire-ja) 0.0 0 15 @@ -2584,6 +2545,7 @@ 0.0 #f ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-dark-fire-ja) 0.0 0 15 1.0 0.0 #f) ) (target-gun-fire-dark) ) @@ -2725,8 +2687,8 @@ (logtest? (state-flags sf16) (-> self state-flags)) (logtest? (-> self game secrets) (game-secrets endless-ammo)) ) - (and (-> gp-0 active?) (not (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 257)) - (= (-> self skel top-anim frame-group) (-> self draw art-group data 206)) + (and (-> gp-0 active?) (not (or (= (-> self skel top-anim frame-group) jakb-gun-blue-fire-ja) + (= (-> self skel top-anim frame-group) jakb-pilot-gun-blue-fire-ja) ) ) ) @@ -2739,8 +2701,8 @@ (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim (if (focus-test? self pilot-riding) - (-> self draw art-group data 206) - (-> self draw art-group data 257) + jakb-pilot-gun-blue-fire-ja + jakb-gun-blue-fire-ja ) ) (* 6.0 f0-24) diff --git a/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc b/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc index 47291bf9d5a..45ea96c6707 100644 --- a/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc @@ -53,7 +53,7 @@ (go target-running-attack) ) (if (and (using-gun? self) (let ((v1-79 (ja-group))) - (and v1-79 (= v1-79 (-> self draw art-group data 5))) + (and v1-79 (= v1-79 jakb-stance-loop-ja)) ) ) (go target-gun-stance) @@ -112,17 +112,17 @@ ) (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 12)) (= v1-2 (-> self draw art-group data 7)))) + ((and v1-2 (or (= v1-2 jakb-walk-ja) (= v1-2 jakb-run-ja))) (set! gp-0 15) (set! f30-0 (ja-frame-num 0)) ) ((let ((v1-9 (ja-group))) - (and v1-9 (or (= v1-9 (-> self draw art-group data 23)) (= v1-9 (-> self draw art-group data 27)))) + (and v1-9 (or (= v1-9 jakb-jump-ja) (= v1-9 jakb-jump-loop-ja))) ) (set! gp-0 30) ) ((let ((v1-16 (ja-group))) - (and v1-16 (= v1-16 (-> self draw art-group data 97))) + (and v1-16 (= v1-16 jakb-swim-walk-ja)) ) (set! gp-0 120) ) @@ -130,18 +130,18 @@ ) (cond ((and (= (ja-group-size) 6) (let ((v1-25 (ja-group))) - (and v1-25 (= v1-25 (-> self draw art-group data 94))) + (and v1-25 (= v1-25 jakb-wade-shallow-walk-ja)) ) ) ) (else (ja-channel-push! 6 (the-as time-frame gp-0)) - (ja :group! (-> self draw art-group data 94) + (ja :group! jakb-wade-shallow-walk-ja :num! (identity f30-0) :dist (-> *TARGET-bank* wade-shallow-walk-cycle-dist) ) (ja :chan 1 - :group! (-> self draw art-group data 95) + :group! jakb-wade-deep-walk-ja :num! (identity f30-0) :dist (-> *TARGET-bank* wade-deep-walk-cycle-dist) ) @@ -151,11 +151,7 @@ (set! (-> gp-3 frame-interp 0) f0-2) ) (set! (-> gp-3 dist) (-> *TARGET-bank* walk-cycle-dist)) - (joint-control-channel-group-eval! - gp-3 - (the-as art-joint-anim (-> self draw art-group data 12)) - num-func-identity - ) + (joint-control-channel-group-eval! gp-3 (the-as art-joint-anim jakb-walk-ja) num-func-identity) (set! (-> gp-3 frame-num) f30-0) ) (let ((gp-4 (-> self skel root-channel 3))) @@ -164,11 +160,7 @@ (set! (-> gp-4 frame-interp 0) f0-4) ) (set! (-> gp-4 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (joint-control-channel-group-eval! - gp-4 - (the-as art-joint-anim (-> self draw art-group data 14)) - num-func-identity - ) + (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim jakb-walk-down-ja) num-func-identity) (set! (-> gp-4 frame-num) f30-0) ) (let ((gp-5 (-> self skel root-channel 4))) @@ -177,11 +169,7 @@ (set! (-> gp-5 frame-interp 0) f0-6) ) (set! (-> gp-5 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (joint-control-channel-group-eval! - gp-5 - (the-as art-joint-anim (-> self draw art-group data 16)) - num-func-identity - ) + (joint-control-channel-group-eval! gp-5 (the-as art-joint-anim jakb-walk-left-ja) num-func-identity) (set! (-> gp-5 frame-num) f30-0) ) ) @@ -205,7 +193,7 @@ (set! f26-0 (seek f26-0 f24-0 (fmax 0.05 (fmin 0.2 (* 0.25 f0-14))))) ) ) - (ja :chan 3 :group! (-> self draw art-group data 14) :dist (-> *TARGET-bank* walk-down-cycle-dist)) + (ja :chan 3 :group! jakb-walk-down-ja :dist (-> *TARGET-bank* walk-down-cycle-dist)) (cond ((>= f28-0 0.0) (let ((v1-83 (-> self skel root-channel 3))) @@ -214,7 +202,7 @@ (set! (-> v1-83 frame-interp 0) f0-20) ) (set! (-> v1-83 dist) (-> *TARGET-bank* walk-up-cycle-dist)) - (set! (-> v1-83 frame-group) (the-as art-joint-anim (-> self draw art-group data 13))) + (set! (-> v1-83 frame-group) (the-as art-joint-anim jakb-walk-up-ja)) ) ) (else @@ -224,7 +212,7 @@ (set! (-> v1-86 frame-interp 0) f0-22) ) (set! (-> v1-86 dist) (-> *TARGET-bank* walk-down-cycle-dist)) - (set! (-> v1-86 frame-group) (the-as art-joint-anim (-> self draw art-group data 14))) + (set! (-> v1-86 frame-group) (the-as art-joint-anim jakb-walk-down-ja)) ) ) ) @@ -236,7 +224,7 @@ (set! (-> v1-89 frame-interp 0) f0-25) ) (set! (-> v1-89 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-89 frame-group) (the-as art-joint-anim (-> self draw art-group data 15))) + (set! (-> v1-89 frame-group) (the-as art-joint-anim jakb-walk-right-ja)) ) ) (else @@ -246,7 +234,7 @@ (set! (-> v1-92 frame-interp 0) f0-27) ) (set! (-> v1-92 dist) (-> *TARGET-bank* walk-side-cycle-dist)) - (set! (-> v1-92 frame-group) (the-as art-joint-anim (-> self draw art-group data 16))) + (set! (-> v1-92 frame-group) (the-as art-joint-anim jakb-walk-left-ja)) ) ) ) @@ -447,7 +435,7 @@ (if (and (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) (let ((gp-0 (ja-group))) (ja-aframe-num 0) - (if (or (and (= gp-0 (-> self draw art-group data 101)) #t) (and (= gp-0 (-> self draw art-group data 100)) #t)) + (if (or (and (= gp-0 jakb-swim-up-ja) #t) (and (= gp-0 jakb-swim-down-to-up-ja) #t)) #f #t ) @@ -461,16 +449,14 @@ :code (behavior () (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 101)) (= v1-2 (-> self draw art-group data 100)))) + ((and v1-2 (or (= v1-2 jakb-swim-up-ja) (= v1-2 jakb-swim-down-to-up-ja))) (ja-channel-push! 1 (seconds 0.075)) - (ja-no-eval :group! (-> self draw art-group data 102) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 102)) frames num-frames) -1)) - (if (= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) - 1.0 - 2.0 - ) - ) + (ja-no-eval :group! jakb-swim-up-to-stance-ja + :num! (seek! max (if (= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) + 1.0 + 2.0 + ) + ) :frame-num 0.0 ) (until (ja-done? 0) @@ -491,7 +477,7 @@ ) (else (let ((v1-43 (ja-group))) - (if (and v1-43 (= v1-43 (-> self draw art-group data 97))) + (if (and v1-43 (= v1-43 jakb-swim-walk-ja)) (ja-channel-push! 1 (seconds 0.83)) (ja-channel-push! 1 (seconds 0.15)) ) @@ -500,7 +486,7 @@ ) ) (until #f - (ja :group! (-> self draw art-group data 96) :num! min) + (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (can-play-stance-amibent?) (suspend) @@ -580,21 +566,14 @@ :code (behavior () (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 101)) - (= v1-2 (-> self draw art-group data 100)) - (= v1-2 (-> self draw art-group data 102)) - ) - ) + ((and v1-2 (or (= v1-2 jakb-swim-up-ja) (= v1-2 jakb-swim-down-to-up-ja) (= v1-2 jakb-swim-up-to-stance-ja))) (ja-channel-push! 1 (seconds 0.3)) ) ((let ((v1-8 (ja-group))) - (and v1-8 (= v1-8 (-> self draw art-group data 102))) + (and v1-8 (= v1-8 jakb-swim-up-to-stance-ja)) ) (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 97) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 97)) frames num-frames) -1))) - :frame-num (ja-aframe 19.0 0) - ) + (ja-no-eval :group! jakb-swim-walk-ja :num! (seek!) :frame-num (ja-aframe 19.0 0)) (until (ja-done? 0) (compute-alignment! (-> self align)) (if (not (logtest? (-> self align flags) (align-flags disabled))) @@ -612,10 +591,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 97) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 97)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-swim-walk-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (if (not (logtest? (-> self align flags) (align-flags disabled))) @@ -749,66 +725,61 @@ (f30-0 0.0) ) (let ((v1-2 (ja-group))) - (set! f30-0 - (cond - ((and v1-2 - (or (= v1-2 (-> self draw art-group data 96)) - (= v1-2 (-> self draw art-group data 97)) - (= v1-2 (-> self draw art-group data 102)) - (= v1-2 (-> self draw art-group data 101)) - (= v1-2 (-> self draw art-group data 100)) - ) - ) - (let ((t9-0 ja-channel-push!) - (a0-16 1) - (v1-7 (ja-group)) - ) - (t9-0 a0-16 (the-as time-frame (if (and v1-7 (= v1-7 (-> self draw art-group data 100))) - 105 - 22 - ) - ) + (set! f30-0 (cond + ((and v1-2 (or (= v1-2 jakb-swim-stance-ja) + (= v1-2 jakb-swim-walk-ja) + (= v1-2 jakb-swim-up-to-stance-ja) + (= v1-2 jakb-swim-up-ja) + (= v1-2 jakb-swim-down-to-up-ja) + ) + ) + (let ((t9-0 ja-channel-push!) + (a0-16 1) + (v1-7 (ja-group)) + ) + (t9-0 a0-16 (the-as time-frame (if (and v1-7 (= v1-7 jakb-swim-down-to-up-ja)) + 105 + 22 + ) + ) + ) ) - ) - (ja-no-eval :group! (-> self draw art-group data 98) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 98)) frames num-frames) -1))) - :frame-num 0.0 + (ja-no-eval :group! jakb-swim-walk-to-down-ja :num! (seek!) :frame-num 0.0) + (until (ja-done? 0) + (compute-alignment! (-> self align)) + (align! (-> self align) (align-opts adjust-y-vel adjust-xz-vel) 1.0 1.0 1.0) + (if (= (ja-aframe-num 0) 73.0) + (spawn-ripples (-> self water) 0.7 (-> self control trans) 1 *null-vector* #f) ) - (until (ja-done? 0) - (compute-alignment! (-> self align)) - (align! (-> self align) (align-opts adjust-y-vel adjust-xz-vel) 1.0 1.0 1.0) - (if (= (ja-aframe-num 0) 73.0) - (spawn-ripples (-> self water) 0.7 (-> self control trans) 1 *null-vector* #f) - ) - (suspend) - (ja :num! (seek!)) - ) - (ja :group! (-> self draw art-group data 99) :num! min) - f30-0 - ) - (else - (let ((v1-50 (ja-group))) - (cond - ((and v1-50 (or (= v1-50 (-> self draw art-group data 52)) - (= v1-50 (-> self draw art-group data 55)) - (= v1-50 (-> self draw art-group data 53)) - (= v1-50 (-> self draw art-group data 56)) - ) - ) - (ja-channel-push! 1 (seconds 0.075)) - (set! gp-0 120) - (ja :group! (-> self draw art-group data 99) :num! (identity (ja-aframe 124.0 0))) - -16384.0 + (suspend) + (ja :num! (seek!)) + ) + (ja :group! jakb-swim-down-ja :num! min) + f30-0 ) (else - (ja-channel-push! 1 (seconds 0.075)) - (ja :group! (-> self draw art-group data 99) :num! min) - f30-0 + (let ((v1-50 (ja-group))) + (cond + ((and v1-50 (or (= v1-50 jakb-flop-down-ja) + (= v1-50 jakb-moving-flop-down-ja) + (= v1-50 jakb-flop-down-loop-ja) + (= v1-50 jakb-moving-flop-down-loop-ja) + ) + ) + (ja-channel-push! 1 (seconds 0.075)) + (set! gp-0 120) + (ja :group! jakb-swim-down-ja :num! (identity (ja-aframe 124.0 0))) + -16384.0 + ) + (else + (ja-channel-push! 1 (seconds 0.075)) + (ja :group! jakb-swim-down-ja :num! min) + f30-0 + ) + ) + ) ) ) - ) - ) - ) ) ) (until #f @@ -898,10 +869,7 @@ (let ((s5-0 #t) (gp-0 #f) ) - (ja-no-eval :group! (-> self draw art-group data 100) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 100)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-swim-down-to-up-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (target-swim-tilt (if (< 8192.0 (-> self water swim-depth)) @@ -940,7 +908,7 @@ (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 101) :num! min) + (ja :group! jakb-swim-up-ja :num! min) (until #f (target-swim-tilt (if (< 8192.0 (-> self water swim-depth)) @@ -1012,7 +980,7 @@ :code (behavior ((arg0 float) (arg1 float)) (die-on-next-update! (-> self water bob)) (ja-channel-push! 1 (seconds 0.05)) - (ja :group! (-> self draw art-group data 103) :num! min) + (ja :group! jakb-swim-jump-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (compute-alignment! (-> self align)) (if (not (logtest? (-> self align flags) (align-flags disabled))) diff --git a/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc b/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc index 3e8c1227f2d..4dc70165ba7 100644 --- a/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc @@ -708,7 +708,7 @@ ) (update-rates! (-> self clock) f30-0) ) - (ja :group! (-> self draw art-group data 111) + (ja :group! jakb-tube-turn-ja :num! (identity (ja-aframe (+ (-> self tube turn-anim-frame) (* 5.0 (sin (* 145.63556 (the float (- (current-time) (-> self state-time)))))) @@ -745,12 +745,9 @@ :code (behavior () (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 30)) (= v1-2 (-> self draw art-group data 27)))) + ((and v1-2 (or (= v1-2 jakb-duck-high-jump-ja) (= v1-2 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 112) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 112)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-tube-jump-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -797,7 +794,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (ja-channel-push! 1 (seconds 0.05)) - (ja :group! (-> self draw art-group data 30) :num! (identity (ja-aframe 16.0 0))) + (ja :group! jakb-duck-high-jump-ja :num! (identity (ja-aframe 16.0 0))) (let ((f30-0 35.0) (f28-0 1.0) ) @@ -820,10 +817,10 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -973,7 +970,7 @@ (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 69) :num! (seek! (ja-aframe 134.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-deatha-ja :num! (seek! (ja-aframe 134.0 0)) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (let ((gp-2 (new 'stack-no-clear 'vector))) @@ -1112,7 +1109,7 @@ (go-virtual slide-control-ride) ) ) - :code (the-as (function none :behavior slide-control) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1167,7 +1164,7 @@ ) ) ) - :code (the-as (function none :behavior slide-control) sleep-code) + :code sleep-code ) ;; definition for method 11 of type slide-control diff --git a/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc b/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc index de63738a4cc..41df7ab7564 100644 --- a/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc @@ -1223,8 +1223,8 @@ :enter (behavior () (set-setting! 'mode-name 'cam-turret 0.0 0) ) - :code (the-as (function none :behavior base-turret) sleep-code) - :post (the-as (function none :behavior base-turret) transform-post) + :code sleep-code + :post transform-post ) ;; definition for function set-recoil @@ -1681,7 +1681,7 @@ (base-turret-method-43 self) (set! (-> self focus-status) (focus-status disable ignore inactive)) ) - :code (the-as (function none :behavior base-turret) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2538,10 +2538,7 @@ This commonly includes things such as: ) ) (set! (-> self alt-cam-pos quad) (-> self control camera-pos quad)) - (ja-no-eval :group! (-> self draw art-group data 361) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 361)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 361) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 12.0)))) (let ((f28-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 0.0 12.0))) @@ -2602,10 +2599,7 @@ This commonly includes things such as: (set! (-> self control unknown-vector40 quad) (-> gp-0 quad)) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 360) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 360)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 360) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (cond ((< (ja-aframe-num 0) 88.0) diff --git a/test/decompiler/reference/jak2/engine/target/target2_REF.gc b/test/decompiler/reference/jak2/engine/target/target2_REF.gc index 8ab5599dd02..ef5d80c62ac 100644 --- a/test/decompiler/reference/jak2/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target2_REF.gc @@ -26,10 +26,7 @@ (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 0.05)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 63) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 63)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-trip-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-xz-vel) 1.0 1.0 1.0) @@ -54,18 +51,12 @@ ) ) (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1))) - :frame-num (ja-aframe 40.0 0) - ) + (ja-no-eval :group! jakb-painful-land-ja :num! (seek!) :frame-num (ja-aframe 40.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-painful-land-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -138,7 +129,7 @@ (when (and a0-0 (= (-> *setting-control* user-current spooling) (process->ppointer self))) (ja-abort-spooled-anim a0-0 (the-as art-joint-anim #f) -1) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 5) :num! min) + (ja :group! jakb-stance-loop-ja :num! min) ) ) (set! (-> self spool-anim) #f) @@ -175,8 +166,8 @@ ) (ja-play-spooled-anim (-> self spool-anim) - (the-as art-joint-anim (-> self draw art-group data 5)) - (the-as art-joint-anim (-> self draw art-group data 5)) + (the-as art-joint-anim jakb-stance-loop-ja) + (the-as art-joint-anim jakb-stance-loop-ja) (lambda ((arg0 process-drawable)) (!= (-> *cpad-list* cpads 0 stick0-speed) 0.0)) ) (go target-stance) @@ -384,13 +375,10 @@ (+! gp-0 (- (current-time) (-> self clock old-frame-counter))) (suspend) ) - (if (or (> gp-0 0) (let ((v1-10 (ja-group))) - (and v1-10 (or (= v1-10 (-> self draw art-group data 23)) - (= v1-10 (-> self draw art-group data 27)) - (= v1-10 (-> self draw art-group data 30)) - ) - ) - ) + (if (or (> gp-0 0) + (let ((v1-10 (ja-group))) + (and v1-10 (or (= v1-10 jakb-jump-ja) (= v1-10 jakb-jump-loop-ja) (= v1-10 jakb-duck-high-jump-ja))) + ) ) (target-hit-ground-anim #f (are-still?)) ) @@ -404,7 +392,7 @@ ((logtest? (water-flags swimming) (-> self water flags)) (ja-channel-push! 1 (seconds 0.15)) (until #f - (ja :group! (-> self draw art-group data 96) :num! min) + (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -421,16 +409,16 @@ (let* ((v1-49 (-> self gun gun-type)) (s5-2 (cond ((= v1-49 (pickup-type eco-blue)) - (-> self draw art-group data 255) + jakb-gun-stance-blue-ja ) ((= v1-49 (pickup-type eco-yellow)) - (-> self draw art-group data 254) + jakb-gun-stance-yellow-ja ) ((= v1-49 (pickup-type eco-dark)) - (-> self draw art-group data 253) + jakb-gun-stance-dark-ja ) (else - (-> self draw art-group data 244) + jakb-gun-stance-ja ) ) ) @@ -454,10 +442,7 @@ (else (target-stance-push 1) (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-stance-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -472,7 +457,7 @@ ) (('shock-in) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 73) :num! (seek! (ja-aframe 15.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-shocked-ja :num! (seek! (ja-aframe 15.0 0)) :frame-num 0.0) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -481,10 +466,7 @@ (ja :num! (seek! (ja-aframe 15.0 0))) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 73) - :num! (seek! (ja-aframe 26.0 0)) - :frame-num (ja-aframe 16.0 0) - ) + (ja-no-eval :group! jakb-shocked-ja :num! (seek! (ja-aframe 26.0 0)) :frame-num (ja-aframe 16.0 0)) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -497,10 +479,7 @@ ) (('shock-out) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 73) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 73)) frames num-frames) -1))) - :frame-num (ja-aframe 17.0 0) - ) + (ja-no-eval :group! jakb-shocked-ja :num! (seek!) :frame-num (ja-aframe 17.0 0)) (until (ja-done? 0) (if (!= gp-2 (-> self control unknown-spool-anim00)) (goto cfg-82) @@ -606,7 +585,7 @@ ) (let ((v1-8 (ja-group))) (cond - ((and v1-8 (= v1-8 (-> self draw art-group data 107))) + ((and v1-8 (= v1-8 jakb-pole-jump-loop-ja)) (while (not (-> self control did-move-to-pole-or-max-jump-height)) (ja :num! (seek!)) (suspend) @@ -622,10 +601,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 104) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 104)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -637,10 +613,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 104) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 104)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (can-play-stance-amibent?) (suspend) @@ -658,10 +631,7 @@ :exit (-> target-pole-cycle exit) :code (behavior ((arg0 object) (arg1 object) (arg2 float)) (let ((f0-2 (+ 1.0 (fmin 17.0 (ja-aframe-num 0))))) - (ja-no-eval :group! (-> self draw art-group data 105) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 105)) frames num-frames) -1))) - :frame-num (ja-aframe f0-2 0) - ) + (ja-no-eval :group! jakb-pole-flip-up-ja :num! (seek!) :frame-num (ja-aframe f0-2 0)) ) (until (ja-done? 0) (suspend) @@ -687,7 +657,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (send-event *camera* 'damp-up) - (ja :group! (-> self draw art-group data 107) :num! min) + (ja :group! jakb-pole-jump-loop-ja :num! min) (let ((f0-1 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) @@ -699,10 +669,10 @@ ) ) (ja-channel-push! 1 (seconds 0.25)) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -715,10 +685,7 @@ :exit (-> target-pole-cycle exit) :code (behavior ((arg0 float) (arg1 float) (arg2 float)) (let ((f30-1 (+ 4.0 (ja-aframe-num 0)))) - (ja-no-eval :group! (-> self draw art-group data 106) - :num! (seek! (ja-aframe 16.0 0)) - :frame-num (ja-aframe f30-1 0) - ) + (ja-no-eval :group! jakb-pole-flip-forward-ja :num! (seek! (ja-aframe 16.0 0)) :frame-num (ja-aframe f30-1 0)) ) (until (ja-done? 0) (suspend) @@ -891,17 +858,14 @@ (cond ((= (-> gp-0 pilot-edge-grab?) 'target-double-jump) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek! (ja-aframe 14.0 0) 0.75) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-ja :num! (seek! (ja-aframe 14.0 0) 0.75) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 14.0 0) 0.75)) ) (sound-play "jump-double") (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (ja-aframe 14.0 0)) - :frame-num (ja-aframe 5.0 0) - ) + (ja-no-eval :group! jakb-jump-ja :num! (seek! (ja-aframe 14.0 0)) :frame-num (ja-aframe 5.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 14.0 0))) @@ -909,7 +873,7 @@ ) ((-> gp-0 pilot-edge-grab?) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek! (ja-aframe 14.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-ja :num! (seek! (ja-aframe 14.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 14.0 0))) @@ -918,9 +882,9 @@ (else (while (< 0.0 (-> self control hand-to-edge-dist)) (let ((v1-60 (ja-group))) - (when (not (and v1-60 (= v1-60 (-> self draw art-group data 27)))) + (when (not (and v1-60 (= v1-60 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.15)) - (ja :group! (-> self draw art-group data 27) :num! min) + (ja :group! jakb-jump-loop-ja :num! min) ) ) (suspend) @@ -957,31 +921,27 @@ (logclear! (-> self control root-prim prim-core action) (collide-action dont-push-away)) (set! (-> self control transv quad) (the-as uint128 0)) (let ((s4-0 (new 'stack-no-clear 'vector))) - (let ((a1-3 - (cond - ((using-gun? self) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 281)) - 0.0 - 0 - 30 - 1.0 - 0.0 - #f - ) - (-> self draw art-group data 281) - ) - (else - (-> self draw art-group data 38) + (let ((a1-3 (cond + ((using-gun? self) + (push-anim-to-targ + (-> self skel top-anim) + (the-as art-joint-anim jakb-gun-edge-grab-to-jump-ja) + 0.0 + 0 + 30 + 1.0 + 0.0 + #f + ) + jakb-gun-edge-grab-to-jump-ja + ) + (else + jakb-edge-grab-to-jump-ja + ) + ) ) - ) - ) ) - (ja-no-eval :group! a1-3 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-3) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-3 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (target-compute-edge-rider) @@ -1016,7 +976,7 @@ (if (using-gun? self) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 280)) + (the-as art-joint-anim jakb-gun-edge-grab-off-ja) 0.0 0 30 @@ -1025,7 +985,7 @@ #f ) ) - (ja-no-eval :group! (-> self draw art-group data 39) :num! (seek! (ja-aframe 191.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-edge-grab-off-ja :num! (seek! (ja-aframe 191.0 0)) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (when (not (logtest? (-> self align flags) (align-flags disabled))) @@ -1092,14 +1052,14 @@ (else (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.1)) (ja-channel-push! 1 1) - (ja :group! (-> self draw art-group data 25) :num! min) + (ja :group! jakb-painful-land-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 26) :num! min) + (ja :group! jakb-painful-land-end-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) @@ -1220,7 +1180,7 @@ (if (and (using-gun? self) (and (-> self next-state) (= (-> self next-state name) 'target-stance)) (let ((v1-85 (ja-group))) - (and v1-85 (= v1-85 (-> self draw art-group data 5))) + (and v1-85 (= v1-85 jakb-stance-loop-ja)) ) ) (go target-gun-stance) @@ -1242,10 +1202,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 81) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 81)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1256,13 +1213,9 @@ (set! (-> a0-5 frame-interp 1) f0-7) (set! (-> a0-5 frame-interp 0) f0-7) ) - (set! (-> a0-5 frame-group) (the-as art-joint-anim (-> self draw art-group data 88))) + (set! (-> a0-5 frame-group) (the-as art-joint-anim jakb-wall-hide-body-ja)) (set! (-> a0-5 param 0) 1.0) - (joint-control-channel-group-eval! - a0-5 - (the-as art-joint-anim (-> self draw art-group data 88)) - num-func-loop! - ) + (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim jakb-wall-hide-body-ja) num-func-loop!) ) (set! (-> self control unknown-word04) (the-as uint 0.5)) (set! (-> self control did-move-to-pole-or-max-jump-height) 0.5) @@ -1288,7 +1241,7 @@ ) (until #f (let ((s5-0 (rand-vu-int-range 30 600))) - (ja :group! (-> self draw art-group data 85)) + (ja :group! jakb-wall-hide-head-ja) (let ((s4-0 (current-time))) (until (>= (- (current-time) s4-0) s5-0) (gp-0) @@ -1300,10 +1253,7 @@ (cond ((or (cpad-hold? 1 r3) (-> self control unknown-float35)) (let ((f30-1 (rand-vu-float-range 0.25 0.75))) - (ja-no-eval :group! (-> self draw art-group data 82) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 82)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-scared-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1311,13 +1261,7 @@ ) (let ((s5-1 (rand-vu-int-range 1 10))) (dotimes (s4-1 s5-1) - (ja-no-eval :group! (-> self draw art-group data 83) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 83)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-scared-loop-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1326,10 +1270,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data 84) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 84)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-scared-return-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1337,13 +1278,7 @@ ) ) ((rand-vu-percent? 0.5) - (ja-no-eval :group! (-> self draw art-group data 86) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 86)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-head-left-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1357,10 +1292,7 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 86) - :num! (seek! 0.0 f30-0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 86)) frames num-frames) -1)) - ) + (ja-no-eval :group! jakb-wall-hide-head-left-ja :num! (seek! 0.0 f30-0) :frame-num max) (until (ja-done? 0) (gp-0) (suspend) @@ -1368,10 +1300,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 87) - :num! (seek! 0.0 f30-0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 87)) frames num-frames) -1)) - ) + (ja-no-eval :group! jakb-wall-hide-head-right-ja :num! (seek! 0.0 f30-0) :frame-num max) (until (ja-done? 0) (gp-0) (suspend) @@ -1385,13 +1314,7 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 87) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 87)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-wall-hide-head-right-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (gp-0) (suspend) @@ -1420,7 +1343,7 @@ (set! (-> self control mod-surface) *turn-around-mods*) (ja-channel-push! 1 (seconds 0.15)) (set-forward-vel 0.0) - (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek! (ja-aframe 15.0 0) 3.0) :frame-num 0.0) + (ja-no-eval :group! jakb-duck-stance-ja :num! (seek! (ja-aframe 15.0 0) 3.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 15.0 0) 3.0)) @@ -1522,7 +1445,7 @@ (when gp-0 (send-event (ppointer->process (-> self sidekick)) 'matrix 'play-anim) (ja-channel-set! 1) - (ja-no-eval :group! gp-0 :num! (seek! (the float (+ (-> gp-0 frames num-frames) -1))) :frame-num 0.0) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/engine/target/target_REF.gc b/test/decompiler/reference/jak2/engine/target/target_REF.gc index 05864b591c1..5c8627391ab 100644 --- a/test/decompiler/reference/jak2/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target_REF.gc @@ -115,7 +115,7 @@ (if (and (using-gun? self) (and (-> self next-state) (= (-> self next-state name) 'target-stance)) (let ((v1-85 (ja-group))) - (and v1-85 (= v1-85 (-> self draw art-group data 5))) + (and v1-85 (= v1-85 jakb-stance-loop-ja)) ) ) (go target-gun-stance) @@ -289,7 +289,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.04)) - (ja :group! (-> self draw art-group data 22) :num! min) + (ja :group! jakb-turn-around-ja :num! min) (quaternion-rotate-y! (-> self control dir-targ) (-> self control dir-targ) 32768.0) (compute-alignment! (-> self align)) (until (ja-done? 0) @@ -332,15 +332,12 @@ ) :code (behavior () (let ((v1-2 (ja-group))) - (if (not (and v1-2 (= v1-2 (-> self draw art-group data 20)))) + (if (not (and v1-2 (= v1-2 jakb-duck-stance-ja))) (ja-channel-push! 1 (seconds 0.1)) ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-duck-stance-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -804,10 +801,10 @@ (logtest? (-> self state-flags) (state-flags prevent-duck)) ) (let ((v1-13 (ja-group))) - (and (not (and v1-13 (or (= v1-13 (-> self draw art-group data 60)) - (= v1-13 (-> self draw art-group data 59)) - (= v1-13 (-> self draw art-group data 283)) - (= v1-13 (-> self draw art-group data 282)) + (and (not (and v1-13 (or (= v1-13 jakb-duck-roll-end-ja) + (= v1-13 jakb-duck-roll-ja) + (= v1-13 jakb-gun-duck-roll-end-ja) + (= v1-13 jakb-gun-duck-roll-ja) ) ) ) @@ -855,7 +852,7 @@ :code (behavior ((arg0 symbol)) (let ((v1-2 (ja-group))) (cond - ((and v1-2 (or (= v1-2 (-> self draw art-group data 59)) (= v1-2 (-> self draw art-group data 282)))) + ((and v1-2 (or (= v1-2 jakb-duck-roll-ja) (= v1-2 jakb-gun-duck-roll-ja))) (set! (-> self neck flex-blend) 0.0) (set! (-> self neck base-joint) (the-as uint 8)) (cond @@ -863,7 +860,7 @@ (set! (-> self gun surpress-time) (+ (current-time) (seconds 0.7))) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 283)) + (the-as art-joint-anim jakb-gun-duck-roll-end-ja) 0.0 0 30 @@ -871,20 +868,14 @@ 6.0 #f ) - (ja-no-eval :group! (-> self draw art-group data 283) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 283)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-gun-duck-roll-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 60) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 60)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-duck-roll-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -895,13 +886,11 @@ (set! (-> self neck base-joint) (the-as uint 6)) ) ((let ((v1-68 (ja-group))) - (and (and v1-68 (= v1-68 (-> self draw art-group data 20))) - (= (-> self skel root-channel 0) (-> self skel channel)) - ) + (and (and v1-68 (= v1-68 jakb-duck-stance-ja)) (= (-> self skel root-channel 0) (-> self skel channel))) ) ) ((let ((v1-78 (ja-group))) - (and v1-78 (or (= v1-78 (-> self draw art-group data 21)) (= v1-78 (-> self draw art-group data 302)))) + (and v1-78 (or (= v1-78 jakb-duck-walk-ja) (= v1-78 jakb-gun-duck-walk-ja))) ) (ja-channel-push! 1 (seconds 0.1)) ) @@ -910,10 +899,7 @@ ) (else (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-stance-to-duck-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -922,10 +908,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jakb-duck-stance-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -946,7 +929,7 @@ (set! (-> self control bend-target) 1.0) (target-collide-set! 'duck 1.0) (let ((v1-7 (ja-group))) - (if (not (and v1-7 (or (= v1-7 (-> self draw art-group data 59)) (= v1-7 (-> self draw art-group data 282))))) + (if (not (and v1-7 (or (= v1-7 jakb-duck-roll-ja) (= v1-7 jakb-gun-duck-roll-ja)))) (set! (-> self control mod-surface) *duck-mods*) ) ) @@ -965,7 +948,7 @@ ) (if (and (using-gun? self) (begin (set! v1-22 (get-channel (-> self skel top-anim) 0)) v1-22) - (= (-> v1-22 frame-group) (-> self draw art-group data 283)) + (= (-> v1-22 frame-group) jakb-gun-duck-roll-end-ja) ) (target-top-anim-base-mode 60) ) @@ -1008,21 +991,21 @@ ) :code (behavior ((arg0 symbol)) (let ((gp-0 (if (using-gun? self) - (-> self draw art-group data 302) - (-> self draw art-group data 21) + jakb-gun-duck-walk-ja + jakb-duck-walk-ja ) ) (v1-6 (ja-group)) ) (cond - ((and (and v1-6 (or (= v1-6 (-> self draw art-group data 21)) (= v1-6 (-> self draw art-group data 302)))) + ((and (and v1-6 (or (= v1-6 jakb-duck-walk-ja) (= v1-6 jakb-gun-duck-walk-ja))) (= (-> self skel root-channel 0) (-> self skel channel)) ) ) (else (let ((v1-16 (ja-group))) (cond - ((and v1-16 (= v1-16 (-> self draw art-group data 20))) + ((and v1-16 (= v1-16 jakb-duck-stance-ja)) (ja-channel-push! 1 (seconds 0.45)) (ja :group! gp-0 :num! min) ) @@ -1061,9 +1044,9 @@ (let ((s5-0 (-> gp-0 frame-group)) (f0-0 (ja-aframe-num 0)) ) - (when (or (= s5-0 (-> self draw art-group data 304)) (= s5-0 (-> self draw art-group data 300))) + (when (or (= s5-0 jakb-gun-side-jump-ja) (= s5-0 jakb-gun-front-jump-ja)) (let ((v1-13 (ja-group))) - (if (and v1-13 (= v1-13 (-> self draw art-group data 30))) + (if (and v1-13 (= v1-13 jakb-duck-high-jump-ja)) (set! (-> gp-0 frame-num) (/ (- f0-0 (+ 16.0 (-> s5-0 artist-base))) (-> s5-0 artist-step))) (set! (-> gp-0 frame-num) (/ (- f0-0 (-> s5-0 artist-base)) (-> s5-0 artist-step))) ) @@ -1126,7 +1109,7 @@ (a0-1 #f) (v1-12 (ja-group)) ) - (t9-0 a0-1 (the-as time-frame (if (and v1-12 (= v1-12 (-> self draw art-group data 27))) + (t9-0 a0-1 (the-as time-frame (if (and v1-12 (= v1-12 jakb-jump-loop-ja)) 15 -1 ) @@ -1185,21 +1168,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 0.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 0.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 0.0 30 30 @@ -1212,19 +1186,16 @@ ) (let ((v1-18 (ja-group))) (cond - ((and (and v1-18 (= v1-18 (-> self draw art-group data 54))) - (>= 25.0 (ja-aframe-num 0)) - (>= (ja-aframe-num 0) 17.0) - ) + ((and (and v1-18 (= v1-18 jakb-flop-down-land-ja)) (>= 25.0 (ja-aframe-num 0)) (>= (ja-aframe-num 0) 17.0)) (set! (-> self neck flex-blend) 0.0) (ja-channel-push! 1 0) (cond ((using-gun? self) - (ja :group! (-> self draw art-group data 30) :num! (identity (ja-aframe 16.0 0))) + (ja :group! jakb-duck-high-jump-ja :num! (identity (ja-aframe 16.0 0))) (set! f28-0 35.0) ) (else - (ja :group! (-> self draw art-group data 58) :num! (identity (ja-aframe 25.0 0))) + (ja :group! jakb-flop-jump-ja :num! (identity (ja-aframe 25.0 0))) (set! f28-0 24.0) (set! f30-0 0.3) ) @@ -1232,40 +1203,32 @@ ) ((and (focus-test? self dark) (nonzero? (-> self darkjak))) (ja-channel-push! 1 (seconds 0.05)) - (ja :group! (-> self draw art-group data 394) :num! min) + (ja :group! jakb-darkjak-jump-ja :num! min) (suspend) 0 ) (else (ja-channel-push! 2 (seconds 0.05)) - (ja :group! (-> self draw art-group data 23) :num! min) + (ja :group! jakb-jump-ja :num! min) (let ((a0-23 (-> self skel root-channel 1))) (let ((f0-8 (-> self control unknown-float35))) (set! (-> a0-23 frame-interp 1) f0-8) (set! (-> a0-23 frame-interp 0) f0-8) ) - (set! (-> a0-23 frame-group) (the-as art-joint-anim (-> self draw art-group data 29))) + (set! (-> a0-23 frame-group) (the-as art-joint-anim jakb-jump-forward-ja)) (set! (-> a0-23 param 0) 0.0) - (joint-control-channel-group-eval! - a0-23 - (the-as art-joint-anim (-> self draw art-group data 29)) - num-func-chan - ) + (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim jakb-jump-forward-ja) num-func-chan) ) (suspend) - (ja :group! (-> self draw art-group data 23) :num! (+!)) + (ja :group! jakb-jump-ja :num! (+!)) (let ((a0-25 (-> self skel root-channel 1))) (let ((f0-11 (-> self control unknown-float35))) (set! (-> a0-25 frame-interp 1) f0-11) (set! (-> a0-25 frame-interp 0) f0-11) ) - (set! (-> a0-25 frame-group) (the-as art-joint-anim (-> self draw art-group data 29))) + (set! (-> a0-25 frame-group) (the-as art-joint-anim jakb-jump-forward-ja)) (set! (-> a0-25 param 0) 0.0) - (joint-control-channel-group-eval! - a0-25 - (the-as art-joint-anim (-> self draw art-group data 29)) - num-func-chan - ) + (joint-control-channel-group-eval! a0-25 (the-as art-joint-anim jakb-jump-forward-ja) num-func-chan) ) (suspend) 0 @@ -1317,21 +1280,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 3.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 3.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 3.0 30 30 @@ -1343,20 +1297,17 @@ ) ) (ja-channel-set! 1) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num (ja-aframe 3.0 0) - ) + (ja-no-eval :group! jakb-jump-ja :num! (seek!) :frame-num (ja-aframe 3.0 0)) (until (ja-done? 0) (set! (-> self control time-of-last-clear-wall-in-jump) 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) (target-jump-top-anim) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -1390,7 +1341,7 @@ (a0-0 #f) (v1-2 (ja-group)) ) - (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 (-> self draw art-group data 27))) + (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 jakb-jump-loop-ja)) 15 -1 ) @@ -1434,21 +1385,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 7.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 7.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 7.0 30 30 @@ -1462,18 +1404,12 @@ (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 394) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 394)) frames num-frames) -1))) - :frame-num (ja-aframe 7.0 0) - ) + (ja-no-eval :group! jakb-darkjak-jump-ja :num! (seek!) :frame-num (ja-aframe 7.0 0)) ) (else (ja-channel-push! 2 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num (ja-aframe 5.0 0) - ) - (ja :chan 1 :group! (-> self draw art-group data 29) :num! (chan 0)) + (ja-no-eval :group! jakb-jump-ja :num! (seek!) :frame-num (ja-aframe 5.0 0)) + (ja :chan 1 :group! jakb-jump-forward-ja :num! (chan 0)) ) ) (until (ja-done? 0) @@ -1541,7 +1477,7 @@ (a0-0 #f) (v1-2 (ja-group)) ) - (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 (-> self draw art-group data 27))) + (t9-0 a0-0 (the-as time-frame (if (and v1-2 (= v1-2 jakb-jump-loop-ja)) 15 -1 ) @@ -1604,27 +1540,24 @@ :exit target-exit :code (behavior ((arg0 float) (arg1 float) (arg2 symbol)) (let ((v1-2 (ja-group))) - (if (not (and (and v1-2 (= v1-2 (-> self draw art-group data 20))) - (= (-> self skel root-channel 0) (-> self skel channel)) - ) - ) + (if (not (and (and v1-2 (= v1-2 jakb-duck-stance-ja)) (= (-> self skel root-channel 0) (-> self skel channel)))) (ja-channel-push! 1 (seconds 0.04)) ) ) (let ((v1-11 arg2)) (cond ((or (= v1-11 'flop) (= v1-11 'flop-forward)) - (ja-no-eval :group! (-> self draw art-group data 58) :num! (seek! (ja-aframe 25.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-flop-jump-ja :num! (seek! (ja-aframe 25.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 25.0 0))) ) ) ((using-gun? self) - (ja :group! (-> self draw art-group data 30) :num! (identity (ja-aframe 16.0 0))) + (ja :group! jakb-duck-high-jump-ja :num! (identity (ja-aframe 16.0 0))) ) (else - (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek! (ja-aframe 16.0 0)) :frame-num 0.0) + (ja-no-eval :group! jakb-duck-high-jump-ja :num! (seek! (ja-aframe 16.0 0)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 16.0 0))) @@ -1688,21 +1621,12 @@ (set! (-> self gun top-anim-low-high) 0.0) (case (-> self gun gun-type) (((pickup-type eco-blue)) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 304)) - 0.0 - 30 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-side-jump-ja) 0.0 30 30 1.0 0.0 #f) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 300)) + (the-as art-joint-anim jakb-gun-front-jump-ja) 0.0 30 30 @@ -1762,18 +1686,18 @@ (cond ((or (= arg2 'flop) (= arg2 'flop-forward)) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) (else - (ja-no-eval :group! (-> self draw art-group data 27) :num! (loop!) :frame-num 0.0) + (ja-no-eval :group! jakb-jump-loop-ja :num! (loop!) :frame-num 0.0) (until #f (suspend) - (ja :group! (-> self draw art-group data 27) :num! (loop!)) + (ja :group! jakb-jump-loop-ja :num! (loop!)) ) #f ) @@ -1822,10 +1746,7 @@ ) (('hit) (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 66) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 66)) frames num-frames) -1))) - :frame-num (ja-aframe 15.0 0) - ) + (ja-no-eval :group! jakb-hit-from-front-ja :num! (seek!) :frame-num (ja-aframe 15.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1900,7 +1821,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 305)) + (the-as art-joint-anim jakb-gun-side-jump-land-ja) 0.0 30 30 @@ -1912,7 +1833,7 @@ (((pickup-type eco-red) (pickup-type eco-dark)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 301)) + (the-as art-joint-anim jakb-gun-front-jump-land-ja) 0.0 30 30 @@ -1924,7 +1845,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 301)) + (the-as art-joint-anim jakb-gun-front-jump-land-ja) 0.0 30 30 @@ -2133,10 +2054,10 @@ (target-exit) ) :code (behavior () - (let ((gp-0 (-> self draw art-group data 40))) + (let ((gp-0 jakb-attack-from-stance-ja)) (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) - (set! gp-0 (-> self draw art-group data 399)) + (set! gp-0 jakb-darkjak-attack-spin-ja) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -1365.3334) ) ((using-gun? self) @@ -2145,7 +2066,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 0.0 30 30 @@ -2153,13 +2074,13 @@ 0.0 #f ) - (set! gp-0 (-> self draw art-group data 248)) + (set! gp-0 jakb-gun-attack-from-stance-ja) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -3276.8) ) (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 250)) + (the-as art-joint-anim jakb-gun-attack-from-stance-blue-ja) 0.0 30 30 @@ -2167,12 +2088,12 @@ 0.0 #f ) - (set! gp-0 (-> self draw art-group data 250)) + (set! gp-0 jakb-gun-attack-from-stance-blue-ja) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 248)) + (the-as art-joint-anim jakb-gun-attack-from-stance-ja) 0.0 30 30 @@ -2180,7 +2101,7 @@ 0.0 #f ) - (set! gp-0 (-> self draw art-group data 248)) + (set! gp-0 jakb-gun-attack-from-stance-ja) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -3276.8) ) ) @@ -2191,13 +2112,7 @@ ) (ja-channel-push! 1 (seconds 0.05)) (set! (-> self control unknown-sound-id01) (sound-play "spin-kick")) - (ja-no-eval :group! gp-0 - :num! (seek! - (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) - (-> self control current-surface align-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self control current-surface align-speed)) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -2232,7 +2147,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 251)) + (the-as art-joint-anim jakb-gun-attack-from-stance-blue-end-ja) 0.0 0 60 @@ -2245,7 +2160,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 249)) + (the-as art-joint-anim jakb-gun-attack-from-stance-end-ja) 0.0 0 60 @@ -2258,7 +2173,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 249)) + (the-as art-joint-anim jakb-gun-attack-from-stance-end-ja) 0.0 0 60 @@ -2477,7 +2392,7 @@ (not (logtest? (-> self state-flags) (state-flags prevent-jump prevent-attack))) (not (logtest? (-> self control current-surface flags) (surface-flag no-attack))) (let ((v1-48 (ja-group))) - (and (not (and v1-48 (= v1-48 (-> self draw art-group data 406)))) + (and (not (and v1-48 (= v1-48 jakb-darkjak-attack-combo3-ja))) (and (not (logtest? (-> self control current-surface flags) (surface-flag no-jump))) (not (logtest? (-> self state-flags) (state-flags prevent-jump))) ) @@ -2515,7 +2430,7 @@ ) (set! (-> self control dynam gravity-max) 368640.0) (set! (-> self control dynam gravity-length) 368640.0) - (let ((gp-1 (-> self draw art-group data 48))) + (let ((gp-1 jakb-attack-punch-ja)) (ja-channel-push! 1 (seconds 0.02)) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) @@ -2523,7 +2438,7 @@ (((pickup-type eco-yellow)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 273)) + (the-as art-joint-anim jakb-gun-attack-butt-ja) 0.0 30 60 @@ -2531,12 +2446,12 @@ 0.0 #f ) - (set! gp-1 (-> self draw art-group data 275)) + (set! gp-1 jakb-gun-attack-butt-blue-ja) ) (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 275)) + (the-as art-joint-anim jakb-gun-attack-butt-blue-ja) 0.0 30 60 @@ -2544,12 +2459,12 @@ 0.0 #f ) - (set! gp-1 (-> self draw art-group data 275)) + (set! gp-1 jakb-gun-attack-butt-blue-ja) ) (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 273)) + (the-as art-joint-anim jakb-gun-attack-butt-ja) 0.0 30 60 @@ -2557,11 +2472,11 @@ 0.0 #f ) - (set! gp-1 (-> self draw art-group data 273)) + (set! gp-1 jakb-gun-attack-butt-ja) ) ) ) - (ja-no-eval :group! gp-1 :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)))) + (ja-no-eval :group! gp-1 :num! (seek!)) ) (target-start-attack) (target-danger-set! 'punch #f) @@ -2630,21 +2545,19 @@ (let ((s5-2 (ja-group)) (f24-0 (ja-aframe-num 0)) ) - (if (or (and (= s5-2 (-> self draw art-group data 48)) + (if (or (and (= s5-2 jakb-attack-punch-ja) (>= f24-0 10.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 48)) frames num-frames) -1)) - (ja-frame-num 0) - ) + (>= (the float (+ (-> (the-as art-joint-anim jakb-attack-punch-ja) frames num-frames) -1)) (ja-frame-num 0)) ) - (and (= s5-2 (-> self draw art-group data 273)) + (and (= s5-2 jakb-gun-attack-butt-ja) (>= f24-0 10.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 273)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-gun-attack-butt-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) - (and (= s5-2 (-> self draw art-group data 275)) + (and (= s5-2 jakb-gun-attack-butt-blue-ja) (>= f24-0 10.0) - (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 275)) frames num-frames) -1)) + (>= (the float (+ (-> (the-as art-joint-anim jakb-gun-attack-butt-blue-ja) frames num-frames) -1)) (ja-frame-num 0) ) ) @@ -2745,7 +2658,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 276)) + (the-as art-joint-anim jakb-gun-attack-butt-blue-end-ja) 0.0 0 60 @@ -2757,7 +2670,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 274)) + (the-as art-joint-anim jakb-gun-attack-butt-end-ja) 0.0 0 60 @@ -2873,9 +2786,9 @@ ) (let ((v1-22 (ja-group))) (if (and v1-22 - (or (= v1-22 (-> self draw art-group data 51)) - (= v1-22 (-> self draw art-group data 267)) - (= v1-22 (-> self draw art-group data 279)) + (or (= v1-22 jakb-attack-uppercut-ja) + (= v1-22 jakb-gun-attack-upperbutt-ja) + (= v1-22 jakb-gun-attack-upperbutt-blue-ja) ) ) (set! f0-7 @@ -3048,7 +2961,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (let* ((v1-2 (ja-group)) - (f30-0 (if (and v1-2 (= v1-2 (-> self draw art-group data 20))) + (f30-0 (if (and v1-2 (= v1-2 jakb-duck-stance-ja)) 5.0 0.0 ) @@ -3061,7 +2974,7 @@ (((pickup-type eco-blue)) (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 279)) + (the-as art-joint-anim jakb-gun-attack-upperbutt-blue-ja) f30-0 5 30 @@ -3069,7 +2982,7 @@ 0.0 #f ) - (ja-no-eval :group! (-> self draw art-group data 279) + (ja-no-eval :group! jakb-gun-attack-upperbutt-blue-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0) ) @@ -3081,7 +2994,7 @@ (else (push-anim-to-targ (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 267)) + (the-as art-joint-anim jakb-gun-attack-upperbutt-ja) f30-0 5 30 @@ -3089,7 +3002,7 @@ 0.0 #f ) - (ja-no-eval :group! (-> self draw art-group data 267) + (ja-no-eval :group! jakb-gun-attack-upperbutt-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0) ) @@ -3107,10 +3020,7 @@ (set! (-> self control unknown-sound-id00) (add-process *gui-control* self (gui-channel jak) (gui-action queue) "darkbom1" -99.0 0) ) - (ja-no-eval :group! (-> self draw art-group data 391) - :num! (seek! (ja-aframe 7.0 0)) - :frame-num (ja-aframe f30-0 0) - ) + (ja-no-eval :group! jakb-darkjak-attack-ice-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 7.0 0))) @@ -3118,10 +3028,7 @@ (go target-darkjak-bomb1 arg0 arg1) ) (else - (ja-no-eval :group! (-> self draw art-group data 51) - :num! (seek! (ja-aframe 7.0 0)) - :frame-num (ja-aframe f30-0 0) - ) + (ja-no-eval :group! jakb-attack-uppercut-ja :num! (seek! (ja-aframe 7.0 0)) :frame-num (ja-aframe f30-0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! (ja-aframe 7.0 0))) @@ -3223,7 +3130,7 @@ (if (and (cpad-pressed? (-> self control cpad number) circle) (and (can-feet? #f) (let ((v1-65 (ja-group))) - (and v1-65 (or (= v1-65 (-> self draw art-group data 51)) (= v1-65 (-> self draw art-group data 267)))) + (and v1-65 (or (= v1-65 jakb-attack-uppercut-ja) (= v1-65 jakb-gun-attack-upperbutt-ja))) ) (>= (ja-aframe-num 0) 12.0) ) @@ -3243,8 +3150,8 @@ (slide-down-test) ) :code (behavior ((arg0 float) (arg1 float)) - (when (or (= (-> self skel top-anim frame-group) (-> self draw art-group data 267)) - (= (-> self skel top-anim frame-group) (-> self draw art-group data 279)) + (when (or (= (-> self skel top-anim frame-group) jakb-gun-attack-upperbutt-ja) + (= (-> self skel top-anim frame-group) jakb-gun-attack-upperbutt-blue-ja) ) (let ((v1-10 (get-channel (-> self skel top-anim) 0))) (if v1-10 @@ -3259,7 +3166,7 @@ (compute-alignment! (-> self align)) (set! (-> self control turn-go-the-long-way) 1.0) (let ((v1-27 (ja-group))) - (if (and v1-27 (= v1-27 (-> self draw art-group data 51))) + (if (and v1-27 (= v1-27 jakb-attack-uppercut-ja)) (align! (-> self align) (the-as align-opts (cond @@ -3390,7 +3297,7 @@ (let ((v1-2 (get-channel (-> self skel top-anim) 0))) (when v1-2 (case (-> v1-2 frame-group) - (((-> self draw art-group data 286)) + ((jakb-gun-flop-down-ja) (set! (-> v1-2 param 1) 10.0) ) ) @@ -3405,10 +3312,9 @@ :trans (behavior () (delete-back-vel) (let ((gp-1 (logtest? (-> self control status) (collide-status on-surface)))) - (when (and (not gp-1) - (let ((v1-6 (ja-group))) - (and v1-6 (or (= v1-6 (-> self draw art-group data 53)) (= v1-6 (-> self draw art-group data 55)))) - ) + (when (and (not gp-1) (let ((v1-6 (ja-group))) + (and v1-6 (or (= v1-6 jakb-flop-down-loop-ja) (= v1-6 jakb-moving-flop-down-ja))) + ) ) (when (and (or (< (target-move-dist (seconds 0.1)) 1638.4) (and (logtest? (-> self control status) (collide-status touch-wall)) (< 0.7 (-> self control poly-angle))) @@ -3459,7 +3365,7 @@ ) (when (and (not (-> self control danger-mode)) (let ((v1-82 (ja-group))) - (and v1-82 (= v1-82 (-> self draw art-group data 52))) + (and v1-82 (= v1-82 jakb-flop-down-ja)) ) (>= (ja-aframe-num 0) 8.0) ) @@ -3469,23 +3375,11 @@ ) :code (behavior ((arg0 float) (arg1 float) (arg2 float)) (if (using-gun? self) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 286)) - 0.0 - 0 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-flop-down-ja) 0.0 0 30 1.0 0.0 #f) ) (ja-channel-set! 2) - (ja-no-eval :group! (-> self draw art-group data 52) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 52)) frames num-frames) -1))) - :frame-num 0.0 - ) - (ja :chan 1 :group! (-> self draw art-group data 55) :num! (chan 0) :frame-num 0.0) + (ja-no-eval :group! jakb-flop-down-ja :num! (seek!) :frame-num 0.0) + (ja :chan 1 :group! jakb-moving-flop-down-ja :num! (chan 0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3503,7 +3397,7 @@ (set! (-> self control dynam gravity quad) (-> self control standard-dynamics gravity quad)) (target-danger-set! 'flop-down #f) (let ((v1-56 (get-channel (-> self skel top-anim) 0))) - (if (and v1-56 (= (-> v1-56 frame-group) (-> self draw art-group data 286))) + (if (and v1-56 (= (-> v1-56 frame-group) jakb-gun-flop-down-ja)) (set! (-> v1-56 param 1) 0.0) ) ) @@ -3667,7 +3561,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) ) (let ((v1-37 (ja-group))) - (if (and (and v1-37 (= v1-37 (-> self draw art-group data 54))) (>= (ja-aframe-num 0) 28.0)) + (if (and (and v1-37 (= v1-37 jakb-flop-down-land-ja)) (>= (ja-aframe-num 0) 28.0)) (logior! (-> *flop-land-mods* flags) (surface-flag check-edge)) ) ) @@ -3744,20 +3638,11 @@ (cond ((using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 282)) - 0.0 - 15 - 30 - 1.0 - 0.0 - #f - ) - (ja :group! (-> self draw art-group data 282) :num! min) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-duck-roll-ja) 0.0 15 30 1.0 0.0 #f) + (ja :group! jakb-gun-duck-roll-ja :num! min) ) (else - (ja :group! (-> self draw art-group data 59) :num! min) + (ja :group! jakb-duck-roll-ja :num! min) ) ) (until (ja-done? 0) @@ -3898,9 +3783,7 @@ (if (and (cpad-pressed? (-> self control cpad number) circle) (can-feet? #f) (let ((v1-20 (ja-group))) - (and (and v1-20 (= v1-20 (-> self draw art-group data 27))) - (= (-> self skel root-channel 0) (-> self skel channel)) - ) + (and (and v1-20 (= v1-20 jakb-jump-loop-ja)) (= (-> self skel root-channel 0) (-> self skel channel))) ) ) (go target-attack-air #f) @@ -3909,19 +3792,10 @@ :code (behavior ((arg0 float) (arg1 float)) (local-vars (v1-37 symbol)) (ja-channel-push! 1 (seconds 0.04)) - (ja :group! (-> self draw art-group data 61) :num! min) + (ja :group! jakb-roll-flip-ja :num! min) (when (using-gun? self) (set! (-> self gun top-anim-low-high) 0.0) - (push-anim-to-targ - (-> self skel top-anim) - (the-as art-joint-anim (-> self draw art-group data 284)) - 0.0 - 0 - 30 - 1.0 - 0.0 - #f - ) + (push-anim-to-targ (-> self skel top-anim) (the-as art-joint-anim jakb-gun-roll-flip-ja) 0.0 0 30 1.0 0.0 #f) ) (let ((f30-0 1.0)) (until v1-37 @@ -3961,9 +3835,9 @@ (while (not (logtest? (-> self control status) (collide-status on-surface))) (when (>= (- (current-time) (-> self state-time)) (seconds 0.01)) (let ((v1-50 (ja-group))) - (when (not (and v1-50 (= v1-50 (-> self draw art-group data 27)))) + (when (not (and v1-50 (= v1-50 jakb-jump-loop-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja :group! (-> self draw art-group data 27) :num! min) + (ja :group! jakb-jump-loop-ja :num! min) ) ) ) @@ -3985,7 +3859,7 @@ ) (suspend) (let ((v1-62 (ja-group))) - (if (and v1-62 (= v1-62 (-> self draw art-group data 27))) + (if (and v1-62 (= v1-62 jakb-jump-loop-ja)) (ja :num! (loop!)) (ja :num-func num-func-identity :frame-num max) ) @@ -4025,7 +3899,7 @@ ) (else (let ((v1-86 (ja-group))) - (if (and v1-86 (= v1-86 (-> self draw art-group data 27))) + (if (and v1-86 (= v1-86 jakb-jump-loop-ja)) (go target-hit-ground #f) (go target-stance) ) diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc index e413e08a19c..b93a504975d 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc @@ -1540,7 +1540,7 @@ ) #f ) - :post (the-as (function none :behavior progress) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1799,7 +1799,7 @@ ) #f ) - :post (the-as (function none :behavior progress) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/kernel/gkernel_REF.gc b/test/decompiler/reference/jak2/kernel/gkernel_REF.gc index adfc988c166..5223fbda2bb 100644 --- a/test/decompiler/reference/jak2/kernel/gkernel_REF.gc +++ b/test/decompiler/reference/jak2/kernel/gkernel_REF.gc @@ -1476,7 +1476,7 @@ ;; failed to figure out what this is: (defstate dead-state (process) - :code (the-as (function none :behavior process) nothing) + :code nothing ) ;; definition for symbol entity-deactivate-handler, type (function process entity-actor none) diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc index f4962388d69..7c1c76e6239 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc @@ -87,14 +87,14 @@ ) ) ) - :code (the-as (function none :behavior piston) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate dormant-down (piston) :virtual #t :event (-> (method-of-type piston idle) event) - :code (the-as (function none :behavior piston) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -106,7 +106,7 @@ (set! (-> self root trans y) (+ (-> self init-height) (+ (-> self range-bottom) f1-1))) ) ) - :code (the-as (function none :behavior piston) transform-and-sleep) + :code transform-and-sleep ) ;; failed to figure out what this is: @@ -118,8 +118,8 @@ (set! (-> self sound-time 0) (+ (get-timeframe-offset! (-> self sync) 0) (seconds -0.1))) ) ) - :trans (the-as (function none :behavior piston) rider-trans) - :code (the-as (function none :behavior piston) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (let ((f0-1 (- (-> self range-top) (-> self range-bottom)))) (set! (-> self root trans y) @@ -296,7 +296,7 @@ This commonly includes things such as: ) (rider-trans) ) - :code (the-as (function none :behavior turbine) sleep-code) + :code sleep-code :post (behavior () (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (-> self rotspeed) (seconds-per-frame))) (let ((f1-2 (- (-> self dest-height) (-> self root trans y)))) @@ -315,8 +315,8 @@ This commonly includes things such as: :enter (behavior () (set! (-> self dest-height) (+ (-> self root trans y) (-> self rise-height))) ) - :trans (the-as (function none :behavior turbine) rider-trans) - :code (the-as (function none :behavior turbine) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (-> self rotspeed) (seconds-per-frame))) (let ((f1-2 (- (-> self dest-height) (-> self root trans y)))) @@ -451,9 +451,9 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior liftcat) rider-trans) - :code (the-as (function none :behavior liftcat) sleep-code) - :post (the-as (function none :behavior liftcat) rider-post) + :trans rider-trans + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -486,8 +486,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior liftcat) sleep-code) - :post (the-as (function none :behavior liftcat) rider-post) + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -503,7 +503,7 @@ This commonly includes things such as: :enter (behavior () (process-entity-status! self (entity-perm-status subtask-complete) #t) ) - :code (the-as (function none :behavior liftcat) sleep-code) + :code sleep-code ) ;; definition for method 11 of type liftcat @@ -868,7 +868,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior slider) sleep-code) + :code sleep-code :post (behavior () (let ((f30-0 (get-norm! (-> self sync) 0))) (set! (-> self path-pos) f30-0) @@ -1104,7 +1104,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (atoll-windmill) :virtual #t - :code (the-as (function none :behavior atoll-windmill) sleep-code) + :code sleep-code :post (behavior () (let ((f0-0 (get-scaled-val! (-> self sync) -65536.0 0))) (quaternion-axis-angle! @@ -1208,7 +1208,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (atoll-valve) :virtual #t - :code (the-as (function none :behavior atoll-valve) sleep-code) + :code sleep-code ) ;; definition for method 11 of type atoll-valve @@ -1269,7 +1269,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (atoll-hatch) :virtual #t - :code (the-as (function none :behavior atoll-hatch) sleep-code) + :code sleep-code ) ;; definition for method 11 of type atoll-hatch @@ -1348,7 +1348,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (atoll-hellcat) :virtual #t - :code (the-as (function none :behavior atoll-hellcat) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1437,7 +1437,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (atoll-mar-symbol) :virtual #t - :code (the-as (function none :behavior atoll-mar-symbol) sleep-code) + :code sleep-code ) ;; definition for method 11 of type atoll-mar-symbol diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc index eb851f77c2d..e8b3eea8689 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc @@ -1769,7 +1769,7 @@ ;; failed to figure out what this is: (defstate dormant (atoll-tank) :virtual #t - :code (the-as (function none :behavior atoll-tank) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc index f84cd0d7a18..564729cd108 100644 --- a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc @@ -952,10 +952,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -975,15 +972,9 @@ (a1-16 (-> self draw art-group data (-> *juicer-global-info* idle-anim v1-62))) ) (set! gp-1 (ash 1 v1-62)) - (ja-no-eval :group! a1-16 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-16) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-16 :num! (seek! max f30-0) :frame-num 0.0) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1076,7 +1067,7 @@ ;; failed to figure out what this is: (defstate ambush-cont (juicer) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior juicer) enemy-event-handler) + :event enemy-event-handler :code (behavior () (let ((a0-0 (-> self intro-path)) (v1-1 (+ (-> self ambush-path-pt) 1)) @@ -1137,10 +1128,7 @@ (let* ((a0-13 (enemy-method-120 self 2 s5-0)) (a1-8 (-> self draw art-group data (-> *juicer-global-info* notice-anim a0-13))) ) - (ja-no-eval :group! a1-8 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-8) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-8 :num! (seek! max f30-1) :frame-num 0.0) ) (until (ja-done? 0) (let ((a1-9 (-> self nav state))) @@ -1164,10 +1152,7 @@ (let ((gp-1 (-> self draw art-group data (-> *juicer-global-info* celebrate-anim (get-rand-int self 2)))) (f30-0 (get-rand-float-range self 0.9 1.1)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1370,7 +1355,7 @@ ;; failed to figure out what this is: (defstate attack (juicer) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior juicer) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state)) (a0-1 (-> self root trans)) @@ -1408,10 +1393,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! juicer-attack0-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim juicer-attack0-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! juicer-attack0-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (< 11.0 (ja-aframe-num 0)) (juicer-method-184 self #t) @@ -1427,10 +1409,7 @@ (set! (-> v1-29 attack-id) s5-0) (let ((s4-0 (current-time))) (until (>= (- (current-time) s4-0) (seconds 0.25)) - (ja-no-eval :group! juicer-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim juicer-attack0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! juicer-attack0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((s3-0 (handle->process (-> self focus handle)))) (when s3-0 @@ -1531,10 +1510,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1557,10 +1533,7 @@ (let ((gp-2 (-> self draw art-group data (-> *juicer-global-info* celebrate-anim (get-rand-int self 2)))) (f30-2 (get-rand-float-range self 0.9 1.1)) ) - (ja-no-eval :group! gp-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-2) frames num-frames) -1)) f30-2) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-2 :num! (seek! max f30-2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-2)) @@ -1580,14 +1553,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1632,10 +1598,7 @@ (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1667,14 +1630,7 @@ ) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info taunt-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info taunt-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/atoll/sniper_REF.gc b/test/decompiler/reference/jak2/levels/atoll/sniper_REF.gc index 2d19592a83e..ef351a5a493 100644 --- a/test/decompiler/reference/jak2/levels/atoll/sniper_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/sniper_REF.gc @@ -274,14 +274,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc index d472c004c60..36f57ce0503 100644 --- a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc @@ -37,10 +37,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -48,7 +45,7 @@ ) #f ) - :post (the-as (function none :behavior cboss-tractor) ja-post) + :post ja-post ) ;; definition for method 11 of type cboss-tractor @@ -965,10 +962,7 @@ For example for an elevator pre-compute the distance between the first and last ;; failed to figure out what this is: (defstate spawning (krew-boss-clone) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior krew-boss-clone) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (sound-play "krew-spawn") ) @@ -988,10 +982,7 @@ For example for an elevator pre-compute the distance between the first and last ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 12) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1249,10 +1240,7 @@ For example for an elevator pre-compute the distance between the first and last ;; failed to figure out what this is: (defstate die (krew-boss-clone) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior krew-boss-clone) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (if (nonzero? (-> self id)) (sound-stop (-> self id)) @@ -1298,7 +1286,7 @@ For example for an elevator pre-compute the distance between the first and last ) (cleanup-for-death self) ) - :post (the-as (function none :behavior krew-boss-clone) enemy-simple-post) + :post enemy-simple-post ) ;; definition for method 114 of type krew-boss-clone @@ -2113,7 +2101,7 @@ For example for an elevator pre-compute the distance between the first and last (go-virtual play-intro) ) ) - :code (the-as (function none :behavior krew-boss) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2556,7 +2544,7 @@ For example for an elevator pre-compute the distance between the first and last ;; failed to figure out what this is: (defstate hostile (krew-boss) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior krew-boss) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((gp-0 (/ (-> self hit-points) (if (logtest? (-> *game-info* secrets) (game-secrets hero-mode)) 2 @@ -2875,7 +2863,7 @@ For example for an elevator pre-compute the distance between the first and last ;; failed to figure out what this is: (defstate die (krew-boss) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior krew-boss) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type nav-enemy die) enter))) (if t9-0 @@ -2970,10 +2958,7 @@ For example for an elevator pre-compute the distance between the first and last ) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1)) - (-> self clock time-adjust-ratio) - ) + :num! (seek! max (-> self clock time-adjust-ratio)) :frame-num 0.0 ) (while (not (ja-done? 0)) diff --git a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc index b21e7662bf9..a24969fdac9 100644 --- a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc @@ -132,7 +132,7 @@ This commonly includes things such as: (defstate idle (cas-conveyor) :virtual #t :trans sound-update - :code (the-as (function none :behavior cas-conveyor) sleep-code) + :code sleep-code :post (behavior () (when (or (= (-> self my-id) -1) (= (-> self my-id) (/ *cas-conveyor-room-id* 8))) (cond @@ -329,7 +329,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-conveyor-switch) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-608 symbol) (sv-624 symbol) (sv-640 (function vector cspace vector)) (sv-656 vector)) (when (and (logtest? (actor-option user17) (-> self fact options)) @@ -600,7 +600,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-electric-fence) sleep-code) + :code sleep-code :post (behavior () (when (not (-> self stop)) (when (< (-> self next-spawn-time) (current-time)) @@ -1223,20 +1223,14 @@ For example for an elevator pre-compute the distance between the first and last (when (or (= f0-0 10.0) (= f0-0 40.0) (= f0-0 50.0)) (cond ((= f0-0 10.0) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1249,20 +1243,14 @@ For example for an elevator pre-compute the distance between the first and last (when (or (= f0-0 40.0) (= f0-0 50.0) (= f0-0 80.0) (= f0-0 90.0)) (cond ((or (= f0-0 40.0) (= f0-0 50.0)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1275,20 +1263,14 @@ For example for an elevator pre-compute the distance between the first and last (when (or (= f0-0 80.0) (= f0-0 90.0) (= f0-0 120.0)) (cond ((or (= f0-0 80.0) (= f0-0 90.0)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1300,20 +1282,14 @@ For example for an elevator pre-compute the distance between the first and last ((= (-> self anim-index) 3) (cond ((= f0-0 10.0) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (suspend) (ja :num! (seek! 0.0)) @@ -1564,8 +1540,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-cas-switch cas-switch 0 2 - ((1 (meters 999999))) +(defskelgroup skel-cas-switch cas-switch cas-switch-lod0-jg cas-switch-idle-ja + ((cas-switch-lod0-mg (meters 999999))) :bounds (static-spherem 0 2.7 0 3) :origin-joint-index 3 ) @@ -1618,7 +1594,7 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior cas-switch) rider-trans) + :trans rider-trans :code (behavior () (until #f (let ((a1-0 (new 'stack-no-clear 'event-message-block))) @@ -1677,7 +1653,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-switch) rider-post) + :post rider-post ) ;; definition for method 11 of type cas-switch @@ -1857,7 +1833,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-trapdoor) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1911,7 +1887,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior cas-trapdoor) ja-post) + :post ja-post ) ;; definition for method 11 of type cas-trapdoor @@ -2007,31 +1983,28 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior cas-chain-plat) sleep-code) - :post (the-as (function none :behavior cas-chain-plat) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: (defstate drop (cas-chain-plat) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual down) ) - :post (the-as (function none :behavior cas-chain-plat) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate down (cas-chain-plat) :virtual #t - :code (the-as (function none :behavior cas-chain-plat) sleep-code) + :code sleep-code ) ;; definition for method 11 of type cas-chain-plat @@ -2164,10 +2137,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2175,7 +2145,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-rot-blade) transform-post) + :post transform-post ) ;; definition for method 11 of type cas-rot-blade @@ -2295,10 +2265,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2306,7 +2273,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-flag-a) ja-post) + :post ja-post ) ;; definition for method 11 of type cas-flag-a @@ -2365,10 +2332,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2376,7 +2340,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior cas-flag-b) ja-post) + :post ja-post ) ;; definition for method 11 of type cas-flag-b @@ -2485,7 +2449,7 @@ This commonly includes things such as: (set! (-> self state-time) (current-time)) ) ) - :code (the-as (function none :behavior cas-robot-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2519,10 +2483,7 @@ This commonly includes things such as: ) :code (behavior () (sound-play "robo-hatch-open") - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -2659,10 +2620,7 @@ This commonly includes things such as: ) ) (sound-play "robo-hatch-cls") - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (transform-post) (suspend) @@ -2690,10 +2648,7 @@ This commonly includes things such as: :code (behavior () (local-vars (v1-28 symbol)) (sound-play "robo-hatch-cls") - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (transform-post) (suspend) @@ -2908,7 +2863,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (lightning-ball) :virtual #t - :code (the-as (function none :behavior lightning-ball) sleep-code) + :code sleep-code :post (behavior () (when (>= (- (current-time) (-> self timer)) (seconds 0.08)) (let ((gp-0 (new 'stack-no-clear 'collide-query))) diff --git a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc index 5bd1ada7009..fdbdfc90ab5 100644 --- a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc @@ -551,10 +551,7 @@ (logand! (-> self flags) -9) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -576,10 +573,7 @@ ;; failed to figure out what this is: (defstate roll-hostile (roboguard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior roboguard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag use-notice-distance)) (logior! (-> self flags) 4) @@ -736,18 +730,12 @@ ;; failed to figure out what this is: (defstate roll-to-walk (roboguard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior roboguard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () '() ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (< 17.0 (ja-aframe-num 0)) (logand! (-> self flags) -5) @@ -773,20 +761,14 @@ ;; failed to figure out what this is: (defstate idle-dizzy (roboguard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior roboguard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logand! (-> self flags) -5) (roboguard-level-method-185 self (the-as symbol 0)) ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -860,9 +842,9 @@ ;; failed to figure out what this is: (defstate explode (roboguard-level) :virtual #t - :enter (the-as (function none :behavior roboguard-level) #f) - :exit (the-as (function none :behavior roboguard-level) #f) - :trans (the-as (function none :behavior roboguard-level) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (sound-play "robo-explode") (let ((v1-2 (-> self root root-prim))) @@ -876,7 +858,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior roboguard-level) #f) + :post #f ) ;; definition for method 185 of type roboguard-level diff --git a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc index f1ff921accd..669e610aa78 100644 --- a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc @@ -2117,10 +2117,7 @@ :code (behavior () (until #f (suspend) - (ja-no-eval :group! bombbot-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim bombbot-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! bombbot-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2214,10 +2211,7 @@ :code (behavior () (until #f (suspend) - (ja-no-eval :group! bombbot-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim bombbot-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! bombbot-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc b/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc index dc173eaccae..f96d609432f 100644 --- a/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc @@ -470,7 +470,7 @@ ) #f ) - :post (the-as (function none :behavior race-ring) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1818,7 +1818,7 @@ ) ) ) - :code (the-as (function none :behavior bush-collect) sleep-code) + :code sleep-code :post (behavior () (ja-post) ) diff --git a/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc b/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc index 028c1c3ca77..cd08e25dbb1 100644 --- a/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc @@ -4,7 +4,7 @@ ;; failed to figure out what this is: (defstate target-pilot-start (target) :event target-pilot-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :code (behavior ((arg0 handle) (arg1 symbol) (arg2 symbol)) (target-pilot-init arg0 arg2) (suspend) @@ -238,7 +238,7 @@ ;; failed to figure out what this is: (defstate target-pilot-stance (target) :event target-pilot-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :trans (behavior () (target-pilot-trans) ) @@ -267,7 +267,7 @@ ;; failed to figure out what this is: (defstate target-pilot-impact (target) :event target-pilot-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :trans (behavior () (target-pilot-trans) ) @@ -323,50 +323,35 @@ (ja-channel-push! 1 (seconds 0.05)) (cond ((= s5-0 4) - (ja-no-eval :group! (-> self draw art-group data 457) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 457)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 457) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= s5-0 5) - (ja-no-eval :group! (-> self draw art-group data 458) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 458)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 458) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((zero? s5-0) - (ja-no-eval :group! (-> self draw art-group data 455) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 455)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 455) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= s5-0 1) - (ja-no-eval :group! (-> self draw art-group data 456) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 456)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 456) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 455) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 455)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 455) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -379,50 +364,35 @@ (let ((v1-131 s5-0)) (cond ((= v1-131 4) - (ja-no-eval :group! (-> self draw art-group data 232) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 232)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 232) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-131 5) - (ja-no-eval :group! (-> self draw art-group data 233) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 233)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 233) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((zero? v1-131) - (ja-no-eval :group! (-> self draw art-group data 211) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 211)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 211) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-131 1) - (ja-no-eval :group! (-> self draw art-group data 212) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 212)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 212) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 215) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 215)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 215) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -432,53 +402,35 @@ ) ) ((begin (ja-channel-push! 1 (seconds 0.05)) (set! v1-252 s5-0) (= v1-252 4)) - (ja-no-eval :group! (-> self draw art-group data 234) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 234)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 234) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-252 5) - (ja-no-eval :group! (-> self draw art-group data 235) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 235)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 235) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((zero? v1-252) - (ja-no-eval :group! (-> self draw art-group data 204) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 204)) frames num-frames) -1)) - 1.3 - ) - :frame-num (ja-aframe 4.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 204) :num! (seek! max 1.3) :frame-num (ja-aframe 4.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.3)) ) ) ((= v1-252 1) - (ja-no-eval :group! (-> self draw art-group data 205) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 205)) frames num-frames) -1))) - :frame-num (ja-aframe 2.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 205) :num! (seek!) :frame-num (ja-aframe 2.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 208) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 208)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 208) :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -523,7 +475,7 @@ ) ) ) - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :code (behavior () (logior! (-> self focus-status) (focus-status pilot)) (logior! (-> self state-flags) (state-flags sf6)) @@ -540,10 +492,7 @@ (set! (-> self neck flex-blend) 0.0) (set! (-> self control unknown-vector37 quad) (-> self control trans quad)) (set! (-> self control unknown-vector39 quad) (-> self control quat quad)) - (ja :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja :group! gp-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 10.0)))) @@ -609,7 +558,7 @@ ;; failed to figure out what this is: (defstate target-pilot-get-off (target) :event target-standard-event-handler - :exit (the-as (function none :behavior target) target-pilot-exit) + :exit target-pilot-exit :trans (behavior () (let ((gp-0 (handle->process (-> self pilot vehicle)))) (when (not (if (type? gp-0 vehicle) diff --git a/test/decompiler/reference/jak2/levels/city/common/searchlight_REF.gc b/test/decompiler/reference/jak2/levels/city/common/searchlight_REF.gc index 0f6e1db36e5..3b40cadc49d 100644 --- a/test/decompiler/reference/jak2/levels/city/common/searchlight_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/searchlight_REF.gc @@ -77,7 +77,7 @@ ) #f ) - :post (the-as (function none :behavior searchlight) ja-post) + :post ja-post ) ;; definition for method 11 of type searchlight diff --git a/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc index 51efd373517..21f850c0feb 100644 --- a/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc @@ -653,7 +653,7 @@ ;; failed to figure out what this is: (defstate idle (boat-base) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior boat-base) vehicle-event-handler) + :event vehicle-event-handler :enter (behavior () (logior! (-> self flags) (rigid-body-object-flag riding)) (set! (-> self state-time) (current-time)) @@ -986,7 +986,7 @@ ) ) ) - :code (the-as (function none :behavior boat-manager) sleep-code) + :code sleep-code ) ;; definition for method 11 of type boat-manager diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc index 10d55b62f37..a439184911a 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc @@ -941,10 +941,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1514,7 +1511,7 @@ This commonly includes things such as: :exit (behavior () (logclear! (-> self focus-status) (focus-status ignore)) ) - :code (the-as (function none :behavior cty-guard-turret) sleep-code) + :code sleep-code :post (behavior () (when (>= (-> self id) 0) (let* ((v1-4 (-> *game-info* sub-task-list (game-task-node city-power-resolution))) @@ -2439,7 +2436,7 @@ This commonly includes things such as: (parking-spot-method-21 self) (send-event (handle->process (-> self vehicle)) 'traffic-off-force) ) - :code (the-as (function none :behavior parking-spot) sleep-code) + :code sleep-code :post (behavior () (when (>= (- (current-time) (-> self state-time)) (seconds 0.25)) (set! (-> self state-time) (current-time)) @@ -2632,7 +2629,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate broken (propa) :virtual #t - :code (the-as (function none :behavior propa) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2746,7 +2743,7 @@ This commonly includes things such as: 0 ) ) - :code (the-as (function none :behavior propa) sleep-code) + :code sleep-code :post (behavior () (cond ((or (not (-> *setting-control* user-current speech-control)) @@ -3023,7 +3020,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (baron-statue) :virtual #t - :code (the-as (function none :behavior baron-statue) sleep-code) + :code sleep-code ) ;; definition for method 11 of type baron-statue @@ -3187,7 +3184,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior burning-bush) sleep-code) + :code sleep-code :post (behavior () (rlet ((acc :class vf) (vf0 :class vf) @@ -4180,7 +4177,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior barons-ship-lores) ja-post) + :post ja-post ) ;; definition for method 9 of type city-race-ring-info @@ -4277,7 +4274,7 @@ This commonly includes things such as: :trans (behavior () '() ) - :code (the-as (function none :behavior lurker-pipe-lid) sleep-code) + :code sleep-code :post (behavior () (if (< 0.0 (-> self angle)) (set! (-> self angle) @@ -4430,15 +4427,15 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior ctyn-lamp) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate die (ctyn-lamp) :virtual #t - :enter (the-as (function none :behavior ctyn-lamp) #f) - :exit (the-as (function none :behavior ctyn-lamp) #f) - :trans (the-as (function none :behavior ctyn-lamp) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (sound-play "lamp-hit") (let ((v1-3 (-> self root root-prim))) @@ -4452,7 +4449,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior ctyn-lamp) #f) + :post #f ) ;; definition for method 29 of type ctyn-lamp 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 11565f14ea5..4eb553d886d 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 @@ -1088,9 +1088,9 @@ ;; failed to figure out what this is: (defstate die (farm-marrow) :virtual #t - :enter (the-as (function none :behavior farm-marrow) #f) - :exit (the-as (function none :behavior farm-marrow) #f) - :trans (the-as (function none :behavior farm-marrow) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1103,7 +1103,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-marrow) #f) + :post #f ) ;; failed to figure out what this is: @@ -1245,7 +1245,7 @@ :exit (behavior () '() ) - :code (the-as (function none :behavior farm-marrow) sleep-code) + :code sleep-code :post (behavior () (dotimes (gp-0 5) (shaker-method-9 (-> self shakers gp-0)) @@ -1405,9 +1405,9 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (farm-beetree) :virtual #t - :enter (the-as (function none :behavior farm-beetree) #f) - :exit (the-as (function none :behavior farm-beetree) #f) - :trans (the-as (function none :behavior farm-beetree) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1420,7 +1420,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-beetree) #f) + :post #f ) ;; failed to figure out what this is: @@ -1520,8 +1520,8 @@ This commonly includes things such as: ) ) ) - :exit (the-as (function none :behavior farm-beetree) #f) - :code (the-as (function none :behavior farm-beetree) sleep-code) + :exit #f + :code sleep-code :post (behavior () (dotimes (gp-0 2) (shaker-method-9 (-> self shakers gp-0)) @@ -1677,9 +1677,9 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (farm-cabbage) :virtual #t - :enter (the-as (function none :behavior farm-cabbage) #f) - :exit (the-as (function none :behavior farm-cabbage) #f) - :trans (the-as (function none :behavior farm-cabbage) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1692,7 +1692,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-cabbage) #f) + :post #f ) ;; failed to figure out what this is: @@ -1792,8 +1792,8 @@ This commonly includes things such as: ) ) ) - :exit (the-as (function none :behavior farm-cabbage) #f) - :code (the-as (function none :behavior farm-cabbage) sleep-code) + :exit #f + :code sleep-code :post (behavior () (dotimes (gp-0 2) (shaker-method-9 (-> self shakers gp-0)) @@ -1951,9 +1951,9 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (farm-small-cabbage) :virtual #t - :enter (the-as (function none :behavior farm-small-cabbage) #f) - :exit (the-as (function none :behavior farm-small-cabbage) #f) - :trans (the-as (function none :behavior farm-small-cabbage) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1966,7 +1966,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-small-cabbage) #f) + :post #f ) ;; failed to figure out what this is: @@ -2051,8 +2051,8 @@ This commonly includes things such as: ) ) ) - :exit (the-as (function none :behavior farm-small-cabbage) #f) - :code (the-as (function none :behavior farm-small-cabbage) sleep-code) + :exit #f + :code sleep-code :post (behavior () (dotimes (gp-0 1) (shaker-method-9 (-> self shakers gp-0)) @@ -2210,9 +2210,9 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (farm-chilirots) :virtual #t - :enter (the-as (function none :behavior farm-chilirots) #f) - :exit (the-as (function none :behavior farm-chilirots) #f) - :trans (the-as (function none :behavior farm-chilirots) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -2225,7 +2225,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior farm-chilirots) #f) + :post #f ) ;; failed to figure out what this is: @@ -2355,7 +2355,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior farm-chilirots) sleep-code) + :code sleep-code :post (behavior () (dotimes (gp-0 4) (shaker-method-9 (-> self shakers gp-0)) @@ -2465,10 +2465,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/city/farm/yakow_REF.gc b/test/decompiler/reference/jak2/levels/city/farm/yakow_REF.gc index 533a884ac73..d06e733ea5f 100644 --- a/test/decompiler/reference/jak2/levels/city/farm/yakow_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/farm/yakow_REF.gc @@ -288,10 +288,7 @@ (ja-channel-push! 1 (seconds 0.15)) (until #f (let ((f30-0 (rand-vu-float-range 0.9 1.1))) - (ja-no-eval :group! yakow-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -299,10 +296,7 @@ ) (when (rand-vu-percent? 0.25) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! yakow-graze-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-graze-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-graze-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -336,14 +330,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -361,10 +348,7 @@ (nav-enemy-method-167 self) (until #f (let ((f28-0 (rand-vu-float-range 0.9 1.1))) - (ja-no-eval :group! yakow-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-idle-ja) frames num-frames) -1)) f28-0) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-idle-ja :num! (seek! max f28-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f28-0)) @@ -372,10 +356,7 @@ ) (when (rand-vu-percent? 0.25) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! yakow-graze-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-graze-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-graze-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -410,14 +391,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.6)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -435,7 +409,7 @@ ;; failed to figure out what this is: (defstate kicked (yakow) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior yakow) #f) + :event #f :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -452,17 +426,14 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! yakow-kicked-in-place-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim yakow-kicked-in-place-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! yakow-kicked-in-place-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual active) ) - :post (the-as (function none :behavior yakow) ja-post) + :post ja-post ) ;; definition for method 114 of type yakow diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc index f3fae30631c..7561c24afdd 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc @@ -4,10 +4,7 @@ ;; failed to figure out what this is: (defstate waiting-idle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -68,10 +65,7 @@ ) (let ((s5-0 (get-rand-int-range self 3 7))) (dotimes (s4-0 s5-0) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -86,10 +80,7 @@ (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 0.5)) ) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) 0.33) - :frame-num (ja-aframe 3.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.33)) @@ -112,10 +103,7 @@ ) (let ((s5-4 (get-rand-int-range self 5 7))) (dotimes (s4-1 s5-4) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) 0.5) - :frame-num (ja-aframe 2.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max 0.5) :frame-num (ja-aframe 2.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -140,10 +128,7 @@ ) (let ((s5-5 (get-rand-int-range self 3 7))) (dotimes (s4-2 s5-5) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -157,16 +142,13 @@ ) #f ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-turn (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -194,10 +176,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -213,10 +192,7 @@ ;; failed to figure out what this is: (defstate traveling (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -276,10 +252,7 @@ ;; failed to figure out what this is: (defstate move-to-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -359,16 +332,13 @@ ) #f ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: (defstate board-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -530,16 +500,13 @@ (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate ride-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -599,13 +566,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 11) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1)) - (-> self anim-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek! max (-> self anim-speed)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max (-> self anim-speed))) @@ -613,16 +574,13 @@ ) #f ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate exit-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -777,16 +735,13 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate traveling-blocked (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -810,7 +765,7 @@ ) ) :code (-> (method-of-type crocadog-escort waiting-idle) code) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -921,10 +876,7 @@ (suspend) (ja :num! (seek! (ja-aframe 3.0 0) 0.5)) ) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) 0.33) - :frame-num (ja-aframe 3.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.33)) @@ -933,13 +885,7 @@ (else (ja-channel-push! 1 (seconds 0.1)) (let ((f30-0 (get-rand-float-range self 0.4 0.6))) - (ja-no-eval :group! (-> self draw art-group data 14) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 14)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 14) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -988,10 +934,7 @@ ;; failed to figure out what this is: (defstate knocked-off-vehicle (crocadog-escort) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crocadog-escort) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1018,5 +961,5 @@ (set! (-> self travel-anim-interp) 0.0) ) :code (-> (method-of-type crocadog-escort waiting-idle) code) - :post (the-as (function none :behavior crocadog-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc index 356898963f1..5d74cfe6791 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc @@ -4,7 +4,7 @@ ;; failed to figure out what this is: (defstate waiting-idle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -66,10 +66,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.1)) @@ -77,13 +74,13 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-turn (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -118,10 +115,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -137,7 +131,7 @@ ;; failed to figure out what this is: (defstate traveling (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -204,7 +198,7 @@ ;; failed to figure out what this is: (defstate move-to-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -292,13 +286,13 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: (defstate board-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -441,13 +435,13 @@ (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate ride-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -524,13 +518,13 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate exit-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -679,13 +673,13 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate traveling-blocked (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -721,7 +715,7 @@ ) ) :code (-> (method-of-type kid-escort waiting-idle) code) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -817,7 +811,7 @@ ;; failed to figure out what this is: (defstate arrested (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -881,13 +875,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - 0.143 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.143)) @@ -899,10 +887,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) (when (not (logtest? (bot-flags bf19) (-> self bot-flags))) (until #f (until (ja-done? 0) @@ -912,10 +897,7 @@ (suspend) (ja :num! (seek! max 0.1)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) ) #f (label cfg-27) @@ -943,14 +925,11 @@ (suspend) (ja :num! (seek! max 0.1)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -968,21 +947,12 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - 0.143 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.143)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) (until #f (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) @@ -994,10 +964,7 @@ (suspend) (ja :num! (seek! max 0.1)) ) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) ) #f ) @@ -1022,7 +989,7 @@ ;; failed to figure out what this is: (defstate knocked-off-vehicle (kid-escort) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid-escort) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1052,32 +1019,20 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (dotimes (gp-0 3) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.1)) ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1)) - 0.143 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.143)) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1)) 0.1) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.1)) @@ -1085,5 +1040,5 @@ ) #f ) - :post (the-as (function none :behavior kid-escort) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc index 5df756bfea2..3a23bfde0d5 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc @@ -1322,7 +1322,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tanker-container) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1337,7 +1337,7 @@ ) (tanker-container-method-22 self) ) - :code (the-as (function none :behavior tanker-container) sleep-code) + :code sleep-code ) ;; definition for method 11 of type tanker-container @@ -1460,7 +1460,7 @@ This commonly includes things such as: (logior! (-> self mask) (process-mask actor-pause)) (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tanker-crash) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1474,8 +1474,8 @@ This commonly includes things such as: ) (logclear! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tanker-crash) sleep-code) - :post (the-as (function none :behavior tanker-crash) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type tanker-crash @@ -1612,7 +1612,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tanker-deadly) sleep-code) + :code sleep-code :post (behavior () (set! (-> self prev-pos quad) (-> self root trans quad)) (let ((v1-1 (ppointer->process (-> self parent))) 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 698f18ade83..2a6aacab6fe 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 @@ -1069,11 +1069,11 @@ ) ) ) - :enter (the-as (function none :behavior market-object) #f) - :exit (the-as (function none :behavior market-object) #f) - :trans (the-as (function none :behavior market-object) #f) - :code (the-as (function none :behavior market-object) sleep-code) - :post (the-as (function none :behavior market-object) #f) + :enter #f + :exit #f + :trans #f + :code sleep-code + :post #f ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc index 53adcdf2912..8976e461140 100644 --- a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc @@ -579,8 +579,8 @@ :enter (behavior () '() ) - :trans (the-as (function none :behavior paddywagon) #f) - :code (the-as (function none :behavior paddywagon) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-158 self) ) @@ -1234,7 +1234,7 @@ ;; failed to figure out what this is: (defstate exit-vehicle (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((a0-1 (find-nearest-nav-mesh (-> self root trans) (the-as float #x7f800000)))) (if a0-1 @@ -1426,14 +1426,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - 0.5 - ) + :num! (seek! max 0.5) :frame-num 0.0 ) (until (ja-done? 0) @@ -1465,14 +1458,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -1524,7 +1510,7 @@ ;; failed to figure out what this is: (defstate go-at-end (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -1615,7 +1601,7 @@ ;; failed to figure out what this is: (defstate go-at-pipe (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -1756,7 +1742,7 @@ ;; failed to figure out what this is: (defstate wait-at-end (city-lurker) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior city-lurker) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logclear! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -1797,14 +1783,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -3377,7 +3356,3 @@ (none) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc b/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc index fc654b51387..90bc9372474 100644 --- a/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc @@ -70,7 +70,7 @@ ;; failed to figure out what this is: (defstate idle (krew-package) :virtual #t - :code (the-as (function none :behavior krew-package) sleep-code) + :code sleep-code :post (behavior () (let ((gp-0 (handle->process (-> self attach-object)))) (cond diff --git a/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc index 8d537ec9843..d939501b5c4 100644 --- a/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc @@ -202,7 +202,7 @@ This commonly includes things such as: (go-virtual done) ) ) - :code (the-as (function none :behavior ctypal-broke-wall) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -211,7 +211,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate done (ctypal-broke-wall) :virtual #t - :code (the-as (function none :behavior ctypal-broke-wall) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -302,7 +302,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (ctypal-baron-statue-broken) :virtual #t - :code (the-as (function none :behavior ctypal-baron-statue-broken) sleep-code) + :code sleep-code ) ;; definition for method 11 of type ctypal-baron-statue-broken 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 ce06cac5ffe..694280bf6d2 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 @@ -3644,7 +3644,7 @@ ) #f ) - :post (the-as (function none :behavior hiphog-exterior-marquee) ja-post) + :post ja-post ) ;; definition for method 11 of type hiphog-exterior-marquee @@ -3768,10 +3768,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc b/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc index a110564cfea..d0a2a77e2b0 100644 --- a/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc @@ -1174,7 +1174,7 @@ ) ) ) - :code (the-as (function none :behavior ctyport-mine) transform-and-sleep-code) + :code transform-and-sleep-code :post (behavior () (ctyport-mine-method-23 self) (transform-post) @@ -1313,10 +1313,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1324,7 +1321,7 @@ ) #f ) - :post (the-as (function none :behavior ctyport-spy) ja-post) + :post ja-post ) ;; definition for function ctyport-spy-init-by-other @@ -1546,7 +1543,7 @@ ) #f ) - :post (the-as (function none :behavior ctyport-cargo) transform-post) + :post transform-post ) ;; definition for method 30 of type ctyport-cargo @@ -1586,10 +1583,7 @@ (set-setting! 'mode-name 'cam-fixed 0.0 0) (suspend) (ctyport-cargo-method-30 self) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1599,7 +1593,7 @@ ) #f ) - :post (the-as (function none :behavior ctyport-cargo) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc b/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc index e2ff5ec6e73..775f3addbb5 100644 --- a/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc @@ -460,10 +460,7 @@ ;; failed to figure out what this is: (defstate taunt (errol-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior errol-racer) - vehicle-rider-event-handler - ) + :event vehicle-rider-event-handler :enter (behavior () (format #t "errol-rider::taunt race-errol-pass~%") (speech-control-method-12 *speech-control* self (speech-type speech-type-53)) @@ -472,20 +469,14 @@ (ja-channel-push! 1 (seconds 0.05)) (cond ((zero? (rand-vu-int-count 2)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -893,7 +884,7 @@ ) ) ) - :code (the-as (function none :behavior turbo-ring) sleep-code) + :code sleep-code :post (behavior () (if (and (-> self player-got) (>= (- (current-time) (-> self touch-time)) (seconds 3)) diff --git a/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc b/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc index 53395dafbde..793434f5dac 100644 --- a/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc @@ -70,7 +70,7 @@ ;; failed to figure out what this is: (defstate idle (seal-of-mar) :virtual #t - :code (the-as (function none :behavior seal-of-mar) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self node-list data 3 bone transform trans)) (ja-post) diff --git a/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc b/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc index bbeab9756ef..c465244f87b 100644 --- a/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc @@ -156,10 +156,7 @@ (task-arrow-spawn beam-params self) ) (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -167,7 +164,7 @@ ) #f ) - :post (the-as (function none :behavior krew-collection-item) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc b/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc index 67473a3f00c..255e469a7d7 100644 --- a/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc @@ -317,14 +317,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -344,12 +337,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -399,7 +387,7 @@ ;; failed to figure out what this is: (defstate exit-vehicle (citizen-rebel) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen-rebel) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((a0-1 (find-nearest-nav-mesh (-> self root trans) (the-as float #x7f800000)))) (if a0-1 @@ -634,26 +622,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) @@ -798,26 +774,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) @@ -1845,7 +1809,3 @@ (none) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc index 67b01b6b036..ef55f7f8407 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc @@ -4,7 +4,7 @@ ;; failed to figure out what this is: (defstate waiting-idle (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -61,10 +61,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -72,13 +69,13 @@ ) #f ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-turn (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -127,10 +124,7 @@ ) ) (ja-channel-push! 1 (seconds 0.4)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -189,10 +183,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -214,13 +205,13 @@ ) (kid-method-232 self) ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-with-kor (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type kid waiting-idle) enter) :exit (-> (method-of-type kid waiting-idle) exit) :trans (behavior () @@ -238,7 +229,7 @@ ;; failed to figure out what this is: (defstate scared-idle (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -295,10 +286,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -306,13 +294,13 @@ ) #f ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate traveling (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -376,7 +364,7 @@ ;; failed to figure out what this is: (defstate traveling-blocked (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -409,7 +397,7 @@ ) ) :code (-> (method-of-type kid waiting-idle) code) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -459,10 +447,7 @@ :code (behavior () (local-vars (v1-31 enemy-flag) (v1-39 enemy-flag)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -511,7 +496,7 @@ ;; failed to figure out what this is: (defstate arrested (kid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -559,10 +544,7 @@ :code (behavior () (when (not (logtest? (bot-flags bf20) (-> self bot-flags))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -586,10 +568,7 @@ ) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 4)) @@ -603,7 +582,7 @@ ) #f ) - :post (the-as (function none :behavior kid) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc index 668c14d58af..7fdbaef0947 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc @@ -4,7 +4,7 @@ ;; failed to figure out what this is: (defstate waiting-idle (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -61,10 +61,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -72,13 +69,13 @@ ) #f ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-turn (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -128,10 +125,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -200,10 +194,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -225,13 +216,13 @@ ) (kor-method-232 self) ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-with-kid (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type kor waiting-idle) enter) :exit (-> (method-of-type kor waiting-idle) exit) :trans (behavior () @@ -249,7 +240,7 @@ ;; failed to figure out what this is: (defstate scared-idle (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -306,10 +297,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -317,13 +305,13 @@ ) #f ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate traveling (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -387,7 +375,7 @@ ;; failed to figure out what this is: (defstate traveling-blocked (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -420,7 +408,7 @@ ) ) :code (-> (method-of-type kor waiting-idle) code) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -470,10 +458,7 @@ :code (behavior () (local-vars (v1-31 enemy-flag) (v1-39 enemy-flag)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -522,7 +507,7 @@ ;; failed to figure out what this is: (defstate arrested (kor) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior kor) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -573,10 +558,7 @@ ((and (not (logtest? (bot-flags bf20) (-> self bot-flags))) (< (- (current-time) (-> self arrest-attempt-time)) (seconds 0.8)) ) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -602,20 +584,14 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) frames num-frames) -1))) - :frame-num (ja-aframe 4.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num (ja-aframe 4.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 3)) @@ -629,7 +605,7 @@ ) #f ) - :post (the-as (function none :behavior kor) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-chick_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-chick_REF.gc index f41e8d33023..a4823c748ee 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-chick_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-chick_REF.gc @@ -520,10 +520,7 @@ (let ((f30-1 (/ 1.0 (rand-vu-float-range 10.0 13.0)))) (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! citizen-chick-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-chick-idle-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-chick-idle-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc index fd22aed9169..d16c2460e8b 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc @@ -246,14 +246,7 @@ (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-fat_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-fat_REF.gc index 365b8402c09..2bcdf493bc7 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-fat_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-fat_REF.gc @@ -544,20 +544,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! citizen-fat-arms-hips-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-fat-arms-hips-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-fat-arms-hips-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! citizen-fat-arms-crossed-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-fat-arms-crossed-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-fat-arms-crossed-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc index 676b68a8860..a6e6c56ae14 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc @@ -588,20 +588,14 @@ (+! gp-0 -1) (cond ((zero? s5-0) - (ja-no-eval :group! citizen-norm-arms-hips-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-norm-arms-hips-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-norm-arms-hips-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) ) ) (else - (ja-no-eval :group! citizen-norm-arms-crossed-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim citizen-norm-arms-crossed-ja) frames num-frames) -1)) f30-1) - :frame-num 0.0 - ) + (ja-no-eval :group! citizen-norm-arms-crossed-ja :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) @@ -706,7 +700,7 @@ ;; failed to figure out what this is: (defstate knocked-off-vehicle (citizen-norm) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen-norm) enemy-event-handler) + :event enemy-event-handler :enter (behavior () '() ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc index 88e7d9e961f..646b7971f52 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc @@ -1330,7 +1330,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate in-ditch (citizen) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1357,21 +1357,13 @@ This commonly includes things such as: :exit (behavior () '() ) - :trans (the-as (function none :behavior citizen) #f) + :trans #f :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (cond ((focus-test? self touch-water) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self water-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self water-anim))) frames num-frames) -1) - ) - 0.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self water-anim)) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) @@ -1391,14 +1383,7 @@ This commonly includes things such as: (else (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -1418,7 +1403,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate wait (citizen) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1443,14 +1428,7 @@ This commonly includes things such as: (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1471,7 +1449,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate active (citizen) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior citizen) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1605,7 +1583,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior citizen) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc index 2333626c541..eb317eb7381 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc @@ -591,7 +591,7 @@ ;; failed to figure out what this is: (defstate flee (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -808,7 +808,7 @@ ;; failed to figure out what this is: (defstate avoid-danger (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -990,7 +990,7 @@ ;; failed to figure out what this is: (defstate clear-path (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1091,7 +1091,7 @@ ;; failed to figure out what this is: (defstate on-ground (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1131,12 +1131,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-on-ground)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-on-ground))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1156,7 +1151,7 @@ ;; failed to figure out what this is: (defstate dive (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1222,12 +1217,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-dive)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-dive))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1260,7 +1250,7 @@ ;; failed to figure out what this is: (defstate cower-ground (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1306,16 +1296,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self info anim-cover-head-start)) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self info anim-cover-head-start))) - frames - num-frames - ) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1324,16 +1305,7 @@ ) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self info anim-cover-head-loop)) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self info anim-cover-head-loop))) - frames - num-frames - ) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1347,16 +1319,7 @@ #f (label cfg-9) (ja-no-eval :group! (-> self draw art-group data (-> self info anim-cover-head-end)) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self info anim-cover-head-end))) - frames - num-frames - ) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1380,7 +1343,7 @@ ;; failed to figure out what this is: (defstate get-up-front (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1407,14 +1370,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1439,7 +1395,7 @@ ;; failed to figure out what this is: (defstate get-up-back (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1466,12 +1422,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1625,14 +1576,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -2056,7 +2000,7 @@ ;; failed to figure out what this is: (defstate exit-vehicle (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (change-to (find-nearest-nav-mesh (-> self root trans) (the-as float #x7f800000)) self) (if (not (-> self nav)) @@ -2206,7 +2150,7 @@ ;; failed to figure out what this is: (defstate wait-at-dest (civilian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior civilian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logclear! (-> self flags) (citizen-flag persistent)) (set! (-> self state-time) (current-time)) @@ -2227,14 +2171,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - 0.1 - ) + :num! (seek! max 0.1) :frame-num 0.0 ) (until (ja-done? 0) @@ -2248,7 +2185,3 @@ (nav-enemy-simple-post) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc index 8c13b4e12f8..0353f772a2d 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc @@ -809,7 +809,7 @@ ;; failed to figure out what this is: (defstate get-up-front (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -845,14 +845,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -878,7 +871,7 @@ ;; failed to figure out what this is: (defstate get-up-back (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -914,12 +907,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - (-> self speed-scale) - ) + :num! (seek! max (-> self speed-scale)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1315,7 +1303,7 @@ ;; failed to figure out what this is: (defstate knocked-off-vehicle (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () '() ) @@ -1424,7 +1412,7 @@ ;; failed to figure out what this is: (defstate close-attack-active (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -1462,10 +1450,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 7.0 (ja-frame-num 0)) (not gp-0)) (let ((v1-22 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) @@ -1790,7 +1775,7 @@ ;; failed to figure out what this is: (defstate search (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1927,7 +1912,7 @@ ;; failed to figure out what this is: (defstate hostile (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (when *debug-segment* (when (not (-> self nav)) @@ -2134,7 +2119,7 @@ ;; failed to figure out what this is: (defstate close-attack (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -2177,10 +2162,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 7.0 (ja-frame-num 0)) (not gp-0)) (let ((v1-22 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) @@ -2202,7 +2184,7 @@ ;; failed to figure out what this is: (defstate gun-shoot (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self other-side) (if (< (rand-vu) 0.5) @@ -2283,14 +2265,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 0 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 0 anim-index))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2358,14 +2333,7 @@ (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 2 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 2 anim-index))) frames num-frames) - -1 - ) - ) - f30-1 - ) + :num! (seek! max f30-1) :frame-num 0.0 ) (until (ja-done? 0) @@ -2445,7 +2413,7 @@ ;; failed to figure out what this is: (defstate roll-right (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -2557,7 +2525,7 @@ ;; failed to figure out what this is: (defstate roll-left (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -2649,7 +2617,7 @@ ;; failed to figure out what this is: (defstate arrest (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) @@ -2688,13 +2656,7 @@ (speech-control-method-12 *speech-control* self (speech-type speech-type-13)) (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 19) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2708,10 +2670,7 @@ ) (goto cfg-17) ) - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2721,13 +2680,7 @@ (label cfg-17) (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2745,7 +2698,7 @@ ;; failed to figure out what this is: (defstate waiting-ambush (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) @@ -2784,23 +2737,14 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 19) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (while (not (logtest? (-> self flags) (citizen-flag target-in-sight))) - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2808,13 +2752,7 @@ ) (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-1)) @@ -3224,7 +3162,7 @@ ;; failed to figure out what this is: (defstate attack (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self joint-enable) #t) @@ -3323,10 +3261,7 @@ ) (cond ((< f0-6 0.0) - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 25) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-rotate-local-y! (-> self root quat) (-> self root quat) (* f30-0 (seconds-per-frame))) (suspend) @@ -3334,10 +3269,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! 0.0) - :frame-num (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1)) - ) + (ja-no-eval :group! (-> self draw art-group data 25) :num! (seek! 0.0) :frame-num max) (until (ja-done? 0) (quaternion-rotate-local-y! (-> self root quat) (-> self root quat) (* f30-0 (seconds-per-frame))) (suspend) @@ -3388,10 +3320,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 21) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 21)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 21) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3458,10 +3387,7 @@ ) (set! (-> v1-182 state mode) (the-as lightning-mode a0-62)) ) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3763,7 +3689,7 @@ ;; failed to figure out what this is: (defstate exit-transport (crimson-guard) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self nav flags) (nav-control-flag output-sphere-hash)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc index cf1db0e3ba9..22cf4dc34d4 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc @@ -428,10 +428,7 @@ ;; failed to figure out what this is: (defstate ambush-jumping (metalhead-flitter) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-flitter) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -454,9 +451,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1))) - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!)) (until #f (when (< (-> self base-height) (-> self root trans y)) (let ((gp-0 (get-process *default-dead-pool* part-tracker #x4000))) @@ -527,10 +522,7 @@ ) #f (label cfg-26) - (ja-no-eval :group! (-> self draw art-group data 11) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -545,7 +537,7 @@ (label cfg-33) (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-flitter) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; definition for method 99 of type metalhead-flitter @@ -715,14 +707,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -810,10 +795,7 @@ ;; failed to figure out what this is: (defstate attack (metalhead-flitter) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-flitter) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -878,10 +860,7 @@ :code (behavior () (ja-channel-push! 2 (seconds 0.1)) (let ((f30-0 (metalhead-flitter-method-209 self))) - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek! max 0.8) :frame-num 0.0) (let ((a0-3 (-> self skel root-channel 1))) (set! (-> a0-3 frame-interp 1) f30-0) (set! (-> a0-3 frame-interp 0) f30-0) @@ -914,10 +893,7 @@ (logclear! (-> self focus-status) (focus-status dangerous)) ) (dotimes (gp-1 (get-rand-int self 3)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -925,7 +901,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior metalhead-flitter) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: @@ -969,14 +945,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1060,14 +1029,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - (get-rand-float-range self 0.9 1.1) - ) + :num! (seek! max (get-rand-float-range self 0.9 1.1)) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc index 8654e53e1ff..537ddf88af8 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc @@ -358,10 +358,7 @@ ;; failed to figure out what this is: (defstate falling-ambush (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (when (logtest? (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) @@ -396,13 +393,7 @@ ) :code (behavior () (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -412,7 +403,7 @@ (sound-play "grunt-notice") (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; definition for method 93 of type metalhead-grunt @@ -432,10 +423,7 @@ ;; failed to figure out what this is: (defstate jumping-ambush (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy ambush) enter)) (when (zero? (-> self intro-path)) @@ -470,10 +458,7 @@ ;; failed to figure out what this is: (defstate jumping-ambush-cont (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (let ((a0-0 (-> self intro-path)) (v1-1 (+ (-> self jumping-ambush-path-pt) 1)) @@ -546,10 +531,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -567,20 +549,14 @@ (let ((gp-1 (-> self draw art-group data (-> self patrol-anim anim-index))) (s5-1 (get-rand-int-range self 2 5)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) (ja :num! (seek! max f30-0)) ) (dotimes (s4-1 s5-1) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -599,14 +575,7 @@ (nav-enemy-method-167 self) (ja-channel-push! 1 (seconds 0.3)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -615,14 +584,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -764,10 +726,7 @@ 0 ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -777,16 +736,13 @@ ) #f ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate attack (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state))) (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) @@ -846,10 +802,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -890,16 +843,13 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate spin-attack (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -960,10 +910,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a0-9 (handle->process (-> self focus handle)))) (if a0-9 @@ -982,7 +929,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior metalhead-grunt) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1008,10 +955,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1219,10 +1163,7 @@ ;; failed to figure out what this is: (defstate wait-for-focus (metalhead-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy idle) enter) :trans (behavior () (let ((s5-0 (handle->process (-> self focus handle)))) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc index f9e3b5d6c76..7ad59b7884d 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc @@ -906,19 +906,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 6.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 6.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -931,10 +925,7 @@ ;; failed to figure out what this is: (defstate fire (metalhead-predator) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-predator) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-2 *game-info*) @@ -971,10 +962,7 @@ (let ((gp-0 0)) (set! (-> self shoot-angle) (* 182.04445 (rand-vu-float-range -45.0 45.0))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 9.0 (ja-frame-num 0)) (zero? gp-0)) (set! gp-0 1) @@ -1006,16 +994,13 @@ (label cfg-26) (go-hostile self) ) - :post (the-as (function none :behavior metalhead-predator) enemy-simple-post) + :post enemy-simple-post ) ;; failed to figure out what this is: (defstate close-attack (metalhead-predator) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior metalhead-predator) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (traffic-danger-init! self) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -1047,10 +1032,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 4.0 (ja-frame-num 0)) (not gp-0)) (metalhead-predator-method-205 self #t) @@ -1064,10 +1046,7 @@ (set! (-> v1-32 speed) 0.0) ) 0 - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1077,7 +1056,7 @@ ) (go-hostile self) ) - :post (the-as (function none :behavior metalhead-predator) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; definition for method 205 of type metalhead-predator diff --git a/test/decompiler/reference/jak2/levels/city/traffic/traffic-manager_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/traffic-manager_REF.gc index f38cb706d4c..f0e95dfba9c 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/traffic-manager_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/traffic-manager_REF.gc @@ -753,7 +753,7 @@ (defstate active (traffic-manager) :virtual #t :event traffic-manager-event-handler - :code (the-as (function none :behavior traffic-manager) sleep-code) + :code sleep-code :post (behavior () (update self) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc index a910d825adc..f8fe8ef29d3 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc @@ -98,8 +98,8 @@ ) ) ) - :code (the-as (function none :behavior vehicle-turret) sleep-code) - :post (the-as (function none :behavior vehicle-turret) transform-post) + :code sleep-code + :post transform-post ) ;; definition for method 28 of type vehicle-turret @@ -353,10 +353,7 @@ ) :code (behavior () (ja-channel-push! 1 0) - (ja-no-eval :group! transport-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim transport-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! transport-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -391,10 +388,7 @@ :code (behavior () (ja-channel-push! 1 0) (sound-play "tran-door-open") - (ja-no-eval :group! transport-hatch-open-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim transport-hatch-open-ja) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! transport-hatch-open-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -461,10 +455,7 @@ (ja-channel-push! 1 0) (sound-play "tran-thrust") (sound-play "tran-door-close") - (ja-no-eval :group! transport-hatch-close-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim transport-hatch-close-ja) frames num-frames) -1)) 0.2) - :frame-num 0.0 - ) + (ja-no-eval :group! transport-hatch-close-ja :num! (seek! max 0.2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.2)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc index 0b2592a70eb..59e85f6bf49 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc @@ -1362,10 +1362,7 @@ ;; failed to figure out what this is: (defstate active (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (let ((v1-0 (-> self controller branch))) (when (or (not v1-0) (zero? v1-0)) @@ -1387,8 +1384,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (cond ((logtest? (rigid-body-object-flag alert) (-> self flags)) @@ -1417,15 +1414,12 @@ ;; failed to figure out what this is: (defstate hostile (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self ai-hook) (method-of-object self vehicle-method-93)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (when (logtest? (rigid-body-object-flag in-pursuit) (-> self flags)) @@ -1471,15 +1465,12 @@ ;; failed to figure out what this is: (defstate stop-and-shoot (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (let ((s5-0 (new 'stack-no-clear 'vehicle-guard-target-data))) @@ -1500,16 +1491,13 @@ ;; failed to figure out what this is: (defstate slow-pursuit (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (let ((s5-0 (new 'stack-no-clear 'vehicle-guard-target-data))) @@ -1536,16 +1524,13 @@ ;; failed to figure out what this is: (defstate waiting-ambush (vehicle-guard) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-guard) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (logior! (-> self flags) (rigid-body-object-flag riding ignition ai-driving)) (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) ) - :trans (the-as (function none :behavior vehicle-guard) #f) - :code (the-as (function none :behavior vehicle-guard) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-guard-method-150 self) (let ((gp-0 (new 'stack-no-clear 'vehicle-guard-target-data))) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc index c3f56fc8cf6..f072156b2a1 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc @@ -217,7 +217,7 @@ (ja-channel-push! 1 (seconds 0.05)) (ja :group! (-> self draw art-group data (-> self riding-anim))) ) - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code :post (behavior () (vehicle-rider-method-34 self) ) @@ -227,7 +227,7 @@ (defstate taunt (vehicle-rider) :virtual #t :event vehicle-rider-event-handler - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code :post (behavior () (go-virtual active) (vehicle-rider-method-34 self) @@ -238,7 +238,7 @@ (defstate got-passed (vehicle-rider) :virtual #t :event vehicle-rider-event-handler - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code :post (behavior () (go-virtual active) (vehicle-rider-method-34 self) @@ -255,7 +255,7 @@ :exit (behavior () (logclear! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior vehicle-rider) sleep-code) + :code sleep-code ) ;; definition for method 11 of type vehicle-rider diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc index 8a55bab16fb..44720eeefbb 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc @@ -15,7 +15,7 @@ (rigid-body-object-method-39 self) (go-virtual waiting) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (ja-post) ) @@ -43,7 +43,7 @@ (logclear! (-> self focus-status) (focus-status disable inactive)) (logclear! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -60,8 +60,8 @@ :exit (behavior () '() ) - :trans (the-as (function none :behavior vehicle) #f) - :code (the-as (function none :behavior vehicle) sleep-code) + :trans #f + :code sleep-code :post (behavior () (check-player-get-on self) (vehicle-method-122 self) @@ -116,8 +116,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle) #f) - :code (the-as (function none :behavior vehicle) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-method-123 self) ) @@ -196,7 +196,7 @@ ) ) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (local-vars (a0-3 int) (a0-5 int)) (let* ((v1-1 (-> *perf-stats* data 18)) @@ -253,7 +253,7 @@ (go-virtual explode) ) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (vehicle-method-121 self) ) @@ -450,7 +450,7 @@ (set! (-> self state-time) (current-time)) ) ) - :code (the-as (function none :behavior vehicle) sleep-code) + :code sleep-code :post (behavior () (vehicle-explode-post) ) diff --git a/test/decompiler/reference/jak2/levels/city/vinroom/vinroom-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/vinroom/vinroom-obs_REF.gc index 4f14d5df3b4..e15a4c0d99e 100644 --- a/test/decompiler/reference/jak2/levels/city/vinroom/vinroom-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/vinroom/vinroom-obs_REF.gc @@ -110,7 +110,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior vin-turbine) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -125,10 +125,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc index 420223bf68e..1cf0c7be8a8 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc @@ -4,7 +4,7 @@ ;; failed to figure out what this is: (defstate waiting-idle (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -53,10 +53,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.03)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -83,10 +80,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -94,13 +88,13 @@ ) #f ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate standing-idle (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -213,10 +207,7 @@ (and v1-31 (= v1-31 (-> self draw art-group data 3))) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -229,10 +220,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -240,13 +228,13 @@ ) #f ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate standing-turn (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -303,10 +291,7 @@ (f28-0 10.0) ) (quaternion-rotate-y! s5-1 (-> gp-0 src-quat) f0-1) - (ja-no-eval :group! s4-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-0) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-0 :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (let ((f0-6 (ja-aframe-num 0))) (cond @@ -328,13 +313,13 @@ ) (go-virtual standing-idle) ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate traveling (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -397,7 +382,7 @@ ;; failed to figure out what this is: (defstate traveling-blocked (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -425,7 +410,7 @@ ) ) :code (-> (method-of-type ashelin waiting-idle) code) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -462,7 +447,7 @@ ;; failed to figure out what this is: (defstate standing-blast (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -492,10 +477,7 @@ ) ) (let ((gp-0 #f)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (not gp-0) (>= (ja-aframe-num 0) 7.0)) (set! gp-0 #t) @@ -516,13 +498,13 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior ashelin) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate chase (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (nav-enemy-method-166 self) @@ -577,7 +559,7 @@ ;; failed to figure out what this is: (defstate back-spring (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -608,10 +590,7 @@ ) (quaternion-copy! s5-0 (-> self root quat)) (quaternion<-rotate-y-vector s4-0 gp-1) - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 33) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) s5-0 s4-0 (/ (ja-frame-num 0) (the float (ja-num-frames 0)))) (suspend) @@ -657,10 +636,7 @@ (set! (-> self nav state speed) f0-13) ) 0 - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 34) :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (let ((a1-12 (-> self nav state))) (set! (-> gp-1 quad) (-> a1-12 heading quad)) @@ -690,10 +666,7 @@ (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) ) - (ja-no-eval :group! (-> self draw art-group data 35) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 35) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -716,7 +689,7 @@ ;; failed to figure out what this is: (defstate cartwheel-left (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -748,10 +721,7 @@ (quaternion-copy! s5-0 (-> self root quat)) (quaternion<-rotate-y-vector s4-0 gp-1) (quaternion-rotate-y! s4-0 s4-0 -16384.0) - (ja-no-eval :group! (-> self draw art-group data 36) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 36)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 36) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) s5-0 s4-0 (/ (ja-frame-num 0) (the float (ja-num-frames 0)))) (suspend) @@ -795,10 +765,7 @@ (set! (-> self nav state speed) f0-13) ) 0 - (ja-no-eval :group! (-> self draw art-group data 37) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 37)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 37) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((a1-11 (-> self nav state))) (set! (-> gp-1 quad) (-> a1-11 heading quad)) @@ -822,10 +789,7 @@ (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) ) - (ja-no-eval :group! (-> self draw art-group data 38) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 38)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 38) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -848,7 +812,7 @@ ;; failed to figure out what this is: (defstate tumble-right (ashelin) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ashelin) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -880,10 +844,7 @@ (quaternion-copy! s5-0 (-> self root quat)) (quaternion<-rotate-y-vector s4-0 gp-1) (quaternion-rotate-y! s4-0 s4-0 16384.0) - (ja-no-eval :group! (-> self draw art-group data 39) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 39) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) s5-0 s4-0 (/ (ja-frame-num 0) (the float (ja-num-frames 0)))) (suspend) @@ -927,10 +888,7 @@ (set! (-> self nav state speed) f0-13) ) 0 - (ja-no-eval :group! (-> self draw art-group data 40) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 40)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 40) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((a1-11 (-> self nav state))) (set! (-> gp-1 quad) (-> a1-11 heading quad)) @@ -954,10 +912,7 @@ (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) ) - (ja-no-eval :group! (-> self draw art-group data 41) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 41)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 41) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1096,10 +1051,7 @@ ) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc index a7250850960..80a6b3c58c0 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc @@ -27,14 +27,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -157,10 +150,7 @@ ) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -182,7 +172,7 @@ ;; failed to figure out what this is: (defstate failed (bot) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior bot) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type bot die-falling) enter)) (logclear! (-> self bot-flags) (bot-flags bf11)) @@ -213,10 +203,7 @@ (gp-0 (-> self draw art-group data (-> self enemy-info idle-anim))) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (when (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 0.5)) @@ -233,13 +220,13 @@ ) #f ) - :post (the-as (function none :behavior bot) nav-enemy-die-falling-post) + :post nav-enemy-die-falling-post ) ;; failed to figure out what this is: (defstate hidden (bot) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior bot) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status disable)) (let ((v1-3 (-> self root root-prim))) @@ -267,6 +254,6 @@ ) (set! (-> self enemy-flags) v0-0) ) - :code (the-as (function none :behavior bot) sleep-code) - :post (the-as (function none :behavior bot) nav-enemy-simple-post) + :code sleep-code + :post nav-enemy-simple-post ) diff --git a/test/decompiler/reference/jak2/levels/common/ai/halt/hal_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/halt/hal_REF.gc index 0724778a6ef..3a0c70633f8 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/halt/hal_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/halt/hal_REF.gc @@ -548,9 +548,9 @@ (defstate idle (hal) :virtual #t :event hal-event-handler - :enter (the-as (function none :behavior hal) nothing) - :exit (the-as (function none :behavior hal) nothing) - :trans (the-as (function none :behavior hal) nothing) - :code (the-as (function none :behavior hal) sleep-code) + :enter nothing + :exit nothing + :trans nothing + :code sleep-code :post hal-post ) diff --git a/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc index e835fab2a9a..a6b039451e4 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc @@ -4,7 +4,7 @@ ;; failed to figure out what this is: (defstate waiting-idle (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -42,14 +42,14 @@ (ruffian-method-240 self) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-turn (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -78,7 +78,7 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 49152.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -88,7 +88,7 @@ ;; failed to figure out what this is: (defstate scared-idle (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -123,14 +123,14 @@ (ruffian-method-240 self) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate scared-turn (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -159,7 +159,7 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 49152.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -169,7 +169,7 @@ ;; failed to figure out what this is: (defstate alert-idle (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type ruffian scared-idle) enter) :trans (behavior () (bot-method-223 self #t) @@ -190,14 +190,14 @@ (ruffian-method-241 self) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate alert-turn (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -216,7 +216,7 @@ :trans (behavior () (bot-method-223 self #t) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 49152.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -226,7 +226,7 @@ ;; failed to figure out what this is: (defstate traveling (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -286,7 +286,7 @@ ;; failed to figure out what this is: (defstate traveling-blocked (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -313,8 +313,8 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -343,13 +343,13 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing ) ;; failed to figure out what this is: (defstate kick (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -378,7 +378,7 @@ :trans (behavior () (bot-method-223 self #f) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing :post (behavior () (seek-toward-heading-vec! (-> self root) (-> self focus-info bullseye-xz-dir) 131072.0 (seconds 0.05)) (nav-enemy-simple-post) @@ -388,7 +388,7 @@ ;; failed to figure out what this is: (defstate blast (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -406,14 +406,14 @@ :exit (behavior () (logclear! (-> self enemy-flags) (enemy-flag actor-pause-backup)) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate bomb-recoil (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -423,8 +423,8 @@ (nav-enemy-method-167 self) (set! (-> self travel-anim-interp) 0.0) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -440,7 +440,7 @@ (set! (-> self next-fire-time) 0) 0 ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing ) ;; failed to figure out what this is: @@ -498,13 +498,13 @@ ) (set! (-> self travel-anim-interp) 0.0) ) - :code (the-as (function none :behavior ruffian) nothing) + :code nothing ) ;; failed to figure out what this is: (defstate plant-bomb (ruffian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ruffian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -534,6 +534,6 @@ ) ) ) - :code (the-as (function none :behavior ruffian) nothing) - :post (the-as (function none :behavior ruffian) nav-enemy-simple-post) + :code nothing + :post nav-enemy-simple-post ) diff --git a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc index bcdc5c54c8b..74f1678af3a 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc @@ -4,7 +4,7 @@ ;; failed to figure out what this is: (defstate waiting-crouched (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -44,10 +44,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data 47) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 47)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 47) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -55,13 +52,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-far (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -132,10 +129,7 @@ ) (else (ja-channel-push! 1 (seconds 0.3)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -145,10 +139,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -156,13 +147,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-close (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -214,48 +205,46 @@ ) :code (behavior () (let* ((v1-2 (ja-group)) - (gp-0 - (-> self - draw - art-group - data - (cond - ((and v1-2 (= v1-2 (-> self draw art-group data 4))) - (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) - (until (ja-done? 0) - (suspend) - (ja :num! (seek!)) - ) - 7 - ) - (else - (let ((v1-32 (ja-group))) - (cond - ((and v1-32 (= v1-32 (-> self draw art-group data 5))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + (gp-0 (-> self + draw + art-group + data + (cond + ((and v1-2 (= v1-2 (-> self draw art-group data 4))) + (ja-channel-push! 1 (seconds 0.1)) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) + (until (ja-done? 0) + (suspend) + (ja :num! (seek!)) ) - (else - (let ((v1-46 (ja-group))) - (cond - ((and v1-46 (= v1-46 (-> self draw art-group data 7))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + 7 + ) + (else + (let ((v1-32 (ja-group))) + (cond + ((and v1-32 (= v1-32 (-> self draw art-group data 5))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) ) - (else - 7 + 7 + ) + (else + (let ((v1-46 (ja-group))) + (cond + ((and v1-46 (= v1-46 (-> self draw art-group data 7))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) + ) + 7 + ) + (else + 7 + ) + ) ) ) ) @@ -263,9 +252,7 @@ ) ) ) - ) ) - ) ) (let ((v1-62 (ja-group))) (if (not (and v1-62 (= v1-62 gp-0))) @@ -273,10 +260,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -285,13 +269,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate waiting-turn (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -340,10 +324,7 @@ (cond ((and v1-8 (or (= v1-8 (-> self draw art-group data 4)) (= v1-8 (-> self draw art-group data 6)))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -387,10 +368,7 @@ ) ) ) - (ja-no-eval :group! a1-11 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-11) frames num-frames) -1)) 1.3) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-11 :num! (seek! max 1.3) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -449,10 +427,7 @@ ) ) (quaternion-rotate-y! s5-1 (-> gp-0 src-quat) f0-19) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1)) 1.3) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek! max 1.3) :frame-num 0.0) (until (ja-done? 0) (let ((f0-24 (ja-aframe-num 0))) (cond @@ -474,13 +449,13 @@ ) (go-virtual waiting-close) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate charge-plasma (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -525,10 +500,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 35) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 35) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -536,10 +508,7 @@ (logior! (-> self plasma flags) (plasma-flags pf01)) (ja-channel-push! 1 (seconds 0.07)) (until #f - (ja-no-eval :group! (-> self draw art-group data 36) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 36)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 36) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self plasma flags) (plasma-flags pf02)) (logtest? (-> self plasma flags) (plasma-flags pf03)) @@ -553,20 +522,14 @@ #f (label cfg-12) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 37) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 37)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 37) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-push! 1 (seconds 0.07)) (until #f - (ja-no-eval :group! (-> self draw art-group data 38) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 38)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 38) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (logtest? (-> self plasma flags) (plasma-flags pf03)) (logior! (-> self plasma flags) (plasma-flags pf04)) @@ -587,7 +550,7 @@ ;; failed to figure out what this is: (defstate gun-jam (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -620,13 +583,13 @@ ) (go-virtual repair-gun) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate repair-gun (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -664,10 +627,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 26) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 26)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -675,10 +635,7 @@ (until #f (ja-channel-push! 1 (seconds 0.07)) (countdown (gp-0 (get-rand-int-range self 2 4)) - (ja-no-eval :group! (-> self draw art-group data 27) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 27)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -691,10 +648,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 28) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -706,10 +660,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.13)) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -721,10 +672,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 31) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 31) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -736,10 +684,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.13)) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -751,10 +696,7 @@ (go-virtual waiting-close) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 32) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 32)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 32) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -767,10 +709,7 @@ ) (countdown (gp-1 (get-rand-int-range self 2 3)) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 33) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -783,10 +722,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 34) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -800,13 +736,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate clean-gun (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -845,10 +781,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -862,10 +795,7 @@ (ja-channel-push! 1 (seconds 0.13)) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! (-> self draw art-group data 29) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 29)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -878,10 +808,7 @@ (ja-channel-push! 1 (seconds 0.13)) (while (nonzero? s5-1) (+! s5-1 -1) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -892,10 +819,7 @@ ) (when (nonzero? gp-0) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 31) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 31) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -905,13 +829,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate traveling (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -978,7 +902,7 @@ ;; failed to figure out what this is: (defstate traveling-blocked (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1015,10 +939,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.3)) (until #f - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1026,7 +947,7 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1073,48 +994,46 @@ ) :code (behavior () (let* ((v1-2 (ja-group)) - (gp-0 - (-> self - draw - art-group - data - (cond - ((and v1-2 (= v1-2 (-> self draw art-group data 4))) - (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) - (until (ja-done? 0) - (suspend) - (ja :num! (seek!)) - ) - 7 - ) - (else - (let ((v1-32 (ja-group))) - (cond - ((and v1-32 (= v1-32 (-> self draw art-group data 5))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + (gp-0 (-> self + draw + art-group + data + (cond + ((and v1-2 (= v1-2 (-> self draw art-group data 4))) + (ja-channel-push! 1 (seconds 0.1)) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) + (until (ja-done? 0) + (suspend) + (ja :num! (seek!)) ) - (else - (let ((v1-46 (ja-group))) - (cond - ((and v1-46 (= v1-46 (-> self draw art-group data 7))) - (ja-no-eval :num! (seek!)) - (while (not (ja-done? 0)) - (suspend) - (ja-eval) - ) - 7 + 7 + ) + (else + (let ((v1-32 (ja-group))) + (cond + ((and v1-32 (= v1-32 (-> self draw art-group data 5))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) ) - (else - 7 + 7 + ) + (else + (let ((v1-46 (ja-group))) + (cond + ((and v1-46 (= v1-46 (-> self draw art-group data 7))) + (ja-no-eval :num! (seek!)) + (while (not (ja-done? 0)) + (suspend) + (ja-eval) + ) + 7 + ) + (else + 7 + ) + ) ) ) ) @@ -1122,9 +1041,7 @@ ) ) ) - ) ) - ) ) (let ((v1-62 (ja-group))) (if (not (and v1-62 (= v1-62 gp-0))) @@ -1132,10 +1049,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1149,7 +1063,7 @@ ;; failed to figure out what this is: (defstate whip (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -1201,10 +1115,7 @@ ) ) ) - (ja-no-eval :group! a1-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-2) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-2 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (focus-test? self dangerous) (< f30-0 (ja-aframe-num 0))) (if (logtest? (-> self enemy-flags) (enemy-flag check-water)) @@ -1230,7 +1141,7 @@ ;; failed to figure out what this is: (defstate blast (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (let ((v1-2 self)) @@ -1299,13 +1210,13 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate chase (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self skel top-anim interp) 1.0) @@ -1358,7 +1269,7 @@ ;; failed to figure out what this is: (defstate chase-attack (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type sig chase) enter)) (set! (-> self skel top-anim interp) 1.0) @@ -1452,10 +1363,7 @@ :code (behavior () (local-vars (v1-31 enemy-flag) (v1-39 enemy-flag)) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1537,19 +1445,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1557,10 +1459,7 @@ (ja-channel-push! 1 (seconds 0.2)) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 0.5)) @@ -1579,7 +1478,7 @@ ;; failed to figure out what this is: (defstate sig-path-run (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1633,13 +1532,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate sig-path-jump (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1689,10 +1588,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 57) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 57)) frames num-frames) -1))) - :frame-num f30-0 - ) + (ja-no-eval :group! (-> self draw art-group data 57) :num! (seek!) :frame-num f30-0) ) (until (ja-done? 0) (suspend) @@ -1703,13 +1599,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate sig-path-jump-land (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1752,13 +1648,7 @@ (let* ((f0-0 (vector-length (-> self root transv))) (f0-2 (fmax 0.1 (* 0.000020345053 f0-0))) ) - (ja-no-eval :group! (-> self draw art-group data 58) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 58)) frames num-frames) -1)) - f0-2 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 58) :num! (seek! max f0-2) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -1770,13 +1660,13 @@ ) (go-virtual sig-path-run) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate sig-path-shoot-jump (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1827,10 +1717,7 @@ ) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 59) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 59)) frames num-frames) -1))) - :frame-num f30-0 - ) + (ja-no-eval :group! (-> self draw art-group data 59) :num! (seek!) :frame-num f30-0) ) (until (ja-done? 0) (if (and (not (logtest? (bot-flags bf25) (-> self bot-flags))) @@ -1846,13 +1733,13 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate sig-path-shoot-jump-land (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1895,13 +1782,7 @@ (let* ((f0-0 (vector-length (-> self root transv))) (f0-2 (fmax 0.1 (* 0.000020345053 f0-0))) ) - (ja-no-eval :group! (-> self draw art-group data 60) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 60)) frames num-frames) -1)) - f0-2 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 60) :num! (seek! max f0-2) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -1913,13 +1794,13 @@ ) (go-virtual sig-path-run) ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate sig-path-idle (sig) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1939,19 +1820,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! (-> self draw art-group data 61) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 61)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 61) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 62) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1959,5 +1834,5 @@ ) #f ) - :post (the-as (function none :behavior sig) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/test/decompiler/reference/jak2/levels/common/airlock_REF.gc b/test/decompiler/reference/jak2/levels/common/airlock_REF.gc index ee9c7dfa2f3..cc89f45cca9 100644 --- a/test/decompiler/reference/jak2/levels/common/airlock_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/airlock_REF.gc @@ -429,11 +429,7 @@ ) ) (if (and (>= argc 2) (and (= (-> block param 1) #t) (want-cross-airlock? self) (destination-loaded? self #f))) - (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) - :num! (identity - (the float (+ (-> (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) frames num-frames) -1)) - ) - ) + (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) :num! max) ) (and (-> self next-state) (= (-> self next-state name) 'close)) ) @@ -816,11 +812,7 @@ ) ) (process-entity-status! self (entity-perm-status subtask-complete) #t) - (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) - :num! (identity - (the float (+ (-> (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) frames num-frames) -1)) - ) - ) + (ja :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) :num! max) (transform-post) (logior! (-> self mask) (process-mask sleep-code)) (suspend) @@ -1346,8 +1338,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-vin-door-ctyinda vin-door-ctyinda 0 2 - ((1 (meters 999999))) +(defskelgroup skel-vin-door-ctyinda vin-door-ctyinda vin-door-ctyinda-lod0-jg vin-door-ctyinda-idle-ja + ((vin-door-ctyinda-lod0-mg (meters 999999))) :bounds (static-spherem 0 3 0 6) ) @@ -1512,7 +1504,10 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-oracle-door oracle-door 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 4 0 10)) +(defskelgroup skel-oracle-door oracle-door oracle-door-lod0-jg oracle-door-idle-ja + ((oracle-door-lod0-mg (meters 999999))) + :bounds (static-spherem 0 4 0 10) + ) ;; definition of type oracle-door (deftype oracle-door (com-airlock) diff --git a/test/decompiler/reference/jak2/levels/common/battle_REF.gc b/test/decompiler/reference/jak2/levels/common/battle_REF.gc index 2a20b192924..26e3722ea3e 100644 --- a/test/decompiler/reference/jak2/levels/common/battle_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/battle_REF.gc @@ -1527,7 +1527,7 @@ (draw-battle-marks self) ) ) - :code (the-as (function none :behavior battle) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1682,7 +1682,7 @@ (draw-battle-marks self) ) ) - :code (the-as (function none :behavior battle) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1698,7 +1698,7 @@ ) (unset-battle-music self) ) - :code (the-as (function none :behavior battle) sleep-code) + :code sleep-code ) ;; definition for method 47 of type battle diff --git a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc index 33ce7c8b8b0..f5ba875ca31 100644 --- a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc @@ -304,7 +304,7 @@ ) ) ) - :code (the-as (function none :behavior elec-gate) sleep-code) + :code sleep-code :post (behavior () (set-elec-scale-if-close! self 0.0) (if (nonzero? (-> self part-off)) @@ -676,7 +676,7 @@ ) ) ) - :code (the-as (function none :behavior elec-gate) sleep-code) + :code sleep-code :post (behavior () (set-elec-scale-if-close! self 1.0) (if (nonzero? (-> self part)) @@ -770,7 +770,7 @@ ) ) ) - :code (the-as (function none :behavior elec-gate) sleep-code) + :code sleep-code :post (behavior () (set-elec-scale-if-close! self 0.0) (if (nonzero? (-> self part-off)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc index c7279258014..835f3b2c726 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc @@ -1146,32 +1146,14 @@ ) 0 (nav-enemy-method-167 self) - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) (ja :num! (seek!)) ) (until (not (enemy-method-123 self 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1230,10 +1212,7 @@ (gp-1 (new 'stack-no-clear 'vector)) ) (vector-! gp-1 (-> self focus-pos) (-> self root trans)) - (ja-no-eval :group! a1-3 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-3) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-3 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) gp-1 65536.0 (seconds 0.02)) (suspend) @@ -1358,10 +1337,7 @@ (vector-normalize! gp-0 1.0) (cond ((>= (vector-dot s4-0 gp-0) 0.707) - (ja-no-eval :group! amphibian-attack-forward-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-forward-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-forward-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) (else (let ((v1-22 (>= (vector-dot s5-0 gp-0) 0.0))) @@ -1369,14 +1345,8 @@ (set! v1-22 (not v1-22)) ) (if v1-22 - (ja-no-eval :group! amphibian-attack-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-right-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) - (ja-no-eval :group! amphibian-attack-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-left-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-right-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) + (ja-no-eval :group! amphibian-attack-left-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) ) ) @@ -1403,7 +1373,7 @@ ;; failed to figure out what this is: (defstate stare-idle (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy stare) enter)) (let ((v1-2 self)) @@ -1417,10 +1387,7 @@ (ja-channel-push! 1 (seconds 0.1)) (let ((gp-0 (get-rand-int-range self 1 3))) (dotimes (s5-0 gp-0) - (ja-no-eval :group! amphibian-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! amphibian-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1429,7 +1396,7 @@ ) (go-virtual stare) ) - :post (the-as (function none :behavior amphibian) nav-enemy-stare-post) + :post nav-enemy-stare-post ) ;; failed to figure out what this is: @@ -1481,7 +1448,7 @@ ;; failed to figure out what this is: (defstate attack-forward (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -1523,23 +1490,20 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! amphibian-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) (until (>= (ja-aframe-num 0) (ja-aframe 2.0 0)) (suspend) (ja :num! (seek!)) ) (go-virtual attack-forward-lunge) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate attack-forward-lunge (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state))) (set! (-> v1-1 speed) 51200.0) @@ -1605,7 +1569,7 @@ ;; failed to figure out what this is: (defstate attack-forward-end (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -1637,13 +1601,13 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate attack-spin (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -1700,10 +1664,7 @@ (vector-normalize! gp-0 1.0) (cond ((>= (vector-dot s4-0 gp-0) 0.707) - (ja-no-eval :group! amphibian-attack-forward-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-forward-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-forward-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) (else (let ((v1-22 (>= (vector-dot s5-0 gp-0) 0.0))) @@ -1711,14 +1672,8 @@ (set! v1-22 (not v1-22)) ) (if v1-22 - (ja-no-eval :group! amphibian-attack-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-right-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) - (ja-no-eval :group! amphibian-attack-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-attack-left-ja) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) + (ja-no-eval :group! amphibian-attack-right-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) + (ja-no-eval :group! amphibian-attack-left-ja :num! (seek!) :frame-num (ja-aframe 0.0 0)) ) ) ) @@ -1745,13 +1700,13 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate tongue-attack (amphibian) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -1826,17 +1781,14 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.7)) - (ja-no-eval :group! amphibian-tongue-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim amphibian-tongue-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! amphibian-tongue-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (react-to-focus self) ) - :post (the-as (function none :behavior amphibian) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 7 of type amphibian diff --git a/test/decompiler/reference/jak2/levels/common/enemy/bouncer_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/bouncer_REF.gc index c8554b11c60..ca0bba62e7a 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/bouncer_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/bouncer_REF.gc @@ -180,7 +180,7 @@ ) #f ) - :post (the-as (function none :behavior bouncer) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -189,9 +189,7 @@ :code (behavior () (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) (ja-no-eval :group! (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) - :num! (seek! - (the float (+ (-> (get-art-by-name (-> self draw art-group) "idle" art-joint-anim) frames num-frames) -1)) - ) + :num! (seek!) :frame-num (ja-aframe 6.0 0) ) (until (ja-done? 0) @@ -200,7 +198,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior bouncer) transform-post) + :post transform-post ) ;; definition for method 23 of type bouncer diff --git a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc index 56ca1cc3bed..4c896741aa8 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc @@ -703,14 +703,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -748,10 +741,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! centurion-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -760,7 +750,7 @@ ) #f ) - :post (the-as (function none :behavior centurion) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 180 of type centurion @@ -849,7 +839,7 @@ ;; failed to figure out what this is: (defstate fire (centurion) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior centurion) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self can-shoot?) (the-as basic #t)) (if (and (-> self first-shoot?) (logtest? (-> self draw status) (draw-control-status on-screen))) @@ -885,10 +875,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! centurion-shoot-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-shoot-start-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-shoot-start-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((gp-2 (handle->process (-> self focus handle)))) (when gp-2 @@ -934,10 +921,7 @@ (when (handle->process (-> self focus handle)) ) (centurion-method-180 self) - (ja-no-eval :group! centurion-shoot-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-shoot-loop-ja) frames num-frames) -1)) 0.4) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-shoot-loop-ja :num! (seek! max 0.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4)) @@ -945,10 +929,7 @@ (set! (-> self can-take-damage?) #f) (set! (-> self root root-prim specific 0) (-> self root root-prim specific 1)) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! centurion-shoot-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-shoot-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-shoot-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -956,13 +937,13 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior centurion) enemy-simple-post) + :post enemy-simple-post ) ;; failed to figure out what this is: (defstate attack (centurion) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior centurion) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3 prim-core action) (collide-action solid deadly) @@ -988,17 +969,14 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! centurion-hit-away-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centurion-hit-away-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! centurion-hit-away-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual hostile) ) - :post (the-as (function none :behavior centurion) enemy-simple-post) + :post enemy-simple-post ) ;; definition for method 132 of type centurion @@ -1397,7 +1375,7 @@ ) #f ) - :post (the-as (function none :behavior centurion) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; definition for method 77 of type centurion diff --git a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc index 4ddc986e544..ad186e02491 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc @@ -749,7 +749,7 @@ ;; failed to figure out what this is: (defstate ambush-jumping (flitter) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flitter) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -772,9 +772,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! flitter-ambush-jump-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-jump-ja) frames num-frames) -1))) - ) + (ja-no-eval :group! flitter-ambush-jump-ja :num! (seek!)) (until #f (when (< (-> self base-height) (-> self root trans y)) (let ((gp-0 (get-process *default-dead-pool* part-tracker #x4000))) @@ -845,10 +843,7 @@ ) #f (label cfg-26) - (ja-no-eval :group! flitter-ambush-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flitter-ambush-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -863,7 +858,7 @@ (label cfg-33) (go-virtual hostile) ) - :post (the-as (function none :behavior flitter) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; definition for method 99 of type flitter @@ -1031,14 +1026,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1120,14 +1108,7 @@ (ja-channel-push! 1 (seconds 0.2)) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - (get-rand-float-range self 0.9 1.1) - ) + :num! (seek! max (get-rand-float-range self 0.9 1.1)) :frame-num 0.0 ) (until (ja-done? 0) @@ -1204,7 +1185,7 @@ ;; failed to figure out what this is: (defstate attack (flitter) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flitter) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1267,10 +1248,7 @@ :code (behavior () (ja-channel-push! 2 (seconds 0.1)) (let ((f30-0 (flitter-method-183 self))) - (ja-no-eval :group! flitter-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-attack-ja) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! flitter-attack-ja :num! (seek! max 0.8) :frame-num 0.0) (let ((a0-3 (-> self skel root-channel 1))) (set! (-> a0-3 frame-interp 1) f30-0) (set! (-> a0-3 frame-interp 0) f30-0) @@ -1302,10 +1280,7 @@ (logclear! (-> self focus-status) (focus-status dangerous)) ) (dotimes (gp-1 (get-rand-int self 3)) - (ja-no-eval :group! flitter-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flitter-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1313,7 +1288,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior flitter) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc index f1bba3c4c86..980a19812aa 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc @@ -456,14 +456,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -480,10 +473,7 @@ (until (not #f) (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) - (ja-no-eval :group! fodder-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! fodder-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -492,10 +482,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) (dotimes (num-chews (rand-vu-int-range 4 7)) - (ja-no-eval :group! fodder-chew-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-chew-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! fodder-chew-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -514,14 +501,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -561,14 +541,7 @@ (s4-0 (< f28-0 (+ -1.0 (the-as float v1-19)))) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - (* 2.0 f30-0) - ) + :num! (seek! max (* 2.0 f30-0)) :frame-num 0.0 ) (until (ja-done? 0) @@ -931,10 +904,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -960,14 +930,7 @@ ) (let ((f30-2 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-2 - ) + :num! (seek! max f30-2) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc index 7807d9d918a..ee952963d2c 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc @@ -450,13 +450,7 @@ (s4-0 (-> (the-as (pointer int32) (+ (* (get-rand-int self gp-0) 8) (the-as int s5-0))))) ) (until #f - (ja-no-eval :group! (-> self draw art-group data s4-0) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data s4-0)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data s4-0) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -470,14 +464,7 @@ ) 0 (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -487,14 +474,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -513,13 +493,7 @@ (ja-no-eval :num! (loop!)) (set! s4-0 (-> (the-as (pointer int32) (+ (* (get-rand-int self gp-0) 8) (the-as int s5-0))))) (ja-channel-push! 1 (seconds 0.6)) - (ja-no-eval :group! (-> self draw art-group data s4-0) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data s4-0)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data s4-0) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) @@ -629,10 +603,7 @@ (f30-0 (get-rand-float-range self 0.9 1.1)) ) (until #f - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -662,7 +633,7 @@ ;; failed to figure out what this is: (defstate backup (grenadier) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grenadier) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -683,10 +654,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! grenadier-run-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-run-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-run-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -710,7 +678,7 @@ ;; failed to figure out what this is: (defstate spin-kick (grenadier) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grenadier) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -746,10 +714,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.135)) - (ja-no-eval :group! grenadier-spin-kick-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-spin-kick-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-spin-kick-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -943,10 +908,7 @@ 0 (logclear! (-> self nav flags) (nav-control-flag update-heading-from-facing)) (logior! (-> self status-flags) (grenadier-flags grflags-1)) - (ja-no-eval :group! grenadier-run-to-throw-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-run-to-throw-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-run-to-throw-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -967,10 +929,7 @@ (cond ((logtest? (-> self status-flags) (grenadier-flags grflags-0)) (ja-channel-push! 1 (seconds 0.135)) - (ja-no-eval :group! grenadier-throw-quick-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-throw-quick-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-throw-quick-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1010,20 +969,14 @@ (let ((f0-14 (vector-vector-distance (-> self root trans) (get-trans (the-as process-focusable a0-50) 0)))) (cond ((< 102400.0 f0-14) - (ja-no-eval :group! grenadier-throw-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-throw-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-throw-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (else - (ja-no-eval :group! grenadier-throw1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-throw1-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-throw1-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1092,10 +1045,7 @@ ) (let ((gp-1 (-> self draw art-group data v1-10))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -1168,20 +1118,14 @@ (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (cond ((zero? (rand-vu-int-range 0 1)) - (ja-no-eval :group! grenadier-victory-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-victory-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-victory-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) (else - (ja-no-eval :group! grenadier-notice-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grenadier-notice-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! grenadier-notice-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc index 940d3ddbf25..96b80f00420 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc @@ -478,7 +478,7 @@ ;; failed to figure out what this is: (defstate falling-ambush (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (when (logtest? (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) @@ -535,14 +535,7 @@ (sound-play "grunt-notice") (ja-channel-push! 1 0) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - 1.8 - ) + :num! (seek! max 1.8) :frame-num 0.0 ) (until (ja-done? 0) @@ -554,7 +547,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior grunt) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; definition for method 93 of type grunt @@ -574,7 +567,7 @@ ;; failed to figure out what this is: (defstate jumping-ambush (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy ambush) enter)) (when (zero? (-> self intro-path)) @@ -609,7 +602,7 @@ ;; failed to figure out what this is: (defstate jumping-ambush-cont (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :code (behavior () (let ((a0-0 (-> self intro-path)) (v1-1 (+ (-> self unknown-byte-1ji2n3) 1)) @@ -675,10 +668,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -696,20 +686,14 @@ (let ((gp-1 (-> self draw art-group data (-> self patrol-anim anim-index))) (s5-1 (get-rand-int-range self 2 5)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (ja-blend-eval) (suspend) (ja :num! (seek! max f30-0)) ) (dotimes (s4-1 s5-1) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -728,14 +712,7 @@ (nav-enemy-method-167 self) (ja-channel-push! 1 (seconds 0.3)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -744,14 +721,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -889,10 +859,7 @@ 0 ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -902,13 +869,13 @@ ) #f ) - :post (the-as (function none :behavior grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate attack (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self nav state))) (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) @@ -957,10 +924,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1001,13 +965,13 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior grunt) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate spin-attack (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) @@ -1057,10 +1021,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a0-9 (handle->process (-> self focus handle)))) (if a0-9 @@ -1079,7 +1040,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior grunt) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -1136,10 +1097,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1165,18 +1123,12 @@ ) ) (let ((f30-2 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! grunt-celebrate-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-start-ja) frames num-frames) -1)) f30-2) - :frame-num 0.0 - ) + (ja-no-eval :group! grunt-celebrate-start-ja :num! (seek! max f30-2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-2)) ) - (ja-no-eval :group! grunt-celebrate-finish-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-finish-ja) frames num-frames) -1)) f30-2) - :frame-num 0.0 - ) + (ja-no-eval :group! grunt-celebrate-finish-ja :num! (seek! max f30-2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-2)) @@ -1239,10 +1191,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1276,10 +1225,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1491,7 +1437,7 @@ ;; failed to figure out what this is: (defstate wait-for-focus (grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy idle) enter) :trans (behavior () (let ((s5-0 (handle->process (-> self focus handle)))) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc index c4dca06a271..4ca2072e1f9 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc @@ -1720,14 +1720,7 @@ (gp-0 (new 'stack-no-clear 'vector)) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -1754,10 +1747,7 @@ ;; failed to figure out what this is: (defstate hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((t9-0 (-> (method-of-type nav-enemy hostile) enter))) (if t9-0 @@ -1847,10 +1837,7 @@ ;; failed to figure out what this is: (defstate tazer-hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -1913,10 +1900,7 @@ ;; failed to figure out what this is: (defstate blast-hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -1991,10 +1975,7 @@ ;; failed to figure out what this is: (defstate grenade-hostile (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (set! (-> self state-time) (current-time)) @@ -2067,10 +2048,7 @@ ;; failed to figure out what this is: (defstate arrest (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) @@ -2123,13 +2101,7 @@ (speech-control-method-12 *speech-control* self (speech-type speech-type-13)) (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 19) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2142,10 +2114,7 @@ ) (goto cfg-13) ) - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2155,13 +2124,7 @@ (label cfg-13) (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1)) - f30-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek! max f30-1) :frame-num 0.0) (until (ja-done? 0) (seek-toward-heading-vec! (-> self root) (-> self target-self-xz) 65536.0 (seconds 0.02)) (suspend) @@ -2178,10 +2141,7 @@ ;; failed to figure out what this is: (defstate gun-shoot (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self other-side) (the-as uint (if (< (rand-vu) 0.5) #t @@ -2243,14 +2203,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 0 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 0 anim-index))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2340,14 +2293,7 @@ (let ((f30-1 (get-rand-float-range self 0.9 1.1))) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self anim-shoot 2 anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-shoot 2 anim-index))) frames num-frames) - -1 - ) - ) - f30-1 - ) + :num! (seek! max f30-1) :frame-num 0.0 ) (until (ja-done? 0) @@ -2768,10 +2714,7 @@ ;; failed to figure out what this is: (defstate close-attack (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-3 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) (logior! (-> v1-3 prim-core action) (collide-action deadly)) @@ -2804,10 +2747,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2874,10 +2814,7 @@ ;; failed to figure out what this is: (defstate grenade-attack (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -2960,10 +2897,7 @@ ;; failed to figure out what this is: (defstate attack (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self joint-enable) #t) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -3047,10 +2981,7 @@ ) (cond ((< 5461.3335 (fabs (-> self target-y-angle))) - (ja-no-eval :group! (-> self draw art-group data 25) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 25) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (< 5461.3335 (fabs (-> self target-y-angle))) (seek-to-point-toward-point! @@ -3065,10 +2996,7 @@ ) ) (else - (ja-no-eval :group! (-> self draw art-group data 20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 20) :num! (seek!) :frame-num 0.0) (until v1-69 (suspend) (ja :num! (seek!)) @@ -3098,10 +3026,7 @@ ) (else (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 21) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 21)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 21) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3167,10 +3092,7 @@ ) (set! (-> v1-151 state mode) (the-as lightning-mode a0-44)) ) - (ja-no-eval :group! (-> self draw art-group data 23) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 23)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3185,10 +3107,7 @@ ) ) (when (not (handle->process (-> self focus handle))) - (ja-no-eval :group! (-> self draw art-group data 24) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 24) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3209,10 +3128,7 @@ ;; failed to figure out what this is: (defstate get-up-front (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -3240,16 +3156,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-front))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-front)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3272,10 +3179,7 @@ ;; failed to figure out what this is: (defstate get-up-back (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -3303,14 +3207,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self anim-get-up-back))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self anim-get-up-back)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3390,10 +3287,7 @@ ;; failed to figure out what this is: (defstate roll-right (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -3505,10 +3399,7 @@ ;; failed to figure out what this is: (defstate roll-left (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -3863,10 +3754,7 @@ (let ((gp-0 (-> self draw art-group data (-> self enemy-info die-falling-anim))) (f30-0 (get-rand-float-range self 0.8 1.2)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -3893,10 +3781,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3912,10 +3797,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 32) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 32)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 32) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3931,10 +3813,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 34) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 34) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3949,10 +3828,7 @@ (ja-eval) ) (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 33) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 33) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -3962,10 +3838,7 @@ ) (when gp-1 (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -4254,10 +4127,7 @@ ;; failed to figure out what this is: (defstate exit-transport (crimson-guard-level) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-level) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self nav flags) (nav-control-flag output-sphere-hash)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/guard-conversation_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/guard-conversation_REF.gc index a3e73b0e27f..acf038072aa 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/guard-conversation_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/guard-conversation_REF.gc @@ -304,7 +304,7 @@ ) ) ) - :code (the-as (function none :behavior guard-conversation) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -359,7 +359,7 @@ (guard-conversation-method-24 self) ) ) - :code (the-as (function none :behavior guard-conversation) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc index 7548b1e0461..28d415deb0f 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc @@ -137,10 +137,7 @@ ) :code (behavior () (ja-channel-push! 1 0) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -175,10 +172,7 @@ :code (behavior () (ja-channel-push! 1 0) (sound-play "tran-door-open") - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -244,10 +238,7 @@ (ja-channel-push! 1 0) (sound-play "tran-thrust") (sound-play "tran-door-close") - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) 0.2) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.2) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.2)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc index f321f4c5e5e..dc630170993 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc @@ -730,7 +730,7 @@ ) ) ) - :post (the-as (function none :behavior hopper) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -747,10 +747,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! hopper-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hopper-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hopper-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -759,7 +756,7 @@ ) #f ) - :post (the-as (function none :behavior hopper) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -774,10 +771,7 @@ (ja :group! hopper-notice-ja) (ja :group! hopper-notice-alt-ja) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a1-4 (-> self nav state))) (set! (-> gp-0 quad) (-> a1-4 travel quad)) 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 10f8b44c2a4..902e9de24d3 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 @@ -692,10 +692,7 @@ ;; failed to figure out what this is: (defstate ambush-fly (crimson-guard-hover) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-hover) - enemy-event-handler - ) + :event enemy-event-handler :trans (behavior () (when (hover-nav-control-method-23 (-> self hover)) (hover-enemy-method-153 self) @@ -716,7 +713,7 @@ ) ) ) - :code (the-as (function none :behavior crimson-guard-hover) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (-> (method-of-type hover-enemy ambush) post) ) @@ -785,13 +782,7 @@ (sound-play "hover-warn") (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -862,10 +853,7 @@ ;; failed to figure out what this is: (defstate kick-attack (crimson-guard-hover) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-hover) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) ) @@ -874,7 +862,7 @@ (go-hostile self) ) ) - :code (the-as (function none :behavior crimson-guard-hover) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (let ((a1-0 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-0 from) (process->ppointer self)) @@ -971,13 +959,7 @@ ) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -1027,16 +1009,7 @@ :code (behavior () (local-vars (v1-35 enemy-flag) (v1-43 enemy-flag)) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-recover-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1074,10 +1047,7 @@ ;; failed to figure out what this is: (defstate die-now (crimson-guard-hover) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior crimson-guard-hover) - enemy-event-handler - ) + :event enemy-event-handler :code (behavior () (dispose! self) (let ((v1-3 (-> self root root-prim))) @@ -1095,7 +1065,7 @@ (send-event self 'death-end) (cleanup-for-death self) ) - :post (the-as (function none :behavior crimson-guard-hover) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1142,20 +1112,14 @@ (ja-channel-push! 1 (seconds 0.2)) (cond ((< (-> self flying-death-spin-dest) 0.0) - (ja-no-eval :group! crimson-guard-hover-death-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim crimson-guard-hover-death-left-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! crimson-guard-hover-death-left-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! crimson-guard-hover-death-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim crimson-guard-hover-death-right-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! crimson-guard-hover-death-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc index e04683e4eac..396af96014c 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc @@ -712,10 +712,7 @@ (ja-channel-set! 3) ) ) - (ja-no-eval :group! flamer-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flamer-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flamer-idle-ja :num! (seek!) :frame-num 0.0) (let ((a0-7 (-> self skel root-channel 1))) (let ((f0-4 0.0)) (set! (-> a0-7 frame-interp 1) f0-4) @@ -815,7 +812,7 @@ ;; failed to figure out what this is: (defstate wait-for-formation (flamer) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flamer) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type flamer idle) enter) :trans (-> (method-of-type flamer idle) trans) :code (behavior () @@ -978,7 +975,7 @@ (flamer-method-186 self f30-0) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (nav-enemy-simple-post) @@ -1022,7 +1019,7 @@ (go-virtual exit-ambush-path) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (flamer-flit-post) @@ -1070,7 +1067,7 @@ (flamer-method-186 self f30-0) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (when (>= (- (current-time) (-> self flit-timer)) (rand-vu-int-range (seconds 1.2) (seconds 3))) @@ -1140,7 +1137,7 @@ ) ) ) - :code (the-as (function none :behavior flamer) flamer-fly-code) + :code flamer-fly-code :post (behavior () (flamer-method-187 self) (flamer-flit-post) @@ -1198,20 +1195,14 @@ (ja-channel-push! 1 (seconds 0.1)) (cond ((zero? (rand-vu-int-range 0 2)) - (ja-no-eval :group! flamer-shoot1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flamer-shoot1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flamer-shoot1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! flamer-shoot-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flamer-shoot-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flamer-shoot-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc index 6383856e771..e66be0f3932 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc @@ -186,7 +186,7 @@ ) ) ) - :code (the-as (function none :behavior hover-enemy-manager) sleep-code) + :code sleep-code :post hover-enemy-manager-post ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc index cacac2d4791..3a783dd8571 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc @@ -393,10 +393,7 @@ (cond ((-> self restart-fly-anims) (ja-channel-push! 3 (seconds 0.2)) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) (-> self fly-anim-speed)) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self fly-anim-speed)) :frame-num 0.0) (let ((a0-4 (-> self skel root-channel 1))) (let ((f0-4 0.0)) (set! (-> a0-4 frame-interp 1) f0-4) @@ -670,21 +667,12 @@ ;; failed to figure out what this is: (defstate knocked-recover (hover-enemy) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hover-enemy) enemy-event-handler) + :event enemy-event-handler :code (behavior () (local-vars (v1-38 enemy-flag) (v1-46 enemy-flag)) (ja-channel-push! 1 (seconds 0.5)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info knocked-land-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info knocked-land-anim))) - frames - num-frames - ) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -801,16 +789,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self flying-death-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self flying-death-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self flying-death-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc index 963691e4655..b0b0acb78ba 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc @@ -664,7 +664,7 @@ ) ) ) - :code (the-as (function none :behavior hover-formation) sleep-code) + :code sleep-code :post (behavior () (set-anchor-proc (-> self formation) (process->handle *target*)) (hover-formation-control-method-14 (-> self formation)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc index 320811250de..4253c1cdeba 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc @@ -34,7 +34,7 @@ ;; failed to figure out what this is: (defstate idle (nav-network-control) :virtual #t - :code (the-as (function none :behavior nav-network-control) sleep-code) + :code sleep-code :post (behavior () (nav-network-method-29 (-> self nav-network)) (nav-network-method-27 (-> self nav-network)) 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 eca1f052079..03c24ccd36a 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 @@ -684,7 +684,7 @@ ) ) ) - :code (the-as (function none :behavior wasp) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -710,7 +710,7 @@ (go-virtual shoot-bridge-hold) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (hover-nav-control-method-11 (-> self hover) (the-as vector #f)) (hover-enemy-dest-post) @@ -727,7 +727,7 @@ ) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (hover-nav-control-method-11 (-> self hover) (the-as vector #f)) (hover-enemy-dest-post) @@ -762,7 +762,7 @@ ) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self focus-pos quad)) @@ -812,13 +812,7 @@ (ja-channel-push! 1 (seconds 0.2)) (sound-play "wasp-warn" :position (-> self root trans)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -892,7 +886,7 @@ (go empty-state) ) ) - :code (the-as (function none :behavior wasp) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (if (not (hover-nav-control-method-23 (-> self hover))) (hover-nav-control-method-11 (-> self hover) (the-as vector #f)) @@ -969,13 +963,7 @@ (ja-channel-push! 1 (seconds 0.2)) (sound-play "wasp-warn" :position (-> self root trans)) (ja-no-eval :group! (-> self draw art-group data (-> self hover-info shoot-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self hover-info shoot-anim))) frames num-frames) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -1012,20 +1000,11 @@ ;; failed to figure out what this is: (defstate knocked-recover (wasp) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior wasp) enemy-event-handler) + :event enemy-event-handler :code (behavior () (local-vars (v1-35 enemy-flag) (v1-43 enemy-flag)) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-recover-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-recover-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1063,7 +1042,7 @@ ;; failed to figure out what this is: (defstate die-explode (wasp) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior wasp) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (set! (-> self hit-points) 0) @@ -1125,7 +1104,7 @@ ;; failed to figure out what this is: (defstate die-now (wasp) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior wasp) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (let ((v1-3 (-> self root root-prim))) @@ -1143,7 +1122,7 @@ (send-event self 'death-end) (cleanup-for-death self) ) - :post (the-as (function none :behavior wasp) transform-post) + :post transform-post ) ;; definition for method 107 of type wasp diff --git a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc index 4c410d519ad..33ba7d557b2 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc @@ -642,10 +642,7 @@ (gp-0 (new 'stack-no-clear 'vector)) ) (ja :group! (-> self draw art-group data (-> *metalmonk-global-info* notice-anim (get-rand-int self 2)))) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a1-4 (-> self nav state))) (set! (-> gp-0 quad) (-> a1-4 travel quad)) @@ -731,10 +728,7 @@ ) ) (dotimes (s4-0 s5-0) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -754,15 +748,9 @@ (a1-16 (-> self draw art-group data (-> *metalmonk-global-info* idle-anim v1-62))) ) (set! gp-1 (ash 1 v1-62)) - (ja-no-eval :group! a1-16 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-16) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-16 :num! (seek! max f30-0) :frame-num 0.0) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -787,7 +775,7 @@ ;; failed to figure out what this is: (defstate attack (metalmonk) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior metalmonk) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (metalmonk-method-180 self #t) @@ -836,10 +824,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! s5-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-0 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-focus)) @@ -854,7 +839,7 @@ ) ) ) - :post (the-as (function none :behavior metalmonk) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: @@ -893,10 +878,7 @@ (ja :group! (-> self draw art-group data (-> *metalmonk-global-info* celebrate-anim (get-rand-int self 2)))) (ja :num-func num-func-identity :frame-num 0.0) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc index a899e698455..13f3cabad49 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc @@ -1000,7 +1000,7 @@ ;; failed to figure out what this is: (defstate backup (spyder) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior spyder) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1022,16 +1022,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (until #f - (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info run-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info run-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/common/entities/cty-guard-turret-button_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/cty-guard-turret-button_REF.gc index 115f56a517a..5aec2e9582e 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/cty-guard-turret-button_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/cty-guard-turret-button_REF.gc @@ -124,13 +124,7 @@ (defstate pop-up (cty-guard-turret-button) :virtual #t :code (behavior () - (ja-no-eval :group! cty-guard-turret-button-pop-up-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim cty-guard-turret-button-pop-up-ja) frames num-frames) -1)) - 0.4 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! cty-guard-turret-button-pop-up-ja :num! (seek! max 0.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4)) @@ -175,7 +169,3 @@ (press! self #t) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/common/entities/fort-floor-spike_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/fort-floor-spike_REF.gc index b6c1b93b837..4448f221df6 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/fort-floor-spike_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/fort-floor-spike_REF.gc @@ -178,7 +178,7 @@ (set! (-> self no-overlap-timer) (the-as uint 0)) 0 ) - :code (the-as (function none :behavior fort-floor-spike) sleep-code) + :code sleep-code :post (behavior () (dotimes (gp-0 (-> self spike-dim 0)) (let ((s5-0 (-> self spike-row data gp-0))) diff --git a/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc index 4507f19416a..e867e13ae12 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc @@ -560,7 +560,7 @@ (go-virtual open-guns) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post (behavior () (set! (-> self y-offset) (seek-ease (-> self y-offset) @@ -604,7 +604,7 @@ (go-virtual dormant-aware) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self y-offset) -81920.0 (* 49152.0 (seconds-per-frame))) (let ((f30-0 (- 1.0 (fabs (* 0.000012207031 (-> self y-offset)))))) @@ -653,14 +653,7 @@ ) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -712,10 +705,7 @@ (sound-play "buoy-guns-in") (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) - (ja-no-eval :group! gun-buoy-close-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim gun-buoy-close-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gun-buoy-close-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -796,7 +786,7 @@ ) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post (behavior () (sound-play "buoy-alarm" :id (-> self warning-id)) (when *sound-player-enable* @@ -855,7 +845,7 @@ ) ) ) - :code (the-as (function none :behavior gun-buoy) sleep-code) + :code sleep-code :post gun-buoy-chase-post ) @@ -922,10 +912,7 @@ (let ((t0-0 (-> *gun-buoy-victory-speech* *gun-buoy-victory-index*))) (set! (-> self voice-id) (add-process *gui-control* self (gui-channel guard) (gui-action play) t0-0 -99.0 0)) ) - (ja-no-eval :group! gun-buoy-close-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim gun-buoy-close-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gun-buoy-close-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc index 6265334df9c..ba0951df33c 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc @@ -940,7 +940,7 @@ ;; failed to figure out what this is: (defstate attack (spydroid) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior spydroid) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self hit-target) #f) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -1052,8 +1052,8 @@ ) ) ) - :code (the-as (function none :behavior spydroid) sleep-code) - :post (the-as (function none :behavior spydroid) nav-enemy-chase-post) + :code sleep-code + :post nav-enemy-chase-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc index fcbef0a64f3..2f01e113ef7 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc @@ -1402,7 +1402,7 @@ (defstate active (race-manager) :virtual #t :event race-manager-event-handler - :code (the-as (function none :behavior race-manager) sleep-code) + :code sleep-code :post (behavior () (update self) (let ((gp-0 (-> self race-state racer-array (-> self race-state i-player))) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc index b0bcb4b832a..0e13e7d5769 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc @@ -43,10 +43,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -54,7 +51,7 @@ ) #f ) - :post (the-as (function none :behavior race-signal-banner) ja-post) + :post ja-post ) ;; definition for function race-signal-banner-init-by-other @@ -199,7 +196,7 @@ (defstate idle (race-signal) :virtual #t :event race-signal-event-handler - :code (the-as (function none :behavior race-signal) sleep-code) + :code sleep-code :post (behavior () (race-signal-method-29 self) ) @@ -621,28 +618,19 @@ ;; failed to figure out what this is: (defstate taunt (stadium-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior stadium-racer) - vehicle-rider-event-handler - ) + :event vehicle-rider-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.05)) (cond ((zero? (rand-vu-int-count 2)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -790,7 +778,7 @@ ) ) ) - :code (the-as (function none :behavior turbo-pickup) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) 0 diff --git a/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc b/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc index 8597e12e897..7003720ea24 100644 --- a/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc @@ -968,10 +968,7 @@ ;; failed to figure out what this is: (defstate waiting-race (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self flags) (rigid-body-object-flag ignition)) @@ -1011,8 +1008,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle-racer) #f) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :trans #f + :code sleep-code :post (behavior () (when (logtest? (-> self flags) (rigid-body-object-flag waiting-for-player)) (set! (-> self camera-dist2) (vector-vector-distance-squared (-> self root trans) (camera-pos))) @@ -1030,17 +1027,14 @@ ;; failed to figure out what this is: (defstate waiting-for-start (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self damage-factor) (-> self info damage-factor)) (vehicle-method-143 self) (logior! (-> self flags) (rigid-body-object-flag ignition)) ) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :code sleep-code :post (behavior () (vector-reset! (-> self target-acceleration)) (logclear! (-> self flags) (rigid-body-object-flag player-impulse-force player-contact-force)) @@ -1058,10 +1052,7 @@ ;; failed to figure out what this is: (defstate racing (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self flags) (rigid-body-object-flag riding ignition)) @@ -1090,8 +1081,8 @@ ) ) ) - :trans (the-as (function none :behavior vehicle-racer) #f) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-racer-method-152 self) ) @@ -1100,10 +1091,7 @@ ;; failed to figure out what this is: (defstate race-finished (vehicle-racer) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior vehicle-racer) - vehicle-event-handler - ) + :event vehicle-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self flags) (the-as @@ -1115,8 +1103,8 @@ (set! (-> self controls brake) 0.0) (set! (-> self controls steering) 0.0) ) - :trans (the-as (function none :behavior vehicle-racer) #f) - :code (the-as (function none :behavior vehicle-racer) sleep-code) + :trans #f + :code sleep-code :post (behavior () (vehicle-racer-method-155 self) ) diff --git a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc index 1f62d3a28f1..e16d0e0a95e 100644 --- a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc @@ -274,8 +274,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-sew-gold-key sew-gold-key 0 2 - ((1 (meters 200))) +(defskelgroup skel-sew-gold-key sew-gold-key sew-gold-key-lod0-jg sew-gold-key-idle-ja + ((sew-gold-key-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) @@ -381,10 +381,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -392,7 +389,7 @@ ) #f ) - :post (the-as (function none :behavior metalkor-highres) ja-post) + :post ja-post ) ;; definition for method 11 of type metalkor-highres @@ -1312,8 +1309,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-shard mtn-shard 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-shard mtn-shard mtn-shard-lod0-jg mtn-shard-idle-ja + ((mtn-shard-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.5) :origin-joint-index 3 ) @@ -1326,8 +1323,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-gear-device-gear mtn-gear-device-gear 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-gear-device-gear mtn-gear-device-gear mtn-gear-device-gear-lod0-jg mtn-gear-device-gear-idle-ja + ((mtn-gear-device-gear-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.5) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc index a2491f2507b..43428b05a75 100644 --- a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc @@ -547,7 +547,7 @@ ;; failed to figure out what this is: (defstate hidden (warp-gate) :virtual #t - :code (the-as (function none :behavior warp-gate) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1123,10 +1123,7 @@ This commonly includes things such as: (set! (-> v1-80 prim-core collide-as) (-> self control backup-collide-as)) (set! (-> v1-80 prim-core collide-with) (-> self control backup-collide-with)) ) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))) - :frame-num (ja-aframe 50.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num (ja-aframe 50.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/consite/consite-obs_REF.gc b/test/decompiler/reference/jak2/levels/consite/consite-obs_REF.gc index 13a3906157f..7a62b14f4ce 100644 --- a/test/decompiler/reference/jak2/levels/consite/consite-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/consite/consite-obs_REF.gc @@ -35,7 +35,7 @@ ;; failed to figure out what this is: (defstate idle (consite-break-scaffold) :virtual #t - :code (the-as (function none :behavior consite-break-scaffold) sleep-code) + :code sleep-code ) ;; definition for method 11 of type consite-break-scaffold @@ -108,10 +108,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -119,7 +116,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior consite-bomb-elevator-hinges) ja-post) + :post ja-post ) ;; definition for method 11 of type consite-bomb-elevator-hinges @@ -199,10 +196,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -210,7 +204,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior consite-bomb-elevator) ja-post) + :post ja-post ) ;; definition for method 11 of type consite-bomb-elevator @@ -296,10 +290,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -307,7 +298,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior consite-silo-doors) ja-post) + :post ja-post ) ;; definition for method 11 of type consite-silo-doors 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 4d1b137a1a0..229f8ad95c7 100644 --- a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc @@ -1134,7 +1134,7 @@ ) ) ) - :code (the-as (function symbol none :behavior target) sleep-code) + :code (the-as (function symbol object) sleep-code) :post target-no-move-post ) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc index 16c9280b7d8..3f29c230375 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc @@ -635,21 +635,17 @@ ) (cond ((-> self b) - (ja :group! dig-digger-idle-ja - :num! (identity (the float (+ (-> (the-as art-joint-anim dig-digger-idle-ja) frames num-frames) -1))) - ) + (ja :group! dig-digger-idle-ja :num! max) (setup-masks (-> self draw) 0 2) ) (else - (ja :group! dig-digger-idle-ja - :num! (identity (the float (+ (-> (the-as art-joint-anim dig-digger-idle-ja) frames num-frames) -1))) - ) + (ja :group! dig-digger-idle-ja :num! max) (setup-masks (-> self draw) 0 2) ) ) (ja-post) ) - :code (the-as (function none :behavior dig-clasp) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -697,8 +693,8 @@ (go-virtual broken) ) ) - :code (the-as (function none :behavior dig-clasp) sleep-code) - :post (the-as (function none :behavior dig-clasp) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -725,7 +721,7 @@ :enter (behavior () (ja-post) ) - :code (the-as (function none :behavior dig-clasp) sleep-code) + :code sleep-code ) ;; definition for method 11 of type dig-clasp @@ -1106,8 +1102,8 @@ This commonly includes things such as: :trans (behavior () (dig-tether-method-24 self) ) - :code (the-as (function none :behavior dig-tether) sleep-code) - :post (the-as (function none :behavior dig-tether) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1150,8 +1146,8 @@ This commonly includes things such as: (ja :num-func num-func-identity :frame-num (* 10.0 (-> self frame value))) ) ) - :code (the-as (function none :behavior dig-tether) sleep-code) - :post (the-as (function none :behavior dig-tether) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 7 of type dig-tether @@ -1503,7 +1499,7 @@ This commonly includes things such as: (spawn (-> self part) (-> self root trans)) ) ) - :code (the-as (function none :behavior dig-digger) sleep-code) + :code sleep-code :post (behavior () (transform-post) (dig-digger-method-24 self) @@ -1528,7 +1524,7 @@ This commonly includes things such as: ) (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior dig-digger) sleep-code) + :code sleep-code ) ;; definition for method 10 of type dig-digger diff --git a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc index 7fe287de157..9fcf94562ad 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc @@ -618,7 +618,7 @@ (defstate idle (dig-log) :virtual #t :event dig-log-event-handler - :code (the-as (function none :behavior dig-log) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -730,7 +730,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior dig-log) transform-post) + :post transform-post ) ;; definition for method 11 of type dig-log diff --git a/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc index 6d2c36b33d8..84fe4fc73bf 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc @@ -510,123 +510,69 @@ (while (< (current-time) (-> self wait-time)) (suspend) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-1 (current-time))) (until (>= (- (current-time) gp-1) (seconds 0.5)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-2 (current-time))) (until (>= (- (current-time) gp-2) (seconds 0.5)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-3 (current-time))) (until (>= (- (current-time) gp-3) (seconds 0.5)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - 0.375 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.375) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.375)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-4 (current-time))) (until (>= (- (current-time) gp-4) (seconds 0.25)) (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - 0.4375 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.4375) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4375)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((gp-5 (current-time))) (until (>= (- (current-time) gp-5) (seconds 0.125)) (suspend) ) ) (dotimes (gp-6 12) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) - 0.437 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.437) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.437)) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (let ((s5-0 (current-time))) (until (>= (- (current-time) s5-0) (seconds 0.05)) (suspend) @@ -989,7 +935,7 @@ ) ) ) - :code (the-as (function none :behavior dig-bomb-crate) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc index 3da7979f6eb..c3461cd4bc4 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc @@ -287,7 +287,7 @@ ;; failed to figure out what this is: (defstate idle (dig-spikey-step) :virtual #t - :trans (the-as (function none :behavior dig-spikey-step) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 (current-time))) (until (>= (- (current-time) gp-0) (the int (-> self cycle-offset))) @@ -749,7 +749,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior dig-spikey-sphere-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -790,17 +790,14 @@ This commonly includes things such as: ) ) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual idle) ) - :post (the-as (function none :behavior dig-spikey-sphere-door) ja-post) + :post ja-post ) ;; definition for method 11 of type dig-spikey-sphere-door @@ -1020,7 +1017,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior dig-balloon-lurker-trapeze) ja-post) + :post ja-post ) ;; definition for method 21 of type dig-balloon-lurker-trapeze @@ -1308,7 +1305,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior dig-balloon-lurker) transform-post) + :post transform-post ) ;; definition of type dig-wheel-step @@ -1355,10 +1352,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) (-> self anim-speed)) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max (-> self anim-speed)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max (-> self anim-speed))) @@ -1366,7 +1360,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior dig-wheel-step) rider-post) + :post rider-post ) ;; definition for method 10 of type dig-wheel-step @@ -1564,8 +1558,8 @@ This commonly includes things such as: ) (rigid-body-object-event-handler proc argc message block) ) - :trans (the-as (function none :behavior dig-tipping-rock) rider-trans) - :code (the-as (function none :behavior dig-tipping-rock) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (rigid-body-object-method-37 self) ) @@ -1855,8 +1849,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior dig-stomp-block) sleep-code) - :post (the-as (function none :behavior dig-stomp-block) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1881,7 +1875,7 @@ This commonly includes things such as: (send-event (ppointer->process (-> self parent)) 'clear-flag) (go-virtual waiting) ) - :post (the-as (function none :behavior dig-stomp-block) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -2144,7 +2138,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior dig-stomp-block-controller) sleep-code) + :code sleep-code :post (behavior () (dotimes (v1-0 4) (when (-> self stomp-blocks v1-0) @@ -2232,7 +2226,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (dig-totem) :virtual #t - :code (the-as (function none :behavior dig-totem) sleep-code) + :code sleep-code ) ;; definition for method 11 of type dig-totem diff --git a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc index 4dfba0a3526..7f1c555a10b 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc @@ -1286,16 +1286,13 @@ This commonly includes things such as: (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 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) - :post (the-as (function none :behavior drill-barons-ship-explode) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/drill/drill-mech-master_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-mech-master_REF.gc index 724525e76bd..6f5969ea81e 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-mech-master_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-mech-master_REF.gc @@ -182,7 +182,7 @@ (talker-spawn-func (-> *talker-speech* 182) *entity-pool* (target-pos 0) (the-as region #f)) ) ) - :code (the-as (function none :behavior drill-mech-master) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc index 21fcc46dcbb..db36e8885cf 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc @@ -79,19 +79,19 @@ ) ) ) - :trans (the-as (function none :behavior drill-flip-step) plat-trans) + :trans plat-trans :code (behavior () (ja-channel-push! 1 0) (ja :group! (-> self draw art-group data 3) :num! min) (sleep-code) ) - :post (the-as (function none :behavior drill-flip-step) plat-post) + :post plat-post ) ;; failed to figure out what this is: (defstate swing-down (drill-flip-step) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior drill-flip-step) plat-event) + :event plat-event :enter (behavior () (process-entity-status! self (entity-perm-status bit-12) #f) ) @@ -104,23 +104,20 @@ ) :code (behavior () (logclear! (-> self root root-prim prim-core action) (collide-action rideable)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.75) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.75) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.75)) ) (go-virtual down) ) - :post (the-as (function none :behavior drill-flip-step) plat-post) + :post plat-post ) ;; failed to figure out what this is: (defstate swing-up (drill-flip-step) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior drill-flip-step) plat-event) + :event plat-event :enter (behavior () (process-entity-status! self (entity-perm-status bit-12) #t) ) @@ -132,17 +129,14 @@ (plat-trans) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual up) ) - :post (the-as (function none :behavior drill-flip-step) plat-post) + :post plat-post ) ;; definition for method 31 of type drill-flip-step @@ -323,7 +317,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior drill-falling-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -339,16 +333,7 @@ This commonly includes things such as: (until #f (when (!= (-> self hit-state) (-> self next-hit-state)) (ja-no-eval :group! (-> self draw art-group data (-> *drill-falling-door-anim-table* (-> self hit-state))) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> *drill-falling-door-anim-table* (-> self hit-state)))) - frames - num-frames - ) - -1 - ) - ) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -387,15 +372,10 @@ This commonly includes things such as: (process-entity-status! self (entity-perm-status bit-12) #t) (cond (arg0 - (ja :group! (-> self draw art-group data 6) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 6) :num! max) ) (else - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -404,7 +384,7 @@ This commonly includes things such as: ) (sleep-code) ) - :post (the-as (function none :behavior drill-falling-door) transform-post) + :post transform-post ) ;; definition for method 11 of type drill-falling-door @@ -515,17 +495,14 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior drill-sliding-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate open (drill-sliding-door) :virtual #t :code (behavior () - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -669,10 +646,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -726,10 +700,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -737,7 +708,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-breakable-barrel) ja-post) + :post ja-post ) ;; definition for method 11 of type drill-breakable-barrel @@ -840,10 +811,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) (rand-vu-float-range 0.8 1.2)) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max (rand-vu-float-range 0.8 1.2)) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max (rand-vu-float-range 0.8 1.2))) @@ -851,7 +819,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-metalhead-eggs) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -1315,10 +1283,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1326,7 +1291,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-bridge-shot) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -1383,24 +1348,19 @@ This commonly includes things such as: (-> gp-1 ppointer) ) ) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (suspend) (logior! (-> self mask) (process-mask sleep)) (suspend) 0 ) - :post (the-as (function none :behavior drill-bridge-shot) transform-post) + :post transform-post ) ;; definition for method 11 of type drill-bridge-shot @@ -1500,10 +1460,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1511,7 +1468,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior drill-drill) ja-post) + :post ja-post ) ;; definition for method 11 of type drill-drill diff --git a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc index d403a94a770..74599503049 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc @@ -171,8 +171,8 @@ and translate the platform via the `smush` (logior! (-> self root root-prim prim-core action) (collide-action rideable)) ) :trans drill-plat-falling-trans - :code (the-as (function none :behavior drill-plat-falling) sleep-code) - :post (the-as (function none :behavior drill-plat-falling) plat-post) + :code sleep-code + :post plat-post ) ;; failed to figure out what this is: @@ -185,17 +185,14 @@ and translate the platform via the `smush` (drill-plat-falling-trans) ) :code (behavior () - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual idle) ) - :post (the-as (function none :behavior drill-plat-falling) plat-post) + :post plat-post ) ;; definition for method 11 of type drill-plat-falling @@ -354,10 +351,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -372,10 +366,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (ja-channel-push! 1 0) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (sound-play "drill-elevator" :id (-> self sound-id) :position (-> self root trans)) (suspend) @@ -388,10 +379,7 @@ This commonly includes things such as: ) (sound-stop (-> self sound-id)) (sound-play "d-elev-fence-dn" :position (-> self root trans)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -868,7 +856,7 @@ For example for an elevator pre-compute the distance between the first and last (find-overlapping-shapes (-> self root) a1-0) ) ) - :code (the-as (function none :behavior fire-floor) sleep-code) + :code sleep-code :post (behavior () (let ((f28-0 (+ -8192.0 (-> self size 0))) (f30-0 (+ -8192.0 (-> self size 1))) @@ -1706,7 +1694,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior drill-laser) sleep-code) + :code sleep-code ) ;; definition for method 11 of type drill-laser diff --git a/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc index ad70a1941bc..6d986fed32e 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc @@ -634,9 +634,7 @@ (when (not arg0) (spawn-explode-part self) (ja-no-eval :group! (get-art-by-name (-> self draw art-group) "break" art-joint-anim) - :num! (seek! - (the float (+ (-> (get-art-by-name (-> self draw art-group) "break" art-joint-anim) frames num-frames) -1)) - ) + :num! (seek!) :frame-num 0.0 ) (until (ja-done? 0) @@ -645,11 +643,7 @@ (ja :num! (seek!)) ) ) - (ja :group! (get-art-by-name (-> self draw art-group) "break" art-joint-anim) - :num! (identity - (the float (+ (-> (get-art-by-name (-> self draw art-group) "break" art-joint-anim) frames num-frames) -1)) - ) - ) + (ja :group! (get-art-by-name (-> self draw art-group) "break" art-joint-anim) :num! max) (transform-post) (sleep-code) ) @@ -695,7 +689,7 @@ (deactivate (-> self child 0)) ) ) - :code (the-as (function none :behavior drill-control-panel) sleep-code) + :code sleep-code :post (behavior () (spawn-with-cspace (-> self part) (the-as cspace (-> self node-list data))) (sound-play "small-panel" :id (-> self idle-sound-id)) @@ -855,19 +849,14 @@ This commonly includes things such as: :code (behavior ((arg0 symbol)) (when (not arg0) (spawn-explode-part self) - (ja-no-eval :group! (-> self draw art-group data 9) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 9) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 9) :num! max) (transform-post) (sleep-code) ) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc index e2bac58e258..4e79bae2d8c 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc @@ -850,7 +850,7 @@ (ja-abort-spooled-anim (-> self anim) (the-as art-joint-anim #f) -1) ) :trans (-> (method-of-type drill-wall idle) trans) - :post (the-as (function none :behavior drill-wall) transform-post) + :post transform-post ) ;; definition for method 11 of type drill-wall @@ -1057,7 +1057,7 @@ This commonly includes things such as: (ja-abort-spooled-anim (-> self anim) (the-as art-joint-anim #f) -1) ) :trans (-> (method-of-type drill-crane idle) trans) - :post (the-as (function none :behavior drill-crane) transform-post) + :post transform-post ) ;; definition for method 11 of type drill-crane diff --git a/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc index f2865e0d932..0cb025a4e86 100644 --- a/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc @@ -357,10 +357,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc index 9698dc2d6f8..b181dedfe72 100644 --- a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc @@ -652,7 +652,7 @@ ) (ginsu-method-182 self) ) - :code (the-as (function none :behavior ginsu) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -691,7 +691,7 @@ ) (ginsu-method-182 self) ) - :code (the-as (function none :behavior ginsu) sleep-code) + :code sleep-code :post (behavior () (let ((s5-0 (ginsu-method-181 self (new 'stack-no-clear 'vector))) (gp-0 (new-stack-vector0)) @@ -732,7 +732,7 @@ ;; failed to figure out what this is: (defstate anticipate-attack (ginsu) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -769,7 +769,7 @@ ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior ginsu) sleep-code) + :code sleep-code :post (behavior () (let ((gp-0 (ginsu-method-181 self (new 'stack-no-clear 'vector)))) (set! (-> gp-0 y) 0.0) @@ -794,7 +794,7 @@ ;; failed to figure out what this is: (defstate attack (ginsu) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (ginsu-method-183 self #t) @@ -841,8 +841,8 @@ (go-virtual circling) ) ) - :code (the-as (function none :behavior ginsu) sleep-code) - :post (the-as (function none :behavior ginsu) nav-enemy-chase-post) + :code sleep-code + :post nav-enemy-chase-post ) ;; failed to figure out what this is: @@ -888,8 +888,8 @@ (ja :num! (loop!)) ) ) - :code (the-as (function none :behavior ginsu) sleep-code) - :post (the-as (function none :behavior ginsu) enemy-simple-post) + :code sleep-code + :post enemy-simple-post ) ;; definition for function ginsu-sounds-off diff --git a/test/decompiler/reference/jak2/levels/forest/fish_REF.gc b/test/decompiler/reference/jak2/levels/forest/fish_REF.gc index 7237a74b193..3df4dded561 100644 --- a/test/decompiler/reference/jak2/levels/forest/fish_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/fish_REF.gc @@ -70,10 +70,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) 5.0) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 5.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 5.0)) @@ -81,7 +78,7 @@ ) #f ) - :post (the-as (function none :behavior minnow) ja-post) + :post ja-post ) ;; definition of type fish @@ -153,7 +150,7 @@ (format #t "training-manager received event ~s~%" message) (format #t "event-from ~s~%" proc) ) - :code (the-as (function none :behavior fish-manager) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-448 (function vector vector float vector)) diff --git a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc index f2f911ad630..f145b3f1ec0 100644 --- a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc @@ -265,10 +265,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! (-> self draw art-group data 11) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -311,30 +308,21 @@ This commonly includes things such as: (let ((v1-5 (vector-inv-orient-by-quat! (new 'stack-no-clear 'vector) (-> self hit-dir) (-> self root quat)))) (cond ((< (-> v1-5 x) (-> v1-5 z)) - (ja-no-eval :group! (-> self draw art-group data 12) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((< (-> v1-5 x) 0.0) - (ja-no-eval :group! (-> self draw art-group data 13) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 13)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 13) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 14) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 14)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 14) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -372,18 +360,12 @@ This commonly includes things such as: (set! (-> gp-0 y) (lerp 20480.0 40960.0 f30-0)) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -419,7 +401,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate dormant (forest-youngsamos) :virtual #t - :code (the-as (function none :behavior forest-youngsamos) sleep-code) + :code sleep-code ) ;; definition for function forest-youngsamos-bounce-reaction diff --git a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc index 4308beeadae..c7f95847fbf 100644 --- a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc @@ -781,10 +781,7 @@ The faster it's moving the fast it flaps it's wings, etc (defstate pegasus-debug (pegasus) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((cam-dbg-vec (new 'stack-no-clear 'vector))) (let ((vec (new 'stack-no-clear 'vector))) @@ -816,7 +813,7 @@ The faster it's moving the fast it flaps it's wings, etc ) #f ) - :post (the-as (function none :behavior pegasus) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -832,10 +829,7 @@ The faster it's moving the fast it flaps it's wings, etc (let ((event-result (send-event-function (handle->process (-> self incoming attacker-handle)) evt))) (-> self speed) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! pegasus-board-attack-pegasus-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim pegasus-board-attack-pegasus-ja) frames num-frames) -1)) 1.5) - :frame-num 0.0 - ) + (ja-no-eval :group! pegasus-board-attack-pegasus-ja :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (let ((frame-num (ja-aframe-num 0)) (speed (-> self speed)) @@ -905,7 +899,7 @@ The faster it's moving the fast it flaps it's wings, etc ) #f ) - :post (the-as (function none :behavior pegasus) enemy-simple-post) + :post enemy-simple-post ) ;; definition for function pegasus-fly-code @@ -1069,7 +1063,7 @@ The faster it's moving the fast it flaps it's wings, etc ;; failed to figure out what this is: (defstate pegasus-tired (pegasus) - :event (the-as (function process int symbol event-message-block object :behavior pegasus) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((func (-> (method-of-type enemy flee) enter))) (if func @@ -1186,10 +1180,7 @@ The faster it's moving the fast it flaps it's wings, etc (let ((anim-group (ja-group))) (when (not (and anim-group (= anim-group pegasus-idle-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! pegasus-fly-to-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim pegasus-fly-to-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! pegasus-fly-to-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1239,14 +1230,7 @@ The faster it's moving the fast it flaps it's wings, etc (let ((anim-length (get-rand-float-range self 0.8 1.2))) (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - anim-length - ) + :num! (seek! max anim-length) :frame-num 0.0 ) (until (ja-done? 0) @@ -1257,13 +1241,7 @@ The faster it's moving the fast it flaps it's wings, etc (suspend) (ja :num! (seek! max anim-length)) ) - (ja-no-eval :group! pegasus-idle-takeoff-in-air-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim pegasus-idle-takeoff-in-air-ja) frames num-frames) -1)) - anim-length - ) - :frame-num 0.0 - ) + (ja-no-eval :group! pegasus-idle-takeoff-in-air-ja :num! (seek! max anim-length) :frame-num 0.0) (until (ja-done? 0) (if (pegasus-calc-speed 61440.0 122880.0 204800.0 49152.0) (react-to-focus self) diff --git a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc index 283bab6a8e2..93f3db8d026 100644 --- a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc @@ -943,10 +943,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! predator-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-idle-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-idle-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -955,13 +952,13 @@ ) #f ) - :post (the-as (function none :behavior predator) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate notice (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (go-virtual hostile) ) @@ -983,7 +980,7 @@ ;; failed to figure out what this is: (defstate fire (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-2 *game-info*) @@ -1010,10 +1007,7 @@ (let ((gp-0 0)) (set! (-> self shoot-angle) (* 182.04445 (rand-vu-float-range -45.0 45.0))) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! predator-shoot-guns0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-shoot-guns0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-shoot-guns0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and (< 9.0 (ja-frame-num 0)) (zero? gp-0)) (set! gp-0 1) @@ -1046,13 +1040,13 @@ (label cfg-26) (go-virtual hide) ) - :post (the-as (function none :behavior predator) enemy-simple-post) + :post enemy-simple-post ) ;; failed to figure out what this is: (defstate close-attack (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set-dangerous! self #t) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -1077,10 +1071,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! predator-close-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-close-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-close-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1089,10 +1080,7 @@ (set! (-> v1-25 speed) 0.0) ) 0 - (ja-no-eval :group! predator-close-attack-recover-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-close-attack-recover-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-close-attack-recover-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1102,13 +1090,13 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior predator) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate hidden (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1148,10 +1136,7 @@ (until #f (ja-channel-push! 1 (seconds 0.2)) (until (logtest? (-> self nav state flags) (nav-state-flag at-target)) - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1159,10 +1144,7 @@ ) (ja-channel-push! 1 (seconds 0.2)) (until (not (logtest? (-> self nav state flags) (nav-state-flag at-target))) - (ja-no-eval :group! predator-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1179,7 +1161,7 @@ ;; failed to figure out what this is: (defstate hide (predator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (nav-enemy-method-166 self) @@ -1230,10 +1212,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1295,19 +1274,13 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 6.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 6.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! predator-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim predator-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! predator-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1733,13 +1706,13 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior predator-manager) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate closed (predator-manager) :virtual #t - :code (the-as (function none :behavior predator-manager) sleep-code) + :code sleep-code ) ;; definition for method 11 of type predator-manager diff --git a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc index 9bb2045def4..798c2353a6b 100644 --- a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc @@ -170,10 +170,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) :code (behavior () (until #f - (ja-no-eval :group! wren-hop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-hop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-hop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -244,10 +241,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (get-point-in-path! (-> self path) (-> self move-dest) f0-0 'interp) ) (logior! (-> self flags) (wren-flags wrflags-1)) - (ja-no-eval :group! wren-peck-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-peck-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-peck-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -321,10 +315,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ) (ja-channel-push! 2 (seconds 0.3)) - (ja-no-eval :group! wren-glide-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-glide-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-glide-ja :num! (seek!) :frame-num 0.0) (let ((a0-4 (-> self skel root-channel 1))) (let ((f0-5 0.0)) (set! (-> a0-4 frame-interp 1) f0-5) @@ -374,10 +365,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (set! (-> self bob-level-seek) 0.0) (ja-channel-push! 1 (seconds 0.3)) (while (!= (-> self path-u) 1.0) - (ja-no-eval :group! wren-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim wren-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! wren-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc index d95de972794..c80d1617c11 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc @@ -62,7 +62,7 @@ ) ) ) - :code (the-as (function none :behavior fort-elec-switch) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -453,7 +453,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior fort-fence) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -492,7 +492,7 @@ This commonly includes things such as: (suspend) 0 ) - :post (the-as (function none :behavior fort-fence) transform-post) + :post transform-post ) ;; definition for method 11 of type fort-fence diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpb-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpb-obs_REF.gc index 6fd2ff2d7a0..e1a1c18e7e4 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpb-obs_REF.gc @@ -37,7 +37,7 @@ ;; failed to figure out what this is: (defstate idle (fort-plat-orbit) :virtual #t - :trans (the-as (function none :behavior fort-plat-orbit) rider-trans) + :trans rider-trans :code (behavior () (until #f (let ((f30-0 (the float (ja-num-frames 0)))) @@ -60,7 +60,7 @@ ) #f ) - :post (the-as (function none :behavior fort-plat-orbit) rider-post) + :post rider-post ) ;; definition for method 11 of type fort-plat-orbit @@ -203,7 +203,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (fort-plat-shuttle-plat) :virtual #t - :trans (the-as (function none :behavior fort-plat-shuttle-plat) rider-trans) + :trans rider-trans :code (behavior () (until (< 1.0 (-> self path-pos)) (suspend) @@ -320,7 +320,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior fort-plat-shuttle) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -336,7 +336,7 @@ This commonly includes things such as: (set! (-> self next-spawn-time) (get-timeframe-offset! (-> self sync) 0)) ) ) - :code (the-as (function none :behavior fort-plat-shuttle) sleep-code) + :code sleep-code ) ;; definition for method 22 of type fort-plat-shuttle diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc index f4daa95fc39..f3ff340c98c 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc @@ -98,7 +98,7 @@ ) ) ) - :code (the-as (function none :behavior fort-dump-bomb-a) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) ) @@ -290,7 +290,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior fort-missile-target) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -560,7 +560,7 @@ This commonly includes things such as: (go-virtual targets-active) ) ) - :code (the-as (function none :behavior fort-missile) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -975,7 +975,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate dormant (fort-missile) :virtual #t - :code (the-as (function none :behavior fort-missile) sleep-code) + :code sleep-code ) ;; definition for method 10 of type fort-missile diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc index b7a21c488a9..52aff854c32 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc @@ -182,7 +182,7 @@ (logior! (-> self draw status) (draw-control-status no-draw)) (set! (-> self transition) 0.0) ) - :code (the-as (function none :behavior fort-roboscreen) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -598,10 +598,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1384,7 +1381,7 @@ (defstate idle (fort-robotank-turret) :virtual #t :event robotank-turret-handler - :code (the-as (function none :behavior fort-robotank-turret) sleep-code) + :code sleep-code :post turret-post ) @@ -1412,10 +1409,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1480,19 +1474,13 @@ (dotimes (s5-2 gp-2) (let ((s4-1 (max 2 (min 4 (rand-vu-int-range 1 8))))) (dotimes (s3-2 s4-1) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (fort-robotank-turret-method-33 self) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc index e5aaaf5aba0..e5beed4f95c 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc @@ -808,7 +808,7 @@ (go-virtual moving) ) ) - :code (the-as (function none :behavior fort-robotank) sleep-code) + :code sleep-code :post fort-robotank-post ) @@ -837,7 +837,7 @@ ) ) ) - :code (the-as (function none :behavior fort-robotank) sleep-code) + :code sleep-code :post (behavior () (fort-robotank-post) ) @@ -1031,7 +1031,7 @@ (go-virtual moving) ) ) - :code (the-as (function none :behavior fort-robotank) sleep-code) + :code sleep-code :post fort-robotank-post ) @@ -1056,7 +1056,7 @@ (suspend) ) ) - :post (the-as (function none :behavior fort-robotank) pusher-post) + :post pusher-post ) ;; definition for method 10 of type fort-robotank diff --git a/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc index a7afbc5ad3c..88b53485f49 100644 --- a/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc @@ -53,19 +53,19 @@ ;; failed to figure out what this is: (defstate plat-idle (fort-lift-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) + :event #f ) ;; failed to figure out what this is: (defstate plat-anim-active (fort-lift-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) + :event #f :enter (behavior () (get-point-at-percent-along-path! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (set! (-> self last-val) 0.0) (set! (-> self sound-time) (get-timeframe-offset! (-> self sync) 0)) ) - :trans (the-as (function none :behavior fort-lift-plat) plat-trans) + :trans plat-trans :code (behavior () (until #f (let ((f30-0 (* (get-current-phase-no-mod (-> self sync)) (the float (+ (-> (ja-group) frames num-frames) -1))))) @@ -94,7 +94,7 @@ ;; failed to figure out what this is: (defstate plat-path-active (fort-lift-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) + :event #f :enter (behavior () (let ((t9-0 (-> (method-of-type plat plat-path-active) enter))) (if t9-0 @@ -115,7 +115,7 @@ (set! (-> self last-val) (-> self path-pos)) (plat-trans) ) - :code (the-as (function none :behavior fort-lift-plat) sleep-code) + :code sleep-code :post (behavior () (when (< (-> self sound-time) (current-time)) (sound-stop (-> self sound-id)) @@ -299,7 +299,7 @@ otherwise, [[plat::34]] ;; failed to figure out what this is: (defstate idle (fort-claw) :virtual #t - :code (the-as (function none :behavior fort-claw) sleep-code) + :code sleep-code :post (behavior () (let ((f30-0 (seek (-> self path-u) (-> self path-dest) (* 0.04 (seconds-per-frame))))) (set! (-> self path-u) f30-0) @@ -326,7 +326,7 @@ otherwise, [[plat::34]] (go-virtual idle) ) ) - :code (the-as (function none :behavior fort-claw) sleep-code) + :code sleep-code ) ;; definition for method 11 of type fort-claw diff --git a/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc b/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc index 7985737ad9e..159d3bff451 100644 --- a/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc @@ -768,7 +768,7 @@ ;; failed to figure out what this is: (defstate attack (fort-turret) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-turret) enemy-event-handler) + :event enemy-event-handler :exit (behavior () (set! (-> self flash-state) #f) ) @@ -792,10 +792,7 @@ ) :code (behavior () (sound-play "turret-up") - (ja-no-eval :group! fort-turret-rise-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fort-turret-rise-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! fort-turret-rise-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -816,10 +813,7 @@ (fort-turret-method-142 self #t gp-2) ) ) - (ja-no-eval :group! fort-turret-shoot-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim fort-turret-shoot-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! fort-turret-shoot-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -856,7 +850,7 @@ ;; failed to figure out what this is: (defstate sweep (fort-turret) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior fort-turret) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) ) @@ -882,7 +876,7 @@ :code (behavior () (sleep-code) ) - :post (the-as (function none :behavior fort-turret) enemy-simple-post) + :post enemy-simple-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc index b28c30be755..c01c1c99210 100644 --- a/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc @@ -81,7 +81,7 @@ ) ) ) - :code (the-as (function none :behavior fort-trap-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -155,7 +155,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior fort-trap-door) ja-post) + :post ja-post ) ;; definition for method 11 of type fort-trap-door diff --git a/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc index aa2b8b35306..f28f9c6ac97 100644 --- a/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc @@ -453,7 +453,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior prsn-cell-door) transform-post) + :post transform-post ) ;; definition for method 11 of type prsn-cell-door @@ -532,10 +532,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -543,7 +540,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior prsn-vent-fan) ja-post) + :post ja-post ) ;; definition for method 11 of type prsn-vent-fan @@ -595,16 +592,10 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (prsn-torture) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior prsn-torture) - dark-lightning-handler - ) + :event dark-lightning-handler :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc index 71fd593b553..7c4041e2180 100644 --- a/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc @@ -67,7 +67,7 @@ ) ) ) - :code (the-as (function none :behavior fort-elec-button) sleep-code) + :code sleep-code ) ;; definition for method 33 of type fort-elec-button diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc index d598feb7d19..eb725e48743 100644 --- a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc @@ -39,8 +39,8 @@ ;; failed to figure out what this is: (defstate idle (fort-twist-rail) :virtual #t - :trans (the-as (function none :behavior fort-twist-rail) rider-trans) - :code (the-as (function none :behavior fort-twist-rail) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (let ((f0-0 (get-norm! (-> self sync) 0))) (quaternion-rotate-y! (-> self root quat) (-> self init-quat) (+ -2730.6667 (* 5461.3335 f0-0))) @@ -228,7 +228,7 @@ This commonly includes things such as: (go-virtual die) ) ) - :code (the-as (function none :behavior fort-elec-belt-inst) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-1696 @@ -547,7 +547,7 @@ This commonly includes things such as: (set! (-> self next-spawn-time) (get-timeframe-offset! (-> self sync) 0)) ) ) - :code (the-as (function none :behavior fort-elec-belt) sleep-code) + :code sleep-code ) ;; definition for method 15 of type fort-elec-belt diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc index a6aebf104c9..d42b5ed00dc 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc @@ -181,7 +181,7 @@ ;; failed to figure out what this is: (defstate idle (training-path) :virtual #t - :code (the-as (function none :behavior training-path) sleep-code) + :code sleep-code :post (behavior () (when *display-path-marks* (let ((gp-0 add-debug-text-3d) @@ -1462,7 +1462,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior training-manager) sleep-code) + :code sleep-code :post (behavior () (send-event (handle->process (-> self hud-score)) 'force-show) (send-event (handle->process (-> self hud-goal)) 'force-show) @@ -2196,7 +2196,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior training-manager) sleep-code) + :code sleep-code ) ;; definition for method 28 of type training-manager @@ -2338,8 +2338,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior gungame-door) sleep-code) - :post (the-as (function none :behavior gungame-door) transform-post) + :code sleep-code + :post transform-post ) ;; failed to figure out what this is: @@ -2382,10 +2382,7 @@ This commonly includes things such as: (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2398,7 +2395,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior gungame-door) transform-post) + :post transform-post ) ;; definition for method 23 of type gungame-door @@ -2523,7 +2520,7 @@ This commonly includes things such as: (label cfg-12) (go-virtual idle) ) - :post (the-as (function none :behavior gungame-door) transform-post) + :post transform-post ) ;; definition for method 11 of type gungame-door diff --git a/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc b/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc index adaa751a326..a9e12181aa7 100644 --- a/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc @@ -166,10 +166,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -177,7 +174,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior hide-light) ja-post) + :post ja-post ) ;; definition for method 11 of type hide-light diff --git a/test/decompiler/reference/jak2/levels/hiphog/hiphog-obs_REF.gc b/test/decompiler/reference/jak2/levels/hiphog/hiphog-obs_REF.gc index 169ca201e6d..df1133b90e7 100644 --- a/test/decompiler/reference/jak2/levels/hiphog/hiphog-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/hiphog/hiphog-obs_REF.gc @@ -35,8 +35,8 @@ ;; failed to figure out what this is: (defstate idle (hip-trophy-a) :virtual #t - :code (the-as (function none :behavior hip-trophy-a) sleep-code) - :post (the-as (function none :behavior hip-trophy-a) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-a @@ -98,8 +98,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-trophy-d) :virtual #t - :code (the-as (function none :behavior hip-trophy-d) sleep-code) - :post (the-as (function none :behavior hip-trophy-d) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-d @@ -161,8 +161,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-trophy-f) :virtual #t - :code (the-as (function none :behavior hip-trophy-f) sleep-code) - :post (the-as (function none :behavior hip-trophy-f) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-f @@ -224,8 +224,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-trophy-g) :virtual #t - :code (the-as (function none :behavior hip-trophy-g) sleep-code) - :post (the-as (function none :behavior hip-trophy-g) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-g @@ -287,8 +287,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-trophy-i) :virtual #t - :code (the-as (function none :behavior hip-trophy-i) sleep-code) - :post (the-as (function none :behavior hip-trophy-i) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-i @@ -350,8 +350,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-trophy-j) :virtual #t - :code (the-as (function none :behavior hip-trophy-j) sleep-code) - :post (the-as (function none :behavior hip-trophy-j) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-j @@ -413,8 +413,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-trophy-n) :virtual #t - :code (the-as (function none :behavior hip-trophy-n) sleep-code) - :post (the-as (function none :behavior hip-trophy-n) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-n @@ -476,8 +476,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-trophy-m) :virtual #t - :code (the-as (function none :behavior hip-trophy-m) sleep-code) - :post (the-as (function none :behavior hip-trophy-m) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type hip-trophy-m diff --git a/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc b/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc index 94de7e7b095..10a6a4a1f59 100644 --- a/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc @@ -116,8 +116,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate hide (hip-whack-a-metal) :virtual #t - :enter (the-as (function none :behavior hip-whack-a-metal) #f) - :exit (the-as (function none :behavior hip-whack-a-metal) #f) + :enter #f + :exit #f :code (behavior () (ja-post) (sleep-code) @@ -211,7 +211,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (hip-mirror) :virtual #t - :code (the-as (function none :behavior hip-mirror) sleep-code) + :code sleep-code :post (behavior () (let* ((f0-0 (vector-vector-distance (math-camera-pos) (-> self root trans))) (f0-1 (lerp-scale 1.0 0.0 f0-0 40960.0 122880.0)) diff --git a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc index 81d68a3f536..63479c025a3 100644 --- a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc +++ b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc @@ -1666,10 +1666,7 @@ ) ) :code (behavior ((arg0 time-frame) (arg1 uint)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1683,10 +1680,7 @@ ) (ja-channel-push! 1 (seconds 0.05)) (sound-play "whack-down") - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2296,10 +2290,7 @@ (when (-> self dizzy?) (sound-play "whack-dizzy") (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (rand-vu-percent? 0.2) (let* ((gp-2 (get-process *default-dead-pool* lightning-tracker #x4000)) @@ -2369,10 +2360,7 @@ 9 :to *entity-pool* ) - (ja-no-eval :group! (-> self draw art-group data 17) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (+! (-> self event-time) (- (current-time) (-> self clock old-frame-counter))) (suspend) @@ -2382,10 +2370,7 @@ (dotimes (v1-85 4) (set! (-> self slot-buffer v1-85) -1) ) - (ja-no-eval :group! (-> self draw art-group data 18) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 18)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (+! (-> self event-time) (- (current-time) (-> self clock old-frame-counter))) (suspend) diff --git a/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc b/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc index 63295130f79..a41de56c037 100644 --- a/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc @@ -89,13 +89,7 @@ (ja-channel-set! 1) (let ((f30-0 (rand-vu-float-range 0.8 1.2))) (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -328,7 +322,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior metalhead-spawner) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -475,10 +469,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -486,7 +477,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior vil-windmill-sail) ja-post) + :post ja-post ) ;; definition for method 11 of type vil-windmill-sail diff --git a/test/decompiler/reference/jak2/levels/mountain/canyon/mincan-obs_REF.gc b/test/decompiler/reference/jak2/levels/mountain/canyon/mincan-obs_REF.gc index e714119be92..77aed346987 100644 --- a/test/decompiler/reference/jak2/levels/mountain/canyon/mincan-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/canyon/mincan-obs_REF.gc @@ -99,10 +99,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -110,7 +107,7 @@ ) #f ) - :post (the-as (function none :behavior mincan-lighthouse-lens) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -119,10 +116,7 @@ :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 8) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 8)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -130,7 +124,7 @@ ) #f ) - :post (the-as (function none :behavior mincan-lighthouse-lens) ja-post) + :post ja-post ) ;; definition for method 11 of type mincan-lighthouse-lens @@ -218,10 +212,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -229,7 +220,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lighthouse) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -238,10 +229,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -249,7 +237,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lighthouse) ja-post) + :post ja-post ) ;; definition for method 11 of type mincan-lighthouse @@ -317,10 +305,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -328,7 +313,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lens) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -337,10 +322,7 @@ This commonly includes things such as: :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -348,7 +330,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-lens) transform-post) + :post transform-post ) ;; definition for method 11 of type mincan-lens @@ -472,10 +454,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -483,7 +462,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mincan-cogs) ja-post) + :post ja-post ) ;; definition for method 11 of type mincan-cogs diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc index f7ac37c2bf3..6fa75de2a5a 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc @@ -29,8 +29,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-iris-door mtn-iris-door 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-iris-door mtn-iris-door mtn-iris-door-lod0-jg mtn-iris-door-idle-ja + ((mtn-iris-door-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 13.5) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc index 0fbddbb5de7..1bc20fb2598 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc @@ -463,8 +463,8 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) - :post (the-as (function none :behavior mtn-dice) transform-post) + :code sleep-code + :post transform-post ) ;; definition for method 26 of type mtn-dice @@ -934,7 +934,7 @@ (when (and (zero? (-> self active)) (dice-wrong-way?)) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) + :code sleep-code :post (behavior () (rider-trans) (if (= (-> self active) 1) @@ -987,7 +987,7 @@ :trans (behavior () '() ) - :code (the-as (function none :behavior mtn-dice) sleep-code) + :code sleep-code :post (behavior () (rider-trans) (rider-post) @@ -1065,7 +1065,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -1098,8 +1098,8 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior mtn-dice) sleep-code) - :post (the-as (function none :behavior mtn-dice) transform-post) + :code sleep-code + :post transform-post ) ;; definition for function dice-joint-callback @@ -1644,14 +1644,14 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (mtn-plat-updown) :virtual #t - :code (the-as (function none :behavior mtn-plat-updown) sleep-code) - :post (the-as (function none :behavior mtn-plat-updown) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: (defstate active (mtn-plat-updown) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mtn-plat-updown) plat-event) + :event plat-event :trans (behavior () (set! (-> self path-pos) (get-norm! (-> self sync) 0)) (get-point-at-percent-along-path! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) @@ -1659,10 +1659,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1670,7 +1667,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mtn-plat-updown) plat-post) + :post plat-post ) ;; definition for method 31 of type mtn-plat-updown @@ -1812,7 +1809,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-plat-eject) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1823,7 +1820,7 @@ This commonly includes things such as: (ja-channel-push! 1 0) (ja-no-eval :group! (-> self draw art-group data 3) :num! (loop!) :frame-num 0.0) ) - :code (the-as (function none :behavior mtn-plat-eject) sleep-code) + :code sleep-code :post (behavior () (let ((gp-1 (vector-! (new 'stack-no-clear 'vector) (-> self dest-pos) (-> self root trans)))) (vector-normalize! gp-1 (* 0.25 (vector-length gp-1))) @@ -1926,8 +1923,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (mtn-plat-long) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mtn-plat-long) plat-event) - :trans (the-as (function none :behavior mtn-plat-long) plat-trans) + :event plat-event + :trans plat-trans :code (behavior () (until #f (let ((f0-1 (* (get-current-phase-no-mod (-> self sync)) (the float (+ (-> (ja-group) frames num-frames) -1)))) @@ -1944,7 +1941,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mtn-plat-long) plat-post) + :post plat-post ) ;; definition for method 31 of type mtn-plat-long @@ -2054,7 +2051,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-gate) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2070,10 +2067,7 @@ This commonly includes things such as: (suspend) ) ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2088,7 +2082,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior mtn-gate) transform-post) + :post transform-post ) ;; definition for method 11 of type mtn-gate @@ -2252,7 +2246,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (mtn-aval-rocks-shadow) :virtual #t - :code (the-as (function none :behavior mtn-aval-rocks-shadow) sleep-code) + :code sleep-code :post (behavior () (let ((s5-0 (-> (the-as process-drawable (-> self parent-ptr 0)) node-list data (-> self parent-joint))) (gp-0 (-> self draw shadow-ctrl)) @@ -2772,8 +2766,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-plat-return mtn-plat-return 0 4 - ((1 (meters 999999))) +(defskelgroup skel-mtn-plat-return mtn-plat-return mtn-plat-return-lod0-jg mtn-plat-return-idle-ja + ((mtn-plat-return-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4.8) ) @@ -2821,8 +2815,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-plat-return) sleep-code) - :post (the-as (function none :behavior mtn-plat-return) plat-post) + :code sleep-code + :post plat-post ) ;; failed to figure out what this is: @@ -2847,7 +2841,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior mtn-plat-return) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self path-pos) (-> self dest-pos) (* (-> self path-speed) (seconds-per-frame))) (get-point-at-percent-along-path! @@ -2890,8 +2884,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-plat-return) sleep-code) - :post (the-as (function none :behavior mtn-plat-return) plat-post) + :code sleep-code + :post plat-post ) ;; definition for method 37 of type mtn-plat-return @@ -2993,7 +2987,7 @@ This commonly includes things such as: :trans (behavior () (plat-trans) ) - :code (the-as (function none :behavior mtn-plat-gap) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self path-pos) (-> self dest-pos) (* (-> self path-speed) (seconds-per-frame))) (get-point-at-percent-along-path! @@ -3027,8 +3021,8 @@ This commonly includes things such as: :trans (behavior () (plat-trans) ) - :code (the-as (function none :behavior mtn-plat-gap) sleep-code) - :post (the-as (function none :behavior mtn-plat-gap) plat-post) + :code sleep-code + :post plat-post ) ;; definition of type mtn-button @@ -3077,25 +3071,22 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior mtn-button) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate open (mtn-button) :virtual #t - :trans (the-as (function none :behavior mtn-button) rider-trans) + :trans rider-trans :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual waiting) ) - :post (the-as (function none :behavior mtn-button) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -3109,13 +3100,10 @@ This commonly includes things such as: ) ) :enter (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (transform-post) ) - :code (the-as (function none :behavior mtn-button) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -3128,19 +3116,14 @@ This commonly includes things such as: (script-eval (the-as pair gp-0) :vector (-> self root trans)) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) (ja :num! (seek!)) ) ) - (ja :group! (-> self draw art-group data 3) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 3) :num! max) (transform-post) (process-entity-status! self (entity-perm-status subtask-complete) #t) (sleep-code) @@ -3254,10 +3237,7 @@ This commonly includes things such as: :code (behavior () (add-process *gui-control* self (gui-channel art-load) (gui-action queue) "mountain-gear-res" -99.0 0) (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (update! (-> self sound)) (suspend) @@ -3266,13 +3246,13 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior mtn-gear-device) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate idle-collapsed (mtn-gear-device) :virtual #t - :code (the-as (function none :behavior mtn-gear-device) transform-and-sleep-code) + :code transform-and-sleep-code ) ;; definition for method 11 of type mtn-gear-device @@ -3504,7 +3484,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate rising (trans-plat) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior trans-plat) plat-event) + :event plat-event :code (behavior () (get-point-at-percent-along-path! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (let ((f30-0 (-> self basetrans y)) @@ -3519,7 +3499,7 @@ This commonly includes things such as: ) (go-virtual waiting) ) - :post (the-as (function none :behavior trans-plat) plat-post) + :post plat-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-scenes_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-scenes_REF.gc index cd053c25c58..efd8a7ae985 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-scenes_REF.gc @@ -1918,8 +1918,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-plat-buried mtn-plat-buried 0 4 - ((1 (meters 999999))) +(defskelgroup skel-mtn-plat-buried mtn-plat-buried mtn-plat-buried-lod0-jg mtn-plat-buried-idle-ja + ((mtn-plat-buried-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4.8) ) @@ -3106,8 +3106,8 @@ otherwise, [[plat::34]] ;; failed to figure out what this is: (defstate idle (mtn-lens) :virtual #t - :code (the-as (function none :behavior mtn-lens) sleep-code) - :post (the-as (function none :behavior mtn-lens) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type mtn-lens @@ -3159,8 +3159,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (mtn-lens-base) :virtual #t - :code (the-as (function none :behavior mtn-lens-base) sleep-code) - :post (the-as (function none :behavior mtn-lens-base) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type mtn-lens-base @@ -3215,7 +3215,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (mtn-lens-floor) :virtual #t - :code (the-as (function none :behavior mtn-lens-floor) transform-and-sleep-code) + :code transform-and-sleep-code :post (behavior () (spawn-with-cspace (-> self part) (-> self node-list data 3)) ) @@ -3224,7 +3224,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle-no-beam (mtn-lens-floor) :virtual #t - :code (the-as (function none :behavior mtn-lens-floor) transform-and-sleep-code) + :code transform-and-sleep-code ) ;; definition for method 11 of type mtn-lens-floor @@ -3296,8 +3296,8 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (mtn-shard) :virtual #t - :code (the-as (function none :behavior mtn-shard) sleep-code) - :post (the-as (function none :behavior mtn-shard) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type mtn-shard diff --git a/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc b/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc index eaa8cf087f6..048252a4856 100644 --- a/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc @@ -104,7 +104,7 @@ ;; failed to figure out what this is: (defstate hit (rhino-wall) :virtual #t - :post (the-as (function none :behavior rhino-wall) transform-post) + :post transform-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc index ed39e6ee920..e6ad48f01b4 100644 --- a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc @@ -895,14 +895,7 @@ (gp-0 #t) ) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -931,14 +924,7 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info hit-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info hit-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -946,10 +932,7 @@ (ja :num! (seek! max f30-0)) ) (let ((gp-0 #t)) - (ja-no-eval :group! rhino-victory-hit2-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-hit2-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-hit2-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (when (and gp-0 (>= (ja-frame-num 0) 5.0)) (activate! *camera-smush-control* 819.2 37 600 1.0 0.1 (-> self clock)) @@ -1168,10 +1151,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.075)) - (ja-no-eval :group! rhino-victory-begin-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-begin-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-begin-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1186,10 +1166,7 @@ (collide-action solid no-standon) ) (until #f - (ja-no-eval :group! rhino-victory-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-loop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1232,10 +1209,7 @@ (set! (-> self attack-id) a0-29) ) (let ((gp-1 #t)) - (ja-no-eval :group! rhino-victory-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-victory-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-victory-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (when (and gp-1 (>= (ja-frame-num 0) 12.0)) (activate! *camera-smush-control* 819.2 37 600 1.0 0.1 (-> self clock)) @@ -1271,7 +1245,7 @@ ;; failed to figure out what this is: (defstate run-away (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (nav-enemy-method-166 self) @@ -1324,10 +1298,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.05)) (until #f - (ja-no-eval :group! rhino-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1470,7 +1441,7 @@ ;; failed to figure out what this is: (defstate attack (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) @@ -1511,10 +1482,7 @@ :code (behavior () (let ((gp-0 #f)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! rhino-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-focus)) (set! gp-0 #t) @@ -1528,7 +1496,7 @@ ) ) ) - :post (the-as (function none :behavior rhino) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; definition for method 142 of type rhino @@ -1549,7 +1517,7 @@ ;; failed to figure out what this is: (defstate stop-run (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((gp-0 (new 'stack-no-clear 'vector))) (new 'stack-no-clear 'vector) @@ -1605,10 +1573,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! rhino-skid-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-skid-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-skid-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self skid-speed) (fmax 0.0 (- (-> self skid-speed) (* 32768.0 (seconds-per-frame))))) (suspend) @@ -1641,10 +1606,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data v1-30) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data v1-30)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data v1-30) :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (set! (-> self skid-speed) (fmax 0.0 (- (-> self skid-speed) (* 32768.0 (seconds-per-frame))))) @@ -1671,13 +1633,13 @@ (go-virtual hostile) ) ) - :post (the-as (function none :behavior rhino) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: (defstate charge (rhino) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set-setting! 'sound-mode #f 0.0 1) (set-setting! 'sound-excitement 'abs 0.0 0) @@ -1724,27 +1686,18 @@ ) ) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! rhino-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! rhino-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! rhino-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rhino-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rhino-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1840,10 +1793,7 @@ ) (while (nonzero? s5-0) (+! s5-0 -1) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1869,14 +1819,7 @@ ) (let ((f30-2 (get-rand-float-range self 0.9 1.1))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info victory-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info victory-anim))) frames num-frames) - -1 - ) - ) - f30-2 - ) + :num! (seek! max f30-2) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc index 37e1996c546..2651a8c416d 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc @@ -35,7 +35,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (ja-post) (do-push-aways (-> self root)) @@ -96,7 +96,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (ja-post) (do-push-aways (-> self root)) @@ -206,7 +206,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -245,7 +245,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor-egg) sleep-code) + :code sleep-code :post (behavior () (ja-post) (do-push-aways (-> self root)) @@ -739,7 +739,7 @@ ) (metalkor-update-ik) ) - :code (the-as (function none :behavior metalkor-legs) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1473,7 +1473,7 @@ ) (update (-> self tail) self) ) - :code (the-as (function none :behavior metalkor-lowtorso) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1706,7 +1706,7 @@ (sound-play "warp-ring" :id (-> self spin-sound) :position (-> self root trans)) (set! (-> self spin-sound-playing) #t) ) - :code (the-as (function none :behavior rift-ring-ingame) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) (ja-post) @@ -1827,8 +1827,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior metalkor-spinner) sleep-code) - :post (the-as (function none :behavior metalkor-spinner) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1872,8 +1872,8 @@ This commonly includes things such as: (set! (-> self root scale y) (* 0.000009042245 f30-0)) ) ) - :code (the-as (function none :behavior metalkor-spinner) sleep-code) - :post (the-as (function none :behavior metalkor-spinner) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1936,8 +1936,8 @@ This commonly includes things such as: (quaternion-from-two-vectors! (-> self root quat) (new 'static 'vector :y -1.0) gp-2) ) ) - :code (the-as (function none :behavior metalkor-spinner) sleep-code) - :post (the-as (function none :behavior metalkor-spinner) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1978,7 +1978,7 @@ This commonly includes things such as: :enter (behavior () (ja-post) ) - :code (the-as (function none :behavior nest-break-precipice) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1988,7 +1988,7 @@ This commonly includes things such as: (cleanup-for-death self) (deactivate self) ) - :code (the-as (function none :behavior nest-break-precipice) sleep-code) + :code sleep-code ) ;; definition for method 11 of type nest-break-precipice @@ -2090,7 +2090,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (nestb-tail-bound) :virtual #t - :code (the-as (function none :behavior nestb-tail-bound) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2100,8 +2100,8 @@ This commonly includes things such as: (ja :num! (loop!)) (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 3))) ) - :code (the-as (function none :behavior metalkor-kid) sleep-code) - :post (the-as (function none :behavior metalkor-kid) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -2110,8 +2110,8 @@ This commonly includes things such as: :trans (behavior () (clone-anim-once (ppointer->handle (-> self parent)) #t (-> self prefix)) ) - :code (the-as (function none :behavior metalkor-wings) sleep-code) - :post (the-as (function none :behavior metalkor-wings) ja-post) + :code sleep-code + :post ja-post ) ;; definition for function metalkor-distort-update @@ -2160,8 +2160,8 @@ This commonly includes things such as: (deactivate self) ) ) - :code (the-as (function none :behavior metalkor-distort) sleep-code) - :post (the-as (function none :behavior metalkor-distort) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -2207,8 +2207,8 @@ This commonly includes things such as: (set-vector! (-> self draw color-emissive) f0-0 f0-0 f0-0 1.0) ) ) - :code (the-as (function none :behavior metalkor-rays) sleep-code) - :post (the-as (function none :behavior metalkor-rays) ja-post) + :code sleep-code + :post ja-post ) ;; definition for function metalkor-rays-init-by-other @@ -2364,8 +2364,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior metalkor-explode) sleep-code) - :post (the-as (function none :behavior metalkor-explode) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -2395,7 +2395,7 @@ This commonly includes things such as: (set-vector! (-> self draw color-emissive) f0-0 f0-0 f0-0 1.0) ) ) - :code (the-as (function none :behavior rift-occlude) sleep-code) + :code sleep-code ) ;; definition for method 7 of type metalkor-bomb @@ -2582,6 +2582,6 @@ This commonly includes things such as: (metalkor-bomb-ground-check) (metalkor-bomb-collide) ) - :code (the-as (function none :behavior metalkor-bomb) sleep-code) - :post (the-as (function none :behavior metalkor-bomb) ja-post) + :code sleep-code + :post ja-post ) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc index e59caa01609..017878afa22 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc @@ -27,7 +27,7 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-metalkor-kid kid kid-lod0-jg 19 +(defskelgroup skel-metalkor-kid kid kid-lod0-jg kid-idle-floating-ja ((kid-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :shadow kid-shadow-mg @@ -213,7 +213,7 @@ ) ) ) - :code (the-as (function none :behavior gem-tracker) sleep-code) + :code sleep-code ) ;; definition of type flitter-gem-tracker diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc index 311b70df62f..8b6957371c2 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc @@ -1464,7 +1464,7 @@ (ja-channel-push! 1 (seconds 0.1)) (ja :group! (-> self draw art-group data 3) :num! min) ) - :code (the-as (function symbol none :behavior metalkor) sleep-code) + :code (the-as (function symbol object) sleep-code) ) ;; failed to figure out what this is: @@ -1611,7 +1611,7 @@ ) (update! (-> self ring-cam-pos) 0.0) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1732,7 +1732,7 @@ ) (update! (-> self ring-cam-pos) 0.0) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1792,7 +1792,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1820,7 +1820,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1939,7 +1939,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1959,7 +1959,7 @@ (deactivate self) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2143,7 +2143,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2242,7 +2242,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2285,7 +2285,7 @@ (metalkor-walk-the-walk 53248.0 #f) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2345,7 +2345,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2390,7 +2390,7 @@ (metalkor-walk-the-walk 122880.0 #f) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2453,7 +2453,7 @@ ) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2630,7 +2630,7 @@ ) (metalkor-common) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -2656,7 +2656,7 @@ (metalkor-go-next-stage) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2833,7 +2833,7 @@ (metalkor-common) ) ) - :code (the-as (function none :behavior metalkor) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc index 8c395358718..cba47aee2dd 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc @@ -1671,10 +1671,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1682,7 +1679,7 @@ ) #f ) - :post (the-as (function none :behavior nest-gun-parts) ja-post) + :post ja-post ) ;; definition for method 11 of type nest-gun-parts @@ -1743,10 +1740,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1754,7 +1748,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior nest-unbroken-rocks) ja-post) + :post ja-post ) ;; definition for method 11 of type nest-unbroken-rocks diff --git a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc index 42ec4df8043..7d74ea9cbb2 100644 --- a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc @@ -200,10 +200,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! flying-spider-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -211,7 +208,7 @@ ) #f ) - :post (the-as (function none :behavior flying-spider) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -238,10 +235,7 @@ :code (behavior () (ja-channel-push! 1 0) (until #f - (ja-no-eval :group! flying-spider-idle-flying-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-idle-flying-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-idle-flying-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -273,12 +267,9 @@ ;; failed to figure out what this is: (defstate ambush-falling (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :code (behavior () - (ja-no-eval :group! flying-spider-drop-down-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-drop-down-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-drop-down-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -292,10 +283,7 @@ (set! (-> s5-0 y) 0.0) (vector-xz-normalize! s5-0 1.0) (forward-up-nopitch->quaternion gp-0 s5-0 *y-vector*) - (ja-no-eval :group! flying-spider-drop-down-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-drop-down-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-drop-down-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (quaternion-slerp! (-> self root quat) (-> self root quat) gp-0 (* 2.0 (seconds-per-frame))) (suspend) @@ -317,7 +305,7 @@ ;; failed to figure out what this is: (defstate hostile (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :trans (behavior () (let ((t9-0 (-> (method-of-type nav-enemy hostile) trans))) (if t9-0 @@ -340,7 +328,7 @@ ;; failed to figure out what this is: (defstate turn-to-focus (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag37) (-> v1-0 enemy-flags)))) @@ -448,7 +436,7 @@ ;; failed to figure out what this is: (defstate attack (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag37)))) @@ -473,10 +461,7 @@ :code (behavior () (until #f (ja-channel-push! 1 (seconds 0.15)) - (ja-no-eval :group! flying-spider-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -528,34 +513,22 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! flying-spider-shoot-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-start-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-start-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) ) - (ja-no-eval :group! flying-spider-shoot-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-right-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-right-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) ) - (ja-no-eval :group! flying-spider-shoot-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-left-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-left-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) ) - (ja-no-eval :group! flying-spider-shoot-stop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim flying-spider-shoot-stop-ja) frames num-frames) -1)) 2.0) - :frame-num 0.0 - ) + (ja-no-eval :group! flying-spider-shoot-stop-ja :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) @@ -570,7 +543,7 @@ ;; failed to figure out what this is: (defstate die (flying-spider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior flying-spider) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (dispose! self) (set! (-> self state-time) (current-time)) @@ -581,14 +554,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -607,7 +573,7 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior flying-spider) enemy-simple-post) + :post enemy-simple-post ) ;; definition for method 74 of type flying-spider diff --git a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc index 36eea460a36..b7730905acd 100644 --- a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc @@ -442,10 +442,7 @@ ) (ja-channel-push! 1 (seconds 0.1)) (until #f - (ja-no-eval :group! mammoth-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -453,7 +450,7 @@ ) #f ) - :post (the-as (function none :behavior mammoth) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -479,10 +476,7 @@ (next-path-index) (set-nav-destination) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! mammoth-idle0-to-walk-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-idle0-to-walk-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-idle0-to-walk-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -535,10 +529,7 @@ ) ) ) - (ja-no-eval :group! (-> self draw art-group data v1-20) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data v1-20)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data v1-20) :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -598,10 +589,7 @@ :code (behavior () (set-nav-destination) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! mammoth-walk-fire0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-walk-fire0-ja) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-walk-fire0-ja :num! (seek! max 0.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.8)) @@ -609,10 +597,7 @@ (until #f (mammoth-walk-check-end) (set-nav-destination) - (ja-no-eval :group! mammoth-walk0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-walk0-ja) frames num-frames) -1)) 0.8) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-walk0-ja :num! (seek! max 0.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.8)) @@ -701,10 +686,7 @@ (set! (-> (new 'stack-no-clear 'vector) quad) (-> a0-6 quad)) (vector+float*! (new 'stack-no-clear 'vector) a0-6 v1-7 (-> self turn-move-start)) ) - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) 0.6667) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max 0.6667) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -714,15 +696,7 @@ ) ) (when (!= (-> self turn-anim) -1) - (ja-no-eval :group! (-> self draw art-group data (-> self turn-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self turn-anim))) frames num-frames) -1) - ) - 0.6667 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self turn-anim)) :num! (seek! max 0.6667) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-xz-vel adjust-quat) 1.0 1.0 1.0) @@ -738,10 +712,7 @@ (set! (-> (new 'stack-no-clear 'vector) quad) (-> a0-23 quad)) (vector+float*! (new 'stack-no-clear 'vector) a0-23 v1-68 (-> self turn-move-end)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) 0.6667) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max 0.6667) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -762,26 +733,17 @@ :virtual #t :code (behavior () (set-nav-destination) - (ja-no-eval :group! mammoth-death-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-death-right-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-death-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! mammoth-death-right-fall-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-death-right-fall-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-death-right-fall-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) - (ja-no-eval :group! mammoth-death-right-fall-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mammoth-death-right-fall-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mammoth-death-right-fall-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc index b036e1de56f..338dc5cdb99 100644 --- a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc @@ -462,40 +462,28 @@ (until #f (let ((gp-0 (get-rand-int-range self 3 5))) (dotimes (s5-0 gp-0) - (ja-no-eval :group! mantis-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ) - (ja-no-eval :group! mantis-idle0-to-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-to-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-to-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (let ((gp-1 (get-rand-int self 3))) (dotimes (s5-1 gp-1) - (ja-no-eval :group! mantis-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ) - (ja-no-eval :group! mantis-idle1-to-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle1-to-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle1-to-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -503,7 +491,7 @@ ) #f ) - :post (the-as (function none :behavior mantis) nav-enemy-face-focus-post) + :post nav-enemy-face-focus-post ) ;; failed to figure out what this is: @@ -607,15 +595,12 @@ ;; failed to figure out what this is: (defstate ambush-crawling (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :code (behavior () (look-at-target! self (enemy-flag lock-focus)) (set! (-> self root trans y) (-> self base-height)) (ja-channel-push! 1 0) - (ja-no-eval :group! mantis-ground-crawl-out-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-ground-crawl-out-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-ground-crawl-out-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -626,13 +611,13 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior mantis) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: (defstate ambush-jumping (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -660,9 +645,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! mantis-ground-jump-out-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-ground-jump-out-ja) frames num-frames) -1))) - ) + (ja-no-eval :group! mantis-ground-jump-out-ja :num! (seek!)) (until #f (if (< (-> self base-height) (-> self root trans y)) (goto cfg-5) @@ -701,10 +684,7 @@ #f (label cfg-24) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! mantis-ground-jump-out-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-ground-jump-out-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-ground-jump-out-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -720,7 +700,7 @@ (label cfg-32) (go-virtual hostile) ) - :post (the-as (function none :behavior mantis) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; failed to figure out what this is: @@ -813,7 +793,7 @@ ;; failed to figure out what this is: (defstate crawl (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (change-to (nav-mesh-from-res-tag (-> self entity) 'nav-mesh-actor 1) self) @@ -845,10 +825,7 @@ ) 0 (dotimes (gp-0 (get-rand-int-range self 1 2)) - (ja-no-eval :group! mantis-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -924,10 +901,7 @@ ) 0 (dotimes (gp-2 (get-rand-int-range self 3 5)) - (ja-no-eval :group! mantis-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-run0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-run0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -943,13 +917,13 @@ ) #f ) - :post (the-as (function none :behavior mantis) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: (defstate attack0 (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -974,10 +948,7 @@ (set! (-> v1-2 target-speed) 81920.0) ) 0 - (ja-no-eval :group! mantis-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -991,10 +962,7 @@ (set! (-> v1-34 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-attack0-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack0-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack0-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1010,13 +978,13 @@ 0 (go-hostile self) ) - :post (the-as (function none :behavior mantis) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate attack1 (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self attack-timer) (current-time)) @@ -1033,10 +1001,7 @@ (set! (-> v1-0 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-attack1-wind-up-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack1-wind-up-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack1-wind-up-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((a0-5 (handle->process (-> self focus handle)))) (if a0-5 @@ -1064,10 +1029,7 @@ (set! (-> v1-41 target-speed) 286720.0) ) 0 - (ja-no-eval :group! mantis-attack1-go-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack1-go-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack1-go-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1081,10 +1043,7 @@ (set! (-> v1-73 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-attack1-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-attack1-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-attack1-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1100,13 +1059,13 @@ 0 (go-hostile self) ) - :post (the-as (function none :behavior mantis) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate roll-right (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -1121,10 +1080,7 @@ ) 0 (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! mantis-roll-right-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-roll-right-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-roll-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1134,10 +1090,7 @@ (set! (-> v1-33 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-roll-right-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-roll-right-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-roll-right-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1171,7 +1124,7 @@ ;; failed to figure out what this is: (defstate roll-left (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :code (behavior () (vector-reset! (-> self root transv)) (vector-x-quaternion! (-> self root transv) (-> self root quat)) @@ -1186,10 +1139,7 @@ ) 0 (ja-channel-push! 1 (seconds 0.067)) - (ja-no-eval :group! mantis-hop-left-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-hop-left-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-hop-left-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1199,10 +1149,7 @@ (set! (-> v1-34 nav callback-info) *nav-enemy-null-callback-info*) ) 0 - (ja-no-eval :group! mantis-hop-left-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-hop-left-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-hop-left-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1215,7 +1162,7 @@ ;; failed to figure out what this is: (defstate hop-away (mantis) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior mantis) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (look-at-target! self (enemy-flag lock-focus)) @@ -1286,10 +1233,7 @@ ) ) (dotimes (gp-1 (get-rand-int-range self 2 4)) - (ja-no-eval :group! mantis-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim mantis-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! mantis-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1299,7 +1243,7 @@ #f ) ) - :post (the-as (function none :behavior mantis) nav-enemy-face-focus-post) + :post nav-enemy-face-focus-post ) ;; definition for method 74 of type mantis diff --git a/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc b/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc index 9d681f2611e..e5540361c85 100644 --- a/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc @@ -38,8 +38,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-nest-switch cas-switch 0 2 - ((1 (meters 999999))) +(defskelgroup skel-nest-switch cas-switch cas-switch-lod0-jg cas-switch-idle-ja + ((cas-switch-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 0 3.5) :origin-joint-index 3 ) @@ -73,9 +73,9 @@ ) ) ) - :trans (the-as (function none :behavior nest-switch) rider-trans) - :code (the-as (function none :behavior nest-switch) sleep-code) - :post (the-as (function none :behavior nest-switch) rider-post) + :trans rider-trans + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -131,7 +131,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (sleep-code) ) - :post (the-as (function none :behavior nest-switch) rider-post) + :post rider-post ) ;; definition for method 11 of type nest-switch @@ -238,13 +238,13 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior nest-piston) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate up (nest-piston) :virtual #t - :trans (the-as (function none :behavior nest-piston) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 (current-time))) (until (>= (- (current-time) gp-0) (seconds 1)) @@ -259,7 +259,7 @@ This commonly includes things such as: (logior! (-> self mask) (process-mask actor-pause)) (sleep-code) ) - :post (the-as (function none :behavior nest-piston) rider-post) + :post rider-post ) ;; definition for method 11 of type nest-piston diff --git a/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc b/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc index fe2c2222c1f..9d5a803811f 100644 --- a/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc @@ -180,7 +180,7 @@ ) ) ) - :code (the-as (function none :behavior canyon-lightning-thingy) sleep-code) + :code sleep-code ) ;; definition for method 7 of type canyon-lightning-thingy diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc index 76808775174..5fd8df4d2c8 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc @@ -28,7 +28,7 @@ (ja :num! (loop!)) (ja-post) ) - :code (the-as (function none :behavior squid-driver) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -52,7 +52,7 @@ :trans (behavior () (clone-anim-once (ppointer->handle (-> self parent)) #f "") ) - :code (the-as (function none :behavior squid-baron) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -68,7 +68,7 @@ (dotimes (v1-6 11) ) ) - :code (the-as (function none :behavior squid-tentacle) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -84,7 +84,7 @@ (ja-post) (go-virtual test) ) - :code (the-as (function none :behavior squid-tentacle) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -94,7 +94,7 @@ ;; failed to figure out what this is: (defstate idle (squid-collision) :virtual #t - :code (the-as (function none :behavior squid-collision) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -424,7 +424,7 @@ (deactivate self) ) ) - :code (the-as (function none :behavior squid-whirlwind) sleep-code) + :code sleep-code ) ;; definition for method 10 of type squid-whirlwind diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc index 2b0c23cd48a..ecf18768bca 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc @@ -456,7 +456,7 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-squid squid squid-lod0-jg 3 +(defskelgroup skel-squid squid squid-lod0-jg squid-squid-idle-ja ((squid-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :shadow squid-shadow-mg @@ -483,7 +483,7 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-squid-driver squid squid-driver-lod0-jg 55 +(defskelgroup skel-squid-driver squid squid-driver-lod0-jg squid-driver-squid-idle-ja ((squid-driver-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) ) @@ -2205,7 +2205,6 @@ This commonly includes things such as: ;; definition for method 45 of type squid ;; INFO: Used lq/sq ;; WARN: Return type mismatch int vs none. -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 310] (defmethod move-to-spot squid ((obj squid) (arg0 vector) (arg1 symbol)) (local-vars (sv-656 vector) diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc index b292138bc9a..73daf524d3a 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc @@ -234,7 +234,7 @@ (debug-draw (-> self second-path)) (debug-draw (-> self third-path)) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -349,7 +349,7 @@ ) (remove-setting! 'point-of-interest) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -368,7 +368,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -384,7 +384,7 @@ (go-virtual fly-to-post) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -489,7 +489,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -673,7 +673,7 @@ (sound-play "squid-spin" :id (-> self spin-sound) :position (-> self root trans)) (set! (-> self spin-sound-playing) #t) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -786,7 +786,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -908,7 +908,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1043,7 +1043,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1113,7 +1113,7 @@ (set! (-> self traj-timer) (current-time)) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1378,7 +1378,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1552,7 +1552,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1622,7 +1622,7 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1655,7 +1655,7 @@ (when (>= (- (current-time) (-> self state-time)) (seconds 3)) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code :post (behavior () (squid-post self) ) @@ -1697,5 +1697,5 @@ ) ) ) - :code (the-as (function none :behavior squid) sleep-code) + :code sleep-code ) diff --git a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc index 11c4aeb7c9c..41ef5a12bb0 100644 --- a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc @@ -168,7 +168,7 @@ ) (rider-trans) ) - :code (the-as (function none :behavior pal-electric-fan) sleep-code) + :code sleep-code :post (behavior () (local-vars (sv-112 vector) (sv-128 vector) (sv-144 lightning-control)) (rlet ((vf0 :class vf) @@ -465,7 +465,7 @@ This commonly includes things such as: (set! (-> self sound-played? 0) #f) (set! (-> self sound-played? 1) #f) ) - :trans (the-as (function none :behavior pal-cable-nut) rider-trans) + :trans rider-trans :code (behavior () (until #f (let* ((f1-0 (* 6.0 (get-current-phase-no-mod (-> self sync)))) @@ -506,7 +506,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior pal-cable-nut) rider-post) + :post rider-post ) ;; definition for method 11 of type pal-cable-nut @@ -891,7 +891,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior pal-rot-gun) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -911,7 +911,7 @@ This commonly includes things such as: (set! (-> self gun-index) 0) 0 ) - :code (the-as (function none :behavior pal-rot-gun) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self spin-rate) (-> self spin-rate-final) (* 3640.889 (seconds-per-frame))) (quaternion-rotate-z! (-> self root quat) (-> self root quat) (* (-> self spin-rate) (seconds-per-frame))) @@ -981,7 +981,7 @@ This commonly includes things such as: (go-virtual idle) ) ) - :code (the-as (function none :behavior pal-rot-gun) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self spin-rate) 0.0 (* 3640.889 (seconds-per-frame))) (quaternion-rotate-z! (-> self root quat) (-> self root quat) (* (-> self spin-rate) (seconds-per-frame))) @@ -1117,10 +1117,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1128,7 +1125,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior pal-windmill) ja-post) + :post ja-post ) ;; definition for method 11 of type pal-windmill @@ -1206,17 +1203,14 @@ This commonly includes things such as: (go-virtual fall) ) ) - :code (the-as (function none :behavior pal-flip-step) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate fall (pal-flip-step) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -1229,7 +1223,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate fallen (pal-flip-step) :virtual #t - :code (the-as (function none :behavior pal-flip-step) sleep-code) + :code sleep-code ) ;; definition for method 11 of type pal-flip-step diff --git a/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc index e330c1de5d6..a7ba235e9b0 100644 --- a/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc @@ -47,13 +47,13 @@ :enter (behavior () (logior! (-> self root root-prim prim-core action) (collide-action rideable)) ) - :trans (the-as (function none :behavior pal-falling-plat) rider-trans) + :trans rider-trans :code (behavior () (ja-no-eval :group! (-> self draw art-group data 2) :num! zero) (transform-post) (sleep-code) ) - :post (the-as (function none :behavior pal-falling-plat) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -80,28 +80,22 @@ :enter (behavior () (sound-play "pal-fall-plat") ) - :trans (the-as (function none :behavior pal-falling-plat) rider-trans) + :trans rider-trans :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (logclear! (-> self root root-prim prim-core action) (collide-action rideable)) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual idle) ) - :post (the-as (function none :behavior pal-falling-plat) rider-post) + :post rider-post ) ;; definition for method 11 of type pal-falling-plat @@ -322,10 +316,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -366,8 +357,8 @@ This commonly includes things such as: 0 (logior! (-> self draw status) (draw-control-status no-draw)) ) - :exit (the-as (function none :behavior pal-grind-ring-center) #f) - :trans (the-as (function none :behavior pal-grind-ring-center) #f) + :exit #f + :trans #f :code (behavior () (send-event (ppointer->process (-> self parent)) 'fall) (while (-> self child) @@ -375,7 +366,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior pal-grind-ring-center) #f) + :post #f ) ;; definition for method 29 of type pal-grind-ring-center @@ -516,10 +507,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -590,10 +578,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -601,7 +586,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior pal-grind-ring) transform-post) + :post transform-post ) ;; definition for method 29 of type pal-grind-ring @@ -729,9 +714,9 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (pal-ent-glass) :virtual #t - :enter (the-as (function none :behavior pal-ent-glass) #f) - :exit (the-as (function none :behavior pal-ent-glass) #f) - :trans (the-as (function none :behavior pal-ent-glass) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (sound-play "glass-crash") (let ((v1-2 (-> self root root-prim))) @@ -745,7 +730,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior pal-ent-glass) #f) + :post #f ) ;; failed to figure out what this is: @@ -778,7 +763,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior pal-ent-glass) sleep-code) + :code sleep-code :post (behavior () '() ) @@ -980,7 +965,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior palent-turret) sleep-code) + :code sleep-code :post (behavior () (transform-post) ) @@ -1143,9 +1128,9 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate die (pal-breakable-window) :virtual #t - :enter (the-as (function none :behavior pal-breakable-window) #f) - :exit (the-as (function none :behavior pal-breakable-window) #f) - :trans (the-as (function none :behavior pal-breakable-window) #f) + :enter #f + :exit #f + :trans #f :code (behavior () (let ((v1-1 (-> self root root-prim))) (set! (-> v1-1 prim-core collide-as) (collide-spec)) @@ -1158,7 +1143,7 @@ This commonly includes things such as: ) (cleanup-for-death self) ) - :post (the-as (function none :behavior pal-breakable-window) #f) + :post #f ) ;; failed to figure out what this is: @@ -1190,7 +1175,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior pal-breakable-window) sleep-code) + :code sleep-code :post (behavior () '() ) diff --git a/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc index 2bc26afbe4e..2577c40e474 100644 --- a/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc @@ -218,7 +218,7 @@ This commonly includes things such as: (pal-prong-small-collision) (transform-post) ) - :code (the-as (function none :behavior pal-prong) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -243,7 +243,7 @@ This commonly includes things such as: :trans (behavior () (go-virtual broken) ) - :code (the-as (function none :behavior pal-prong) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -266,5 +266,5 @@ This commonly includes things such as: (spawn (-> self part) a1-0) ) ) - :code (the-as (function none :behavior pal-prong) sleep-code) + :code sleep-code ) diff --git a/test/decompiler/reference/jak2/levels/palace/throne/palace-scenes_REF.gc b/test/decompiler/reference/jak2/levels/palace/throne/palace-scenes_REF.gc index 7c68ab8a146..af4e2654f0b 100644 --- a/test/decompiler/reference/jak2/levels/palace/throne/palace-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/throne/palace-scenes_REF.gc @@ -37,10 +37,7 @@ :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -48,7 +45,7 @@ ) #f ) - :post (the-as (function none :behavior throne-throne) ja-post) + :post ja-post ) ;; definition for method 11 of type throne-throne diff --git a/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc b/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc index 6d4ee0f8f00..9e43e04c236 100644 --- a/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc @@ -447,7 +447,7 @@ ) (go-virtual broken) ) - :post (the-as (function none :behavior ruins-breakable-wall) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc b/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc index 2ab8797d302..c913e070aff 100644 --- a/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc @@ -135,7 +135,7 @@ ) ) ) - :code (the-as (function none :behavior mechblock) sleep-code) + :code sleep-code :post (behavior () (ja-post) (carry-info-method-9 (-> self carry)) @@ -268,7 +268,7 @@ ) ) ) - :code (the-as (function none :behavior mechblock) sleep-code) + :code sleep-code :post (behavior () (ja-post) (carry-info-method-9 (-> self carry)) @@ -404,7 +404,7 @@ ) ) ) - :code (the-as (function none :behavior mechblock) sleep-code) + :code sleep-code :post (behavior () (vector-v++! (-> self root transv) (compute-acc-due-to-gravity (-> self root) (new-stack-vector0) 0.0)) (let ((v1-2 (new-stack-vector0)) diff --git a/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc b/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc index c1526e9b80c..080c348b1e2 100644 --- a/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc @@ -151,25 +151,25 @@ (suspend) 0 ) - :post (the-as (function none :behavior ruins-pillar-collapse) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate bump (ruins-pillar-collapse) :virtual #t :event (-> (method-of-type ruins-pillar-collapse idle) event) - :trans (the-as (function none :behavior ruins-pillar-collapse) rider-trans) + :trans rider-trans :code (behavior () (go-virtual idle) ) - :post (the-as (function none :behavior ruins-pillar-collapse) rider-post) + :post rider-post ) ;; failed to figure out what this is: (defstate hit (ruins-pillar-collapse) :virtual #t :event (-> (method-of-type ruins-pillar-collapse idle) event) - :trans (the-as (function none :behavior ruins-pillar-collapse) rider-trans) + :trans rider-trans :code (behavior () (+! (-> self hit-points) -1) (if (zero? (-> self hit-points)) @@ -177,7 +177,7 @@ ) (go-virtual idle) ) - :post (the-as (function none :behavior ruins-pillar-collapse) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -217,8 +217,8 @@ ) ) ) - :trans (the-as (function none :behavior ruins-pillar-collapse) rider-trans) - :post (the-as (function none :behavior ruins-pillar-collapse) rider-post) + :trans rider-trans + :post rider-post ) ;; definition for method 11 of type ruins-pillar-collapse diff --git a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc index 403afc4ec04..5d68ea76f5e 100644 --- a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc @@ -689,14 +689,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -728,7 +721,7 @@ ;; failed to figure out what this is: (defstate attack (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self predict-timer) (the-as uint (+ (current-time) 1))) @@ -853,14 +846,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! (-> self draw art-group data (-> self shoot-anim-index)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self shoot-anim-index))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self shoot-anim-index)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -910,7 +896,7 @@ ;; failed to figure out what this is: (defstate hop (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self predict-timer) (the-as uint (current-time))) (let ((v1-2 self)) @@ -993,10 +979,7 @@ ) 0 (ja-channel-push! 2 (seconds 0.1)) - (ja-no-eval :group! rapid-gunner-idle-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-idle-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-idle-ja :num! (seek!) :frame-num 0.0) (let ((a0-17 (-> self skel root-channel 1))) (let ((f0-7 0.0)) (set! (-> a0-17 frame-interp 1) f0-7) @@ -1037,7 +1020,7 @@ ;; failed to figure out what this is: (defstate hop-turn (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self predict-timer) (the-as uint (current-time))) (let ((v1-2 self)) @@ -1077,10 +1060,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! rapid-gunner-turn-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-turn-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-turn-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1111,7 +1091,7 @@ ;; failed to figure out what this is: (defstate cool-down (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self shots-fired) (the-as uint 0)) @@ -1125,10 +1105,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! rapid-gunner-aim-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-aim-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-aim-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1145,7 +1122,7 @@ ;; failed to figure out what this is: (defstate reload (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self predict-timer) (the-as uint (current-time))) (set! (-> self shots-fired) (the-as uint 0)) @@ -1161,10 +1138,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! rapid-gunner-reload-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-reload-ja) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-reload-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -1279,10 +1253,7 @@ ) (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! rapid-gunner-aim-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-aim-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-aim-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1301,7 +1272,7 @@ ;; failed to figure out what this is: (defstate spin-attack (rapid-gunner) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rapid-gunner) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1337,10 +1308,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.135)) - (ja-no-eval :group! rapid-gunner-spin-attack-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim rapid-gunner-spin-attack-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! rapid-gunner-spin-attack-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1395,7 +1363,7 @@ ) #f ) - :post (the-as (function none :behavior rapid-gunner) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 142 of type rapid-gunner diff --git a/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc b/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc index 5e225992ab0..224ca8d3d5d 100644 --- a/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc @@ -135,16 +135,10 @@ ;; failed to figure out what this is: (defstate idle (sinking-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sinking-plat) - rigid-body-object-event-handler - ) + :event rigid-body-object-event-handler :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -203,7 +197,7 @@ ) ) ) - :code (the-as (function none :behavior beam) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -211,10 +205,7 @@ :virtual #t :code (behavior () (sound-play "beam-slip") - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -223,7 +214,7 @@ (suspend) 0 ) - :post (the-as (function none :behavior beam) ja-post) + :post ja-post ) ;; definition for method 11 of type beam @@ -299,7 +290,7 @@ and translate the platform via the `smush` ;; failed to figure out what this is: (defstate fall (ruins-bridge) :virtual #t - :trans (the-as (function none :behavior ruins-bridge) rider-trans) + :trans rider-trans ) ;; definition for method 11 of type ruins-bridge 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 bf0d334634f..b69d0130431 100644 --- a/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc @@ -1355,7 +1355,7 @@ The scale will be linearly-interpolated based on the distance from the camera" ;; failed to figure out what this is: (defstate idle (flag) :virtual #t - :code (the-as (function none :behavior flag) sleep-code) + :code sleep-code :post (behavior () (ja :num! (loop!)) (let ((flag-scale (lerp-scale 1.0 2.5 (vector-vector-distance (camera-pos) (-> self root trans)) 81920.0 901120.0)) diff --git a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-bomb_REF.gc b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-bomb_REF.gc index 03f288ea39d..7a4c9898d15 100644 --- a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-bomb_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-bomb_REF.gc @@ -71,7 +71,7 @@ ) (sleep-code) ) - :post (the-as (function none :behavior jinx-bomb) ja-post) + :post ja-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc index df1b16a1b50..0ee96846142 100644 --- a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc @@ -27,10 +27,7 @@ (suspend) (ja-eval) ) - (ja-no-eval :group! (-> self draw art-group data 61) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 61)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 61) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -46,10 +43,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -63,10 +57,7 @@ ) ) (stop-looking-at-target! self) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -98,10 +89,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -164,10 +152,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -189,7 +174,7 @@ ) (ruffian-method-240 self) ) - :post (the-as (function none :behavior jinx) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -218,10 +203,7 @@ (suspend) (ja-eval) ) - (ja-no-eval :group! (-> self draw art-group data 61) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 61)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 61) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -237,10 +219,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -253,10 +232,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -290,10 +266,7 @@ ) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! s5-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s5-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s5-1 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -352,10 +325,7 @@ ) ) (quaternion-rotate-y! s5-2 (-> gp-0 src-quat) f0-9) - (ja-no-eval :group! s4-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim s4-1) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! s4-1 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((f0-14 (ja-aframe-num 0))) (cond @@ -377,7 +347,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior jinx) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -404,10 +374,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 60) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 60)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 60) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -442,10 +409,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (let ((a1-2 (-> self draw art-group data (-> *jinx-global-info* kick-anim (get-rand-int self 2))))) - (ja-no-eval :group! a1-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-2) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-2 :num! (seek!) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -550,10 +514,7 @@ (let ((gp-1 (-> self draw art-group data (-> *jinx-global-info* bomb-recoil-anim (get-rand-int self 2)))) (f30-0 (get-rand-float-range self 0.4 0.8)) ) - (ja-no-eval :group! gp-1 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-1 :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -601,20 +562,14 @@ :virtual #t :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (set! (-> self state-time) (current-time)) (until #f - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (logtest? (-> self bot-flags) (bot-flags failed)) (>= (- (current-time) (-> self state-time)) (seconds 0.5)) @@ -652,28 +607,23 @@ (vector<-matrix! gp-2 a1-5) (set! (-> gp-2 y) (+ -122.88 (-> self root gspot-pos y))) (quaternion-identity! s5-0) - (set! (-> self bomb-handle) - (ppointer->handle - (process-spawn - jinx-bomb - gp-2 - s5-0 - (-> self level) - (-> self bomb-fuse-delay) - (-> self bomb-func) - (logtest? (bot-flags bf23) (-> self bot-flags)) - :to self - ) - ) + (set! (-> self bomb-handle) (ppointer->handle (process-spawn + jinx-bomb + gp-2 + s5-0 + (-> self level) + (-> self bomb-fuse-delay) + (-> self bomb-func) + (logtest? (bot-flags bf23) (-> self bot-flags)) + :to self + ) + ) ) ) (send-event (handle->process (-> self master-handle)) 'notify 'jinx-bomb) (logior! (-> self bot-flags) (bot-flags bf21)) (setup-masks (-> self draw) 0 4096) - (ja-no-eval :group! (-> self draw art-group data 62) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) - :frame-num (ja-aframe 56.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek!) :frame-num (ja-aframe 56.0 0)) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc b/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc index 5ea4fc0e0c5..b4055ef8dd4 100644 --- a/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc @@ -395,7 +395,7 @@ ;; failed to figure out what this is: (defstate attack-forward (gator) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior gator) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((_self self)) @@ -480,14 +480,8 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.07)) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num (ja-aframe 0.0 0) - ) - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num (ja-aframe 0.0 0)) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((target-pos (new 'stack-no-clear 'vector))) (let ((nav-state (-> self nav state))) @@ -502,7 +496,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior gator) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/sewer/hosehead-fake_REF.gc b/test/decompiler/reference/jak2/levels/sewer/hosehead-fake_REF.gc index a09d36edeaf..95478732300 100644 --- a/test/decompiler/reference/jak2/levels/sewer/hosehead-fake_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/hosehead-fake_REF.gc @@ -218,10 +218,7 @@ (ja-channel-push! 1 (seconds 0.17)) ) ) - (ja-no-eval :group! (-> self draw art-group data 15) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 15)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -233,10 +230,7 @@ (ja-channel-push! 1 (seconds 0.17)) ) ) - (ja-no-eval :group! (-> self draw art-group data 37) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 37)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 37) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -244,10 +238,7 @@ ) ((= v1-0 2) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 13) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 13)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 13) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -255,10 +246,7 @@ ) ((= v1-0 3) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 14) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 14)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 14) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -266,10 +254,7 @@ ) ((= v1-0 4) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 21) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 21)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 21) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -277,10 +262,7 @@ ) ((= v1-0 5) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 35) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 35) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -288,10 +270,7 @@ ) (else (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -330,10 +309,7 @@ ) ) (until #f - (ja-no-eval :group! gp-0 - :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -348,7 +324,7 @@ ;; failed to figure out what this is: (defstate die-fast (hosehead-fake) :virtual #t - :code (the-as (function none :behavior hosehead-fake) nothing) + :code nothing ) ;; definition for function hosehead-fake-init-by-other diff --git a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc index 9d0bf0e2bca..34b68f5cfc3 100644 --- a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc @@ -1042,7 +1042,7 @@ ;; failed to figure out what this is: (defstate idle-sentry (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (-> (method-of-type nav-enemy idle) enter) :exit (-> (method-of-type nav-enemy idle) exit) :trans (behavior () @@ -1075,7 +1075,7 @@ ;; failed to figure out what this is: (defstate hostile-sentry (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () ((-> (method-of-type nav-enemy hostile) enter)) (logior! (-> self skel status) (joint-control-status sync-math)) @@ -1169,10 +1169,7 @@ (ja-channel-push! 1 (seconds 0.01)) (set! (-> self fire-beam?) #t) (until #f - (ja-no-eval :group! hosehead-shoot-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-loop-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-loop-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1182,10 +1179,7 @@ #f (sound-stop (-> self lazer-sound)) (sound-stop (-> self lazer-sound2)) - (ja-no-eval :group! hosehead-shoot-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1374,7 +1368,7 @@ ;; failed to figure out what this is: (defstate ambush (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -1449,10 +1443,7 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! hosehead-jump-down-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-jump-down-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-jump-down-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1473,26 +1464,23 @@ ;; failed to figure out what this is: (defstate ambush-land (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! hosehead-jump-down-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-jump-down-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-jump-down-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-hostile self) ) - :post (the-as (function none :behavior hosehead) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; failed to figure out what this is: (defstate active-wall (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -1515,10 +1503,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.05)) (until #f - (ja-no-eval :group! hosehead-idle-wall0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-idle-wall0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-idle-wall0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1527,7 +1512,7 @@ ) #f ) - :post (the-as (function none :behavior hosehead) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 196 of type hosehead @@ -1631,7 +1616,7 @@ ;; failed to figure out what this is: (defstate notice-wall (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (local-vars (sv-688 vector)) (rlet ((acc :class vf) @@ -1729,10 +1714,7 @@ (set! (-> self come-from-notice) #t) (ja-channel-push! 1 (seconds 0.05)) (until #f - (ja-no-eval :group! hosehead-walk-wall-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-walk-wall-ja) frames num-frames) -1)) 1.5) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-walk-wall-ja :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (set! (-> self root trans y) (- (-> self root trans y) (* 36864.0 (seconds-per-frame)))) (hosehead-method-186 self) @@ -1806,7 +1788,7 @@ ;; failed to figure out what this is: (defstate fire (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (rlet ((acc :class vf) (vf0 :class vf) @@ -1881,10 +1863,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (set! (-> self allow-head) #t) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! hosehead-shoot-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-start-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-start-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (hosehead-method-189 self) (suspend) @@ -1906,10 +1885,7 @@ (label cfg-13) (sound-stop (-> self lazer-sound)) (sound-stop (-> self lazer-sound2)) - (ja-no-eval :group! hosehead-shoot-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-shoot-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-shoot-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -1928,7 +1904,7 @@ ;; failed to figure out what this is: (defstate attack (hosehead) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior hosehead) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-2 *game-info*) @@ -1948,20 +1924,14 @@ (ja-channel-push! 1 (seconds 0.2)) (cond ((zero? (get-rand-int self 2)) - (ja-no-eval :group! hosehead-attack1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-attack1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-attack1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! hosehead-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-attack0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-attack0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1975,20 +1945,14 @@ (let ((v1-57 (get-rand-int self 4))) (cond ((zero? v1-57) - (ja-no-eval :group! hosehead-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) ((= v1-57 1) - (ja-no-eval :group! hosehead-idle2-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-idle2-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-idle2-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1998,7 +1962,7 @@ ) (go-hostile self) ) - :post (the-as (function none :behavior hosehead) enemy-simple-post) + :post enemy-simple-post ) ;; failed to figure out what this is: @@ -2065,7 +2029,7 @@ ) #f ) - :post (the-as (function none :behavior hosehead) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: @@ -2077,14 +2041,7 @@ (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (new 'stack-no-clear 'vector) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info notice-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info notice-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -2116,10 +2073,7 @@ ) (ja-channel-push! 1 (seconds 0.2)) (until #f - (ja-no-eval :group! hosehead-run1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim hosehead-run1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! hosehead-run1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc index 49635d05c53..7410ab1b011 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc @@ -300,7 +300,7 @@ For example for an elevator pre-compute the distance between the first and last ) ) ) - :code (the-as (function none :behavior sew-valve) transform-and-sleep) + :code transform-and-sleep ) ;; failed to figure out what this is: @@ -335,7 +335,7 @@ For example for an elevator pre-compute the distance between the first and last (go-virtual idle) ) ) - :code (the-as (function none :behavior sew-valve) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self spin-rate) 0.0 (* 81920.0 (seconds-per-frame))) (+! (-> self spin) (* (-> self spin-rate) (seconds-per-frame))) @@ -512,8 +512,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-sew-mar-statue sew-mar-statue 0 2 - ((1 (meters 999999))) +(defskelgroup skel-sew-mar-statue sew-mar-statue sew-mar-statue-lod0-jg sew-mar-statue-idle-ja + ((sew-mar-statue-lod0-mg (meters 999999))) :bounds (static-spherem 0 7.5 0 14.4) ) @@ -534,7 +534,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (sew-mar-statue-debris) :virtual #t - :code (the-as (function none :behavior sew-mar-statue-debris) sleep-code) + :code sleep-code ) ;; definition for function sew-mar-statue-debris-init-by-other @@ -602,7 +602,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (sew-mar-statue-debris-b) :virtual #t - :code (the-as (function none :behavior sew-mar-statue-debris-b) sleep-code) + :code sleep-code ) ;; definition for function sew-mar-statue-debris-b-init-by-other @@ -664,7 +664,7 @@ This commonly includes things such as: (setup-masks (-> self draw) 2 4) ) ) - :code (the-as (function none :behavior sew-mar-statue) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -679,7 +679,7 @@ This commonly includes things such as: 0 (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior sew-mar-statue) sleep-code) + :code sleep-code ) ;; definition for method 11 of type sew-mar-statue @@ -775,7 +775,7 @@ and translate the platform via the `smush` ;; failed to figure out what this is: (defstate fall (sew-catwalk) :virtual #t - :trans (the-as (function none :behavior sew-catwalk) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (process-entity-status! self (entity-perm-status subtask-complete) #t) (set! (-> self draw bounds y) -102400.0) @@ -973,7 +973,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior sew-mine) transform-and-sleep-code) + :code transform-and-sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) (let ((gp-0 (mod (-> *display* part-clock frame-counter) 100))) @@ -1069,7 +1069,10 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-sew-mine-a sew-mine-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 3)) +(defskelgroup skel-sew-mine-a sew-mine-a sew-mine-a-lod0-jg sew-mine-a-idle-ja + ((sew-mine-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 3) + ) ;; definition for method 11 of type sew-mine-a ;; WARN: Return type mismatch object vs none. @@ -1140,7 +1143,10 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-sew-mine-b sew-mine-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 2.5)) +(defskelgroup skel-sew-mine-b sew-mine-b sew-mine-b-lod0-jg sew-mine-b-idle-ja + ((sew-mine-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 2.5) + ) ;; failed to figure out what this is: (defstate idle (sew-mine-b) @@ -1421,7 +1427,7 @@ This commonly includes things such as: (suspend) 0 ) - :post (the-as (function none :behavior sew-wall) ja-post) + :post ja-post ) ;; definition for method 11 of type sew-wall @@ -1567,17 +1573,17 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-sew-grill sew-grill 0 3 ((1 (meters 999999))) :bounds (static-spherem 0 3 0 7.5)) +(defskelgroup skel-sew-grill sew-grill sew-grill-lod0-jg sew-grill-idle-ja + ((sew-grill-lod0-mg (meters 999999))) + :bounds (static-spherem 0 3 0 7.5) + ) ;; failed to figure out what this is: (defstate idle (sew-grill) :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1585,7 +1591,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior sew-grill) ja-post) + :post ja-post ) ;; definition for method 11 of type sew-grill @@ -1765,10 +1771,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate waiting (sew-scare-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sew-scare-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self draw status) (draw-control-status no-draw)) @@ -1803,10 +1806,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1814,16 +1814,13 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior sew-scare-grunt) ja-post) + :post ja-post ) ;; failed to figure out what this is: (defstate scare (sew-scare-grunt) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior sew-scare-grunt) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (logclear! (-> self draw status) (draw-control-status no-draw)) (let* ((actor (-> self grill-actor)) diff --git a/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc index 85293386e1b..f034b865e7b 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc @@ -140,10 +140,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.02) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.02) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.02)) @@ -509,10 +506,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.02) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.02) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.02)) @@ -648,10 +642,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -816,10 +807,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.02) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.02) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.02)) @@ -964,8 +952,8 @@ This commonly includes things such as: ) ;; failed to figure out what this is: -(defskelgroup skel-sew-light-switch sew-light-switch 0 2 - ((1 (meters 999999))) +(defskelgroup skel-sew-light-switch sew-light-switch sew-light-switch-lod0-jg sew-light-switch-idle-ja + ((sew-light-switch-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1.5) ) @@ -1024,10 +1012,7 @@ This commonly includes things such as: (sound-play "sew-light-switc") ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) diff --git a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc index f3884eedf52..a21f4c0f6a9 100644 --- a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc @@ -270,7 +270,7 @@ (go-virtual jump) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -307,7 +307,7 @@ (go-virtual idle-training) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -319,7 +319,7 @@ (go-virtual wait-for-pickup) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -331,7 +331,7 @@ (go-virtual jump) ) ) - :code (the-as (function none :behavior hoverboard-training-manager) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1668,7 +1668,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate open (skate-gate) :virtual #t - :code (the-as (function none :behavior skate-gate) sleep-code) + :code sleep-code ) ;; definition for method 29 of type skate-gate @@ -1915,7 +1915,7 @@ This commonly includes things such as: :exit (behavior () '() ) - :code (the-as (function none :behavior skatea-floating-ring) sleep-code) + :code sleep-code :post (behavior () (rlet ((acc :class vf) (vf0 :class vf) diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc index f3f9d470485..1713fa5026c 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc @@ -89,7 +89,7 @@ ) #f ) - :post (the-as (function none :behavior dummy-vehicle) ja-post) + :post ja-post ) ;; definition for method 11 of type dummy-vehicle @@ -211,10 +211,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) 0.5) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.5)) @@ -222,7 +219,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior gar-curtain) transform-post) + :post transform-post ) ;; definition for method 11 of type gar-curtain @@ -742,9 +739,9 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (rift-rider) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior rift-rider) #f) - :trans (the-as (function none :behavior rift-rider) #f) - :code (the-as (function none :behavior rift-rider) sleep-code) + :event #f + :trans #f + :code sleep-code ) ;; failed to figure out what this is: @@ -760,8 +757,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior rift-rider) sleep-code) - :post (the-as (function none :behavior rift-rider) transform-post) + :code sleep-code + :post transform-post ) ;; failed to figure out what this is: @@ -812,7 +809,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior rift-rider) sleep-code) + :code sleep-code :post (behavior () (get-point-in-path! (-> self path) (-> self dest-pos) (-> self path-pos) 'interp) (+! (-> self dest-pos y) (-> self height)) @@ -896,7 +893,7 @@ This commonly includes things such as: (go-virtual defend-stadium-complete) ) ) - :code (the-as (function none :behavior rift-rider) sleep-code) + :code sleep-code :post (behavior () (seek! (-> self height) 4096.0 (* 6144.0 (seconds-per-frame))) (get-point-in-path! (-> self path) (-> self dest-pos) (-> self path-pos) 'interp) @@ -1193,10 +1190,7 @@ This commonly includes things such as: :virtual #t :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1204,7 +1198,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior spotlight) ja-post) + :post ja-post ) ;; definition for method 11 of type spotlight @@ -1678,14 +1672,7 @@ This commonly includes things such as: ) ) ) - (ja-no-eval :group! (-> self draw art-group data (-> self stand-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self stand-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self stand-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1784,12 +1771,7 @@ This commonly includes things such as: (send-event (handle->process (-> self hud)) 'force-show) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data (-> self raise-ship-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self raise-ship-anim))) frames num-frames) -1) - ) - 0.75 - ) + :num! (seek! max 0.75) :frame-num 0.0 ) (until (ja-done? 0) @@ -1999,14 +1981,7 @@ This commonly includes things such as: ) :code (behavior () (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2016,16 +1991,7 @@ This commonly includes things such as: ) (vector-reset! (-> self root transv)) (set! (-> self falling?) #f) - (ja-no-eval :group! (-> self draw art-group data (-> self knocked-land-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self knocked-land-anim))) frames num-frames) - -1 - ) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self knocked-land-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2099,14 +2065,7 @@ This commonly includes things such as: (set! (-> gp-0 y) (lerp 20480.0 40960.0 f30-0)) ) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data (-> self death-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self death-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self death-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2114,14 +2073,7 @@ This commonly includes things such as: (if (-> self skel effect) (logior! (-> self skel effect flags) (effect-control-flag ecf1)) ) - (ja-no-eval :group! (-> self draw art-group data (-> self death-end-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self death-end-anim))) frames num-frames) -1) - ) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data (-> self death-end-anim)) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2524,7 +2476,7 @@ This commonly includes things such as: :enter (behavior () (sound-play "stadium-shield") ) - :code (the-as (function none :behavior stadium-barrier) sleep-code) + :code sleep-code :post (behavior () (if (!= (-> self flashf) 0.0) (seek! (-> self flashf) 0.0 (* 8.0 (seconds-per-frame))) @@ -2866,7 +2818,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior stad-force-field) sleep-code) + :code sleep-code ) ;; definition for method 12 of type stad-force-field @@ -3089,10 +3041,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.25) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.25) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.25)) @@ -3205,10 +3154,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1)) 0.25) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek! max 0.25) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.25)) @@ -3311,7 +3257,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (brutter-balloon) :virtual #t - :code (the-as (function none :behavior brutter-balloon) sleep-code) + :code sleep-code ) ;; definition for method 11 of type brutter-balloon diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-race-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-race-obs_REF.gc index ac9fd9f33c8..b953729ff19 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-race-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-race-obs_REF.gc @@ -51,7 +51,7 @@ ) ) ) - :code (the-as (function none :behavior stdmb-race-hatch) sleep-code) + :code sleep-code :post (behavior () (cond ((!= (-> self tt) (-> self tt-target)) diff --git a/test/decompiler/reference/jak2/levels/strip/chaincrate_REF.gc b/test/decompiler/reference/jak2/levels/strip/chaincrate_REF.gc index 7ef86d13f17..0d62326e74d 100644 --- a/test/decompiler/reference/jak2/levels/strip/chaincrate_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/chaincrate_REF.gc @@ -199,14 +199,14 @@ (update-trans! (-> self sound) (-> self root trans)) (update! (-> self sound)) ) - :code (the-as (function none :behavior strip-chain-crate-slave) sleep-code) - :post (the-as (function none :behavior strip-chain-crate-slave) rider-post) + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: (defstate die-fast (strip-chain-crate-slave) :virtual #t - :code (the-as (function none :behavior strip-chain-crate-slave) nothing) + :code nothing ) ;; definition for function strip-chain-crate-slave-init-by-other diff --git a/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc index ae536f781ff..84bfada6e92 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc @@ -250,8 +250,8 @@ ) ) ) - :trans (the-as (function none :behavior strip-game-crate) rider-trans) - :code (the-as (function none :behavior strip-game-crate) sleep-code) + :trans rider-trans + :code sleep-code :post (behavior () (let* ((f30-1 (* 333.14133 (cos (* 66.8053 (the float (mod (current-time) 981)))))) (f28-1 (* 358.62756 (cos (* 48.65331 (the float (mod (current-time) 1346)))))) @@ -276,7 +276,7 @@ (ja :group! (-> self draw art-group data 3) :num! min) (ja-post) ) - :code (the-as (function none :behavior strip-game-crate) sleep-code) + :code sleep-code ) ;; definition for method 22 of type strip-game-crate @@ -462,8 +462,8 @@ ) ) ) - :code (the-as (function none :behavior crane) sleep-code) - :post (the-as (function none :behavior crane) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 11 of type crane @@ -739,7 +739,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior grunt-egg) sleep-code) + :code sleep-code :post (behavior () (if (nonzero? (-> self sound)) (update! (-> self sound)) diff --git a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc index 48950bb5188..c80f77b8013 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc @@ -168,7 +168,7 @@ ) #f ) - :post (the-as (function none :behavior strip-hazard) transform-post) + :post transform-post ) ;; definition for method 11 of type strip-hazard @@ -885,7 +885,7 @@ This commonly includes things such as: :exit (behavior () (remove-setting! 'entity-name) ) - :code (the-as (function none :behavior grenade-point) sleep-code) + :code sleep-code :post (behavior () (spawn (-> self part) (-> self root trans)) (when (< (-> self lightning-time) (current-time)) 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 7f77cf98360..122405da081 100644 --- a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc @@ -1074,7 +1074,7 @@ ) ) ) - :code (the-as (function symbol none :behavior target) sleep-code) + :code (the-as (function symbol object) sleep-code) :post target-no-move-post ) diff --git a/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc b/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc index 530ad93fe65..7862d9f75bc 100644 --- a/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc @@ -199,10 +199,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -214,10 +211,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -247,19 +241,13 @@ (set! (-> v1-80 enemy-flags) (the-as enemy-flag (logclear (-> v1-80 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (ja-no-eval :group! monster-frog-hop-slow-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-start-ja) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-start-ja :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.4)) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-slow-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-end-ja) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-end-ja :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.4)) @@ -273,19 +261,13 @@ (defbehavior monster-frog-hop-fast-code monster-frog () (until #f (nav-enemy-method-166 self) - (ja-no-eval :group! monster-frog-hop-slow-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-slow-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -331,10 +313,7 @@ ) ) (logclear! (-> self draw status) (draw-control-status no-draw)) - (ja-no-eval :group! monster-frog-popup0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-popup0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-popup0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -345,7 +324,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior monster-frog) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -355,18 +334,12 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 0.8 1.2))) (new 'stack-no-clear 'vector) - (ja-no-eval :group! monster-frog-notice0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-notice0-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-notice0-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! monster-frog-notice0-jump-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-notice0-jump-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-notice0-jump-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (let ((a0-7 (handle->process (-> self focus handle)))) (if a0-7 @@ -381,10 +354,7 @@ (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! monster-frog-notice0-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-notice0-land-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-notice0-land-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -402,19 +372,13 @@ (until #f (nav-enemy-method-165 self) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! monster-frog-hop-slow-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-start-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-start-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-slow-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-slow-end-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-slow-end-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -429,14 +393,7 @@ 0 (nav-enemy-method-167 self) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -446,14 +403,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -473,14 +423,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.6)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -498,13 +441,13 @@ ;; failed to figure out what this is: (defstate pacing (monster-frog) :virtual #t - :code (the-as (function none :behavior monster-frog) monster-frog-hop-slow-code) + :code monster-frog-hop-slow-code ) ;; failed to figure out what this is: (defstate circling (monster-frog) :virtual #t - :code (the-as (function none :behavior monster-frog) monster-frog-hop-slow-code) + :code monster-frog-hop-slow-code ) ;; failed to figure out what this is: @@ -612,13 +555,7 @@ ) 0 (ja-channel-push! 2 (seconds 0.01)) - (ja-no-eval :group! monster-frog-hop-small-start-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim monster-frog-hop-small-start-ja) frames num-frames) -1)) - f28-1 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-small-start-ja :num! (seek! max f28-1) :frame-num 0.0) (let ((a0-15 (-> self skel root-channel 1))) (set! (-> a0-15 frame-interp 1) f30-1) (set! (-> a0-15 frame-interp 0) f30-1) @@ -638,10 +575,7 @@ ) ) (nav-enemy-method-167 self) - (ja-no-eval :group! monster-frog-hop-small-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-hop-small-end-ja) frames num-frames) -1)) f28-1) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-hop-small-end-ja :num! (seek! max f28-1) :frame-num 0.0) (let ((a0-21 (-> self skel root-channel 1))) (set! (-> a0-21 frame-interp 1) f30-1) (set! (-> a0-21 frame-interp 0) f30-1) @@ -677,17 +611,14 @@ ;; failed to figure out what this is: (defstate turn (monster-frog) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior monster-frog) enemy-event-handler) + :event enemy-event-handler :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag37) (-> v1-0 enemy-flags)))) ) 0 - (ja-no-eval :group! monster-frog-rotate-left-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-rotate-left-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-rotate-left-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -696,10 +627,7 @@ (set! (-> v1-26 enemy-flags) (the-as enemy-flag (logclear (-> v1-26 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (ja-no-eval :group! monster-frog-rotate-left-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-rotate-left-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-rotate-left-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -728,7 +656,7 @@ ;; failed to figure out what this is: (defstate attack (monster-frog) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior monster-frog) enemy-event-handler) + :event enemy-event-handler :enter (behavior ((arg0 vector)) (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -775,10 +703,7 @@ :code (behavior ((arg0 vector)) (ja-channel-push! 1 (seconds 0.04)) (nav-enemy-method-166 self) - (ja-no-eval :group! monster-frog-attack0-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-attack0-start-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-attack0-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -790,13 +715,13 @@ ) (go-virtual attack-recover) ) - :post (the-as (function none :behavior monster-frog) nav-enemy-travel-post) + :post nav-enemy-travel-post ) ;; failed to figure out what this is: (defstate attack-recover (monster-frog) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior monster-frog) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (set! (-> v1-0 enemy-flags) (the-as enemy-flag (logclear (-> v1-0 enemy-flags) (enemy-flag enemy-flag36)))) @@ -809,10 +734,7 @@ 0 ) :code (behavior () - (ja-no-eval :group! monster-frog-attack0-end-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-attack0-end-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-attack0-end-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -824,10 +746,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -839,10 +758,7 @@ (ja-channel-push! 1 (seconds 0.1)) ) ) - (ja-no-eval :group! monster-frog-idle1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim monster-frog-idle1-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! monster-frog-idle1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -851,7 +767,7 @@ ) (react-to-focus self) ) - :post (the-as (function none :behavior monster-frog) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 77 of type monster-frog diff --git a/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc b/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc index fee380abd50..758f267bcd8 100644 --- a/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc @@ -513,10 +513,7 @@ (let ((v1-2 (ja-group))) (cond ((and v1-2 (= v1-2 (-> self draw art-group data 421))) - (ja-no-eval :group! (-> self draw art-group data 422) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 422)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 422) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -526,10 +523,7 @@ ((let ((v1-32 (ja-group))) (and v1-32 (= v1-32 (-> self draw art-group data 437))) ) - (ja-no-eval :group! (-> self draw art-group data 442) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 442)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 442) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -542,10 +536,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 429) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 429)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 429) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -557,13 +548,7 @@ ) ) (until #f - (ja-no-eval :group! (-> self draw art-group data 415) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 415)) frames num-frames) -1)) - 1.5 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 415) :num! (seek! max 1.5) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.5)) @@ -654,13 +639,7 @@ ) ) (ja-channel-push! 1 (seconds 0.01)) - (ja-no-eval :group! (-> self draw art-group data 427) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 427)) frames num-frames) -1)) - 2.0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 427) :num! (seek! max 2.0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 2.0)) @@ -913,18 +892,12 @@ (cond ((and (and v1-3 (= v1-3 (-> self draw art-group data 418))) (< 0.6 (-> self control unknown-float35))) (ja-channel-push! 2 (seconds 0.04)) - (ja-no-eval :group! (-> self draw art-group data 418) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 418)) frames num-frames) -1))) - :frame-num (ja-aframe 1.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 418) :num! (seek!) :frame-num (ja-aframe 1.0 0)) (ja :chan 1 :group! (-> self draw art-group data 424) :num! (chan 0)) ) (else (ja-channel-push! 2 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 418) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 418)) frames num-frames) -1))) - :frame-num (ja-aframe 5.0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 418) :num! (seek!) :frame-num (ja-aframe 5.0 0)) (ja :chan 1 :group! (-> self draw art-group data 424) :num! (chan 0)) ) ) @@ -1000,10 +973,7 @@ ) :code (behavior ((arg0 symbol)) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! (-> self draw art-group data 420) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 420)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 420) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1028,10 +998,7 @@ :code (behavior () (set! (-> self control mod-surface) *indax-bounce-mods*) (ja-channel-push! 1 (seconds 0.02)) - (ja-no-eval :group! (-> self draw art-group data 443) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 443)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 443) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-y-vel adjust-xz-vel) 1.0 1.0 2.0) @@ -1041,10 +1008,7 @@ (while (not (logtest? (-> self control status) (collide-status on-surface))) (suspend) ) - (ja-no-eval :group! (-> self draw art-group data 444) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 444)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 444) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1066,13 +1030,7 @@ (let ((gp-0 (-> self draw art-group data 421))) (quaternion-rotate-y! (-> self control quat-for-control) (-> self control quat-for-control) -1365.3334) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! gp-0 - :num! (seek! - (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) - (-> self control current-surface align-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self control current-surface align-speed)) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -1117,13 +1075,7 @@ :code (behavior ((arg0 symbol)) (let ((gp-0 (-> self draw art-group data 428))) (ja-channel-push! 1 (seconds 0.05)) - (ja-no-eval :group! gp-0 - :num! (seek! - (the float (+ (-> (the-as art-joint-anim gp-0) frames num-frames) -1)) - (-> self control current-surface align-speed) - ) - :frame-num 0.0 - ) + (ja-no-eval :group! gp-0 :num! (seek! max (-> self control current-surface align-speed)) :frame-num 0.0) ) (until (ja-done? 0) (compute-alignment! (-> self align)) @@ -1170,7 +1122,7 @@ (set! (-> self control dynam gravity-length) 368640.0) (let ((gp-1 (-> self draw art-group data 437))) (ja-channel-push! 1 (seconds 0.02)) - (ja-no-eval :group! gp-1 :num! (seek! (the float (+ (-> (the-as art-joint-anim gp-1) frames num-frames) -1)))) + (ja-no-eval :group! gp-1 :num! (seek!)) ) (target-start-attack) (target-danger-set! 'punch #f) @@ -1443,10 +1395,7 @@ ) ) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 434) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 434)) frames num-frames) -1))) - :frame-num (ja-aframe f30-0 0) - ) + (ja-no-eval :group! (-> self draw art-group data 434) :num! (seek!) :frame-num (ja-aframe f30-0 0)) ) (until (ja-done? 0) (let ((a1-8 (new 'stack-no-clear 'event-message-block))) @@ -1472,10 +1421,7 @@ (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 433) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 433)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 433) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1490,20 +1436,14 @@ (ja-channel-push! 1 (seconds 0.1)) (cond ((rand-vu-percent? 0.5) - (ja-no-eval :group! (-> self draw art-group data 436) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 436)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 436) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) ) (else - (ja-no-eval :group! (-> self draw art-group data 435) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 435)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 435) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1518,10 +1458,7 @@ (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) (set! (-> self control mod-surface) *neutral-mods*) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 435) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 435)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 435) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc index 28ea0e133ef..c75cadc3a79 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc @@ -183,14 +183,7 @@ (let ((f30-0 (get-rand-float-range self 0.9 1.1))) (until #f (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -207,14 +200,7 @@ 0 (nav-enemy-method-167 self) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -224,14 +210,7 @@ ) (until (not (enemy-method-123 self 0.2)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info idle-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info idle-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -251,14 +230,7 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.05)) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info walk-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info walk-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -292,26 +264,14 @@ ) ) ) - (ja-no-eval :group! tomb-baby-spider-notice-spin-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-notice-spin-ja) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-notice-spin-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (seek-to-point-toward-point! (-> self root) gp-0 (* 1.8 (-> self nav max-rotation-rate)) (seconds 0.02)) (suspend) (ja :num! (seek! max f30-0)) ) ) - (ja-no-eval :group! tomb-baby-spider-notice-land-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-notice-land-ja) frames num-frames) -1)) - f30-0 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-notice-land-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -324,10 +284,7 @@ ;; failed to figure out what this is: (defstate attack (tomb-baby-spider) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior tomb-baby-spider) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (nav-enemy-method-166 self) (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) @@ -371,29 +328,20 @@ ) 0 (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! tomb-baby-spider-attack0-start-ja - :num! (seek! - (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-attack0-start-ja) frames num-frames) -1)) - 0.8 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-attack0-start-ja :num! (seek! max 0.8) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.8)) ) (go-virtual attack-stop) ) - :post (the-as (function none :behavior tomb-baby-spider) nav-enemy-chase-post) + :post nav-enemy-chase-post ) ;; failed to figure out what this is: (defstate attack-stop (tomb-baby-spider) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior tomb-baby-spider) - enemy-event-handler - ) + :event enemy-event-handler :enter (behavior () (let ((v1-0 (-> self nav))) (set! (-> v1-0 target-speed) 0.0) @@ -411,10 +359,7 @@ 0 ) :code (behavior () - (ja-no-eval :group! tomb-baby-spider-attack0-stop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-baby-spider-attack0-stop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-baby-spider-attack0-stop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -477,7 +422,7 @@ ) (go-virtual hostile) ) - :post (the-as (function none :behavior tomb-baby-spider) nav-enemy-face-focus-post) + :post nav-enemy-face-focus-post ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc index 5ddb7170e99..30dee5b9305 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc @@ -407,10 +407,7 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.1)) (until #f - (ja-no-eval :group! tomb-beetle-falling-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-falling-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-falling-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -435,10 +432,7 @@ (set! (-> self state-time) (current-time)) ) :code (behavior () - (ja-no-eval :group! tomb-beetle-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -453,23 +447,20 @@ (ja :num! (loop! f30-1)) ) ) - (ja-no-eval :group! tomb-beetle-flip-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-flip-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-flip-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (go-virtual active) ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-falling-post) + :post nav-enemy-falling-post ) ;; failed to figure out what this is: (defstate active (tomb-beetle) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-beetle) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-0 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-0 enemy-flags))) @@ -519,19 +510,13 @@ (f30-0 (rand-vu-float-range 1.8 1.2)) ) (dotimes (s5-0 gp-0) - (ja-no-eval :group! tomb-beetle-run0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-run0-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-run0-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) ) ) - (ja-no-eval :group! tomb-beetle-run1-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-run1-ja) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-run1-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-0)) @@ -548,7 +533,7 @@ ;; failed to figure out what this is: (defstate stand (tomb-beetle) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-beetle) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (let ((v1-2 self)) @@ -569,10 +554,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! tomb-beetle-stand0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-stand0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-stand0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -580,7 +562,7 @@ ) #f ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -638,10 +620,7 @@ ) ) (until #f - (ja-no-eval :group! tomb-beetle-stand0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-stand0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-stand0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (>= (current-time) (-> self state-timeout)) (goto cfg-20) @@ -665,10 +644,7 @@ (ja-eval) ) (until #f - (ja-no-eval :group! tomb-beetle-fly-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-fly-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-fly-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -730,14 +706,7 @@ (ja-channel-push! 1 (seconds 0.075)) (let ((f30-0 (get-rand-float-range self 1.8 2.2))) (ja-no-eval :group! (-> self draw art-group data (-> self enemy-info die-anim)) - :num! (seek! - (the float - (+ (-> (the-as art-joint-anim (-> self draw art-group data (-> self enemy-info die-anim))) frames num-frames) - -1 - ) - ) - f30-0 - ) + :num! (seek! max f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -748,7 +717,7 @@ (send-event self 'death-end) (go-virtual explode) ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -821,7 +790,7 @@ ) ) ) - :post (the-as (function none :behavior tomb-beetle) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -936,10 +905,7 @@ (ja-eval) ) (until #f - (ja-no-eval :group! tomb-beetle-fly-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-fly-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-fly-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -988,7 +954,7 @@ ;; failed to figure out what this is: (defstate key (tomb-beetle) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-beetle) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (let ((v1-1 (-> self draw shadow-ctrl))) (logclear! (-> v1-1 settings flags) (shadow-flags disable-draw)) @@ -1010,12 +976,9 @@ ) ) ) - :trans (the-as (function none :behavior tomb-beetle) ja-post) + :trans ja-post :code (behavior () - (ja-no-eval :group! tomb-beetle-fly-land-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim tomb-beetle-fly-land-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! tomb-beetle-fly-land-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc index 6484e4c6a13..10bc23b626b 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc @@ -43,7 +43,7 @@ ;; failed to figure out what this is: (defstate plat-idle (tomb-plat-wall) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-plat-wall) plat-event) + :event plat-event :exit (behavior () (when (nonzero? (-> self sound-id)) (sound-stop (-> self sound-id)) @@ -100,10 +100,7 @@ ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -111,7 +108,7 @@ ) #f ) - :post (the-as (function none :behavior tomb-plat-wall) plat-post) + :post plat-post ) ;; definition for method 32 of type tomb-plat-wall @@ -275,8 +272,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-stair-block-spikes) sleep-code) - :post (the-as (function none :behavior tomb-stair-block-spikes) transform-post) + :code sleep-code + :post transform-post ) ;; definition for function tomb-stair-block-spikes-init-by-other @@ -528,9 +525,7 @@ This commonly includes things such as: :virtual #t :enter (behavior () (set! (-> self root trans y) (-> self initial-y)) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (transform-post) ) :trans (behavior () @@ -607,10 +602,7 @@ This commonly includes things such as: (drop-pool 1) (suspend) ) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (lift-pool 1) (drop-pool 0) @@ -625,7 +617,7 @@ This commonly includes things such as: ) (go-virtual sunk) ) - :post (the-as (function none :behavior tomb-stair-block) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -712,13 +704,7 @@ This commonly includes things such as: (set! (-> self camera-state) 1) (ja-channel-push! 1 (seconds 2)) (until #f - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) - 0.125 - ) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 0.125) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.125)) @@ -726,7 +712,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior tomb-stair-block) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -789,8 +775,8 @@ This commonly includes things such as: (drop-pool 1) (position-spikes 1500) ) - :code (the-as (function none :behavior tomb-stair-block) sleep-code) - :post (the-as (function none :behavior tomb-stair-block) transform-post) + :code sleep-code + :post transform-post ) ;; failed to figure out what this is: @@ -835,7 +821,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-stair-block) sleep-code) + :code sleep-code ) ;; definition for method 11 of type tomb-stair-block @@ -1640,13 +1626,13 @@ This commonly includes things such as: :enter (behavior () (logior! (-> self draw status) (draw-control-status no-draw)) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate run-intro (tomb-plat-return) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior tomb-plat-return) plat-event) + :event plat-event :enter (behavior () (process-entity-status! self (entity-perm-status subtask-complete) #t) (logclear! (-> self draw status) (draw-control-status no-draw)) @@ -1665,7 +1651,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) + :code sleep-code :post (behavior () (sound-play "tomb-plat-ret" :id (-> self sound-id) :position (-> self root trans)) (seek! (-> self path-pos) 1.0 (* 2.0 (seconds-per-frame) (-> self path-speed))) @@ -1716,8 +1702,8 @@ This commonly includes things such as: (go-virtual running) ) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) - :post (the-as (function none :behavior tomb-plat-return) plat-post) + :code sleep-code + :post plat-post ) ;; failed to figure out what this is: @@ -1745,7 +1731,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) + :code sleep-code :post (behavior () (sound-play "tomb-plat-ret" :id (-> self sound-id) :position (-> self root trans)) (seek! (-> self path-pos) (-> self dest-pos) (* (-> self path-speed) (seconds-per-frame))) @@ -1789,8 +1775,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-plat-return) sleep-code) - :post (the-as (function none :behavior tomb-plat-return) plat-post) + :code sleep-code + :post plat-post ) ;; definition for method 7 of type tomb-plat-return @@ -2006,7 +1992,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-sphinx) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc index dee6cb6bbce..d7417e80fa1 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc @@ -72,7 +72,7 @@ ) ) ) - :code (the-as (function none :behavior tomb-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -119,10 +119,7 @@ (suspend) ) ) - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (-> self root quat) (transform-post) @@ -264,7 +261,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-beetle-door) sleep-code) + :code sleep-code :post (behavior () 0 ) @@ -314,10 +311,7 @@ This commonly includes things such as: ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -325,7 +319,7 @@ This commonly includes things such as: ) (sleep-code) ) - :post (the-as (function none :behavior tomb-beetle-door) ja-post) + :post ja-post ) ;; definition for symbol tomb-beetle-door-offsets, type (inline-array vector) @@ -989,7 +983,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-plat-simon) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1110,7 +1104,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-plat-simon) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1134,7 +1128,7 @@ This commonly includes things such as: (send-event (handle->process (-> self button-handle)) 'untrigger) ) ) - :code (the-as (function none :behavior tomb-plat-simon) sleep-code) + :code sleep-code :post (behavior () (debug-draw (-> self path)) ) @@ -1302,7 +1296,7 @@ This commonly includes things such as: (set! (-> self move-rate) 122880.0) ) :trans tomb-simon-block-trans - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post (behavior () (if (>= (- (current-time) (-> self state-time)) (the int (* 300.0 (+ (* 0.1 (the float (-> self order))) (* 0.015 (the float (-> self my-idx)))))) @@ -1372,7 +1366,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1403,7 +1397,7 @@ This commonly includes things such as: ) ) :trans tomb-simon-block-trans - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1468,7 +1462,7 @@ This commonly includes things such as: ) (tomb-simon-block-trans) ) - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1509,7 +1503,7 @@ This commonly includes things such as: ) (plat-trans) ) - :code (the-as (function none :behavior tomb-simon-block) sleep-code) + :code sleep-code :post tomb-simon-block-post ) @@ -1526,12 +1520,9 @@ This commonly includes things such as: ) ) ) - :trans (the-as (function none :behavior tomb-simon-block) plat-trans) + :trans plat-trans :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1694,7 +1685,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-simon-button) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1705,20 +1696,15 @@ This commonly includes things such as: (set! (-> v1-2 user-int8 0) 1) ) ) - :trans (the-as (function none :behavior tomb-simon-button) rider-trans) + :trans rider-trans :code (behavior ((arg0 symbol)) (cond (arg0 - (ja :group! (-> self draw art-group data 3) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 3) :num! max) ) (else (sound-play "simon-btn-open") - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1727,7 +1713,7 @@ This commonly includes things such as: ) (go-virtual waiting) ) - :post (the-as (function none :behavior tomb-simon-button) rider-post) + :post rider-post ) ;; failed to figure out what this is: @@ -1760,13 +1746,10 @@ This commonly includes things such as: ) ) :enter (behavior () - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (transform-post) ) - :code (the-as (function none :behavior tomb-simon-button) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1785,17 +1768,12 @@ This commonly includes things such as: ) (cond (arg0 - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (transform-post) ) (else (sound-play "simon-btn-press") - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -1816,10 +1794,7 @@ This commonly includes things such as: (defstate unpress (tomb-simon-button) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -2094,7 +2069,7 @@ This commonly includes things such as: :trans (behavior () 0 ) - :code (the-as (function none :behavior tomb-vibe) sleep-code) + :code sleep-code :post (behavior () (let* ((s5-0 *target*) (gp-0 (if (type? s5-0 process-focusable) @@ -2210,7 +2185,7 @@ This commonly includes things such as: (go-virtual idle) ) ) - :post (the-as (function none :behavior tomb-vibe) transform-post) + :post transform-post ) ;; failed to figure out what this is: @@ -2222,9 +2197,7 @@ This commonly includes things such as: :code (behavior ((arg0 symbol)) (cond (arg0 - (ja :group! (-> self draw art-group data 5) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 5) :num! max) (transform-post) ) (else @@ -2258,10 +2231,7 @@ This commonly includes things such as: (-> gp-1 ppointer) ) ) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -2485,7 +2455,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-water-trap) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2840,7 +2810,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-smash-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2881,10 +2851,7 @@ This commonly includes things such as: ) ) :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) @@ -2898,10 +2865,7 @@ This commonly includes things such as: (defstate close (tomb-smash-door) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (transform-post) (suspend) diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc index b0fc7d883c8..a2d4680e064 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc @@ -270,7 +270,7 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-widow widow widow-lod0-jg 8 +(defskelgroup skel-widow widow widow-lod0-jg widow-drill-ja ((widow-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 12) :shadow widow-shadow-mg @@ -643,8 +643,8 @@ :trans (behavior () (baron-pod-method-21 self #f) ) - :code (the-as (function none :behavior baron-pod) sleep-code) - :post (the-as (function none :behavior baron-pod) transform-post) + :code sleep-code + :post transform-post ) ;; definition for function baron-pod-init-by-other @@ -727,7 +727,7 @@ (deactivate self) ) ) - :code (the-as (function none :behavior tomb-boss-bridge) sleep-code) + :code sleep-code ) ;; definition for method 11 of type tomb-boss-bridge diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc index ecb8d8b97c3..d0ad8d4f2d6 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc @@ -172,8 +172,8 @@ (deactivate self) ) ) - :code (the-as (function none :behavior tomb-boss-catwalk) sleep-code) - :post (the-as (function none :behavior tomb-boss-catwalk) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -216,7 +216,7 @@ ) ) ) - :code (the-as (function none :behavior tomb-boss-catwalk) sleep-code) + :code sleep-code ) ;; definition for method 22 of type tomb-boss-catwalk @@ -862,8 +862,8 @@ This commonly includes things such as: ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) transform-post) + :code sleep-code + :post transform-post ) ;; failed to figure out what this is: @@ -931,8 +931,8 @@ This commonly includes things such as: ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) transform-post) + :code sleep-code + :post transform-post ) ;; failed to figure out what this is: @@ -976,8 +976,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 32 of type widow-bomb @@ -1048,8 +1048,8 @@ This commonly includes things such as: (widow-bomb-method-32 self) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) - :post (the-as (function none :behavior widow-bomb) ja-post) + :code sleep-code + :post ja-post ) ;; definition for method 33 of type widow-bomb @@ -1250,7 +1250,7 @@ This commonly includes things such as: ) (ja :num! (loop!)) ) - :code (the-as (function none :behavior widow-bomb) sleep-code) + :code sleep-code :post (behavior () (transform-post) (do-push-aways (-> self root)) @@ -1598,13 +1598,11 @@ This commonly includes things such as: :virtual #t :enter (behavior () (set! (-> self draw bounds w) 36864.0) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (tomb-boss-pillar-shrink-collision) (ja-post) ) - :code (the-as (function none :behavior tomb-boss-pillar) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1633,8 +1631,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior tomb-boss-pillar) sleep-code) - :post (the-as (function none :behavior tomb-boss-pillar) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1688,7 +1686,7 @@ This commonly includes things such as: (set! (-> v1-2 user-object 1) (-> self segs-shot)) ) ) - :code (the-as (function none :behavior tomb-boss-pillar) sleep-code) + :code sleep-code ) ;; definition for method 10 of type tomb-boss-pillar @@ -1829,13 +1827,11 @@ This commonly includes things such as: :virtual #t :enter (behavior () (set! (-> self draw bounds w) 36864.0) - (ja :group! (-> self draw art-group data 4) - :num! (identity (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1))) - ) + (ja :group! (-> self draw art-group data 4) :num! max) (tomb-boss-firepot-shrink-collision) (ja-post) ) - :code (the-as (function none :behavior tomb-boss-firepot) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1888,8 +1884,8 @@ This commonly includes things such as: (go-virtual broken) ) ) - :code (the-as (function none :behavior tomb-boss-firepot) sleep-code) - :post (the-as (function none :behavior tomb-boss-firepot) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -1940,7 +1936,7 @@ This commonly includes things such as: ) 0 ) - :code (the-as (function none :behavior tomb-boss-firepot) sleep-code) + :code sleep-code ) ;; definition for method 11 of type tomb-boss-firepot diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc index eb0bc5c1901..1e8baac630e 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc @@ -297,7 +297,7 @@ (set-vector! (-> self draw color-mult) f30-1 f30-1 f30-1 1.0) ) ) - :code (the-as (function none :behavior tomb-boss-debris) sleep-code) + :code sleep-code :post (behavior () (transform-post) (let ((a1-0 (new 'stack-no-clear 'overlaps-others-params))) @@ -508,7 +508,7 @@ (set! (-> self state-time) (+ (current-time) (the int (* 300.0 (rand-vu-float-range 0.1 0.5))))) ) ) - :code (the-as (function none :behavior cave-in-master) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -521,7 +521,7 @@ ) ) ) - :code (the-as (function none :behavior cave-in-master) sleep-code) + :code sleep-code ) ;; definition for method 11 of type cave-in-master diff --git a/test/decompiler/reference/jak2/levels/under/centipede_REF.gc b/test/decompiler/reference/jak2/levels/under/centipede_REF.gc index 9fe7f91daaf..056b984da8a 100644 --- a/test/decompiler/reference/jak2/levels/under/centipede_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/centipede_REF.gc @@ -829,7 +829,7 @@ (set! (-> v1-5 prim-core collide-with) (-> self root backup-collide-with)) ) ) - :code (the-as (function none :behavior centipede) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -906,7 +906,7 @@ ) #f ) - :post (the-as (function none :behavior centipede) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; failed to figure out what this is: @@ -999,7 +999,7 @@ (go-virtual attack) ) ) - :code (the-as (function none :behavior centipede) sleep-code) + :code sleep-code :post (behavior () (centipede-method-188 self) (let ((a0-2 (handle->process (-> self focus handle)))) @@ -1045,7 +1045,7 @@ (react-to-focus self) ) ) - :code (the-as (function none :behavior centipede) sleep-code) + :code sleep-code :post (behavior () (centipede-method-188 self) (nav-enemy-method-176 self) @@ -1143,10 +1143,7 @@ :code (behavior () (local-vars (a1-5 event-message-block)) (ja-channel-push! 1 (seconds 0.17)) - (ja-no-eval :group! centipede-attack0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centipede-attack0-ja) frames num-frames) -1)) 3.0) - :frame-num 0.0 - ) + (ja-no-eval :group! centipede-attack0-ja :num! (seek! max 3.0) :frame-num 0.0) (until (ja-done? 0) (centipede-method-186 self) (suspend) @@ -1155,10 +1152,7 @@ (if (not (-> self grabbed-focus?)) (go-virtual attack-failed) ) - (ja-no-eval :group! centipede-eat0-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim centipede-eat0-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! centipede-eat0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc index 087d5ca615a..66535f76fa6 100644 --- a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc @@ -498,7 +498,7 @@ (go-virtual stare) ) ) - :code (the-as (function none :behavior jellyfish) hover-enemy-fly-code) + :code hover-enemy-fly-code :post (behavior () (debug-draw (-> self path)) (hover-enemy-dest-post) @@ -576,7 +576,7 @@ ;; failed to figure out what this is: (defstate threaten (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! *jellyfish-mech-reserved* #t) ) @@ -589,10 +589,7 @@ :code (behavior () (set! (-> self restart-fly-anims) #t) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! jellyfish-notice-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-notice-ja) frames num-frames) -1)) 1.4) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-notice-ja :num! (seek! max 1.4) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 1.4)) @@ -625,7 +622,7 @@ ;; failed to figure out what this is: (defstate charge-attack (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! *jellyfish-mech-reserved* #t) (look-at-target! self (enemy-flag death-start)) @@ -666,19 +663,13 @@ ) ) :code (behavior () - (ja-no-eval :group! jellyfish-notice-charge-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-notice-charge-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-notice-charge-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) ) (until #f - (ja-no-eval :group! jellyfish-notice-charge-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-notice-charge-loop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-notice-charge-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -712,7 +703,7 @@ ;; failed to figure out what this is: (defstate grab-mech (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! *jellyfish-mech-reserved* #t) (set! (-> self attach-lerp) 0.0) @@ -764,10 +755,7 @@ (set-vector! (-> self grab-offset) 0.0 14336.0 0.0 0.0) (set! (-> self grab-start-pos quad) (-> self root trans quad)) (quaternion-copy! (-> self grab-start-quat) (-> self root quat)) - (ja-no-eval :group! jellyfish-grab-start-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-start-ja) frames num-frames) -1)) 1.2) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-start-ja :num! (seek! max 1.2) :frame-num 0.0) (until (ja-done? 0) (set! (-> self attach-lerp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 0.0 14.0)) (suspend) @@ -784,10 +772,7 @@ ) (set! (-> self grab-start-pos quad) (-> self root trans quad)) (quaternion-copy! (-> self grab-start-quat) (-> self root quat)) - (ja-no-eval :group! jellyfish-grab-attach-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-attach-ja) frames num-frames) -1)) 1.2) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-attach-ja :num! (seek! max 1.2) :frame-num 0.0) (until (ja-done? 0) (set! (-> self attach-lerp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 14.0 23.0)) (suspend) @@ -803,10 +788,7 @@ ) (let ((gp-3 *target*)) (dotimes (s5-2 2) - (ja-no-eval :group! jellyfish-grab-attach-loop-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-attach-loop-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-attach-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and gp-3 (focus-test? gp-3 mech) (not (logtest? (-> gp-3 focus-status) (focus-status dead ignore)))) (send-event @@ -829,10 +811,7 @@ (dotimes (gp-4 3) (initialize-chain-joints (-> self tentacles gp-4)) ) - (ja-no-eval :group! jellyfish-grab-detach-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-grab-detach-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-grab-detach-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (set! (-> self attach-lerp) (lerp-scale 0.0 1.0 (ja-aframe-num 0) 48.0 65.0)) (suspend) @@ -861,16 +840,13 @@ ;; failed to figure out what this is: (defstate die (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (logclear! (-> self focus-status) (focus-status dangerous)) (enemy-method-52 self (-> self root transv)) (let ((gp-0 (current-time))) - (ja-no-eval :group! jellyfish-die-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-die-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-die-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (let ((s5-0 (ja-group)) (f0-4 (ja-aframe-num 0)) @@ -906,13 +882,13 @@ ) (cleanup-for-death self) ) - :post (the-as (function none :behavior jellyfish) enemy-falling-post) + :post enemy-falling-post ) ;; failed to figure out what this is: (defstate die-now (jellyfish) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior jellyfish) enemy-event-handler) + :event enemy-event-handler :code (behavior () (dispose! self) (let ((v1-3 (-> self root root-prim))) @@ -921,10 +897,7 @@ ) 0 (logior! (-> self draw status) (draw-control-status no-draw)) - (ja-no-eval :group! jellyfish-die-ja - :num! (seek! (the float (+ (-> (the-as art-joint-anim jellyfish-die-ja) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! jellyfish-die-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/under/pipe-grunt_REF.gc b/test/decompiler/reference/jak2/levels/under/pipe-grunt_REF.gc index 332f920a464..a2a83a5693b 100644 --- a/test/decompiler/reference/jak2/levels/under/pipe-grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/pipe-grunt_REF.gc @@ -58,7 +58,7 @@ ;; failed to figure out what this is: (defstate ambush (pipe-grunt) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior pipe-grunt) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (set! (-> self state-time) (current-time)) (logior! (-> self enemy-flags) (enemy-flag chase-startup)) @@ -105,10 +105,7 @@ (ja-channel-push! 1 0) (until #f (let ((a1-2 (-> self draw art-group data (-> self charge-anim anim-index)))) - (ja-no-eval :group! a1-2 - :num! (seek! (the float (+ (-> (the-as art-joint-anim a1-2) frames num-frames) -1)) f30-0) - :frame-num 0.0 - ) + (ja-no-eval :group! a1-2 :num! (seek! max f30-0) :frame-num 0.0) ) (until (ja-done? 0) (suspend) @@ -118,5 +115,5 @@ ) #f ) - :post (the-as (function none :behavior pipe-grunt) nav-enemy-simple-post) + :post nav-enemy-simple-post ) diff --git a/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc b/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc index d8bdc68f5e8..8f0e0fe1d7c 100644 --- a/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc @@ -370,7 +370,7 @@ ;; failed to figure out what this is: (defstate intro-shooting (sig-under) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior sig-under) enemy-event-handler) + :event enemy-event-handler :enter (behavior () (move-to-point! (-> self root) (the-as vector (-> self sig5-course spots 0))) (quaternion-identity! (-> self root quat)) @@ -451,10 +451,7 @@ (logclear! (-> self bot-flags) (bot-flags bf18)) (let ((gp-3 (+ (current-time) (get-rand-int-range self 30 600)))) (ja-channel-push! 1 (seconds 0.5)) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (>= (current-time) gp-3) (goto cfg-27) @@ -469,7 +466,7 @@ ) #f ) - :post (the-as (function none :behavior sig-under) nav-enemy-simple-post) + :post nav-enemy-simple-post ) ;; definition for method 183 of type sig-under diff --git a/test/decompiler/reference/jak2/levels/under/under-laser_REF.gc b/test/decompiler/reference/jak2/levels/under/under-laser_REF.gc index 93b24a6b571..e3119b1c1ff 100644 --- a/test/decompiler/reference/jak2/levels/under/under-laser_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-laser_REF.gc @@ -229,8 +229,8 @@ (set! (-> self root scale x) (lerp-scale 0.5 3.5 f0-3 32768.0 245760.0)) ) ) - :code (the-as (function none :behavior under-laser-shadow) sleep-code) - :post (the-as (function none :behavior under-laser-shadow) ja-post) + :code sleep-code + :post ja-post ) ;; definition for function under-laser-shadow-init-by-other @@ -279,8 +279,8 @@ (vector+! (-> a0-1 trans) (-> a0-1 trans) (-> (the-as under-laser v1-0) slave-trans-offset)) ) ) - :code (the-as (function none :behavior under-laser-slave) sleep-code) - :post (the-as (function none :behavior under-laser-slave) ja-post) + :code sleep-code + :post ja-post ) ;; definition for function under-laser-slave-init-by-other @@ -369,7 +369,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior under-laser) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -396,7 +396,7 @@ ) (update-vol! (-> self sound) 1.0) ) - :code (the-as (function none :behavior under-laser) sleep-code) + :code sleep-code :post (behavior () (let ((f30-0 (get-norm! (-> self sync) 0))) (vector-lerp! (-> self root trans) (-> self zero-pos) (-> self one-pos) f30-0) diff --git a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc index 2aa137621e6..29c51870cf6 100644 --- a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc @@ -333,7 +333,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior bubbler) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -383,7 +383,7 @@ ) ) ) - :code (the-as (function none :behavior bubbler) sleep-code) + :code sleep-code ) ;; definition for method 10 of type bubbler @@ -503,8 +503,8 @@ This commonly includes things such as: ) (set! (-> self ridden) #f) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -529,8 +529,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -557,8 +557,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -580,8 +580,8 @@ This commonly includes things such as: ) (set! (-> self ridden) #f) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -610,8 +610,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) ;; failed to figure out what this is: @@ -645,8 +645,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-rise-plat) sleep-code) - :post (the-as (function none :behavior under-rise-plat) rider-post) + :code sleep-code + :post rider-post ) ;; definition for method 11 of type under-rise-plat @@ -780,8 +780,8 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-buoy-base) sleep-code) - :post (the-as (function none :behavior under-buoy-base) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: @@ -790,8 +790,8 @@ This commonly includes things such as: :enter (behavior () (process-entity-status! self (entity-perm-status subtask-complete) #t) ) - :code (the-as (function none :behavior under-buoy-base) sleep-code) - :post (the-as (function none :behavior under-buoy-base) ja-post) + :code sleep-code + :post ja-post ) ;; definition for function under-buoy-base-init-by-other @@ -898,8 +898,8 @@ This commonly includes things such as: (set! (-> self root trans quad) (-> (the-as process-drawable v1-0) root trans quad)) ) ) - :code (the-as (function none :behavior under-buoy-chain) sleep-code) - :post (the-as (function none :behavior under-buoy-chain) ja-post) + :code sleep-code + :post ja-post ) ;; definition for function under-buoy-chain-init-by-other @@ -1142,17 +1142,14 @@ This commonly includes things such as: :enter (behavior () 0 ) - :code (the-as (function none :behavior under-buoy-plat) sleep-code) - :post (the-as (function none :behavior under-buoy-plat) ja-post) + :code sleep-code + :post ja-post ) ;; failed to figure out what this is: (defstate running (under-buoy-plat) :virtual #t - :event (the-as - (function process int symbol event-message-block object :behavior under-buoy-plat) - rigid-body-object-event-handler - ) + :event rigid-body-object-event-handler :enter (behavior () (sound-play "break-chain") (send-event (ppointer->process (-> self base)) 'release) @@ -1160,10 +1157,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -1465,7 +1459,7 @@ This commonly includes things such as: (deactivate self) ) ) - :code (the-as (function none :behavior under-mine) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1549,7 +1543,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-mine) sleep-code) + :code sleep-code :post (behavior () (transform-post) (if *nav-network* @@ -1922,7 +1916,7 @@ For example for an elevator pre-compute the distance between the first and last :exit (behavior () (ja-abort-spooled-anim (the-as spool-anim (-> self anim)) (the-as art-joint-anim #f) -1) ) - :post (the-as (function none :behavior under-break-door) ja-post) + :post ja-post ) ;; definition for method 11 of type under-break-door @@ -2061,10 +2055,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2072,7 +2063,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-a) ja-post) + :post ja-post ) ;; definition for method 11 of type under-seaweed-a @@ -2180,10 +2171,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2191,7 +2179,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-b) ja-post) + :post ja-post ) ;; definition for method 11 of type under-seaweed-b @@ -2253,10 +2241,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2264,7 +2249,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-c) ja-post) + :post ja-post ) ;; definition for method 11 of type under-seaweed-c @@ -2326,10 +2311,7 @@ This commonly includes things such as: ) :code (behavior () (until #f - (ja-no-eval :group! (ja-group) - :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -2337,7 +2319,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-seaweed-d) ja-post) + :post ja-post ) ;; definition for method 11 of type under-seaweed-d diff --git a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc index adddb2b34bc..a7f41297856 100644 --- a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc @@ -1362,14 +1362,14 @@ :enter (behavior () (logclear! (-> self flags) (under-block-flags unbflags-0)) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: (defstate rise-up (under-block) :virtual #t :event under-block-event-handler - :trans (the-as (function none :behavior under-block) rider-trans) + :trans rider-trans :code (behavior () (logclear! (-> self flags) (under-block-flags unbflags-0)) (while (not (under-block-method-48 self (-> self col) (-> self row))) @@ -1398,7 +1398,7 @@ (defstate follow (under-block) :virtual #t :event under-block-event-handler - :trans (the-as (function none :behavior under-block) rider-trans) + :trans rider-trans :code (behavior () (logclear! (-> self flags) (under-block-flags unbflags-0)) (set! (-> self state-time) (current-time)) @@ -1427,7 +1427,7 @@ (logior! (-> self flags) (under-block-flags unbflags-0)) (under-block-method-41 self 'active) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1444,7 +1444,7 @@ :trans (behavior () (under-block-method-45 self) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1667,7 +1667,7 @@ :trans (behavior () (under-block-method-45 self) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1703,7 +1703,7 @@ (logclear! (-> self flags) (under-block-flags unbflags-0)) (under-block-method-41 self 'beaten) ) - :code (the-as (function none :behavior under-block) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -1794,7 +1794,7 @@ ;; failed to figure out what this is: (defstate die-fast (under-block) :virtual #t - :code (the-as (function none :behavior under-block) nothing) + :code nothing ) ;; definition for function cshape-reaction-under-block @@ -2265,7 +2265,7 @@ ) 0 ) - :code (the-as (function none :behavior under-shoot-block) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2292,7 +2292,7 @@ ) ) ) - :code (the-as (function none :behavior under-shoot-block) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -2340,7 +2340,7 @@ (defstate beaten (under-shoot-block) :virtual #t :event under-shoot-block-event-handler - :code (the-as (function none :behavior under-shoot-block) sleep-code) + :code sleep-code ) ;; definition for method 10 of type under-shoot-block diff --git a/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc b/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc index d36ba2de10b..74492da2067 100644 --- a/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc @@ -184,7 +184,7 @@ For example for an elevator pre-compute the distance between the first and last (go-virtual plat-path-active) ) ) - :code (the-as (function none :behavior under-plat-shoot) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -528,7 +528,7 @@ otherwise, [[plat::34]] ) ) ) - :code (the-as (function none :behavior under-break-floor) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -575,7 +575,7 @@ otherwise, [[plat::34]] ) (cleanup-for-death self) ) - :post (the-as (function none :behavior under-break-floor) ja-post) + :post ja-post ) ;; failed to figure out what this is: @@ -688,7 +688,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (under-break-wall) :virtual #t - :code (the-as (function none :behavior under-break-wall) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -809,7 +809,7 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (under-break-bridge) :virtual #t - :code (the-as (function none :behavior under-break-bridge) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -967,7 +967,7 @@ This commonly includes things such as: ) ) ) - :code (the-as (function none :behavior under-int-door) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -977,10 +977,7 @@ This commonly includes things such as: (process-entity-status! self (entity-perm-status subtask-complete) #t) (sound-play "und-block-door") (logior! (-> self skel status) (joint-control-status sync-math)) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1)) 0.13) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 0.13) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.13)) @@ -988,13 +985,13 @@ This commonly includes things such as: (logclear! (-> self skel status) (joint-control-status sync-math)) (go-virtual idle-open) ) - :post (the-as (function none :behavior under-int-door) transform-post) + :post transform-post ) ;; failed to figure out what this is: (defstate idle-open (under-int-door) :virtual #t - :code (the-as (function none :behavior under-int-door) sleep-code) + :code sleep-code ) ;; definition for method 11 of type under-int-door @@ -1133,13 +1130,13 @@ This commonly includes things such as: ;; failed to figure out what this is: (defstate idle (under-plat-long) :virtual #t - :event (the-as (function process int symbol event-message-block object :behavior under-plat-long) plat-event) + :event plat-event :trans (behavior () (plat-trans) (vector-lerp! (-> self root trans) (-> self move-start) (-> self move-end) (get-norm! (-> self sync) 0)) ) - :code (the-as (function none :behavior under-plat-long) sleep-code) - :post (the-as (function none :behavior under-plat-long) plat-post) + :code sleep-code + :post plat-post ) ;; definition for method 31 of type under-plat-long @@ -1298,7 +1295,7 @@ This commonly includes things such as: :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) ) - :trans (the-as (function none :behavior under-plat-wall) rider-trans) + :trans rider-trans :code (behavior () (let ((gp-0 #t)) (until #f @@ -1327,7 +1324,7 @@ This commonly includes things such as: ) #f ) - :post (the-as (function none :behavior under-plat-wall) rider-post) + :post rider-post ) ;; definition for method 11 of type under-plat-wall @@ -1532,8 +1529,8 @@ This commonly includes things such as: (set! (-> self desired-volume) 1.0) (set! (-> self volume-seek-speed) (rand-vu-float-range 0.5 0.2)) ) - :code (the-as (function none :behavior under-pipe-growls) sleep-code) - :post (the-as (function none :behavior under-pipe-growls) under-pipe-growls-post) + :code sleep-code + :post under-pipe-growls-post ) ;; failed to figure out what this is: @@ -1580,7 +1577,7 @@ This commonly includes things such as: (sound-play "grunt-notice" :vol 200 :position (target-pos 0)) (sleep-code) ) - :post (the-as (function none :behavior under-pipe-growls) under-pipe-growls-post) + :post under-pipe-growls-post ) ;; failed to figure out what this is: @@ -1596,8 +1593,8 @@ This commonly includes things such as: (go empty-state) ) ) - :code (the-as (function none :behavior under-pipe-growls) sleep-code) - :post (the-as (function none :behavior under-pipe-growls) under-pipe-growls-post) + :code sleep-code + :post under-pipe-growls-post ) ;; definition for function under-pipe-growls-init-by-other diff --git a/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc b/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc index 7d91da3b296..bf57d9b6e92 100644 --- a/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc @@ -57,10 +57,7 @@ ) (ja :num! (loop!)) (ja :chan 1 :num! (chan 0)) - (ja-no-eval :group! (-> self draw art-group data 2) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) frames num-frames) -1))) - :frame-num 0.0 - ) + (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) @@ -77,7 +74,7 @@ ;; failed to figure out what this is: (defstate die-fast (under-warp) :virtual #t - :code (the-as (function none :behavior under-warp) nothing) + :code nothing ) ;; definition for method 22 of type under-warp @@ -478,7 +475,7 @@ (go-virtual big-room-player-under) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -497,7 +494,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -522,7 +519,7 @@ ) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -539,7 +536,7 @@ (go-virtual big-room-player-falling) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -572,7 +569,7 @@ ) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -595,7 +592,7 @@ (go-virtual idle) ) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -606,7 +603,7 @@ :enter (behavior () (go-virtual idle) ) - :code (the-as (function none :behavior underb-master) sleep-code) + :code sleep-code :post underb-master-post ) @@ -819,7 +816,7 @@ ) ) ) - :code (the-as (function none :behavior under-locking) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: @@ -920,7 +917,7 @@ ) ) ) - :code (the-as (function none :behavior under-locking) sleep-code) + :code sleep-code ) ;; failed to figure out what this is: