From 3acdb83bda9c5207cbae2e46e4a4ef7879c22257 Mon Sep 17 00:00:00 2001 From: xTheft Date: Sun, 19 Oct 2025 17:18:06 -0500 Subject: [PATCH 01/13] yink changes --- fighters/younglink/src/acmd/aerials.rs | 13 +- fighters/younglink/src/acmd/specials.rs | 2 +- fighters/younglink/src/acmd/throws.rs | 144 +- .../fighter/common/param/fighter_param.prcxml | 6750 ++++++++--------- .../younglink/motion/body/motion_patch.yaml | 14 +- 5 files changed, 3539 insertions(+), 3384 deletions(-) diff --git a/fighters/younglink/src/acmd/aerials.rs b/fighters/younglink/src/acmd/aerials.rs index 83fc5f511a..7d1549b3b8 100644 --- a/fighters/younglink/src/acmd/aerials.rs +++ b/fighters/younglink/src/acmd/aerials.rs @@ -131,9 +131,9 @@ unsafe extern "C" fn game_attackairb(agent: &mut L2CAgentBase) { } frame(lua_state, 18.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("hip"), 8.0, 55, 75, 0, 40, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 1, 0, Hash40::new("kneer"), 8.0, 55, 75, 0, 40, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 2, 0, Hash40::new("kneer"), 8.0, 55, 75, 0, 40, 4.0, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 0, 0, Hash40::new("hip"), 7.0, 55, 65, 0, 35, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 1, 0, Hash40::new("kneer"), 7.0, 55, 65, 0, 35, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 2, 0, Hash40::new("kneer"), 7.0, 55, 65, 0, 35, 4.0, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); } wait(lua_state, 3.0); if is_excute(agent) { @@ -197,7 +197,12 @@ unsafe extern "C" fn game_attackairlw(agent: &mut L2CAgentBase) { if is_excute(agent) { WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING); WorkModule::on_flag(boma, *FIGHTER_LINK_INSTANCE_WORK_ID_FLAG_ATTACK_AIR_LW_SET_ATTACK); - ATTACK(agent, 0, 0, Hash40::new("top"), 16.0, 70, 83, 0, 30, 4.5, 0.0, 3.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("top"), 16.0, 70, 92, 0, 35, 4.5, 0.0, 3.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("top"), 16.0, 281, 50, 0, 30, 3.5, 0.0, 9.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + } + frame(lua_state, 17.0); + if is_excute(agent) { + ATTACK(agent, 0, 0, Hash40::new("top"), 13.0, 70, 85, 0, 25, 4.5, 0.0, 3.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); ATTACK(agent, 1, 0, Hash40::new("top"), 16.0, 281, 50, 0, 30, 3.5, 0.0, 9.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } frame(lua_state, 41.0); diff --git a/fighters/younglink/src/acmd/specials.rs b/fighters/younglink/src/acmd/specials.rs index 87443e5672..5044593f8b 100644 --- a/fighters/younglink/src/acmd/specials.rs +++ b/fighters/younglink/src/acmd/specials.rs @@ -155,7 +155,7 @@ unsafe extern "C" fn game_specialairhi(agent: &mut L2CAgentBase) { } frame(lua_state, 8.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("top"), 15.0, 361, 100, 0, 20, 3.25, 0.0, 9.0, 11.0, Some(0.0), Some(9.0), Some(-11.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("top"), 16.0, 361, 100, 0, 20, 3.25, 0.0, 9.0, 11.0, Some(0.0), Some(9.0), Some(-11.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } wait(lua_state, 3.0); if is_excute(agent) { diff --git a/fighters/younglink/src/acmd/throws.rs b/fighters/younglink/src/acmd/throws.rs index 79d23e1e6b..d249e89834 100644 --- a/fighters/younglink/src/acmd/throws.rs +++ b/fighters/younglink/src/acmd/throws.rs @@ -1,10 +1,142 @@ use super::*; +unsafe extern "C" fn game_catch(agent: &mut L2CAgentBase) { + let lua_state = agent.lua_state_agent; + let boma = agent.boma(); + frame(lua_state, 6.0); + if is_excute(agent) { + ArticleModule::generate_article(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, false, -1); + ArticleModule::generate_article(boma,*FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, false, -1); + } + frame(lua_state, 11.0); + if is_excute(agent) { + GrabModule::set_rebound(boma, true); + } + frame(lua_state, 12.0); + if is_excute(agent) { + ArticleModule::change_status(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT,*WEAPON_TOONLINK_HOOKSHOT_STATUS_KIND_SHOOT, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + ArticleModule::change_motion(boma,*FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, Hash40::new("shoot"), false, -1.0); + CATCH(agent, 0, Hash40::new("throw"), 2.8, 0.0, 0.0, 0.0, None, None, None, *FIGHTER_STATUS_KIND_CAPTURE_PULLED,*COLLISION_SITUATION_MASK_GA); + CATCH(agent, 1, Hash40::new("handr"), 1.5, 0.0, 0.0, 0.0, None, None, None, *FIGHTER_STATUS_KIND_CAPTURE_PULLED,*COLLISION_SITUATION_MASK_GA); + CATCH(agent, 2, Hash40::new("handr"), 4.0, 0.0, 0.0, 0.0, None, None, None, *FIGHTER_STATUS_KIND_CAPTURE_PULLED,*COLLISION_SITUATION_MASK_G); + } + game_CaptureCutCommon(agent); + frame(lua_state, 14.0); + if is_excute(agent) { + grab!(agent, MA_MSC_CMD_GRAB_CLEAR, 1); + grab!(agent,MA_MSC_CMD_GRAB_CLEAR, 2); + } + frame(lua_state, 19.0); + if is_excute(agent) { + grab!(agent, MA_MSC_CMD_GRAB_CLEAR_ALL); + GrabModule::set_rebound(boma, false); + } + frame(lua_state, 46.0); + if is_excute(agent) { + ArticleModule::change_status_exist(boma,*FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, *WEAPON_TOONLINK_HOOKSHOT_STATUS_KIND_REWIND); + ArticleModule::change_motion(boma,*FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, Hash40::new("back"), false, -1.0); + WorkModule::on_flag(boma, *FIGHTER_LINK_INSTANCE_WORK_ID_FLAG_OFF_MAP_COLL_OFFSET); + } + frame(lua_state, 65.0); + if is_excute(agent) { + ArticleModule::remove_exist(boma,*FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + ArticleModule::remove_exist(boma,*FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + } +} + +unsafe extern "C" fn game_catchdash(agent: &mut L2CAgentBase) { + let lua_state = agent.lua_state_agent; + let boma = agent.boma(); + frame(lua_state, 7.0); + if is_excute(agent) { + ArticleModule::generate_article(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, false, -1); + ArticleModule::generate_article(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, false, -1); + } + frame(lua_state, 13.0); + if is_excute(agent) { + GrabModule::set_rebound(boma, true); + } + frame(lua_state, 14.0); + if is_excute(agent) { + ArticleModule::change_status(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, *WEAPON_TOONLINK_HOOKSHOT_STATUS_KIND_SHOOT, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + ArticleModule::change_motion(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, Hash40::new("shoot"), false, -1.0); + CATCH(agent, 0, Hash40::new("throw"), 2.8, 0.0, 0.0, 0.0, None,None, None,*FIGHTER_STATUS_KIND_CAPTURE_PULLED, *COLLISION_SITUATION_MASK_GA); + CATCH(agent, 1, Hash40::new("handr"), 1.5, 0.0, 0.0, 0.0, None,None, None,*FIGHTER_STATUS_KIND_CAPTURE_PULLED, *COLLISION_SITUATION_MASK_GA); + CATCH(agent, 2, Hash40::new("handr"), 4.0, 0.0, 0.0, 0.0, None,None, None,*FIGHTER_STATUS_KIND_CAPTURE_PULLED, *COLLISION_SITUATION_MASK_G); + } + game_CaptureCutCommon(agent); + wait(lua_state, 2.0); + if is_excute(agent) { + grab!(agent, *MA_MSC_CMD_GRAB_CLEAR, 1); + grab!(agent, *MA_MSC_CMD_GRAB_CLEAR, 2); + } + wait(lua_state, 5.0); + if is_excute(agent) { + grab!(agent, *MA_MSC_CMD_GRAB_CLEAR_ALL); + GrabModule::set_rebound(boma, false); + } + frame(lua_state, 45.0); + if is_excute(agent) { + ArticleModule::change_status_exist(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, *WEAPON_TOONLINK_HOOKSHOT_STATUS_KIND_REWIND); + ArticleModule::change_motion(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, Hash40::new("back"), false, -1.0); + WorkModule::on_flag(boma, *FIGHTER_LINK_INSTANCE_WORK_ID_FLAG_OFF_MAP_COLL_OFFSET); + } + frame(lua_state, 63.0); + if is_excute(agent) { + ArticleModule::remove_exist(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + ArticleModule::remove_exist(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + } +} + +unsafe extern "C" fn game_catchturn(agent: &mut L2CAgentBase) { + let lua_state = agent.lua_state_agent; + let boma = agent.boma(); + frame(lua_state, 6.0); + if is_excute(agent) { + ArticleModule::generate_article(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, false, -1); + ArticleModule::generate_article(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, false, -1); + } + frame(lua_state, 14.0); + if is_excute(agent) { + GrabModule::set_rebound(boma, true); + } + frame(lua_state, 15.0); + if is_excute(agent) { + ArticleModule::change_status(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, *WEAPON_TOONLINK_HOOKSHOT_STATUS_KIND_SHOOT, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + ArticleModule::change_motion(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, Hash40::new("shoot"), false, -1.0); + CATCH(agent, 0, Hash40::new("throw"), 2.8, 0.0, 0.0, 0.0, None,None, None,*FIGHTER_STATUS_KIND_CAPTURE_PULLED, *COLLISION_SITUATION_MASK_GA); + CATCH(agent, 1, Hash40::new("handr"), 1.5, 0.0, 0.0, 0.0, None,None, None,*FIGHTER_STATUS_KIND_CAPTURE_PULLED, *COLLISION_SITUATION_MASK_GA); + CATCH(agent, 2, Hash40::new("handr"), 4.0, 0.0, 0.0, 0.0, None,None, None,*FIGHTER_STATUS_KIND_CAPTURE_PULLED, *COLLISION_SITUATION_MASK_G); + } + game_CaptureCutCommon(agent); + wait(lua_state, 2.0); + if is_excute(agent) { + grab!(agent, *MA_MSC_CMD_GRAB_CLEAR, 1); + grab!(agent, *MA_MSC_CMD_GRAB_CLEAR, 2); + } + wait(lua_state, 5.0); + if is_excute(agent) { + grab!(agent, *MA_MSC_CMD_GRAB_CLEAR_ALL); + GrabModule::set_rebound(boma, false); + } + frame(lua_state, 53.0); + if is_excute(agent) { + ArticleModule::change_status_exist(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, *WEAPON_TOONLINK_HOOKSHOT_STATUS_KIND_REWIND); + ArticleModule::change_motion(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, Hash40::new("back"), false, -1.0); + WorkModule::on_flag(boma, *FIGHTER_LINK_INSTANCE_WORK_ID_FLAG_OFF_MAP_COLL_OFFSET); + } + frame(lua_state, 72.0); + if is_excute(agent) { + ArticleModule::remove_exist(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + ArticleModule::remove_exist(boma, *FIGHTER_YOUNGLINK_GENERATE_ARTICLE_HOOKSHOT_HAND, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL)); + } +} + unsafe extern "C" fn game_throwf(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 6.0, 48, 191, 0, 10, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 48, 105, 0, 35, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 60, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 2.0); @@ -52,7 +184,7 @@ unsafe extern "C" fn game_throwhi(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 80, 100, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 85, 155, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 26.0); @@ -107,7 +239,7 @@ unsafe extern "C" fn game_throwlw(agent: &mut L2CAgentBase) { if is_excute(agent) { FT_LEAVE_NEAR_OTTOTTO(agent, -2, 2); FT_LEAVE_NEAR_OTTOTTO(agent, 2.5, 2.5); - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 138, 68, 0, 50, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 85, 85, 0, 80, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 22.0); @@ -143,4 +275,10 @@ pub fn install(agent: &mut Agent) { agent.acmd("effect_throwhi", effect_throwhi, Priority::Low); agent.acmd("game_throwlw", game_throwlw, Priority::Low); + + agent.acmd("game_catch", game_catch, Priority::Low); + + agent.acmd("game_catchdash", game_catchdash, Priority::Low); + + agent.acmd("game_catchturn", game_catchturn, Priority::Low); } \ No newline at end of file diff --git a/romfs/source/fighter/common/param/fighter_param.prcxml b/romfs/source/fighter/common/param/fighter_param.prcxml index 95ceeebade..053408714e 100644 --- a/romfs/source/fighter/common/param/fighter_param.prcxml +++ b/romfs/source/fighter/common/param/fighter_param.prcxml @@ -1,3375 +1,3375 @@ - - - - - - 1.125 - 0.061 - 1.62 - 0.06 - 0.02 - 1.6 - 4 - 1.6 - 11.946 - 34 - 13 - 33.5 - 0.065 - 0.01 - 1 - 0.016 - 0.095 - 1.8 - 100 - 7 - 11 - 7 - 7 - 12 - 4 - 1 - 10 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 0.95 - 1.265 - 0.08 - 1.76 - 0.02 - 1.76 - 5 - 1 - 1.8 - 12.155 - 13 - 34.5 - 0.03 - 1.105 - 0.02 - 0.12 - 2.4 - 2.96 - 109 - 10 - 13 - 9 - 13 - 12 - 5 - false - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - - - - 1.217 - 0.09 - 1.5 - 0.10167 - 0.02 - 1.5 - 4 - 1 - 1.3 - 9.9385 - 12.58 - 25 - 0.02 - 1 - 0.005 - 0.11 - 2.13 - 104 - 8 - 10 - 7 - 14 - 18 - 4 - 1 - 10.4 - false - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 0.06 - 1.674 - 0.10113 - 0.02 - 1.55 - 4 - 0.95 - 1.34 - 13.2275 - 19.4 - 0.045 - 0.02 - 0.942 - 0.0125 - 0.066 - 1.43 - 2.24 - 108 - 7 - 12 - 9 - 10 - 5 - 5 - false - 0.96 - 12.2 - 0.7 - 1.1 - 1 - 1 - 1 - - - - 1.168 - 0.0655 - 1.45 - 0.08 - 0.02 - 1.696 - 5 - 0.93 - 1.596 - 12.9022 - 0.048 - 0.02 - 1.22 - 0.009 - 0.094 - 1.9 - 2.93 - 108 - 11 - 8 - 9 - 14 - 5 - 5 - 0.94 - 7.7 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 0.927 - 0.08 - 1.524 - 0.0805 - 0.02 - 1.6 - 4 - 1 - 1.6 - 9.07 - 0.04 - 0.02 - 1 - 0.02 - 0.082 - 1.6 - 2.217 - 74 - 7 - 10 - 9 - 12 - 4 - 0.98 - 8.9 - 3 - 25 - 2 - 0.85 - 0.85 - 1.1 - 1 - 1 - 1 - - - - 1.6 - 0.08 - 1.9 - 0.1 - 0.02 - 2.2 - 3 - 0.72 - 0.83 - 1.7 - 12.5125 - 12 - 0.06 - 0.02 - 0.83 - 0.02 - 0.23 - 2.8 - 3.4 - 75 - 15 - 10 - 10 - 10 - 4 - 3 - 25 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 1.24 - 0.09 - 1.8 - 0.08 - 0.02 - 1.8 - 3 - 0.8 - 1.8 - 12.69125 - 15 - 0.03 - 0.02 - 0.901 - 0.01 - 0.11 - 1.9 - 2.7 - 80 - 8 - 9 - 9 - 12 - 13 - 4 - 1.05 - 8.5 - 0.82 - 0.82 - 1.1 - 1 - 1 - 1 - - - - 1.1 - 0.031 - 1.435 - 0.04 - 0.02 - 1.555 - 4 - 0.75 - 0.6 - 1.28 - 12.1 - 44 - 14 - 34 - 0.03 - 0.015 - 0.8 - 0.01 - 0.079 - 1.71 - 2.2 - 100 - 7 - 11 - 8 - 7 - 10 - 4 - 5 - 1 - 10.5 - true - 0.75 - 0.75 - 2.3 - 1.1 - 1 - 1 - 1 - - - - 0.877 - 0.06 - 1.45 - 0.06 - 0.02 - 1.6 - 4 - 1.5 - 1 - 12.3266 - 14.65 - 0.04 - 0.02 - 1.05 - 0.01 - 0.09 - 1.83 - 2.23 - 94 - 8 - 12 - 7 - 9 - 10 - 4 - 4 - 1.055 - 9 - false - 0.75 - 0.75 - 1.9 - 1.1 - 1 - 1 - 1 - - - - 0.927 - 0.08 - 2 - 0.15 - 0.01 - 2.3 - 4 - 0.95 - 2.1 - 14.4 - 40.13 - 12.95 - 29.94 - 0.04 - 0.02 - 1.12 - 0.01 - 0.13 - 2.808 - 3.5 - 99 - 12 - 10 - 9 - 14 - 4 - 1.03 - 11 - 2 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - - - - 0.08 - 1.45 - 0.065 - 0.02 - 5 - 8.7076 - 9.146 - 0.12 - 0.06 - 1.34 - 0.04 - 0.064 - 1.3 - 1.588 - 64 - 10 - 4 - 3 - 1 - 9.8 - 999.84 - 0.81 - 0.81 - 1 - 1.1 - 1 - 1 - 1 - - - - 0.904 - 0.0886 - 1.2 - 0.02 - 0.1 - 1.5 - 5 - 0.71 - 0.73 - 1.3 - 10.7357 - 15.66 - 0.06 - 0.01 - 1.1 - 0.005 - 0.08 - 1.5 - 2.1 - 90 - 8 - 11 - 8 - 7 - 5 - 4 - 1 - 11 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - - - - 0.078 - 1.625 - 0.05428 - 0.02 - 1.735 - 5 - 0.75 - 0.8 - 1.355 - 11.7975 - 14.7 - 0.015 - 1.011 - 0.01 - 0.13 - 2.12 - 2.812 - 117 - 10 - 13 - 13 - 12 - 21 - 5 - 5 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 0.95 - 0.035 - 1.4 - 0.05 - 0.02 - 1.4 - 4 - 0.6 - 9.7132 - 14.75 - 0.027 - 0.02 - 0.83 - 0.02 - 0.1 - 1.61 - 2.167 - 88 - 8 - 9 - 12 - 13 - 4 - 4 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - - - - 1.108 - 0.0385 - 1.4 - 0.06 - 0.02 - 1.545 - 4 - 0.6 - 9.7132 - 14.75 - 0.03105 - 0.02 - 0.87375 - 0.02 - 0.1 - 1.61 - 2.167 - 88 - 8 - 9 - 12 - 13 - 4 - 4 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - - - - 1.43 - 0.082 - 1.704 - 0.1 - 0.02 - 1.83 - 3 - 0.76 - 1.4 - 13.9425 - 15.5 - 0.075 - 1.0175 - 0.0115 - 2.15 - 3.08 - 90 - 8 - 8 - 8 - 12 - 11 - 4 - 5 - 1 - 11.5 - 3 - 25 - 2 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - false - - - - 0.874 - 0.08 - 1.65 - 0.12025 - 0.02 - 1.4 - 5 - 0.72 - 0.7 - 1.175 - 11.2791 - 14.24 - 0.05 - 0.02 - 1.051 - 0.077 - 1.5 - 2.245 - 90 - 9 - 10 - 11 - 11 - 4 - 5 - 1 - 0.79 - 0.79 - 1.1 - 1 - 1 - 1 - - - - 1.12 - 0.062 - 1.52 - 0.06 - 0.02 - 1.5 - 4 - 1.5 - 11.0398 - 30 - 12 - 29.5 - 0.03 - 0.024 - 0.95 - 0.011 - 0.0965 - 2 - 2.7 - 100 - 8 - 12 - 8 - 8 - 13 - 4 - 1 - 10 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 0.5 - 1.0 - 2.0 - - - - 1.25 - 0.096 - 1.85 - 0.08 - 0.02 - 1.82 - 3 - 1.82 - 11.63813 - 32 - 15.43 - 0.08 - 0.0055 - 1.05 - 0.01 - 0.165 - 2.65 - 3.344 - 55 - 10 - 13 - 9 - 14 - 4 - 1 - 8.3 - 0.82 - 0.82 - 1.1 - 1 - 1 - 1 - - - - 1.4 - 0.08 - 1.9 - 0.1 - 0.02 - 1.5 - 5 - 0.7 - 1 - 1.7 - 17.0573 - 12 - 41.778 - 0.06 - 0.02 - 0.83 - 0.02 - 0.17 - 3.1 - 3.5 - 80 - 7 - 9 - 10 - 9 - 10 - 4 - 3 - 25 - 2 - 0.82 - 0.82 - 3.43 - 1.1 - 1 - 1 - 1 - - - - 1.6 - 0.06 - 1.5 - 0.06 - 0.0 - 1.8 - 4 - 1 - 1.20 - 12.03345 - 13.995 - 26.24 - 0.02 - 0.02 - 0.900 - 0.005 - 0.085 - 2.2 - 2.728 - 87 - 9 - 14 - 12 - 8 - 8 - 4 - 0.95 - 12.5 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 0.08 - 1.8 - 0.0802 - 0.02 - 1.6 - 3 - 1 - 1.2 - 12.03345 - 12.6 - 1 - 0.005 - 0.11 - 2.16 - 2.9 - 85 - 8 - 9 - 9 - 12 - 16 - 4 - 1 - 10.4 - 2 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 0.07 - 1.4 - 0.08 - 0.01 - 1.45 - 5 - 0.75 - 1.8 - 10.61365 - 30.5 - 14.21 - 30 - 0.05 - 0.02 - 0.9 - 0.02 - 0.13 - 2 - 109 - 11 - 12 - 12 - 10 - 15 - 5 - 0.96 - 13.4 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 0.05 - 1.45 - 0.05 - 0.1 - 1.66 - 5 - 1.4 - 11.12183 - 14.5 - 0.03 - 0.02 - 1.2 - 0.082 - 1.5 - 2.3 - 93 - 9 - 12 - 9 - 4 - 5 - false - 2 - 20 - 1 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 0.06 - 1.475 - 0.07 - 0.01 - 1.805 - 4 - 1.265 - 11.0718 - 25 - 0.95 - 0.115 - 2.4 - 3.024 - 85 - 10 - 10 - 13 - 10 - 13 - 4 - 4 - 0.96 - 12.4 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 0.06 - 1.5 - 0.08 - 0.02 - 1.5 - 4 - 1 - 1.5 - 9.8348 - 11.76 - 0.048 - 0.02 - 1 - 0.016 - 0.095 - 1.71 - 2.28 - 75 - 9 - 12 - 11 - 10 - 10 - 4 - 1 - 10 - 2 - 20 - 1 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - - - - 0.09 - 1.765 - 0.08 - 0.02 - 2.1 - 4 - 1.5 - 11.44 - 14.32 - 0.062 - 0.01 - 1 - 0.015 - 0.13 - 2.6 - 3.281 - 79 - 9 - 11 - 13 - 9 - 10 - 4 - 5 - 1 - 10.7 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 5 - - - - 1.229 - 0.07 - 1.5 - 0.1 - 0.02 - 1.82 - 4 - 1.55 - 11.0825 - 12.96 - 0.05 - 0.01 - 1.01 - 0.01 - 0.095 - 1.9 - 2.43 - 80 - 9 - 11 - 10 - 11 - 10 - 4 - 2 - 0.9 - 0.9 - 1.1 - 1 - 1 - 1 - - - - 1.35 - 0.0725 - 1.7 - 0.08 - 0.02 - 2.05 - 4 - 0.95 - 0.95 - 1.45 - 13.875 - 37.5 - 13.5 - 32.5 - 0.09 - 0.01 - 1.005 - 0.005 - 0.135 - 2.05 - 2.75 - 79 - 9 - 9 - 9 - 8 - 12 - 4 - 5 - 1 - 11.6 - 0.8 - 0.8 - 2.6 - 1.1 - 1 - 1 - 1 - - - - 0.85 - 0.085 - 1.4 - 0.06 - 0.02 - 1.55 - 5 - 1.3 - 1 - 1.4 - 10.90375 - 13.7 - 0.14 - 0.03 - 1.2 - 0.04 - 0.122 - 1.93 - 2.486 - 102 - 8 - 7 - 12 - 9 - 29 - 4 - 5 - 1 - 10 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 0.08 - 1.35 - 0.1 - 0.02 - 1.55 - 5 - 0.8 - 0.74 - 1.1 - 9.691 - 27.62 - 12.0 - 0.01 - 0.045 - 0.94 - 0.098 - 2.12 - 2.89 - 105 - 12 - 14 - 10 - 10 - 12 - 5 - 0.97 - 12.4 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 1.2 - 0.08 - 2 - 0.065 - 0.01 - 1.55 - 5 - 0.95 - 0.75 - 1.3 - 10.6893 - 14 - 27 - 0.925 - 0.01 - 0.103 - 2.05 - 2.9 - 100 - 9 - 13 - 9 - 12 - 12 - 5 - 1 - 12.2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 1.25 - 0.055 - 1.75 - 0.15 - 0.01 - 1.625 - 4 - 0.72 - 0.8 - 2.1 - 0.9 - 12.5125 - 35.0 - 12.0 - 37.0 - 0.0375 - 0.01 - 1.05 - 0.006 - 0.128 - 2.25 - 2.9 - 80 - 9 - 8 - 9 - 7 - 8 - 4 - 5 - 1.067 - 9.2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - false - - - - 0.2 - 0.1 - 1.12 - 0.075 - 1.6 - 0.08 - 0.02 - 1.58 - 4 - 1 - 1.45 - 11.5294 - 28.0 - 16.03 - 28.0 - 0.9 - 0.018 - 0.098 - 2.0 - 2.5 - 95 - 10 - 9 - 10 - 13 - 11 - 4 - 5 - 1.14 - 10 - 4 - 25 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 0.08 - 0.02 - 0.75 - 0.0875 - 1.5 - 0.02 - 2.09 - 4 - 0.95 - 11.44 - 34 - 15.5 - 0.04 - 0.02 - 1.09 - 0.012 - 0.092 - 1.85 - 2.51 - 110 - 11 - 12 - 14 - 12 - 12 - 5 - 5 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 1.283 - 0.08 - 1.7 - 0.1 - 0.02 - 1.9 - 3 - 1 - 0.85 - 1.7 - 14.7326 - 17 - 33 - 0.01 - 1 - 0.012 - 2.55 - 3.023 - 85 - 11 - 8 - 12 - 4 - 5 - 1 - 9.7 - 0.815 - 0.815 - 0.0792308 - 1.15252 - 1.1 - 1 - 1 - 1 - false - - - - 0.82 - 0.0475 - 1.625 - 0.1 - 0.02 - 1.725 - 4 - 1.5 - 17.0741 - 49 - 12.5 - 0.075 - 1 - 0.125 - 2.3 - 0.0225 - 2.7 - 80 - 9 - 10 - 10 - 4 - 1.055 - 9.1 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 1.8 - 1.8 - 0.5 - - - - 1.414 - 0.085 - 1.7 - 0.12 - 0.02 - 3.5 - 4 - 0.85 - 0.75 - 2 - 12.5125 - 14.595 - 0.035 - 0.01 - 1.11 - 0.111 - 1.98 - 2.67 - 82 - 8 - 11 - 10 - 10 - 16 - 4 - 4 - 0.95 - 10.6 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 0.975 - 0.07 - 1.48 - 0.04 - 0.02 - 1.36 - 5 - 1 - 0.7 - 1.16 - 11.7439 - 15.02 - 0.04 - 0.02 - 0.915 - 0.005 - 0.095 - 2.25 - 3.3 - 107 - 11 - 14 - 11 - 12 - 15 - 5 - 5 - 0.93 - 3 - 25 - 2 - 4 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 0.925 - 0.075 - 1.56 - 0.05 - 0.02 - 1.625 - 4 - 0.7 - 1 - 1.315 - 11.9763 - 11.69 - 0.03 - 0.02 - 1.11 - 0.02 - 0.09 - 1.9 - 2.46 - 83 - 7 - 7 - 8 - 10 - 12 - 4 - 0.95 - 10.3 - true - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.303 - 0.095 - 2.05 - 0.15 - 0.02 - 1.85 - 4 - 1.1 - 1 - 1.25 - 13.44915 - 15.19 - 0.035 - 0 - 1 - 0.005 - 0.125 - 2.02 - 2.728 - 94 - 10 - 8 - 15 - 10 - 10 - 5 - 5 - 1.05 - 10.6 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - false - - - - 1.138 - 0.07 - 1.3 - 0.02 - 0.1 - 1.66 - 4 - 0.7 - 0.8 - 1.3 - 13.585 - 17.98 - 0.025 - 0.04 - 1.08 - 0.01 - 2 - 2.648 - 104 - 9 - 7 - 12 - 11 - 4 - 6 - 0.95 - 13 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.248 - 0.078 - 1.8 - 0.1 - 0.02 - 1.675 - 4 - 1 - 12.0835 - 14.32 - 25 - 0.05 - 0.02 - 1.035 - 0.005 - 0.11 - 2.06 - 2.831 - 85 - 9 - 7 - 11 - 22 - 4 - 4 - 1 - 9.7 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.3 - 0.09 - 1.9 - 0.1 - 0.02 - 1.8 - 4 - 0.9 - 0.75 - 1.7 - 11.44715 - 12 - 33 - 0.06 - 0.02 - 1.2 - 0.015 - 0.16 - 2.7 - 3.4 - 80 - 7 - 10 - 10 - 11 - 12 - 4 - 1.18 - 8.7 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 1.112 - 0.0835 - 1.705 - 0.08584 - 0.02 - 1.507 - 4 - 1 - 1 - 1.55 - 11.61875 - 15.09 - 0.05 - 0.01 - 0.946 - 0.0175 - 0.084 - 1.649 - 2.225 - 85 - 7 - 11 - 12 - 9 - 4 - 4 - 1.037 - 9.6 - true - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.232 - 0.076 - 1.738 - 0.08584 - 0.02 - 1.542 - 4 - 1 - 1.5 - 11.726 - 11.99 - 0.065 - 0.01 - 1.08 - 0.025 - 0.11 - 2.18 - 2.91 - 102 - 7 - 10 - 14 - 17 - 13 - 4 - 1 - 9.8 - 3 - 20 - 20 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.244 - 0.0835 - 1.815 - 0.08584 - 0.02 - 1.89 - 3 - 1 - 1.45 - 12.727 - 13.18 - 0.066 - 0.01 - 0.977 - 0.113 - 1.816 - 2.414 - 96 - 7 - 9 - 10 - 10 - 4 - 5 - 0.96 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 0.057 - 1.735 - 0.09969 - 0.02 - 1.67 - 5 - 0.77 - 1.25 - 14.3 - 16.17 - 0.078 - 0.015 - 1 - 0.009 - 0.081 - 1.6 - 2.287 - 89 - 7 - 10 - 9 - 10 - 4 - 4 - 1 - 12.6 - 2 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 0.0835 - 1.88 - 0.1252 - 0.02 - 2.046 - 5 - 0.95 - 0.8 - 1.5 - 10.725 - 28 - 27 - 0.02 - 0.014 - 1.085 - 0.01 - 0.117 - 2.165 - 3 - 90 - 8 - 9 - 9 - 7 - 10 - 4 - 4 - 1.11 - 10.7 - 2 - 0.785 - 0.785 - 1.1 - 1 - 1 - 1 - - - - 0.063 - 1.775 - 0.1087 - 0.02 - 1.9 - 5 - 1 - 1.46 - 16.445 - 15.51 - 0.058 - 0.01 - 1.09 - 0.01125 - 2.49 - 3.441 - 85 - 9 - 9 - 12 - 20 - 4 - 5 - 1 - 10 - 2 - 0.65 - 0.65 - 1.1 - 1 - 1 - 1 - false - - - - 0.0785 - 1.845 - 0.09969 - 0.02 - 1.815 - 4 - 0.77 - 0.8 - 1.4 - 12.8343 - 14.31 - 0.08 - 0.959 - 0.0065 - 0.124 - 1.915 - 2.51 - 90 - 9 - 8 - 12 - 11 - 4 - 4 - 0.95 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 0.07 - 1.625 - 0.08584 - 0.02 - 1.62 - 4 - 1 - 1.5 - 12.1908 - 27 - 15.48 - 28 - 0.065 - 0.015 - 1.095 - 0.0125 - 0.085 - 1.7 - 2.472 - 95 - 7 - 10 - 12 - 8 - 18 - 4 - 5 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 0.089 - 0.185 - 0.998 - 0.081 - 1.71 - 0.04965 - 0.02 - 1.35 - 5 - 1 - 1.25 - 11.8726 - 14.52 - 0.04 - 0.01 - 1.03 - 0.008 - 0.099 - 2.25 - 3 - 93 - 9 - 10 - 11 - 12 - 4 - 1 - 11.8 - 22 - 2 - false - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 1.175 - 0.085 - 1.6 - 0.04238 - 0.02 - 1.7 - 4 - 1 - 1.3 - 11.9763 - 16.2 - 0.022 - 0.02 - 0.982 - 0.0065 - 0.106 - 2.18 - 2.68 - 96 - 10 - 12 - 14 - 11 - 13 - 5 - 0.98 - 12 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.124 - 0.07 - 1.745 - 0.08584 - 0.02 - 1.724 - 4 - 1 - 1.5 - 12.298 - 15.59 - 0.058 - 0.01 - 0.98 - 0.111 - 2.238 - 3.007 - 110 - 8 - 10 - 10 - 7 - 12 - 5 - 4 - 3 - 25 - 2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - - - - 0.0605 - 1.59 - 0.08584 - 0.02 - 1.642 - 4 - 1 - 1.4 - 12.155 - 14.48 - 0.056 - 0.02 - 1.093 - 0.0135 - 0.088 - 1.91 - 2.8 - 85 - 7 - 8 - 10 - 9 - 11 - 4 - 4 - 1 - 9.5 - 2 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - - - - 0.11 - 1.12 - 0.825 - 0.1 - 1.6 - 0.1 - 0.02 - 1.578 - 5 - 1 - 1.35 - 10.725 - 26 - 13 - 29.5 - 1.1 - 0.005 - 0.12 - 1.857 - 2.6 - 103 - 7 - 9 - 10 - 12 - 5 - 1.02 - 12.3 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 1.205 - 0.062 - 1.66 - 0.055 - 0.03 - 1.855 - 5 - 1 - 1.425 - 11.6188 - 36.5 - 14.0 - 34.0 - 0.045 - 0.015 - 1.01 - 0.007 - 0.135 - 2.4 - 3.25 - 101 - 10 - 12 - 11 - 13 - 13 - 4 - 5 - 1.01 - 12.6 - 0.815 - 0.815 - false - 1 - 1 - 1 - - - - 1.228 - 0.0825 - 1.7215 - 0.04238 - 0.02 - 1.7215 - 4 - 1 - 0.75 - 1.3 - 10.6071 - 0.027 - 0.015 - 0.966 - 0.00525 - 0.1 - 2.08 - 2.848 - 98 - 10 - 10 - 14 - 12 - 12 - 4 - 0.99 - 11.8 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 0.975 - 0.069 - 1.806 - 0.1 - 0.02 - 1.65 - 4 - 1 - 1.5 - 13.9425 - 12.5 - 0.065 - 0.015 - 1.03 - 0.007 - 0.132 - 2.35 - 2.9 - 84 - 8 - 10 - 10 - 8 - 20 - 4 - 4 - 1.03 - 12.6 - 2 - 0.815 - 0.815 - 1 - 1 - 1.1 - 1 - 1 - 1 - false - - - - 0.0585 - 1.525 - 0.0825 - 0.02 - 1.875 - 3 - 1 - 1.6 - 11.7975 - 12.2 - 33 - 33 - 0.05 - 0.018 - 1.095 - 0.0125 - 0.095 - 2.05 - 3.15 - 94 - 7 - 9 - 8 - 8 - 11 - 4 - 1.06 - 10.3 - 2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - - - - 0.0675 - 0.07621 - 0.02 - 1.815 - 5 - 0.85 - 1.55 - 12.155 - 12.56 - 0.05 - 0.01 - 1 - 0.02 - 0.11 - 2.19 - 2.993 - 98 - 10 - 11 - 13 - 12 - 14 - 4 - 5 - 2 - 4 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 0.86 - 0.065 - 1.745 - 0.07621 - 0.02 - 1.51 - 5 - 0.85 - 1.25 - 10.5 - 15 - 30 - 0.02 - 0.965 - 0.015 - 2 - 105 - 8 - 12 - 13 - 18 - 5 - 1 - 13 - 3 - 25 - 2 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.03 - 0.055 - 1.71 - 0.05571 - 0.02 - 1.645 - 5 - 0.95 - 0.6 - 1.567 - 11.7975 - 0.03 - 0.025 - 0.93 - 0.0175 - 0.118 - 2.3 - 3.05 - 116 - 9 - 11 - 14 - 12 - 13 - 5 - 5 - false - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - - - - 0.081 - 1.665 - 0.08584 - 0.02 - 1.58 - 4 - 1 - 1.45 - 11.6188 - 15.29 - 0.03 - 0.02 - 0.978 - 0.084 - 1.76 - 2.37 - 82 - 7 - 9 - 12 - 10 - 11 - 4 - 4 - 1.04 - 9.6 - true - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - - - - 0.87 - 0.08 - 1.6 - 0.05571 - 1.45 - 5 - 0.96 - 0.8 - 1.45 - 11.297 - 31.6 - 11 - 32.8 - 0.05 - 0.01 - 0.97 - 0.0115 - 2.2 - 2.953 - 112 - 9 - 11 - 13 - 10 - 13 - 5 - 5 - 1 - 12.3 - true - 0.805 - 0.805 - 1.1 - 1 - 1 - 1 - - - - 1 - 0.06 - 1.71 - 0.07635 - 0.02 - 1.59 - 5 - 0.95 - 0.825 - 1.5 - 13.3705 - 16 - 0.035 - 0.015 - 0.981 - 0.0125 - 2.2 - 2.3 - 109 - 8 - 8 - 14 - 7 - 11 - 5 - 2 - false - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 1.25 - 0.086 - 1.705 - 0.08 - 0.02 - 1.86 - 4 - 1 - 0.8 - 1.5 - 11.61875 - 12 - 32 - 0.055 - 0.01 - 1.01 - 0.145 - 2.45 - 3.32 - 87 - 8 - 9 - 9 - 12 - 10 - 4 - 1.03 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.1 - 0.075 - 1.65 - 0.05571 - 0.02 - 1.625 - 4 - 1 - 1.3 - 10.3675 - 14.5 - 28 - 0.05 - 0.01 - 0.96 - 0.111 - 1.98 - 2.7 - 101 - 8 - 10 - 12 - 7 - 13 - 4 - 5 - 0.96 - 12.1 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.1 - 0.0595 - 1.525 - 0.08323 - 0.02 - 1.716 - 4 - 0.95 - 1.5 - 10.654 - 14.3 - 0.05 - 0.01 - 0.906 - 0.013 - 0.127 - 2.33 - 3.1 - 100 - 9 - 12 - 12 - 8 - 18 - 4 - 4 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 0.12 - 1.2 - 0.9 - 0.0825 - 1.7 - 0.09012 - 0.02 - 1.65 - 4 - 1.0 - 0.85 - 1.35 - 0.85 - 11.85 - 12.0 - 0.04 - 1.0 - 0.011 - 0.105 - 2.05 - 2.9 - 104 - 7 - 9 - 8 - 13 - 5 - 1.05 - 12.4 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 0.1 - 1.17 - 0.06 - 1.9 - 0.08323 - 1.51 - 5 - 0.85 - 1.35 - 10.47375 - 30 - 28 - 0.035 - 0.01 - 0.853 - 0.009 - 0.109 - 2.2 - 3.106 - 100 - 10 - 12 - 12 - 17 - 4 - 1.02 - 12 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - - - - 1.06 - 0.084 - 1.855 - 0.08323 - 0.02 - 1.54 - 4 - 1 - 0.8 - 1.6 - 14.55 - 12 - 0.04 - 0.02 - 0.86 - 0.012 - 1.815 - 100 - 8 - 11 - 10 - 7 - 13 - 4 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 0.9 - 0.9 - 0.0675 - 1.725 - 0.07915 - 1.495 - 5 - 0.9 - 1.2 - 9 - 18.5 - 10 - 22.5 - 0.032 - 0.01 - 0.91 - 0.0065 - 0.0875 - 1.825 - 2.464 - 96 - 10 - 11 - 8 - 4 - 1.075 - 11.4 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - true - - - - 0.16 - 0.7 - 0.8 - 0.1 - 1.8 - 0.08 - 0.02 - 1.75 - 5 - 1 - 1.45 - 0.91 - 1.8 - 110 - 8 - 9 - 22 - 5 - 4 - 1.067 - 12.6 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 0.065 - 1.82 - 0.08382 - 0.02 - 1.85 - 4 - 1 - 1.5 - 15.8 - 33.5 - 13.2 - 0.04 - 0.01 - 1.03 - 0.0875 - 2.14 - 2.889 - 85 - 10 - 9 - 9 - 10 - 4 - false - 1.8 - 1.1 - 1 - 1 - 1 - - - - 1.12 - 1.725 - 0.06603 - 0.02 - 1.4975 - 5 - 0.85 - 1.3 - 10.328 - 14.7 - 0.04 - 0.015 - 1.05 - 0.089 - 2.02 - 2.884 - 95 - 10 - 11 - 11 - 10 - 4 - 2 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 0.091 - 1.9 - 0.07635 - 1.89 - 3 - 1 - 1.7 - 10.848 - 13 - 0.05 - 0.01 - 1.125 - 0.134 - 2.62 - 3.368 - 78 - 9 - 9 - 9 - 11 - 4 - 2 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 1.105 - 0.079 - 1.625 - 0.06 - 0.02 - 1.7 - 5 - 0.95 - 1.325 - 9.975 - 10 - 0.03 - 0.01 - 0.911 - 0.109 - 2.33 - 3.239 - 80 - 12 - 15 - 14 - 30 - 5 - 4 - 1 - 28 - 30 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - - - - 0.09 - 1.8 - 0.085 - 0.02 - 2.07 - 4 - 0.95 - 0.75 - 1.8 - 12.5125 - 30 - 13 - 30 - 0.035 - 0.018 - 1.1 - 0.01 - 0.145 - 2.5 - 3.272 - 85 - 7 - 9 - 10 - 9 - 13 - 4 - 4 - 1.19 - 9.9 - 3 - 25 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - - - - 1.17 - 0.077 - 1.81 - 0.1009 - 0.02 - 1.6 - 4 - 1 - 1.32 - 10.114 - 28.5 - 13 - 27.5 - 0.036 - 0.015 - 1.112 - 0.005 - 0.11 - 2.06 - 2.76 - 98 - 8 - 11 - 12 - 4 - 5 - 1.17 - 9.9 - false - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - - - - 0.076 - 1.8 - 0.08584 - 0.02 - 1.26 - 5 - 1 - 1.18 - 11.0468 - 14 - 29.3 - 0.035 - 0.01 - 0.99 - 0.01 - 0.102 - 1.78 - 101 - 9 - 11 - 11 - 12 - 13 - 4 - 5 - 1.17 - 9.5 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - - - - 1.11 - 0.06 - 1.86 - 0.1 - 0.02 - 1.61 - 4 - 1.0 - 1.3 - 13.2275 - 35 - 15.39 - 31 - 0.035 - 0.02 - 1.01 - 0.01 - 0.012 - 0.1 - 1.87 - 2.604 - 88 - 12 - 9 - 12 - 10 - 13 - 4 - 6 - 0.96 - 12.7 - 0.7 - 1.1 - 1 - 1 - 1 - - - - 0.904 - 0.08 - 1.69 - 0.1 - 0.02 - 1.79 - 3 - 0.7 - 1 - 1.65 - 10.7357 - 30.03 - 11.5 - 28.03 - 0.045 - 0.02 - 1.055 - 0.12 - 2.34 - 3.2 - 84 - 8 - 12 - 8 - 8 - 12 - 4 - 4 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - - - - 1.6 - 0.06775 - 1.72 - 0.06 - 0.012 - 1.85 - 4 - 0.9 - 0.95 - 1.32 - 12.03345 - 30.5 - 14.0 - 28.5 - 0.05 - 0.015 - 0.99 - 0.006 - 0.091 - 2.28 - 2.698 - 84 - 12 - 9 - 11 - 9 - 12 - 4 - 0.95 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - - - - 1.218 - 0.07 - 1.7 - 0.1 - 0.02 - 1.9 - 4 - 0.9 - 1.4 - 11.0718 - 29.0 - 14.5 - 29.0 - 0.03 - 0.01 - 1.11 - 0.16 - 2.6 - 3.3 - 90 - 8 - 10 - 13 - 9 - 11 - 4 - 4 - 0.96 - 12.5 - true - 0.815 - 0.815 - 2.4 - 1.1 - 1 - 1 - 1 - - - - 0.072 - 1.675 - 0.09613 - 0.02 - 1.735 - 4 - 0.85 - 1.45 - 11.0825 - 33 - 13.96 - 0.06 - 0.96 - 0.015 - 0.11 - 2.42 - 3.146 - 82 - 9 - 11 - 10 - 11 - 10 - 4 - 2 - false - 0.9 - 0.9 - 1.1 - 1 - 1 - 1 - - - - 0.11 - 1.12 - 0.825 - 0.1 - 1.825 - 0.1 - 0.02 - 1.8 - 5 - 1 - 1.5 - 10.725 - 26 - 13 - 29.5 - 1.1 - 0.005 - 0.13 - 2.07 - 2.9 - 94 - 7 - 10 - 11 - 12 - 5 - 1.02 - 12.3 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 2 - - - - 0.90 - 0.0725 - 0.07621 - 0.02 - 1.72 - 4 - 0.85 - 1.3 - 10.5 - 28 - 14 - 28 - 0.04 - 1.1 - 0.013 - 0.11 - 2.23 - 3 - 96 - 9 - 10 - 12 - 8 - 18 - 4 - 1 - 12.3 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 0.902 - 0.784 - 0.333 - - - - 1.75 - 1.9 - 5 - 40 - 18 - 45 - 140 - 15 - 19 - 22 - 20 - 30 - 7 - 10 - 0.37 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - + + + + + + 1.125 + 0.061 + 1.62 + 0.06 + 0.02 + 1.6 + 4 + 1.6 + 11.946 + 34 + 13 + 33.5 + 0.065 + 0.01 + 1 + 0.016 + 0.095 + 1.8 + 100 + 7 + 11 + 7 + 7 + 12 + 4 + 1 + 10 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 0.95 + 1.265 + 0.08 + 1.76 + 0.02 + 1.76 + 5 + 1 + 1.8 + 12.155 + 13 + 34.5 + 0.03 + 1.105 + 0.02 + 0.12 + 2.4 + 2.96 + 109 + 10 + 13 + 9 + 13 + 12 + 5 + false + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + + + + 1.217 + 0.09 + 1.5 + 0.10167 + 0.02 + 1.5 + 4 + 1 + 1.3 + 9.9385 + 12.58 + 25 + 0.02 + 1 + 0.005 + 0.11 + 2.13 + 104 + 8 + 10 + 7 + 14 + 18 + 4 + 1 + 10.4 + false + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 0.06 + 1.674 + 0.10113 + 0.02 + 1.55 + 4 + 0.95 + 1.34 + 13.2275 + 19.4 + 0.045 + 0.02 + 0.942 + 0.0125 + 0.066 + 1.43 + 2.24 + 108 + 7 + 12 + 9 + 10 + 5 + 5 + false + 0.96 + 12.2 + 0.7 + 1.1 + 1 + 1 + 1 + + + + 1.168 + 0.0655 + 1.45 + 0.08 + 0.02 + 1.696 + 5 + 0.93 + 1.596 + 12.9022 + 0.048 + 0.02 + 1.22 + 0.009 + 0.094 + 1.9 + 2.93 + 108 + 11 + 8 + 9 + 14 + 5 + 5 + 0.94 + 7.7 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 0.927 + 0.08 + 1.524 + 0.0805 + 0.02 + 1.6 + 4 + 1 + 1.6 + 9.07 + 0.04 + 0.02 + 1 + 0.02 + 0.082 + 1.6 + 2.217 + 74 + 7 + 10 + 9 + 12 + 4 + 0.98 + 8.9 + 3 + 25 + 2 + 0.85 + 0.85 + 1.1 + 1 + 1 + 1 + + + + 1.6 + 0.08 + 1.9 + 0.1 + 0.02 + 2.2 + 3 + 0.72 + 0.83 + 1.7 + 12.5125 + 12 + 0.06 + 0.02 + 0.83 + 0.02 + 0.23 + 2.8 + 3.4 + 75 + 15 + 10 + 10 + 10 + 4 + 3 + 25 + 2 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 1.24 + 0.09 + 1.8 + 0.08 + 0.02 + 1.8 + 3 + 0.8 + 1.8 + 12.69125 + 15 + 0.03 + 0.02 + 0.901 + 0.01 + 0.11 + 1.9 + 2.7 + 80 + 8 + 9 + 9 + 12 + 13 + 4 + 1.05 + 8.5 + 0.82 + 0.82 + 1.1 + 1 + 1 + 1 + + + + 1.1 + 0.031 + 1.435 + 0.04 + 0.02 + 1.555 + 4 + 0.75 + 0.6 + 1.28 + 12.1 + 44 + 14 + 34 + 0.03 + 0.015 + 0.8 + 0.01 + 0.079 + 1.71 + 2.2 + 100 + 7 + 11 + 8 + 7 + 10 + 4 + 5 + 1 + 10.5 + true + 0.75 + 0.75 + 2.3 + 1.1 + 1 + 1 + 1 + + + + 0.877 + 0.06 + 1.45 + 0.06 + 0.02 + 1.6 + 4 + 1.5 + 1 + 12.3266 + 14.65 + 0.04 + 0.02 + 1.05 + 0.01 + 0.09 + 1.83 + 2.23 + 94 + 8 + 12 + 7 + 9 + 10 + 4 + 4 + 1.055 + 9 + false + 0.75 + 0.75 + 1.9 + 1.1 + 1 + 1 + 1 + + + + 0.927 + 0.08 + 2 + 0.15 + 0.01 + 2.3 + 4 + 0.95 + 2.1 + 14.4 + 40.13 + 12.95 + 29.94 + 0.04 + 0.02 + 1.12 + 0.01 + 0.13 + 2.808 + 3.5 + 99 + 12 + 10 + 9 + 14 + 4 + 1.03 + 11 + 2 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + + + + 0.08 + 1.45 + 0.065 + 0.02 + 5 + 8.7076 + 9.146 + 0.12 + 0.06 + 1.34 + 0.04 + 0.064 + 1.3 + 1.588 + 64 + 10 + 4 + 3 + 1 + 9.8 + 999.84 + 0.81 + 0.81 + 1 + 1.1 + 1 + 1 + 1 + + + + 0.904 + 0.0886 + 1.2 + 0.02 + 0.1 + 1.5 + 5 + 0.71 + 0.73 + 1.3 + 10.7357 + 15.66 + 0.06 + 0.01 + 1.1 + 0.005 + 0.08 + 1.5 + 2.1 + 90 + 8 + 11 + 8 + 7 + 5 + 4 + 1 + 11 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + + + + 0.078 + 1.625 + 0.05428 + 0.02 + 1.735 + 5 + 0.75 + 0.8 + 1.355 + 11.7975 + 14.7 + 0.015 + 1.011 + 0.01 + 0.13 + 2.12 + 2.812 + 117 + 10 + 13 + 13 + 12 + 21 + 5 + 5 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 0.95 + 0.035 + 1.4 + 0.05 + 0.02 + 1.4 + 4 + 0.6 + 9.7132 + 14.75 + 0.027 + 0.02 + 0.83 + 0.02 + 0.1 + 1.61 + 2.167 + 88 + 8 + 9 + 12 + 13 + 4 + 4 + 0.835 + 0.835 + 1.1 + 1 + 1 + 1 + + + + 1.108 + 0.0385 + 1.4 + 0.06 + 0.02 + 1.545 + 4 + 0.6 + 9.7132 + 14.75 + 0.03105 + 0.02 + 0.87375 + 0.02 + 0.1 + 1.61 + 2.167 + 88 + 8 + 9 + 12 + 13 + 4 + 4 + 0.835 + 0.835 + 1.1 + 1 + 1 + 1 + + + + 1.43 + 0.082 + 1.704 + 0.1 + 0.02 + 1.83 + 3 + 0.76 + 1.4 + 13.9425 + 15.5 + 0.075 + 1.0175 + 0.0115 + 2.15 + 3.08 + 90 + 8 + 8 + 8 + 12 + 11 + 4 + 5 + 1 + 11.5 + 3 + 25 + 2 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + false + + + + 0.874 + 0.08 + 1.65 + 0.12025 + 0.02 + 1.4 + 5 + 0.72 + 0.7 + 1.175 + 11.2791 + 14.24 + 0.05 + 0.02 + 1.051 + 0.077 + 1.5 + 2.245 + 90 + 9 + 10 + 11 + 11 + 4 + 5 + 1 + 0.79 + 0.79 + 1.1 + 1 + 1 + 1 + + + + 1.12 + 0.062 + 1.52 + 0.06 + 0.02 + 1.5 + 4 + 1.5 + 11.0398 + 30 + 12 + 29.5 + 0.03 + 0.024 + 0.95 + 0.011 + 0.0965 + 2 + 2.7 + 100 + 8 + 12 + 8 + 8 + 13 + 4 + 1 + 10 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 0.5 + 1.0 + 2.0 + + + + 1.25 + 0.096 + 1.85 + 0.08 + 0.02 + 1.82 + 3 + 1.82 + 11.63813 + 32 + 15.43 + 0.08 + 0.0055 + 1.05 + 0.01 + 0.165 + 2.65 + 3.344 + 55 + 10 + 13 + 9 + 14 + 4 + 1 + 8.3 + 0.82 + 0.82 + 1.1 + 1 + 1 + 1 + + + + 1.4 + 0.08 + 1.9 + 0.1 + 0.02 + 1.5 + 5 + 0.7 + 1 + 1.7 + 17.0573 + 12 + 41.778 + 0.06 + 0.02 + 0.83 + 0.02 + 0.17 + 3.1 + 3.5 + 80 + 7 + 9 + 10 + 9 + 10 + 4 + 3 + 25 + 2 + 0.82 + 0.82 + 3.43 + 1.1 + 1 + 1 + 1 + + + + 1.6 + 0.06 + 1.5 + 0.06 + 0.0 + 1.8 + 4 + 1 + 1.20 + 12.03345 + 13.995 + 26.24 + 0.02 + 0.02 + 0.900 + 0.005 + 0.085 + 2.2 + 2.728 + 87 + 9 + 14 + 12 + 8 + 8 + 4 + 0.95 + 12.5 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 0.08 + 1.8 + 0.0802 + 0.02 + 1.6 + 3 + 1 + 1.2 + 12.03345 + 11.0 + 1 + 0.005 + 0.11 + 2.16 + 2.9 + 85 + 8 + 9 + 9 + 12 + 16 + 4 + 1 + 10.4 + 2 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 0.07 + 1.4 + 0.08 + 0.01 + 1.45 + 5 + 0.75 + 1.8 + 10.61365 + 30.5 + 14.21 + 30 + 0.05 + 0.02 + 0.9 + 0.02 + 0.13 + 2 + 109 + 11 + 12 + 12 + 10 + 15 + 5 + 0.96 + 13.4 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 0.05 + 1.45 + 0.05 + 0.1 + 1.66 + 5 + 1.4 + 11.12183 + 14.5 + 0.03 + 0.02 + 1.2 + 0.082 + 1.5 + 2.3 + 93 + 9 + 12 + 9 + 4 + 5 + false + 2 + 20 + 1 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 0.06 + 1.475 + 0.07 + 0.01 + 1.805 + 4 + 1.265 + 11.0718 + 25 + 0.95 + 0.115 + 2.4 + 3.024 + 85 + 10 + 10 + 13 + 10 + 13 + 4 + 4 + 0.96 + 12.4 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 0.06 + 1.5 + 0.08 + 0.02 + 1.5 + 4 + 1 + 1.5 + 9.8348 + 11.76 + 0.048 + 0.02 + 1 + 0.016 + 0.095 + 1.71 + 2.28 + 75 + 9 + 12 + 11 + 10 + 10 + 4 + 1 + 10 + 2 + 20 + 1 + 0.835 + 0.835 + 1.1 + 1 + 1 + 1 + + + + 0.09 + 1.765 + 0.08 + 0.02 + 2.1 + 4 + 1.5 + 11.44 + 14.32 + 0.062 + 0.01 + 1 + 0.015 + 0.13 + 2.6 + 3.281 + 79 + 9 + 11 + 13 + 9 + 10 + 4 + 5 + 1 + 10.7 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 5 + + + + 1.229 + 0.07 + 1.5 + 0.1 + 0.02 + 1.82 + 4 + 1.55 + 11.0825 + 12.96 + 0.05 + 0.01 + 1.01 + 0.01 + 0.095 + 1.9 + 2.43 + 80 + 9 + 11 + 10 + 11 + 10 + 4 + 2 + 0.9 + 0.9 + 1.1 + 1 + 1 + 1 + + + + 1.35 + 0.0725 + 1.7 + 0.08 + 0.02 + 2.05 + 4 + 0.95 + 0.95 + 1.45 + 13.875 + 37.5 + 13.5 + 32.5 + 0.09 + 0.01 + 1.005 + 0.005 + 0.135 + 2.05 + 2.75 + 79 + 9 + 9 + 9 + 8 + 12 + 4 + 5 + 1 + 11.6 + 0.8 + 0.8 + 2.6 + 1.1 + 1 + 1 + 1 + + + + 0.85 + 0.085 + 1.4 + 0.06 + 0.02 + 1.55 + 5 + 1.3 + 1 + 1.4 + 10.90375 + 13.7 + 0.14 + 0.03 + 1.2 + 0.04 + 0.122 + 1.93 + 2.486 + 102 + 8 + 7 + 12 + 9 + 29 + 4 + 5 + 1 + 10 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 0.08 + 1.35 + 0.1 + 0.02 + 1.55 + 5 + 0.8 + 0.74 + 1.1 + 9.691 + 27.62 + 12.0 + 0.01 + 0.045 + 0.94 + 0.098 + 2.12 + 2.89 + 105 + 12 + 14 + 10 + 10 + 12 + 5 + 0.97 + 12.4 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 1.2 + 0.08 + 2 + 0.065 + 0.01 + 1.55 + 5 + 0.95 + 0.75 + 1.3 + 10.6893 + 14 + 27 + 0.925 + 0.01 + 0.103 + 2.05 + 2.9 + 100 + 9 + 13 + 9 + 12 + 12 + 5 + 1 + 12.2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 1.25 + 0.055 + 1.75 + 0.15 + 0.01 + 1.625 + 4 + 0.72 + 0.8 + 2.1 + 0.9 + 12.5125 + 35.0 + 12.0 + 37.0 + 0.0375 + 0.01 + 1.05 + 0.006 + 0.128 + 2.25 + 2.9 + 80 + 9 + 8 + 9 + 7 + 8 + 4 + 5 + 1.067 + 9.2 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + false + + + + 0.2 + 0.1 + 1.12 + 0.075 + 1.6 + 0.08 + 0.02 + 1.58 + 4 + 1 + 1.45 + 11.5294 + 28.0 + 16.03 + 28.0 + 0.9 + 0.018 + 0.098 + 2.0 + 2.5 + 95 + 10 + 9 + 10 + 13 + 11 + 4 + 5 + 1.14 + 10 + 4 + 25 + 2 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 0.08 + 0.02 + 0.75 + 0.0875 + 1.5 + 0.02 + 2.09 + 4 + 0.95 + 11.44 + 34 + 15.5 + 0.04 + 0.02 + 1.09 + 0.012 + 0.092 + 1.85 + 2.51 + 110 + 11 + 12 + 14 + 12 + 12 + 5 + 5 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 1.283 + 0.08 + 1.7 + 0.1 + 0.02 + 1.9 + 3 + 1 + 0.85 + 1.7 + 14.7326 + 17 + 33 + 0.01 + 1 + 0.012 + 2.55 + 3.023 + 85 + 11 + 8 + 12 + 4 + 5 + 1 + 9.7 + 0.815 + 0.815 + 0.0792308 + 1.15252 + 1.1 + 1 + 1 + 1 + false + + + + 0.82 + 0.0475 + 1.625 + 0.1 + 0.02 + 1.725 + 4 + 1.5 + 17.0741 + 49 + 12.5 + 0.075 + 1 + 0.125 + 2.3 + 0.0225 + 2.7 + 80 + 9 + 10 + 10 + 4 + 1.055 + 9.1 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 1.8 + 1.8 + 0.5 + + + + 1.414 + 0.085 + 1.7 + 0.12 + 0.02 + 3.5 + 4 + 0.85 + 0.75 + 2 + 12.5125 + 14.595 + 0.035 + 0.01 + 1.11 + 0.111 + 1.98 + 2.67 + 82 + 8 + 11 + 10 + 10 + 16 + 4 + 4 + 0.95 + 10.6 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 0.975 + 0.07 + 1.48 + 0.04 + 0.02 + 1.36 + 5 + 1 + 0.7 + 1.16 + 11.7439 + 15.02 + 0.04 + 0.02 + 0.915 + 0.005 + 0.095 + 2.25 + 3.3 + 107 + 11 + 14 + 11 + 12 + 15 + 5 + 5 + 0.93 + 3 + 25 + 2 + 4 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 0.925 + 0.075 + 1.56 + 0.05 + 0.02 + 1.625 + 4 + 0.7 + 1 + 1.315 + 11.9763 + 11.69 + 0.03 + 0.02 + 1.11 + 0.02 + 0.09 + 1.9 + 2.46 + 83 + 7 + 7 + 8 + 10 + 12 + 4 + 0.95 + 10.3 + true + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.303 + 0.095 + 2.05 + 0.15 + 0.02 + 1.85 + 4 + 1.1 + 1 + 1.25 + 13.44915 + 15.19 + 0.035 + 0 + 1 + 0.005 + 0.125 + 2.02 + 2.728 + 94 + 10 + 8 + 15 + 10 + 10 + 5 + 5 + 1.05 + 10.6 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + false + + + + 1.138 + 0.07 + 1.3 + 0.02 + 0.1 + 1.66 + 4 + 0.7 + 0.8 + 1.3 + 13.585 + 17.98 + 0.025 + 0.04 + 1.08 + 0.01 + 2 + 2.648 + 104 + 9 + 7 + 12 + 11 + 4 + 6 + 0.95 + 13 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.248 + 0.078 + 1.8 + 0.1 + 0.02 + 1.675 + 4 + 1 + 12.0835 + 14.32 + 25 + 0.05 + 0.02 + 1.035 + 0.005 + 0.11 + 2.06 + 2.831 + 85 + 9 + 7 + 11 + 22 + 4 + 4 + 1 + 9.7 + 3 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.3 + 0.09 + 1.9 + 0.1 + 0.02 + 1.8 + 4 + 0.9 + 0.75 + 1.7 + 11.44715 + 12 + 33 + 0.06 + 0.02 + 1.2 + 0.015 + 0.16 + 2.7 + 3.4 + 80 + 7 + 10 + 10 + 11 + 12 + 4 + 1.18 + 8.7 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 1.112 + 0.0835 + 1.705 + 0.08584 + 0.02 + 1.507 + 4 + 1 + 1 + 1.55 + 11.61875 + 15.09 + 0.05 + 0.01 + 0.946 + 0.0175 + 0.084 + 1.649 + 2.225 + 85 + 7 + 11 + 12 + 9 + 4 + 4 + 1.037 + 9.6 + true + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.232 + 0.076 + 1.738 + 0.08584 + 0.02 + 1.542 + 4 + 1 + 1.5 + 11.726 + 11.99 + 0.065 + 0.01 + 1.08 + 0.025 + 0.11 + 2.18 + 2.91 + 102 + 7 + 10 + 14 + 17 + 13 + 4 + 1 + 9.8 + 3 + 20 + 20 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.244 + 0.0835 + 1.815 + 0.08584 + 0.02 + 1.89 + 3 + 1 + 1.45 + 12.727 + 13.18 + 0.066 + 0.01 + 0.977 + 0.113 + 1.816 + 2.414 + 96 + 7 + 9 + 10 + 10 + 4 + 5 + 0.96 + 12.5 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 0.057 + 1.735 + 0.09969 + 0.02 + 1.67 + 5 + 0.77 + 1.25 + 14.3 + 16.17 + 0.078 + 0.015 + 1 + 0.009 + 0.081 + 1.6 + 2.287 + 89 + 7 + 10 + 9 + 10 + 4 + 4 + 1 + 12.6 + 2 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 0.0835 + 1.88 + 0.1252 + 0.02 + 2.046 + 5 + 0.95 + 0.8 + 1.5 + 10.725 + 28 + 27 + 0.02 + 0.014 + 1.085 + 0.01 + 0.117 + 2.165 + 3 + 90 + 8 + 9 + 9 + 7 + 10 + 4 + 4 + 1.11 + 10.7 + 2 + 0.785 + 0.785 + 1.1 + 1 + 1 + 1 + + + + 0.063 + 1.775 + 0.1087 + 0.02 + 1.9 + 5 + 1 + 1.46 + 16.445 + 15.51 + 0.058 + 0.01 + 1.09 + 0.01125 + 2.49 + 3.441 + 85 + 9 + 9 + 12 + 20 + 4 + 5 + 1 + 10 + 2 + 0.65 + 0.65 + 1.1 + 1 + 1 + 1 + false + + + + 0.0785 + 1.845 + 0.09969 + 0.02 + 1.815 + 4 + 0.77 + 0.8 + 1.4 + 12.8343 + 14.31 + 0.08 + 0.959 + 0.0065 + 0.124 + 1.915 + 2.51 + 90 + 9 + 8 + 12 + 11 + 4 + 4 + 0.95 + 12.5 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 0.07 + 1.625 + 0.08584 + 0.02 + 1.62 + 4 + 1 + 1.5 + 12.1908 + 27 + 15.48 + 28 + 0.065 + 0.015 + 1.095 + 0.0125 + 0.085 + 1.7 + 2.472 + 95 + 7 + 10 + 12 + 8 + 18 + 4 + 5 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 0.089 + 0.185 + 0.998 + 0.081 + 1.71 + 0.04965 + 0.02 + 1.35 + 5 + 1 + 1.25 + 11.8726 + 14.52 + 0.04 + 0.01 + 1.03 + 0.008 + 0.099 + 2.25 + 3 + 93 + 9 + 10 + 11 + 12 + 4 + 1 + 11.8 + 22 + 2 + false + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 1.175 + 0.085 + 1.6 + 0.04238 + 0.02 + 1.7 + 4 + 1 + 1.3 + 11.9763 + 16.2 + 0.022 + 0.02 + 0.982 + 0.0065 + 0.106 + 2.18 + 2.68 + 96 + 10 + 12 + 14 + 11 + 13 + 5 + 0.98 + 12 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.124 + 0.07 + 1.745 + 0.08584 + 0.02 + 1.724 + 4 + 1 + 1.5 + 12.298 + 15.59 + 0.058 + 0.01 + 0.98 + 0.111 + 2.238 + 3.007 + 110 + 8 + 10 + 10 + 7 + 12 + 5 + 4 + 3 + 25 + 2 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + + + + 0.0605 + 1.59 + 0.08584 + 0.02 + 1.642 + 4 + 1 + 1.4 + 12.155 + 14.48 + 0.056 + 0.02 + 1.093 + 0.0135 + 0.088 + 1.91 + 2.8 + 85 + 7 + 8 + 10 + 9 + 11 + 4 + 4 + 1 + 9.5 + 2 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + + + + 0.11 + 1.12 + 0.825 + 0.1 + 1.6 + 0.1 + 0.02 + 1.578 + 5 + 1 + 1.35 + 10.725 + 26 + 13 + 29.5 + 1.1 + 0.005 + 0.12 + 1.857 + 2.6 + 103 + 7 + 9 + 10 + 12 + 5 + 1.02 + 12.3 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 1.205 + 0.062 + 1.66 + 0.055 + 0.03 + 1.855 + 5 + 1 + 1.425 + 11.6188 + 36.5 + 14.0 + 34.0 + 0.045 + 0.015 + 1.01 + 0.007 + 0.135 + 2.4 + 3.25 + 101 + 10 + 12 + 11 + 13 + 13 + 4 + 5 + 1.01 + 12.6 + 0.815 + 0.815 + false + 1 + 1 + 1 + + + + 1.228 + 0.0825 + 1.7215 + 0.04238 + 0.02 + 1.7215 + 4 + 1 + 0.75 + 1.3 + 10.6071 + 0.027 + 0.015 + 0.966 + 0.00525 + 0.1 + 2.08 + 2.848 + 98 + 10 + 10 + 14 + 12 + 12 + 4 + 0.99 + 11.8 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 0.975 + 0.069 + 1.806 + 0.1 + 0.02 + 1.65 + 4 + 1 + 1.5 + 13.9425 + 12.5 + 0.065 + 0.015 + 1.03 + 0.007 + 0.132 + 2.35 + 2.9 + 84 + 8 + 10 + 10 + 8 + 20 + 4 + 4 + 1.03 + 12.6 + 2 + 0.815 + 0.815 + 1 + 1 + 1.1 + 1 + 1 + 1 + false + + + + 0.0585 + 1.525 + 0.0825 + 0.02 + 1.875 + 3 + 1 + 1.6 + 11.7975 + 12.2 + 33 + 33 + 0.05 + 0.018 + 1.095 + 0.0125 + 0.095 + 2.05 + 3.15 + 94 + 7 + 9 + 8 + 8 + 11 + 4 + 1.06 + 10.3 + 2 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + + + + 0.0675 + 0.07621 + 0.02 + 1.815 + 5 + 0.85 + 1.55 + 12.155 + 12.56 + 0.05 + 0.01 + 1 + 0.02 + 0.11 + 2.19 + 2.993 + 98 + 10 + 11 + 13 + 12 + 14 + 4 + 5 + 2 + 4 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 0.86 + 0.065 + 1.745 + 0.07621 + 0.02 + 1.51 + 5 + 0.85 + 1.25 + 10.5 + 15 + 30 + 0.02 + 0.965 + 0.015 + 2 + 105 + 8 + 12 + 13 + 18 + 5 + 1 + 13 + 3 + 25 + 2 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.03 + 0.055 + 1.71 + 0.05571 + 0.02 + 1.645 + 5 + 0.95 + 0.6 + 1.567 + 11.7975 + 0.03 + 0.025 + 0.93 + 0.0175 + 0.118 + 2.3 + 3.05 + 116 + 9 + 11 + 14 + 12 + 13 + 5 + 5 + false + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + + + + 0.081 + 1.665 + 0.08584 + 0.02 + 1.58 + 4 + 1 + 1.45 + 11.6188 + 15.29 + 0.03 + 0.02 + 0.978 + 0.084 + 1.76 + 2.37 + 82 + 7 + 9 + 12 + 10 + 11 + 4 + 4 + 1.04 + 9.6 + true + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + + + + 0.87 + 0.08 + 1.6 + 0.05571 + 1.45 + 5 + 0.96 + 0.8 + 1.45 + 11.297 + 31.6 + 11 + 32.8 + 0.05 + 0.01 + 0.97 + 0.0115 + 2.2 + 2.953 + 112 + 9 + 11 + 13 + 10 + 13 + 5 + 5 + 1 + 12.3 + true + 0.805 + 0.805 + 1.1 + 1 + 1 + 1 + + + + 1 + 0.06 + 1.71 + 0.07635 + 0.02 + 1.59 + 5 + 0.95 + 0.825 + 1.5 + 13.3705 + 16 + 0.035 + 0.015 + 0.981 + 0.0125 + 2.2 + 2.3 + 109 + 8 + 8 + 14 + 7 + 11 + 5 + 2 + false + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 1.25 + 0.086 + 1.705 + 0.08 + 0.02 + 1.86 + 4 + 1 + 0.8 + 1.5 + 11.61875 + 12 + 32 + 0.055 + 0.01 + 1.01 + 0.145 + 2.45 + 3.32 + 87 + 8 + 9 + 9 + 12 + 10 + 4 + 1.03 + 12.5 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.1 + 0.075 + 1.65 + 0.05571 + 0.02 + 1.625 + 4 + 1 + 1.3 + 10.3675 + 14.5 + 28 + 0.05 + 0.01 + 0.96 + 0.111 + 1.98 + 2.7 + 101 + 8 + 10 + 12 + 7 + 13 + 4 + 5 + 0.96 + 12.1 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.1 + 0.0595 + 1.525 + 0.08323 + 0.02 + 1.716 + 4 + 0.95 + 1.5 + 10.654 + 14.3 + 0.05 + 0.01 + 0.906 + 0.013 + 0.127 + 2.33 + 3.1 + 100 + 9 + 12 + 12 + 8 + 18 + 4 + 4 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 0.12 + 1.2 + 0.9 + 0.0825 + 1.7 + 0.09012 + 0.02 + 1.65 + 4 + 1.0 + 0.85 + 1.35 + 0.85 + 11.85 + 12.0 + 0.04 + 1.0 + 0.011 + 0.105 + 2.05 + 2.9 + 104 + 7 + 9 + 8 + 13 + 5 + 1.05 + 12.4 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 0.1 + 1.17 + 0.06 + 1.9 + 0.08323 + 1.51 + 5 + 0.85 + 1.35 + 10.47375 + 30 + 28 + 0.035 + 0.01 + 0.853 + 0.009 + 0.109 + 2.2 + 3.106 + 100 + 10 + 12 + 12 + 17 + 4 + 1.02 + 12 + 2 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + + + + 1.06 + 0.084 + 1.855 + 0.08323 + 0.02 + 1.54 + 4 + 1 + 0.8 + 1.6 + 14.55 + 12 + 0.04 + 0.02 + 0.86 + 0.012 + 1.815 + 100 + 8 + 11 + 10 + 7 + 13 + 4 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 0.9 + 0.9 + 0.0675 + 1.725 + 0.07915 + 1.495 + 5 + 0.9 + 1.2 + 9 + 18.5 + 10 + 22.5 + 0.032 + 0.01 + 0.91 + 0.0065 + 0.0875 + 1.825 + 2.464 + 96 + 10 + 11 + 8 + 4 + 1.075 + 11.4 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + true + + + + 0.16 + 0.7 + 0.8 + 0.1 + 1.8 + 0.08 + 0.02 + 1.75 + 5 + 1 + 1.45 + 0.91 + 1.8 + 110 + 8 + 9 + 22 + 5 + 4 + 1.067 + 12.6 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 0.065 + 1.82 + 0.08382 + 0.02 + 1.85 + 4 + 1 + 1.5 + 15.8 + 33.5 + 13.2 + 0.04 + 0.01 + 1.03 + 0.0875 + 2.14 + 2.889 + 85 + 10 + 9 + 9 + 10 + 4 + false + 1.8 + 1.1 + 1 + 1 + 1 + + + + 1.12 + 1.725 + 0.06603 + 0.02 + 1.4975 + 5 + 0.85 + 1.3 + 10.328 + 14.7 + 0.04 + 0.015 + 1.05 + 0.089 + 2.02 + 2.884 + 95 + 10 + 11 + 11 + 10 + 4 + 2 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 0.091 + 1.9 + 0.07635 + 1.89 + 3 + 1 + 1.7 + 10.848 + 13 + 0.05 + 0.01 + 1.125 + 0.134 + 2.62 + 3.368 + 78 + 9 + 9 + 9 + 11 + 4 + 2 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 1.105 + 0.079 + 1.625 + 0.06 + 0.02 + 1.7 + 5 + 0.95 + 1.325 + 9.975 + 10 + 0.03 + 0.01 + 0.911 + 0.109 + 2.33 + 3.239 + 80 + 12 + 15 + 14 + 30 + 5 + 4 + 1 + 28 + 30 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + + + + 0.09 + 1.8 + 0.085 + 0.02 + 2.07 + 4 + 0.95 + 0.75 + 1.8 + 12.5125 + 30 + 13 + 30 + 0.035 + 0.018 + 1.1 + 0.01 + 0.145 + 2.5 + 3.272 + 85 + 7 + 9 + 10 + 9 + 13 + 4 + 4 + 1.19 + 9.9 + 3 + 25 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + + + + 1.17 + 0.077 + 1.81 + 0.1009 + 0.02 + 1.6 + 4 + 1 + 1.32 + 10.114 + 28.5 + 13 + 27.5 + 0.036 + 0.015 + 1.112 + 0.005 + 0.11 + 2.06 + 2.76 + 98 + 8 + 11 + 12 + 4 + 5 + 1.17 + 9.9 + false + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + + + + 0.076 + 1.8 + 0.08584 + 0.02 + 1.26 + 5 + 1 + 1.18 + 11.0468 + 14 + 29.3 + 0.035 + 0.01 + 0.99 + 0.01 + 0.102 + 1.78 + 101 + 9 + 11 + 11 + 12 + 13 + 4 + 5 + 1.17 + 9.5 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + + + + 1.11 + 0.06 + 1.86 + 0.1 + 0.02 + 1.61 + 4 + 1.0 + 1.3 + 13.2275 + 35 + 15.39 + 31 + 0.035 + 0.02 + 1.01 + 0.01 + 0.012 + 0.1 + 1.87 + 2.604 + 88 + 12 + 9 + 12 + 10 + 13 + 4 + 6 + 0.96 + 12.7 + 0.7 + 1.1 + 1 + 1 + 1 + + + + 0.904 + 0.08 + 1.69 + 0.1 + 0.02 + 1.79 + 3 + 0.7 + 1 + 1.65 + 10.7357 + 30.03 + 11.5 + 28.03 + 0.045 + 0.02 + 1.055 + 0.12 + 2.34 + 3.2 + 84 + 8 + 12 + 8 + 8 + 12 + 4 + 4 + 3 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + + + + 1.6 + 0.06775 + 1.72 + 0.06 + 0.012 + 1.85 + 4 + 0.9 + 0.95 + 1.32 + 12.03345 + 30.5 + 14.0 + 28.5 + 0.05 + 0.015 + 0.99 + 0.006 + 0.091 + 2.28 + 2.698 + 84 + 12 + 9 + 11 + 9 + 12 + 4 + 0.95 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + + + + 1.218 + 0.07 + 1.7 + 0.1 + 0.02 + 1.9 + 4 + 0.9 + 1.4 + 11.0718 + 29.0 + 14.5 + 29.0 + 0.03 + 0.01 + 1.11 + 0.16 + 2.6 + 3.3 + 90 + 8 + 10 + 13 + 9 + 11 + 4 + 4 + 0.96 + 12.5 + true + 0.815 + 0.815 + 2.4 + 1.1 + 1 + 1 + 1 + + + + 0.072 + 1.675 + 0.09613 + 0.02 + 1.735 + 4 + 0.85 + 1.45 + 11.0825 + 33 + 13.96 + 0.06 + 0.96 + 0.015 + 0.11 + 2.42 + 3.146 + 82 + 9 + 11 + 10 + 11 + 10 + 4 + 2 + false + 0.9 + 0.9 + 1.1 + 1 + 1 + 1 + + + + 0.11 + 1.12 + 0.825 + 0.1 + 1.825 + 0.1 + 0.02 + 1.8 + 5 + 1 + 1.5 + 10.725 + 26 + 13 + 29.5 + 1.1 + 0.005 + 0.13 + 2.07 + 2.9 + 94 + 7 + 10 + 11 + 12 + 5 + 1.02 + 12.3 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 2 + + + + 0.90 + 0.0725 + 0.07621 + 0.02 + 1.72 + 4 + 0.85 + 1.3 + 10.5 + 28 + 14 + 28 + 0.04 + 1.1 + 0.013 + 0.11 + 2.23 + 3 + 96 + 9 + 10 + 12 + 8 + 18 + 4 + 1 + 12.3 + 3 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 0.902 + 0.784 + 0.333 + + + + 1.75 + 1.9 + 5 + 40 + 18 + 45 + 140 + 15 + 19 + 22 + 20 + 30 + 7 + 10 + 0.37 + 0.8 + 0.5 + 1 + 1 + 1 + + + + 4 + 0.8 + 0.5 + 1 + 1 + 1 + + + + 4 + 0.8 + 0.5 + 1 + 1 + 1 + + + + 4 + 0.8 + 0.5 + 1 + 1 + 1 + + + diff --git a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml index e4580a9a94..54d7dc52c6 100644 --- a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml +++ b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml @@ -77,9 +77,18 @@ guard_off: blend_frames: 4 extra: cancel_frame: 12 +catch: + extra: + cancel_frame: 58 +catch_dash: + extra: + cancel_frame: 63 +catch_turn: + extra: + cancel_frame: 61 throw_lw: extra: - cancel_frame: 45 + cancel_frame: 52 throw_hi: extra: cancel_frame: 42 @@ -119,6 +128,9 @@ attack_lw4: attack_air_hi: extra: cancel_frame: 50 +attack_air_b: + extra: + cancel_frame: 29 special_s1: extra: cancel_frame: 43 From 2ed84f95ec473824bfd16907ad5811158f1a934c Mon Sep 17 00:00:00 2001 From: xTheft Date: Tue, 18 Nov 2025 17:10:28 -0600 Subject: [PATCH 02/13] yink whitespace fix --- .../fighter/common/param/fighter_param.prcxml | 190 +++++++++++++++++- 1 file changed, 185 insertions(+), 5 deletions(-) diff --git a/romfs/source/fighter/common/param/fighter_param.prcxml b/romfs/source/fighter/common/param/fighter_param.prcxml index 053408714e..f49c43744c 100644 --- a/romfs/source/fighter/common/param/fighter_param.prcxml +++ b/romfs/source/fighter/common/param/fighter_param.prcxml @@ -36,6 +36,8 @@ 1 1 1 + 9 + 12 @@ -71,6 +73,8 @@ 1 1 1 + 13.5 + 18 @@ -107,6 +111,8 @@ 1 1 1 + 10.125 + 13.5 @@ -142,6 +148,8 @@ 1 1 1 + 10.5 + 14 @@ -177,6 +185,8 @@ 1 1 1 + 10.125 + 13.5 @@ -214,6 +224,8 @@ 1 1 1 + 9 + 12 @@ -251,6 +263,8 @@ 1 1 1 + 9.75 + 13 @@ -273,8 +287,8 @@ 1.9 2.7 80 - 8 - 9 + 7 + 8 9 12 13 @@ -287,6 +301,8 @@ 1 1 1 + 8.625 + 11.5 @@ -329,6 +345,8 @@ 1 1 1 + 9.375 + 12.5 @@ -368,6 +386,8 @@ 1 1 1 + 8.25 + 11 @@ -406,6 +426,8 @@ 1 1 1 + 10.5 + 14 @@ -437,6 +459,8 @@ 1 1 1 + 9 + 12 @@ -446,7 +470,7 @@ 0.02 0.1 1.5 - 5 + 4 0.71 0.73 1.3 @@ -474,6 +498,8 @@ 1 1 1 + 9 + 12 @@ -509,6 +535,8 @@ 1 1 1 + 14.25 + 19 @@ -542,6 +570,8 @@ 1 1 1 + 9 + 12 @@ -575,6 +605,8 @@ 1 1 1 + 8.25 + 11 @@ -614,6 +646,8 @@ 1 1 false + 10.5 + 14 @@ -649,6 +683,8 @@ 1 1 1 + 9 + 12 @@ -689,6 +725,8 @@ 0.5 1.0 2.0 + 9 + 12 @@ -724,6 +762,8 @@ 1 1 1 + 7.875 + 10.5 @@ -764,6 +804,8 @@ 1 1 1 + 9.975 + 13.3 @@ -801,6 +843,8 @@ 1 1 1 + 10.125 + 13.5 @@ -835,6 +879,8 @@ 1 1 1 + 8.625 + 11.5 @@ -871,6 +917,8 @@ 1 1 1 + 11.25 + 15 @@ -905,6 +953,8 @@ 1 1 1 + 11.25 + 14.3 @@ -937,6 +987,8 @@ 1 1 1 + 10.125 + 13.5 @@ -975,6 +1027,8 @@ 1 1 1 + 9.6 + 12.8 @@ -1011,6 +1065,8 @@ 1 1 5 + 9 + 12 @@ -1045,6 +1101,8 @@ 1 1 1 + 9.75 + 13 @@ -1086,6 +1144,8 @@ 1 1 1 + 9 + 12 @@ -1112,8 +1172,8 @@ 8 7 12 - 9 - 29 + 10 + 25 4 5 1 @@ -1124,6 +1184,8 @@ 1 1 1 + 10.35 + 13.8 @@ -1160,6 +1222,8 @@ 1 1 1 + 9.6 + 12.8 @@ -1196,6 +1260,8 @@ 1 1 1 + 9.6 + 12.8 @@ -1238,6 +1304,8 @@ 1 1 false + 7.725 + 10.3 @@ -1280,6 +1348,8 @@ 1 1 1 + 10.5 + 14 @@ -1316,6 +1386,8 @@ 1 1 1 + 12.75 + 17 @@ -1354,6 +1426,8 @@ 1 1 false + 10.125 + 13.5 @@ -1391,6 +1465,8 @@ 1.8 1.8 0.5 + 8.25 + 11 @@ -1428,6 +1504,8 @@ 1 1 1 + 8.4 + 11.2 @@ -1469,6 +1547,8 @@ 1 1 1 + 11.7 + 15.6 @@ -1507,6 +1587,8 @@ 1 1 1 + 7.875 + 10.5 @@ -1546,6 +1628,8 @@ 1 1 false + 9.375 + 12.5 @@ -1582,6 +1666,8 @@ 1 1 1 + 11.625 + 15.5 @@ -1620,6 +1706,8 @@ 1 1 1 + 8.7 + 11.6 @@ -1658,6 +1746,8 @@ 1 1 1 + 9.6 + 12.8 @@ -1696,6 +1786,8 @@ 1 1 1 + 8.1 + 10.8 @@ -1735,6 +1827,8 @@ 1 1 1 + 8.4 + 11.2 @@ -1770,6 +1864,8 @@ 1 1 1 + 7.5 + 10 @@ -1806,6 +1902,8 @@ 1 1 1 + 8.625 + 11.5 @@ -1845,6 +1943,8 @@ 1 1 1 + 9.75 + 13 @@ -1881,6 +1981,8 @@ 1 1 false + 10.5 + 14 @@ -1916,6 +2018,8 @@ 1 1 1 + 8.85 + 11.8 @@ -1952,6 +2056,8 @@ 1 1 1 + 9.6 + 12.8 @@ -1992,6 +2098,8 @@ 1 1 1 + 8.625 + 11.5 @@ -2028,6 +2136,8 @@ 1 1 1 + 8.85 + 11.8 @@ -2065,6 +2175,8 @@ 1 1 1 + 9.75 + 13 @@ -2102,6 +2214,8 @@ 1 1 1 + 9 + 12 @@ -2139,6 +2253,8 @@ 1 1 1 + 8.625 + 11.5 @@ -2178,6 +2294,8 @@ 1 1 1 + 9.375 + 12.5 @@ -2215,6 +2333,8 @@ 1 1 1 + 9.15 + 12.2 @@ -2256,6 +2376,8 @@ 1 1 false + 9 + 12 @@ -2294,6 +2416,8 @@ 1 1 1 + 9.75 + 13 @@ -2329,6 +2453,8 @@ 1 1 1 + 12.225 + 16.3 @@ -2366,6 +2492,8 @@ 1 1 1 + 9.375 + 12.5 @@ -2402,6 +2530,8 @@ 1 1 1 + 13.875 + 18.5 @@ -2438,6 +2568,8 @@ 1 1 1 + 7.875 + 10.5 @@ -2477,6 +2609,8 @@ 1 1 1 + 9.975 + 13.3 @@ -2513,6 +2647,8 @@ 1 1 1 + 9 + 12 @@ -2550,6 +2686,8 @@ 1 1 1 + 9 + 12 @@ -2587,6 +2725,8 @@ 1 1 1 + 10.125 + 13.5 @@ -2623,6 +2763,8 @@ 1 1 1 + 10.5 + 14 @@ -2661,6 +2803,8 @@ 1 1 1 + 8.625 + 11.5 @@ -2698,6 +2842,8 @@ 1 1 1 + 9.375 + 12.5 @@ -2732,6 +2878,8 @@ 1 1 1 + 10.125 + 13.5 @@ -2769,6 +2917,8 @@ 1 1 true + 8.25 + 11 @@ -2800,6 +2950,8 @@ 1 1 1 + 8.625 + 11.5 @@ -2832,6 +2984,8 @@ 1 1 1 + 8.85 + 11.8 @@ -2865,6 +3019,8 @@ 1 1 1 + 9.375 + 12.5 @@ -2897,6 +3053,8 @@ 1 1 1 + 9.375 + 12.5 @@ -2934,6 +3092,8 @@ 1 1 1 + 9.75 + 13 @@ -2976,6 +3136,8 @@ 1 1 1 + 9.375 + 12.5 @@ -3014,6 +3176,8 @@ 1 1 1 + 9.75 + 13 @@ -3050,6 +3214,8 @@ 1 1 1 + 8.4 + 11.2 @@ -3089,6 +3255,8 @@ 1 1 1 + 10.5 + 14 @@ -3128,6 +3296,8 @@ 1 1 1 + 9 + 12 @@ -3166,6 +3336,8 @@ 1 1 1 + 10.125 + 13.5 @@ -3206,6 +3378,8 @@ 1 1 1 + 10.125 + 13.5 @@ -3241,6 +3415,8 @@ 1 1 1 + 9.75 + 13 @@ -3279,6 +3455,8 @@ 1 1 2 + 8.625 + 11.5 @@ -3320,6 +3498,8 @@ 0.902 0.784 0.333 + 9.375 + 12.5 From 9585bf93a9bf28631120bd7cd4670188b05317f6 Mon Sep 17 00:00:00 2001 From: xTheft Date: Tue, 18 Nov 2025 18:21:49 -0600 Subject: [PATCH 03/13] yink take 3 --- .../fighter/common/param/fighter_param.prcxml | 10665 ++++++---------- 1 file changed, 3555 insertions(+), 7110 deletions(-) diff --git a/romfs/source/fighter/common/param/fighter_param.prcxml b/romfs/source/fighter/common/param/fighter_param.prcxml index 55d9363df2..9dda3e0d8a 100644 --- a/romfs/source/fighter/common/param/fighter_param.prcxml +++ b/romfs/source/fighter/common/param/fighter_param.prcxml @@ -1,7110 +1,3555 @@ - - - - - - 1.125 - 0.061 - 1.62 - 0.06 - 0.02 - 1.6 - 4 - 1.6 - 11.946 - 34 - 13 - 33.5 - 0.065 - 0.01 - 1 - 0.016 - 0.095 - 1.8 - 100 - 7 - 11 - 7 - 7 - 12 - 4 - 1 - 10 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.95 - 1.265 - 0.08 - 1.76 - 0.02 - 1.76 - 5 - 1 - 1.8 - 12.155 - 13 - 34.5 - 0.03 - 1.105 - 0.02 - 0.12 - 2.4 - 2.96 - 109 - 10 - 13 - 9 - 13 - 12 - 5 - false - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 13.5 - 18 - - - - 1.217 - 0.09 - 1.5 - 0.10167 - 0.02 - 1.5 - 4 - 1 - 1.3 - 9.9385 - 12.58 - 25 - 0.02 - 1 - 0.005 - 0.11 - 2.13 - 104 - 8 - 10 - 7 - 14 - 18 - 4 - 1 - 10.4 - false - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.06 - 1.674 - 0.10113 - 0.02 - 1.55 - 4 - 0.95 - 1.34 - 13.2275 - 19.4 - 0.045 - 0.02 - 0.942 - 0.0125 - 0.066 - 1.43 - 2.24 - 108 - 7 - 12 - 9 - 10 - 5 - 5 - false - 0.96 - 12.2 - 0.7 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 1.168 - 0.0655 - 1.45 - 0.08 - 0.02 - 1.696 - 5 - 0.93 - 1.596 - 12.9022 - 0.048 - 0.02 - 1.22 - 0.009 - 0.094 - 1.9 - 2.93 - 108 - 11 - 8 - 9 - 14 - 5 - 5 - 0.94 - 7.7 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.927 - 0.08 - 1.524 - 0.0805 - 0.02 - 1.6 - 4 - 1 - 1.6 - 9.07 - 0.04 - 0.02 - 1 - 0.02 - 0.082 - 1.6 - 2.217 - 74 - 7 - 10 - 9 - 12 - 4 - 0.98 - 8.9 - 3 - 25 - 2 - 0.85 - 0.85 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.6 - 0.08 - 1.9 - 0.1 - 0.02 - 2.2 - 3 - 0.72 - 0.83 - 1.7 - 12.5125 - 12 - 0.06 - 0.02 - 0.83 - 0.02 - 0.23 - 2.8 - 3.4 - 75 - 15 - 10 - 10 - 10 - 4 - 3 - 25 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 1.24 - 0.09 - 1.8 - 0.08 - 0.02 - 1.8 - 3 - 0.8 - 1.8 - 12.69125 - 15 - 0.03 - 0.02 - 0.901 - 0.01 - 0.11 - 1.9 - 2.7 - 80 - 7 - 8 - 9 - 12 - 13 - 4 - 1.05 - 8.5 - 0.82 - 0.82 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 1.1 - 0.031 - 1.435 - 0.04 - 0.02 - 1.555 - 4 - 0.75 - 0.6 - 1.28 - 12.1 - 44 - 14 - 34 - 0.03 - 0.015 - 0.8 - 0.01 - 0.079 - 1.71 - 2.2 - 100 - 7 - 11 - 8 - 7 - 10 - 4 - 5 - 1 - 10.5 - true - 0.75 - 0.75 - 2.3 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 0.877 - 0.06 - 1.45 - 0.06 - 0.02 - 1.6 - 4 - 1.5 - 1 - 12.3266 - 14.65 - 0.04 - 0.02 - 1.05 - 0.01 - 0.09 - 1.83 - 2.23 - 94 - 8 - 12 - 7 - 9 - 10 - 4 - 4 - 1.055 - 9 - false - 0.75 - 0.75 - 1.9 - 1.1 - 1 - 1 - 1 - 8.25 - 11 - - - - 0.927 - 0.08 - 2 - 0.15 - 0.01 - 2.3 - 4 - 0.95 - 2.1 - 14.4 - 40.13 - 12.95 - 29.94 - 0.04 - 0.02 - 1.12 - 0.01 - 0.13 - 2.808 - 3.5 - 99 - 12 - 10 - 9 - 14 - 4 - 1.03 - 11 - 2 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.08 - 1.45 - 0.065 - 0.02 - 5 - 8.7076 - 9.146 - 0.12 - 0.06 - 1.34 - 0.04 - 0.064 - 1.3 - 1.588 - 64 - 10 - 4 - 3 - 1 - 9.8 - 999.84 - 0.81 - 0.81 - 1 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.904 - 0.0886 - 1.2 - 0.02 - 0.1 - 1.5 - 4 - 0.71 - 0.73 - 1.3 - 10.7357 - 15.66 - 0.06 - 0.01 - 1.1 - 0.005 - 0.08 - 1.5 - 2.1 - 90 - 8 - 11 - 8 - 7 - 5 - 4 - 1 - 11 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.078 - 1.625 - 0.05428 - 0.02 - 1.735 - 5 - 0.75 - 0.8 - 1.355 - 11.7975 - 14.7 - 0.015 - 1.011 - 0.01 - 0.13 - 2.12 - 2.812 - 117 - 10 - 13 - 13 - 12 - 21 - 5 - 5 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 14.25 - 19 - - - - 0.95 - 0.035 - 1.4 - 0.05 - 0.02 - 1.4 - 4 - 0.6 - 9.7132 - 14.75 - 0.027 - 0.02 - 0.83 - 0.02 - 0.1 - 1.61 - 2.167 - 88 - 8 - 9 - 12 - 13 - 4 - 4 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.108 - 0.0385 - 1.4 - 0.06 - 0.02 - 1.545 - 4 - 0.6 - 9.7132 - 14.75 - 0.03105 - 0.02 - 0.87375 - 0.02 - 0.1 - 1.61 - 2.167 - 88 - 8 - 9 - 12 - 13 - 4 - 4 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - 8.25 - 11 - - - - 1.43 - 0.082 - 1.704 - 0.1 - 0.02 - 1.83 - 3 - 0.76 - 1.4 - 13.9425 - 15.5 - 0.075 - 1.0175 - 0.0115 - 2.15 - 3.08 - 90 - 8 - 8 - 8 - 12 - 11 - 4 - 5 - 1 - 11.5 - 3 - 25 - 2 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - false - 10.5 - 14 - - - - 0.874 - 0.08 - 1.65 - 0.12025 - 0.02 - 1.4 - 5 - 0.72 - 0.7 - 1.175 - 11.2791 - 14.24 - 0.05 - 0.02 - 1.051 - 0.077 - 1.5 - 2.245 - 90 - 9 - 10 - 11 - 11 - 4 - 5 - 1 - 0.79 - 0.79 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.12 - 0.062 - 1.52 - 0.06 - 0.02 - 1.5 - 4 - 1.5 - 11.0398 - 30 - 12 - 29.5 - 0.03 - 0.024 - 0.95 - 0.011 - 0.0965 - 2 - 2.7 - 100 - 8 - 12 - 8 - 8 - 13 - 4 - 1 - 10 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 0.5 - 1.0 - 2.0 - 9 - 12 - - - - 1.25 - 0.096 - 1.85 - 0.08 - 0.02 - 1.82 - 3 - 1.82 - 11.63813 - 32 - 15.43 - 0.08 - 0.0055 - 1.05 - 0.01 - 0.165 - 2.65 - 3.344 - 55 - 10 - 13 - 9 - 14 - 4 - 1 - 8.3 - 0.82 - 0.82 - 1.1 - 1 - 1 - 1 - 7.875 - 10.5 - - - - 1.4 - 0.08 - 1.9 - 0.1 - 0.02 - 1.5 - 5 - 0.7 - 1 - 1.7 - 17.0573 - 12 - 41.778 - 0.06 - 0.02 - 0.83 - 0.02 - 0.17 - 3.1 - 3.5 - 80 - 7 - 9 - 10 - 9 - 10 - 4 - 3 - 25 - 2 - 0.82 - 0.82 - 3.43 - 1.1 - 1 - 1 - 1 - 9.975 - 13.3 - - - - 1.6 - 0.06 - 1.5 - 0.06 - 0.0 - 1.8 - 4 - 1 - 1.20 - 12.03345 - 13.995 - 26.24 - 0.02 - 0.02 - 0.900 - 0.005 - 0.085 - 2.2 - 2.728 - 87 - 9 - 14 - 12 - 8 - 8 - 4 - 0.95 - 12.5 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.08 - 1.8 - 0.0802 - 0.02 - 1.6 - 3 - 1 - 1.2 - 12.03345 - 11.0 - 1 - 0.005 - 0.11 - 2.16 - 2.9 - 85 - 8 - 9 - 9 - 12 - 16 - 4 - 1 - 10.4 - 2 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.07 - 1.4 - 0.08 - 0.01 - 1.45 - 5 - 0.75 - 1.8 - 10.61365 - 30.5 - 14.21 - 30 - 0.05 - 0.02 - 0.9 - 0.02 - 0.13 - 2 - 109 - 11 - 12 - 12 - 10 - 15 - 5 - 0.96 - 13.4 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 11.25 - 15 - - - - 0.05 - 1.45 - 0.05 - 0.1 - 1.66 - 5 - 1.4 - 11.12183 - 14.5 - 0.03 - 0.02 - 1.2 - 0.082 - 1.5 - 2.3 - 93 - 9 - 12 - 9 - 4 - 5 - false - 2 - 20 - 1 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 11.25 - 14.3 - - - - 0.06 - 1.475 - 0.07 - 0.01 - 1.805 - 4 - 1.265 - 11.0718 - 25 - 0.95 - 0.115 - 2.4 - 3.024 - 85 - 10 - 10 - 13 - 10 - 13 - 4 - 4 - 0.96 - 12.4 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.06 - 1.5 - 0.08 - 0.02 - 1.5 - 4 - 1 - 1.5 - 9.8348 - 11.76 - 0.048 - 0.02 - 1 - 0.016 - 0.095 - 1.71 - 2.28 - 75 - 9 - 12 - 11 - 10 - 10 - 4 - 1 - 10 - 2 - 20 - 1 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 0.09 - 1.765 - 0.08 - 0.02 - 2.1 - 4 - 1.5 - 11.44 - 14.32 - 0.062 - 0.01 - 1 - 0.015 - 0.13 - 2.6 - 3.281 - 79 - 9 - 11 - 13 - 9 - 10 - 4 - 5 - 1 - 10.7 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 5 - 9 - 12 - - - - 1.229 - 0.07 - 1.5 - 0.1 - 0.02 - 1.82 - 4 - 1.55 - 11.0825 - 12.96 - 0.05 - 0.01 - 1.01 - 0.01 - 0.095 - 1.9 - 2.43 - 80 - 9 - 11 - 10 - 11 - 10 - 4 - 2 - 0.9 - 0.9 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 1.35 - 0.0725 - 1.7 - 0.08 - 0.02 - 2.05 - 4 - 0.95 - 0.95 - 1.45 - 13.875 - 37.5 - 13.5 - 32.5 - 0.09 - 0.01 - 1.005 - 0.005 - 0.135 - 2.05 - 2.75 - 79 - 9 - 9 - 9 - 8 - 12 - 4 - 5 - 1 - 11.6 - 0.8 - 0.8 - 2.6 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.85 - 0.085 - 1.4 - 0.06 - 0.02 - 1.55 - 5 - 1.3 - 1 - 1.4 - 10.90375 - 13.7 - 0.14 - 0.03 - 1.2 - 0.04 - 0.122 - 1.93 - 2.486 - 102 - 8 - 7 - 12 - 10 - 25 - 4 - 5 - 1 - 10 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 10.35 - 13.8 - - - - 0.08 - 1.35 - 0.1 - 0.02 - 1.55 - 5 - 0.8 - 0.74 - 1.1 - 9.691 - 27.62 - 12.0 - 0.01 - 0.045 - 0.94 - 0.098 - 2.12 - 2.89 - 105 - 12 - 14 - 10 - 10 - 12 - 5 - 0.97 - 12.4 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 1.2 - 0.08 - 2 - 0.065 - 0.01 - 1.55 - 5 - 0.95 - 0.75 - 1.3 - 10.6893 - 14 - 27 - 0.925 - 0.01 - 0.103 - 2.05 - 2.9 - 100 - 9 - 13 - 9 - 12 - 12 - 5 - 1 - 12.2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 1.25 - 0.055 - 1.75 - 0.15 - 0.01 - 1.625 - 4 - 0.72 - 0.8 - 2.1 - 0.9 - 12.5125 - 35.0 - 12.0 - 37.0 - 0.0375 - 0.01 - 1.05 - 0.006 - 0.128 - 2.25 - 2.9 - 80 - 9 - 8 - 9 - 7 - 8 - 4 - 5 - 1.067 - 9.2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - false - 7.725 - 10.3 - - - - 0.2 - 0.1 - 1.12 - 0.075 - 1.6 - 0.08 - 0.02 - 1.58 - 4 - 1 - 1.45 - 11.5294 - 28.0 - 16.03 - 28.0 - 0.9 - 0.018 - 0.098 - 2.0 - 2.5 - 95 - 10 - 9 - 10 - 13 - 11 - 4 - 5 - 1.14 - 10 - 4 - 25 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.08 - 0.02 - 0.75 - 0.0875 - 1.5 - 0.02 - 2.09 - 4 - 0.95 - 11.44 - 34 - 15.5 - 0.04 - 0.02 - 1.09 - 0.012 - 0.092 - 1.85 - 2.51 - 110 - 11 - 12 - 14 - 12 - 12 - 5 - 5 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 12.75 - 17 - - - - 1.283 - 0.08 - 1.7 - 0.1 - 0.02 - 1.9 - 3 - 1 - 0.85 - 1.7 - 14.7326 - 17 - 33 - 0.01 - 1 - 0.012 - 2.55 - 3.023 - 85 - 11 - 8 - 12 - 4 - 5 - 1 - 9.7 - 0.815 - 0.815 - 0.0792308 - 1.15252 - 1.1 - 1 - 1 - 1 - false - 10.125 - 13.5 - - - - 0.82 - 0.0475 - 1.625 - 0.1 - 0.02 - 1.725 - 4 - 1.5 - 17.0741 - 49 - 12.5 - 0.075 - 1 - 0.125 - 2.3 - 0.0225 - 2.7 - 80 - 9 - 10 - 10 - 4 - 1.055 - 9.1 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 1.8 - 1.8 - 0.5 - 8.25 - 11 - - - - 1.414 - 0.085 - 1.7 - 0.12 - 0.02 - 3.5 - 4 - 0.85 - 0.75 - 2 - 12.5125 - 14.595 - 0.035 - 0.01 - 1.11 - 0.111 - 1.98 - 2.67 - 82 - 8 - 11 - 10 - 10 - 16 - 4 - 4 - 0.95 - 10.6 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 8.4 - 11.2 - - - - 0.975 - 0.07 - 1.48 - 0.04 - 0.02 - 1.36 - 5 - 1 - 0.7 - 1.16 - 11.7439 - 15.02 - 0.04 - 0.02 - 0.915 - 0.005 - 0.095 - 2.25 - 3.3 - 107 - 11 - 14 - 11 - 12 - 15 - 5 - 5 - 0.93 - 3 - 25 - 2 - 4 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 11.7 - 15.6 - - - - 0.925 - 0.075 - 1.56 - 0.05 - 0.02 - 1.625 - 4 - 0.7 - 1 - 1.315 - 11.9763 - 11.69 - 0.03 - 0.02 - 1.11 - 0.02 - 0.09 - 1.9 - 2.46 - 83 - 7 - 7 - 8 - 10 - 12 - 4 - 0.95 - 10.3 - true - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 7.875 - 10.5 - - - - 1.303 - 0.095 - 2.05 - 0.15 - 0.02 - 1.85 - 4 - 1.1 - 1 - 1.25 - 13.44915 - 15.19 - 0.035 - 0 - 1 - 0.005 - 0.125 - 2.02 - 2.728 - 94 - 10 - 8 - 15 - 10 - 10 - 5 - 5 - 1.05 - 10.6 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - false - 9.375 - 12.5 - - - - 1.138 - 0.07 - 1.3 - 0.02 - 0.1 - 1.66 - 4 - 0.7 - 0.8 - 1.3 - 13.585 - 17.98 - 0.025 - 0.04 - 1.08 - 0.01 - 2 - 2.648 - 104 - 9 - 7 - 12 - 11 - 4 - 6 - 0.95 - 13 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 11.625 - 15.5 - - - - 1.248 - 0.078 - 1.8 - 0.1 - 0.02 - 1.675 - 4 - 1 - 12.0835 - 14.32 - 25 - 0.05 - 0.02 - 1.035 - 0.005 - 0.11 - 2.06 - 2.831 - 85 - 9 - 7 - 11 - 22 - 4 - 4 - 1 - 9.7 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.7 - 11.6 - - - - 1.3 - 0.09 - 1.9 - 0.1 - 0.02 - 1.8 - 4 - 0.9 - 0.75 - 1.7 - 11.44715 - 12 - 33 - 0.06 - 0.02 - 1.2 - 0.015 - 0.16 - 2.7 - 3.4 - 80 - 7 - 10 - 10 - 11 - 12 - 4 - 1.18 - 8.7 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 1.112 - 0.0835 - 1.705 - 0.08584 - 0.02 - 1.507 - 4 - 1 - 1 - 1.55 - 11.61875 - 15.09 - 0.05 - 0.01 - 0.946 - 0.0175 - 0.084 - 1.649 - 2.225 - 85 - 7 - 11 - 12 - 9 - 4 - 4 - 1.037 - 9.6 - true - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.1 - 10.8 - - - - 1.232 - 0.076 - 1.738 - 0.08584 - 0.02 - 1.542 - 4 - 1 - 1.5 - 11.726 - 11.99 - 0.065 - 0.01 - 1.08 - 0.025 - 0.11 - 2.18 - 2.91 - 102 - 7 - 10 - 14 - 17 - 13 - 4 - 1 - 9.8 - 3 - 20 - 20 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.4 - 11.2 - - - - 1.244 - 0.0835 - 1.815 - 0.08584 - 0.02 - 1.89 - 3 - 1 - 1.45 - 12.727 - 13.18 - 0.066 - 0.01 - 0.977 - 0.113 - 1.816 - 2.414 - 96 - 7 - 9 - 10 - 10 - 4 - 5 - 0.96 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 7.5 - 10 - - - - 0.057 - 1.735 - 0.09969 - 0.02 - 1.67 - 5 - 0.77 - 1.25 - 14.3 - 16.17 - 0.078 - 0.015 - 1 - 0.009 - 0.081 - 1.6 - 2.287 - 89 - 7 - 10 - 9 - 10 - 4 - 4 - 1 - 12.6 - 2 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.0835 - 1.88 - 0.1252 - 0.02 - 2.046 - 5 - 0.95 - 0.8 - 1.5 - 10.725 - 28 - 27 - 0.02 - 0.014 - 1.085 - 0.01 - 0.117 - 2.165 - 3 - 90 - 8 - 9 - 9 - 7 - 10 - 4 - 4 - 1.11 - 10.7 - 2 - 0.785 - 0.785 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.063 - 1.775 - 0.1087 - 0.02 - 1.9 - 5 - 1 - 1.46 - 16.445 - 15.51 - 0.058 - 0.01 - 1.09 - 0.01125 - 2.49 - 3.441 - 85 - 9 - 9 - 12 - 20 - 4 - 5 - 1 - 10 - 2 - 0.65 - 0.65 - 1.1 - 1 - 1 - 1 - false - 10.5 - 14 - - - - 0.0785 - 1.845 - 0.09969 - 0.02 - 1.815 - 4 - 0.77 - 0.8 - 1.4 - 12.8343 - 14.31 - 0.08 - 0.959 - 0.0065 - 0.124 - 1.915 - 2.51 - 90 - 9 - 8 - 12 - 11 - 4 - 4 - 0.95 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.85 - 11.8 - - - - 0.07 - 1.625 - 0.08584 - 0.02 - 1.62 - 4 - 1 - 1.5 - 12.1908 - 27 - 15.48 - 28 - 0.065 - 0.015 - 1.095 - 0.0125 - 0.085 - 1.7 - 2.472 - 95 - 7 - 10 - 12 - 8 - 18 - 4 - 5 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 0.089 - 0.185 - 0.998 - 0.081 - 1.71 - 0.04965 - 0.02 - 1.35 - 5 - 1 - 1.25 - 11.8726 - 14.52 - 0.04 - 0.01 - 1.03 - 0.008 - 0.099 - 2.25 - 3 - 93 - 9 - 10 - 11 - 12 - 4 - 1 - 11.8 - 22 - 2 - false - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 1.175 - 0.085 - 1.6 - 0.04238 - 0.02 - 1.7 - 4 - 1 - 1.3 - 11.9763 - 16.2 - 0.022 - 0.02 - 0.982 - 0.0065 - 0.106 - 2.18 - 2.68 - 96 - 10 - 12 - 14 - 11 - 13 - 5 - 0.98 - 12 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.85 - 11.8 - - - - 1.124 - 0.07 - 1.745 - 0.08584 - 0.02 - 1.724 - 4 - 1 - 1.5 - 12.298 - 15.59 - 0.058 - 0.01 - 0.98 - 0.111 - 2.238 - 3.007 - 110 - 8 - 10 - 10 - 7 - 12 - 5 - 4 - 3 - 25 - 2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.0605 - 1.59 - 0.08584 - 0.02 - 1.642 - 4 - 1 - 1.4 - 12.155 - 14.48 - 0.056 - 0.02 - 1.093 - 0.0135 - 0.088 - 1.91 - 2.8 - 85 - 7 - 8 - 10 - 9 - 11 - 4 - 4 - 1 - 9.5 - 2 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.11 - 1.12 - 0.825 - 0.1 - 1.6 - 0.1 - 0.02 - 1.578 - 5 - 1 - 1.35 - 10.725 - 26 - 13 - 29.5 - 1.1 - 0.005 - 0.12 - 1.857 - 2.6 - 103 - 7 - 9 - 10 - 12 - 5 - 1.02 - 12.3 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 1.205 - 0.062 - 1.66 - 0.055 - 0.03 - 1.855 - 5 - 1 - 1.425 - 11.6188 - 36.5 - 14.0 - 34.0 - 0.045 - 0.015 - 1.01 - 0.007 - 0.135 - 2.4 - 3.25 - 101 - 10 - 12 - 11 - 13 - 13 - 4 - 5 - 1.01 - 12.6 - 0.815 - 0.815 - false - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.228 - 0.0825 - 1.7215 - 0.04238 - 0.02 - 1.7215 - 4 - 1 - 0.75 - 1.3 - 10.6071 - 0.027 - 0.015 - 0.966 - 0.00525 - 0.1 - 2.08 - 2.848 - 98 - 10 - 10 - 14 - 12 - 12 - 4 - 0.99 - 11.8 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 9.15 - 12.2 - - - - 0.975 - 0.069 - 1.806 - 0.1 - 0.02 - 1.65 - 4 - 1 - 1.5 - 13.9425 - 12.5 - 0.065 - 0.015 - 1.03 - 0.007 - 0.132 - 2.35 - 2.9 - 84 - 8 - 10 - 10 - 8 - 20 - 4 - 4 - 1.03 - 12.6 - 2 - 0.815 - 0.815 - 1 - 1 - 1.1 - 1 - 1 - 1 - false - 9 - 12 - - - - 0.0585 - 1.525 - 0.0825 - 0.02 - 1.875 - 3 - 1 - 1.6 - 11.7975 - 12.2 - 33 - 33 - 0.05 - 0.018 - 1.095 - 0.0125 - 0.095 - 2.05 - 3.15 - 94 - 7 - 9 - 8 - 8 - 11 - 4 - 1.06 - 10.3 - 2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.0675 - 0.07621 - 0.02 - 1.815 - 5 - 0.85 - 1.55 - 12.155 - 12.56 - 0.05 - 0.01 - 1 - 0.02 - 0.11 - 2.19 - 2.993 - 98 - 10 - 11 - 13 - 12 - 14 - 4 - 5 - 2 - 4 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 12.225 - 16.3 - - - - 0.86 - 0.065 - 1.745 - 0.07621 - 0.02 - 1.51 - 5 - 0.85 - 1.25 - 10.5 - 15 - 30 - 0.02 - 0.965 - 0.015 - 2 - 105 - 8 - 12 - 13 - 18 - 5 - 1 - 13 - 3 - 25 - 2 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.03 - 0.055 - 1.71 - 0.05571 - 0.02 - 1.645 - 5 - 0.95 - 0.6 - 1.567 - 11.7975 - 0.03 - 0.025 - 0.93 - 0.0175 - 0.118 - 2.3 - 3.05 - 116 - 9 - 11 - 14 - 12 - 13 - 5 - 5 - false - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 13.875 - 18.5 - - - - 0.081 - 1.665 - 0.08584 - 0.02 - 1.58 - 4 - 1 - 1.45 - 11.6188 - 15.29 - 0.03 - 0.02 - 0.978 - 0.084 - 1.76 - 2.37 - 82 - 7 - 9 - 12 - 10 - 11 - 4 - 4 - 1.04 - 9.6 - true - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 7.875 - 10.5 - - - - 0.87 - 0.08 - 1.6 - 0.05571 - 1.45 - 5 - 0.96 - 0.8 - 1.45 - 11.297 - 31.6 - 11 - 32.8 - 0.05 - 0.01 - 0.97 - 0.0115 - 2.2 - 2.953 - 112 - 9 - 11 - 13 - 10 - 13 - 5 - 5 - 1 - 12.3 - true - 0.805 - 0.805 - 1.1 - 1 - 1 - 1 - 9.975 - 13.3 - - - - 1 - 0.06 - 1.71 - 0.07635 - 0.02 - 1.59 - 5 - 0.95 - 0.825 - 1.5 - 13.3705 - 16 - 0.035 - 0.015 - 0.981 - 0.0125 - 2.2 - 2.3 - 109 - 8 - 8 - 14 - 7 - 11 - 5 - 2 - false - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.25 - 0.086 - 1.705 - 0.08 - 0.02 - 1.86 - 4 - 1 - 0.8 - 1.5 - 11.61875 - 12 - 32 - 0.055 - 0.01 - 1.01 - 0.145 - 2.45 - 3.32 - 87 - 8 - 9 - 9 - 12 - 10 - 4 - 1.03 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.1 - 0.075 - 1.65 - 0.05571 - 0.02 - 1.625 - 4 - 1 - 1.3 - 10.3675 - 14.5 - 28 - 0.05 - 0.01 - 0.96 - 0.111 - 1.98 - 2.7 - 101 - 8 - 10 - 12 - 7 - 13 - 4 - 5 - 0.96 - 12.1 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 1.1 - 0.0595 - 1.525 - 0.08323 - 0.02 - 1.716 - 4 - 0.95 - 1.5 - 10.654 - 14.3 - 0.05 - 0.01 - 0.906 - 0.013 - 0.127 - 2.33 - 3.1 - 100 - 9 - 12 - 12 - 8 - 18 - 4 - 4 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.12 - 1.2 - 0.9 - 0.0825 - 1.7 - 0.09012 - 0.02 - 1.65 - 4 - 1.0 - 0.85 - 1.35 - 0.85 - 11.85 - 12.0 - 0.04 - 1.0 - 0.011 - 0.105 - 2.05 - 2.9 - 104 - 7 - 9 - 8 - 13 - 5 - 1.05 - 12.4 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.1 - 1.17 - 0.06 - 1.9 - 0.08323 - 1.51 - 5 - 0.85 - 1.35 - 10.47375 - 30 - 28 - 0.035 - 0.01 - 0.853 - 0.009 - 0.109 - 2.2 - 3.106 - 100 - 10 - 12 - 12 - 17 - 4 - 1.02 - 12 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.06 - 0.084 - 1.855 - 0.08323 - 0.02 - 1.54 - 4 - 1 - 0.8 - 1.6 - 14.55 - 12 - 0.04 - 0.02 - 0.86 - 0.012 - 1.815 - 100 - 8 - 11 - 10 - 7 - 13 - 4 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.9 - 0.9 - 0.0675 - 1.725 - 0.07915 - 1.495 - 5 - 0.9 - 1.2 - 9 - 18.5 - 10 - 22.5 - 0.032 - 0.01 - 0.91 - 0.0065 - 0.0875 - 1.825 - 2.464 - 96 - 10 - 11 - 8 - 4 - 1.075 - 11.4 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - true - 8.25 - 11 - - - - 0.16 - 0.7 - 0.8 - 0.1 - 1.8 - 0.08 - 0.02 - 1.75 - 5 - 1 - 1.45 - 0.91 - 1.8 - 110 - 8 - 9 - 22 - 5 - 4 - 1.067 - 12.6 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.065 - 1.82 - 0.08382 - 0.02 - 1.85 - 4 - 1 - 1.5 - 15.8 - 33.5 - 13.2 - 0.04 - 0.01 - 1.03 - 0.0875 - 2.14 - 2.889 - 85 - 10 - 9 - 9 - 10 - 4 - false - 1.8 - 1.1 - 1 - 1 - 1 - 8.85 - 11.8 - - - - 1.12 - 1.725 - 0.06603 - 0.02 - 1.4975 - 5 - 0.85 - 1.3 - 10.328 - 14.7 - 0.04 - 0.015 - 1.05 - 0.089 - 2.02 - 2.884 - 95 - 10 - 11 - 11 - 10 - 4 - 2 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 0.091 - 1.9 - 0.07635 - 1.89 - 3 - 1 - 1.7 - 10.848 - 13 - 0.05 - 0.01 - 1.125 - 0.134 - 2.62 - 3.368 - 78 - 9 - 9 - 9 - 11 - 4 - 2 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.105 - 0.079 - 1.625 - 0.06 - 0.02 - 1.7 - 5 - 0.95 - 1.325 - 9.975 - 10 - 0.03 - 0.01 - 0.911 - 0.109 - 2.33 - 3.239 - 80 - 12 - 15 - 14 - 30 - 5 - 4 - 1 - 28 - 30 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.09 - 1.8 - 0.085 - 0.02 - 2.07 - 4 - 0.95 - 0.75 - 1.8 - 12.5125 - 30 - 13 - 30 - 0.035 - 0.018 - 1.1 - 0.01 - 0.145 - 2.5 - 3.272 - 85 - 7 - 9 - 10 - 9 - 13 - 4 - 4 - 1.19 - 9.9 - 3 - 25 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.17 - 0.077 - 1.81 - 0.1009 - 0.02 - 1.6 - 4 - 1 - 1.32 - 10.114 - 28.5 - 13 - 27.5 - 0.036 - 0.015 - 1.112 - 0.005 - 0.11 - 2.06 - 2.76 - 98 - 8 - 11 - 12 - 4 - 5 - 1.17 - 9.9 - false - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.076 - 1.8 - 0.08584 - 0.02 - 1.26 - 5 - 1 - 1.18 - 11.0468 - 14 - 29.3 - 0.035 - 0.01 - 0.99 - 0.01 - 0.102 - 1.78 - 101 - 9 - 11 - 11 - 12 - 13 - 4 - 5 - 1.17 - 9.5 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 8.4 - 11.2 - - - - 1.11 - 0.06 - 1.86 - 0.1 - 0.02 - 1.61 - 4 - 1.0 - 1.3 - 13.2275 - 35 - 15.39 - 31 - 0.035 - 0.02 - 1.01 - 0.01 - 0.012 - 0.1 - 1.87 - 2.604 - 88 - 12 - 9 - 12 - 10 - 13 - 4 - 6 - 0.96 - 12.7 - 0.7 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.904 - 0.08 - 1.69 - 0.1 - 0.02 - 1.79 - 3 - 0.7 - 1 - 1.65 - 10.7357 - 30.03 - 11.5 - 28.03 - 0.045 - 0.02 - 1.055 - 0.12 - 2.34 - 3.2 - 84 - 8 - 12 - 8 - 8 - 12 - 4 - 4 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.6 - 0.06775 - 1.72 - 0.06 - 0.012 - 1.85 - 4 - 0.9 - 0.95 - 1.32 - 12.03345 - 30.5 - 14.0 - 28.5 - 0.05 - 0.015 - 0.99 - 0.006 - 0.091 - 2.28 - 2.698 - 84 - 12 - 9 - 11 - 9 - 12 - 4 - 0.95 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 1.218 - 0.07 - 1.7 - 0.1 - 0.02 - 1.9 - 4 - 0.9 - 1.4 - 11.0718 - 29.0 - 14.5 - 29.0 - 0.03 - 0.01 - 1.11 - 0.16 - 2.6 - 3.3 - 90 - 8 - 10 - 13 - 9 - 11 - 4 - 4 - 0.96 - 12.5 - true - 0.815 - 0.815 - 2.4 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.072 - 1.675 - 0.09613 - 0.02 - 1.735 - 4 - 0.85 - 1.45 - 11.0825 - 33 - 13.96 - 0.06 - 0.96 - 0.015 - 0.11 - 2.42 - 3.146 - 82 - 9 - 11 - 10 - 11 - 10 - 4 - 2 - false - 0.9 - 0.9 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.11 - 1.12 - 0.825 - 0.1 - 1.825 - 0.1 - 0.02 - 1.8 - 5 - 1 - 1.5 - 10.725 - 26 - 13 - 29.5 - 1.1 - 0.005 - 0.13 - 2.07 - 2.9 - 94 - 7 - 10 - 11 - 12 - 5 - 1.02 - 12.3 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 2 - 8.625 - 11.5 - - - - 0.90 - 0.0725 - 0.07621 - 0.02 - 1.72 - 4 - 0.85 - 1.3 - 10.5 - 28 - 14 - 28 - 0.04 - 1.1 - 0.013 - 0.11 - 2.23 - 3 - 96 - 9 - 10 - 12 - 8 - 18 - 4 - 1 - 12.3 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 0.902 - 0.784 - 0.333 - 9.375 - 12.5 - - - - 1.75 - 1.9 - 5 - 40 - 18 - 45 - 140 - 15 - 19 - 22 - 20 - 30 - 7 - 10 - 0.37 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - - - - - - - 1.125 - 0.061 - 1.62 - 0.06 - 0.02 - 1.6 - 4 - 1.6 - 11.946 - 34 - 13 - 33.5 - 0.065 - 0.01 - 1 - 0.016 - 0.095 - 1.8 - 100 - 7 - 11 - 7 - 7 - 12 - 4 - 1 - 10 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.95 - 1.265 - 0.08 - 1.76 - 0.02 - 1.76 - 5 - 1 - 1.8 - 12.155 - 13 - 34.5 - 0.03 - 1.105 - 0.02 - 0.12 - 2.4 - 2.96 - 109 - 10 - 13 - 9 - 13 - 12 - 5 - false - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 13.5 - 18 - - - - 1.217 - 0.09 - 1.5 - 0.10167 - 0.02 - 1.5 - 4 - 1 - 1.3 - 9.9385 - 12.58 - 25 - 0.02 - 1 - 0.005 - 0.11 - 2.13 - 104 - 8 - 10 - 7 - 14 - 18 - 4 - 1 - 10.4 - false - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.06 - 1.674 - 0.10113 - 0.02 - 1.55 - 4 - 0.95 - 1.34 - 13.2275 - 19.4 - 0.045 - 0.02 - 0.942 - 0.0125 - 0.066 - 1.43 - 2.24 - 108 - 7 - 12 - 9 - 10 - 5 - 5 - false - 0.96 - 12.2 - 0.7 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 1.168 - 0.0655 - 1.45 - 0.08 - 0.02 - 1.696 - 5 - 0.93 - 1.596 - 12.9022 - 0.048 - 0.02 - 1.22 - 0.009 - 0.094 - 1.9 - 2.93 - 108 - 11 - 8 - 9 - 14 - 5 - 5 - 0.94 - 7.7 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.927 - 0.08 - 1.524 - 0.0805 - 0.02 - 1.6 - 4 - 1 - 1.6 - 9.07 - 0.04 - 0.02 - 1 - 0.02 - 0.082 - 1.6 - 2.217 - 74 - 7 - 10 - 9 - 12 - 4 - 0.98 - 8.9 - 3 - 25 - 2 - 0.85 - 0.85 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.6 - 0.08 - 1.9 - 0.1 - 0.02 - 2.2 - 3 - 0.72 - 0.83 - 1.7 - 12.5125 - 12 - 0.06 - 0.02 - 0.83 - 0.02 - 0.23 - 2.8 - 3.4 - 75 - 15 - 10 - 10 - 10 - 4 - 3 - 25 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 1.24 - 0.09 - 1.8 - 0.08 - 0.02 - 1.8 - 3 - 0.8 - 1.8 - 12.69125 - 15 - 0.03 - 0.02 - 0.901 - 0.01 - 0.11 - 1.9 - 2.7 - 80 - 7 - 8 - 9 - 12 - 13 - 4 - 1.05 - 8.5 - 0.82 - 0.82 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 1.1 - 0.031 - 1.435 - 0.04 - 0.02 - 1.555 - 4 - 0.75 - 0.6 - 1.28 - 12.1 - 44 - 14 - 34 - 0.03 - 0.015 - 0.8 - 0.01 - 0.079 - 1.71 - 2.2 - 100 - 7 - 11 - 8 - 7 - 10 - 4 - 5 - 1 - 10.5 - true - 0.75 - 0.75 - 2.3 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 0.877 - 0.06 - 1.45 - 0.06 - 0.02 - 1.6 - 4 - 1.5 - 1 - 12.3266 - 14.65 - 0.04 - 0.02 - 1.05 - 0.01 - 0.09 - 1.83 - 2.23 - 94 - 8 - 12 - 7 - 9 - 10 - 4 - 4 - 1.055 - 9 - false - 0.75 - 0.75 - 1.9 - 1.1 - 1 - 1 - 1 - 8.25 - 11 - - - - 0.927 - 0.08 - 2 - 0.15 - 0.01 - 2.3 - 4 - 0.95 - 2.1 - 14.4 - 40.13 - 12.95 - 29.94 - 0.04 - 0.02 - 1.12 - 0.01 - 0.13 - 2.808 - 3.5 - 99 - 12 - 10 - 9 - 14 - 4 - 1.03 - 11 - 2 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.08 - 1.45 - 0.065 - 0.02 - 5 - 8.7076 - 9.146 - 0.12 - 0.06 - 1.34 - 0.04 - 0.064 - 1.3 - 1.588 - 64 - 10 - 4 - 3 - 1 - 9.8 - 999.84 - 0.81 - 0.81 - 1 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.904 - 0.0886 - 1.2 - 0.02 - 0.1 - 1.5 - 4 - 0.71 - 0.73 - 1.3 - 10.7357 - 15.66 - 0.06 - 0.01 - 1.1 - 0.005 - 0.08 - 1.5 - 2.1 - 90 - 8 - 11 - 8 - 7 - 5 - 4 - 1 - 11 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.078 - 1.625 - 0.05428 - 0.02 - 1.735 - 5 - 0.75 - 0.8 - 1.355 - 11.7975 - 14.7 - 0.015 - 1.011 - 0.01 - 0.13 - 2.12 - 2.812 - 117 - 10 - 13 - 13 - 12 - 21 - 5 - 5 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 14.25 - 19 - - - - 0.95 - 0.035 - 1.4 - 0.05 - 0.02 - 1.4 - 4 - 0.6 - 9.7132 - 14.75 - 0.027 - 0.02 - 0.83 - 0.02 - 0.1 - 1.61 - 2.167 - 88 - 8 - 9 - 12 - 13 - 4 - 4 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.108 - 0.0385 - 1.4 - 0.06 - 0.02 - 1.545 - 4 - 0.6 - 9.7132 - 14.75 - 0.03105 - 0.02 - 0.87375 - 0.02 - 0.1 - 1.61 - 2.167 - 88 - 8 - 9 - 12 - 13 - 4 - 4 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - 8.25 - 11 - - - - 1.43 - 0.082 - 1.704 - 0.1 - 0.02 - 1.83 - 3 - 0.76 - 1.4 - 13.9425 - 15.5 - 0.075 - 1.0175 - 0.0115 - 2.15 - 3.08 - 90 - 8 - 8 - 8 - 12 - 11 - 4 - 5 - 1 - 11.5 - 3 - 25 - 2 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - false - 10.5 - 14 - - - - 0.874 - 0.08 - 1.65 - 0.12025 - 0.02 - 1.4 - 5 - 0.72 - 0.7 - 1.175 - 11.2791 - 14.24 - 0.05 - 0.02 - 1.051 - 0.077 - 1.5 - 2.245 - 90 - 9 - 10 - 11 - 11 - 4 - 5 - 1 - 0.79 - 0.79 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.12 - 0.062 - 1.52 - 0.06 - 0.02 - 1.5 - 4 - 1.5 - 11.0398 - 30 - 12 - 29.5 - 0.03 - 0.024 - 0.95 - 0.011 - 0.0965 - 2 - 2.7 - 100 - 8 - 12 - 8 - 8 - 13 - 4 - 1 - 10 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 0.5 - 1.0 - 2.0 - 9 - 12 - - - - 1.25 - 0.096 - 1.85 - 0.08 - 0.02 - 1.82 - 3 - 1.82 - 11.63813 - 32 - 15.43 - 0.08 - 0.0055 - 1.05 - 0.01 - 0.165 - 2.65 - 3.344 - 55 - 10 - 13 - 9 - 14 - 4 - 1 - 8.3 - 0.82 - 0.82 - 1.1 - 1 - 1 - 1 - 7.875 - 10.5 - - - - 1.4 - 0.08 - 1.9 - 0.1 - 0.02 - 1.5 - 5 - 0.7 - 1 - 1.7 - 17.0573 - 12 - 41.778 - 0.06 - 0.02 - 0.83 - 0.02 - 0.17 - 3.1 - 3.5 - 80 - 7 - 9 - 10 - 9 - 10 - 4 - 3 - 25 - 2 - 0.82 - 0.82 - 3.43 - 1.1 - 1 - 1 - 1 - 9.975 - 13.3 - - - - 1.6 - 0.06 - 1.5 - 0.06 - 0.0 - 1.8 - 4 - 1 - 1.20 - 12.03345 - 13.995 - 26.24 - 0.02 - 0.02 - 0.900 - 0.005 - 0.085 - 2.2 - 2.728 - 87 - 9 - 14 - 12 - 8 - 8 - 4 - 0.95 - 12.5 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.08 - 1.8 - 0.0802 - 0.02 - 1.6 - 3 - 1 - 1.2 - 12.03345 - 12.6 - 1 - 0.005 - 0.11 - 2.16 - 2.9 - 85 - 8 - 9 - 9 - 12 - 16 - 4 - 1 - 10.4 - 2 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.07 - 1.4 - 0.08 - 0.01 - 1.45 - 5 - 0.75 - 1.8 - 10.61365 - 30.5 - 14.21 - 30 - 0.05 - 0.02 - 0.9 - 0.02 - 0.13 - 2 - 109 - 11 - 12 - 12 - 10 - 15 - 5 - 0.96 - 13.4 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 11.25 - 15 - - - - 0.05 - 1.45 - 0.05 - 0.1 - 1.66 - 5 - 1.4 - 11.12183 - 14.5 - 0.03 - 0.02 - 1.2 - 0.082 - 1.5 - 2.3 - 93 - 9 - 12 - 9 - 4 - 5 - false - 2 - 20 - 1 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 11.25 - 14.3 - - - - 0.06 - 1.475 - 0.07 - 0.01 - 1.805 - 4 - 1.265 - 11.0718 - 25 - 0.95 - 0.115 - 2.4 - 3.024 - 85 - 10 - 10 - 13 - 10 - 13 - 4 - 4 - 0.96 - 12.4 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.06 - 1.5 - 0.08 - 0.02 - 1.5 - 4 - 1 - 1.5 - 9.8348 - 11.76 - 0.048 - 0.02 - 1 - 0.016 - 0.095 - 1.71 - 2.28 - 75 - 9 - 12 - 11 - 10 - 10 - 4 - 1 - 10 - 2 - 20 - 1 - 0.835 - 0.835 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 0.09 - 1.765 - 0.08 - 0.02 - 2.1 - 4 - 1.5 - 11.44 - 14.32 - 0.062 - 0.01 - 1 - 0.015 - 0.13 - 2.6 - 3.281 - 79 - 9 - 11 - 13 - 9 - 10 - 4 - 5 - 1 - 10.7 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 5 - 9 - 12 - - - - 1.229 - 0.07 - 1.5 - 0.1 - 0.02 - 1.82 - 4 - 1.55 - 11.0825 - 12.96 - 0.05 - 0.01 - 1.01 - 0.01 - 0.095 - 1.9 - 2.43 - 80 - 9 - 11 - 10 - 11 - 10 - 4 - 2 - 0.9 - 0.9 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 1.35 - 0.0725 - 1.7 - 0.08 - 0.02 - 2.05 - 4 - 0.95 - 0.95 - 1.45 - 13.875 - 37.5 - 13.5 - 32.5 - 0.09 - 0.01 - 1.005 - 0.005 - 0.135 - 2.05 - 2.75 - 79 - 9 - 9 - 9 - 8 - 12 - 4 - 5 - 1 - 11.6 - 0.8 - 0.8 - 2.6 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.85 - 0.085 - 1.4 - 0.06 - 0.02 - 1.55 - 5 - 1.3 - 1 - 1.4 - 10.90375 - 13.7 - 0.14 - 0.03 - 1.2 - 0.04 - 0.122 - 1.93 - 2.486 - 102 - 8 - 7 - 12 - 10 - 25 - 4 - 5 - 1 - 10 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 10.35 - 13.8 - - - - 0.08 - 1.35 - 0.1 - 0.02 - 1.55 - 5 - 0.8 - 0.74 - 1.1 - 9.691 - 27.62 - 12.0 - 0.01 - 0.045 - 0.94 - 0.098 - 2.12 - 2.89 - 105 - 12 - 14 - 10 - 10 - 12 - 5 - 0.97 - 12.4 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 1.2 - 0.08 - 2 - 0.065 - 0.01 - 1.55 - 5 - 0.95 - 0.75 - 1.3 - 10.6893 - 14 - 27 - 0.925 - 0.01 - 0.103 - 2.05 - 2.9 - 100 - 9 - 13 - 9 - 12 - 12 - 5 - 1 - 12.2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 1.25 - 0.055 - 1.75 - 0.15 - 0.01 - 1.625 - 4 - 0.72 - 0.8 - 2.1 - 0.9 - 12.5125 - 35.0 - 12.0 - 37.0 - 0.0375 - 0.01 - 1.05 - 0.006 - 0.128 - 2.25 - 2.9 - 80 - 9 - 8 - 9 - 7 - 8 - 4 - 5 - 1.067 - 9.2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - false - 7.725 - 10.3 - - - - 0.2 - 0.1 - 1.12 - 0.075 - 1.6 - 0.08 - 0.02 - 1.58 - 4 - 1 - 1.45 - 11.5294 - 28.0 - 16.03 - 28.0 - 0.9 - 0.018 - 0.098 - 2.0 - 2.5 - 95 - 10 - 9 - 10 - 13 - 11 - 4 - 5 - 1.14 - 10 - 4 - 25 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.08 - 0.02 - 0.75 - 0.0875 - 1.5 - 0.02 - 2.09 - 4 - 0.95 - 11.44 - 34 - 15.5 - 0.04 - 0.02 - 1.09 - 0.012 - 0.092 - 1.85 - 2.51 - 110 - 11 - 12 - 14 - 12 - 12 - 5 - 5 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 12.75 - 17 - - - - 1.283 - 0.08 - 1.7 - 0.1 - 0.02 - 1.9 - 3 - 1 - 0.85 - 1.7 - 14.7326 - 17 - 33 - 0.01 - 1 - 0.012 - 2.55 - 3.023 - 85 - 11 - 8 - 12 - 4 - 5 - 1 - 9.7 - 0.815 - 0.815 - 0.0792308 - 1.15252 - 1.1 - 1 - 1 - 1 - false - 10.125 - 13.5 - - - - 0.82 - 0.0475 - 1.625 - 0.1 - 0.02 - 1.725 - 4 - 1.5 - 17.0741 - 49 - 12.5 - 0.075 - 1 - 0.125 - 2.3 - 0.0225 - 2.7 - 80 - 9 - 10 - 10 - 4 - 1.055 - 9.1 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 1.8 - 1.8 - 0.5 - 8.25 - 11 - - - - 1.414 - 0.085 - 1.7 - 0.12 - 0.02 - 3.5 - 4 - 0.85 - 0.75 - 2 - 12.5125 - 14.595 - 0.035 - 0.01 - 1.11 - 0.111 - 1.98 - 2.67 - 82 - 8 - 11 - 10 - 10 - 16 - 4 - 4 - 0.95 - 10.6 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 8.4 - 11.2 - - - - 0.975 - 0.07 - 1.48 - 0.04 - 0.02 - 1.36 - 5 - 1 - 0.7 - 1.16 - 11.7439 - 15.02 - 0.04 - 0.02 - 0.915 - 0.005 - 0.095 - 2.25 - 3.3 - 107 - 11 - 14 - 11 - 12 - 15 - 5 - 5 - 0.93 - 3 - 25 - 2 - 4 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 11.7 - 15.6 - - - - 0.925 - 0.075 - 1.56 - 0.05 - 0.02 - 1.625 - 4 - 0.7 - 1 - 1.315 - 11.9763 - 11.69 - 0.03 - 0.02 - 1.11 - 0.02 - 0.09 - 1.9 - 2.46 - 83 - 7 - 7 - 8 - 10 - 12 - 4 - 0.95 - 10.3 - true - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 7.875 - 10.5 - - - - 1.303 - 0.095 - 2.05 - 0.15 - 0.02 - 1.85 - 4 - 1.1 - 1 - 1.25 - 13.44915 - 15.19 - 0.035 - 0 - 1 - 0.005 - 0.125 - 2.02 - 2.728 - 94 - 10 - 8 - 15 - 10 - 10 - 5 - 5 - 1.05 - 10.6 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - false - 9.375 - 12.5 - - - - 1.138 - 0.07 - 1.3 - 0.02 - 0.1 - 1.66 - 4 - 0.7 - 0.8 - 1.3 - 13.585 - 17.98 - 0.025 - 0.04 - 1.08 - 0.01 - 2 - 2.648 - 104 - 9 - 7 - 12 - 11 - 4 - 6 - 0.95 - 13 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 11.625 - 15.5 - - - - 1.248 - 0.078 - 1.8 - 0.1 - 0.02 - 1.675 - 4 - 1 - 12.0835 - 14.32 - 25 - 0.05 - 0.02 - 1.035 - 0.005 - 0.11 - 2.06 - 2.831 - 85 - 9 - 7 - 11 - 22 - 4 - 4 - 1 - 9.7 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.7 - 11.6 - - - - 1.3 - 0.09 - 1.9 - 0.1 - 0.02 - 1.8 - 4 - 0.9 - 0.75 - 1.7 - 11.44715 - 12 - 33 - 0.06 - 0.02 - 1.2 - 0.015 - 0.16 - 2.7 - 3.4 - 80 - 7 - 10 - 10 - 11 - 12 - 4 - 1.18 - 8.7 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 1.112 - 0.0835 - 1.705 - 0.08584 - 0.02 - 1.507 - 4 - 1 - 1 - 1.55 - 11.61875 - 15.09 - 0.05 - 0.01 - 0.946 - 0.0175 - 0.084 - 1.649 - 2.225 - 85 - 7 - 11 - 12 - 9 - 4 - 4 - 1.037 - 9.6 - true - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.1 - 10.8 - - - - 1.232 - 0.076 - 1.738 - 0.08584 - 0.02 - 1.542 - 4 - 1 - 1.5 - 11.726 - 11.99 - 0.065 - 0.01 - 1.08 - 0.025 - 0.11 - 2.18 - 2.91 - 102 - 7 - 10 - 14 - 17 - 13 - 4 - 1 - 9.8 - 3 - 20 - 20 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.4 - 11.2 - - - - 1.244 - 0.0835 - 1.815 - 0.08584 - 0.02 - 1.89 - 3 - 1 - 1.45 - 12.727 - 13.18 - 0.066 - 0.01 - 0.977 - 0.113 - 1.816 - 2.414 - 96 - 7 - 9 - 10 - 10 - 4 - 5 - 0.96 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 7.5 - 10 - - - - 0.057 - 1.735 - 0.09969 - 0.02 - 1.67 - 5 - 0.77 - 1.25 - 14.3 - 16.17 - 0.078 - 0.015 - 1 - 0.009 - 0.081 - 1.6 - 2.287 - 89 - 7 - 10 - 9 - 10 - 4 - 4 - 1 - 12.6 - 2 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.0835 - 1.88 - 0.1252 - 0.02 - 2.046 - 5 - 0.95 - 0.8 - 1.5 - 10.725 - 28 - 27 - 0.02 - 0.014 - 1.085 - 0.01 - 0.117 - 2.165 - 3 - 90 - 8 - 9 - 9 - 7 - 10 - 4 - 4 - 1.11 - 10.7 - 2 - 0.785 - 0.785 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.063 - 1.775 - 0.1087 - 0.02 - 1.9 - 5 - 1 - 1.46 - 16.445 - 15.51 - 0.058 - 0.01 - 1.09 - 0.01125 - 2.49 - 3.441 - 85 - 9 - 9 - 12 - 20 - 4 - 5 - 1 - 10 - 2 - 0.65 - 0.65 - 1.1 - 1 - 1 - 1 - false - 10.5 - 14 - - - - 0.0785 - 1.845 - 0.09969 - 0.02 - 1.815 - 4 - 0.77 - 0.8 - 1.4 - 12.8343 - 14.31 - 0.08 - 0.959 - 0.0065 - 0.124 - 1.915 - 2.51 - 90 - 9 - 8 - 12 - 11 - 4 - 4 - 0.95 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.85 - 11.8 - - - - 0.07 - 1.625 - 0.08584 - 0.02 - 1.62 - 4 - 1 - 1.5 - 12.1908 - 27 - 15.48 - 28 - 0.065 - 0.015 - 1.095 - 0.0125 - 0.085 - 1.7 - 2.472 - 95 - 7 - 10 - 12 - 8 - 18 - 4 - 5 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.6 - 12.8 - - - - 0.089 - 0.185 - 0.998 - 0.081 - 1.71 - 0.04965 - 0.02 - 1.35 - 5 - 1 - 1.25 - 11.8726 - 14.52 - 0.04 - 0.01 - 1.03 - 0.008 - 0.099 - 2.25 - 3 - 93 - 9 - 10 - 11 - 12 - 4 - 1 - 11.8 - 22 - 2 - false - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 1.175 - 0.085 - 1.6 - 0.04238 - 0.02 - 1.7 - 4 - 1 - 1.3 - 11.9763 - 16.2 - 0.022 - 0.02 - 0.982 - 0.0065 - 0.106 - 2.18 - 2.68 - 96 - 10 - 12 - 14 - 11 - 13 - 5 - 0.98 - 12 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 8.85 - 11.8 - - - - 1.124 - 0.07 - 1.745 - 0.08584 - 0.02 - 1.724 - 4 - 1 - 1.5 - 12.298 - 15.59 - 0.058 - 0.01 - 0.98 - 0.111 - 2.238 - 3.007 - 110 - 8 - 10 - 10 - 7 - 12 - 5 - 4 - 3 - 25 - 2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.0605 - 1.59 - 0.08584 - 0.02 - 1.642 - 4 - 1 - 1.4 - 12.155 - 14.48 - 0.056 - 0.02 - 1.093 - 0.0135 - 0.088 - 1.91 - 2.8 - 85 - 7 - 8 - 10 - 9 - 11 - 4 - 4 - 1 - 9.5 - 2 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 0.11 - 1.12 - 0.825 - 0.1 - 1.6 - 0.1 - 0.02 - 1.578 - 5 - 1 - 1.35 - 10.725 - 26 - 13 - 29.5 - 1.1 - 0.005 - 0.12 - 1.857 - 2.6 - 103 - 7 - 9 - 10 - 12 - 5 - 1.02 - 12.3 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 1.205 - 0.062 - 1.66 - 0.055 - 0.03 - 1.855 - 5 - 1 - 1.425 - 11.6188 - 36.5 - 14.0 - 34.0 - 0.045 - 0.015 - 1.01 - 0.007 - 0.135 - 2.4 - 3.25 - 101 - 10 - 12 - 11 - 13 - 13 - 4 - 5 - 1.01 - 12.6 - 0.815 - 0.815 - false - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.228 - 0.0825 - 1.7215 - 0.04238 - 0.02 - 1.7215 - 4 - 1 - 0.75 - 1.3 - 10.6071 - 0.027 - 0.015 - 0.966 - 0.00525 - 0.1 - 2.08 - 2.848 - 98 - 10 - 10 - 14 - 12 - 12 - 4 - 0.99 - 11.8 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 9.15 - 12.2 - - - - 0.975 - 0.069 - 1.806 - 0.1 - 0.02 - 1.65 - 4 - 1 - 1.5 - 13.9425 - 12.5 - 0.065 - 0.015 - 1.03 - 0.007 - 0.132 - 2.35 - 2.9 - 84 - 8 - 10 - 10 - 8 - 20 - 4 - 4 - 1.03 - 12.6 - 2 - 0.815 - 0.815 - 1 - 1 - 1.1 - 1 - 1 - 1 - false - 9 - 12 - - - - 0.0585 - 1.525 - 0.0825 - 0.02 - 1.875 - 3 - 1 - 1.6 - 11.7975 - 12.2 - 33 - 33 - 0.05 - 0.018 - 1.095 - 0.0125 - 0.095 - 2.05 - 3.15 - 94 - 7 - 9 - 8 - 8 - 11 - 4 - 1.06 - 10.3 - 2 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.0675 - 0.07621 - 0.02 - 1.815 - 5 - 0.85 - 1.55 - 12.155 - 12.56 - 0.05 - 0.01 - 1 - 0.02 - 0.11 - 2.19 - 2.993 - 98 - 10 - 11 - 13 - 12 - 14 - 4 - 5 - 2 - 4 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 12.225 - 16.3 - - - - 0.86 - 0.065 - 1.745 - 0.07621 - 0.02 - 1.51 - 5 - 0.85 - 1.25 - 10.5 - 15 - 30 - 0.02 - 0.965 - 0.015 - 2 - 105 - 8 - 12 - 13 - 18 - 5 - 1 - 13 - 3 - 25 - 2 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.03 - 0.055 - 1.71 - 0.05571 - 0.02 - 1.645 - 5 - 0.95 - 0.6 - 1.567 - 11.7975 - 0.03 - 0.025 - 0.93 - 0.0175 - 0.118 - 2.3 - 3.05 - 116 - 9 - 11 - 14 - 12 - 13 - 5 - 5 - false - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 13.875 - 18.5 - - - - 0.081 - 1.665 - 0.08584 - 0.02 - 1.58 - 4 - 1 - 1.45 - 11.6188 - 15.29 - 0.03 - 0.02 - 0.978 - 0.084 - 1.76 - 2.37 - 82 - 7 - 9 - 12 - 10 - 11 - 4 - 4 - 1.04 - 9.6 - true - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 7.875 - 10.5 - - - - 0.87 - 0.08 - 1.6 - 0.05571 - 1.45 - 5 - 0.96 - 0.8 - 1.45 - 11.297 - 31.6 - 11 - 32.8 - 0.05 - 0.01 - 0.97 - 0.0115 - 2.2 - 2.953 - 112 - 9 - 11 - 13 - 10 - 13 - 5 - 5 - 1 - 12.3 - true - 0.805 - 0.805 - 1.1 - 1 - 1 - 1 - 9.975 - 13.3 - - - - 1 - 0.06 - 1.71 - 0.07635 - 0.02 - 1.59 - 5 - 0.95 - 0.825 - 1.5 - 13.3705 - 16 - 0.035 - 0.015 - 0.981 - 0.0125 - 2.2 - 2.3 - 109 - 8 - 8 - 14 - 7 - 11 - 5 - 2 - false - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.25 - 0.086 - 1.705 - 0.08 - 0.02 - 1.86 - 4 - 1 - 0.8 - 1.5 - 11.61875 - 12 - 32 - 0.055 - 0.01 - 1.01 - 0.145 - 2.45 - 3.32 - 87 - 8 - 9 - 9 - 12 - 10 - 4 - 1.03 - 12.5 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.1 - 0.075 - 1.65 - 0.05571 - 0.02 - 1.625 - 4 - 1 - 1.3 - 10.3675 - 14.5 - 28 - 0.05 - 0.01 - 0.96 - 0.111 - 1.98 - 2.7 - 101 - 8 - 10 - 12 - 7 - 13 - 4 - 5 - 0.96 - 12.1 - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 1.1 - 0.0595 - 1.525 - 0.08323 - 0.02 - 1.716 - 4 - 0.95 - 1.5 - 10.654 - 14.3 - 0.05 - 0.01 - 0.906 - 0.013 - 0.127 - 2.33 - 3.1 - 100 - 9 - 12 - 12 - 8 - 18 - 4 - 4 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.12 - 1.2 - 0.9 - 0.0825 - 1.7 - 0.09012 - 0.02 - 1.65 - 4 - 1.0 - 0.85 - 1.35 - 0.85 - 11.85 - 12.0 - 0.04 - 1.0 - 0.011 - 0.105 - 2.05 - 2.9 - 104 - 7 - 9 - 8 - 13 - 5 - 1.05 - 12.4 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.1 - 1.17 - 0.06 - 1.9 - 0.08323 - 1.51 - 5 - 0.85 - 1.35 - 10.47375 - 30 - 28 - 0.035 - 0.01 - 0.853 - 0.009 - 0.109 - 2.2 - 3.106 - 100 - 10 - 12 - 12 - 17 - 4 - 1.02 - 12 - 2 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.06 - 0.084 - 1.855 - 0.08323 - 0.02 - 1.54 - 4 - 1 - 0.8 - 1.6 - 14.55 - 12 - 0.04 - 0.02 - 0.86 - 0.012 - 1.815 - 100 - 8 - 11 - 10 - 7 - 13 - 4 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.9 - 0.9 - 0.0675 - 1.725 - 0.07915 - 1.495 - 5 - 0.9 - 1.2 - 9 - 18.5 - 10 - 22.5 - 0.032 - 0.01 - 0.91 - 0.0065 - 0.0875 - 1.825 - 2.464 - 96 - 10 - 11 - 8 - 4 - 1.075 - 11.4 - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - true - 8.25 - 11 - - - - 0.16 - 0.7 - 0.8 - 0.1 - 1.8 - 0.08 - 0.02 - 1.75 - 5 - 1 - 1.45 - 0.91 - 1.8 - 110 - 8 - 9 - 22 - 5 - 4 - 1.067 - 12.6 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 8.625 - 11.5 - - - - 0.065 - 1.82 - 0.08382 - 0.02 - 1.85 - 4 - 1 - 1.5 - 15.8 - 33.5 - 13.2 - 0.04 - 0.01 - 1.03 - 0.0875 - 2.14 - 2.889 - 85 - 10 - 9 - 9 - 10 - 4 - false - 1.8 - 1.1 - 1 - 1 - 1 - 8.85 - 11.8 - - - - 1.12 - 1.725 - 0.06603 - 0.02 - 1.4975 - 5 - 0.85 - 1.3 - 10.328 - 14.7 - 0.04 - 0.015 - 1.05 - 0.089 - 2.02 - 2.884 - 95 - 10 - 11 - 11 - 10 - 4 - 2 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 0.091 - 1.9 - 0.07635 - 1.89 - 3 - 1 - 1.7 - 10.848 - 13 - 0.05 - 0.01 - 1.125 - 0.134 - 2.62 - 3.368 - 78 - 9 - 9 - 9 - 11 - 4 - 2 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.105 - 0.079 - 1.625 - 0.06 - 0.02 - 1.7 - 5 - 0.95 - 1.325 - 9.975 - 10 - 0.03 - 0.01 - 0.911 - 0.109 - 2.33 - 3.239 - 80 - 12 - 15 - 14 - 30 - 5 - 4 - 1 - 28 - 30 - false - 0.75 - 0.75 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.09 - 1.8 - 0.085 - 0.02 - 2.07 - 4 - 0.95 - 0.75 - 1.8 - 12.5125 - 30 - 13 - 30 - 0.035 - 0.018 - 1.1 - 0.01 - 0.145 - 2.5 - 3.272 - 85 - 7 - 9 - 10 - 9 - 13 - 4 - 4 - 1.19 - 9.9 - 3 - 25 - 2 - 0.815 - 0.815 - 1.1 - 1 - 1 - 1 - 9.375 - 12.5 - - - - 1.17 - 0.077 - 1.81 - 0.1009 - 0.02 - 1.6 - 4 - 1 - 1.32 - 10.114 - 28.5 - 13 - 27.5 - 0.036 - 0.015 - 1.112 - 0.005 - 0.11 - 2.06 - 2.76 - 98 - 8 - 11 - 12 - 4 - 5 - 1.17 - 9.9 - false - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.076 - 1.8 - 0.08584 - 0.02 - 1.26 - 5 - 1 - 1.18 - 11.0468 - 14 - 29.3 - 0.035 - 0.01 - 0.99 - 0.01 - 0.102 - 1.78 - 101 - 9 - 11 - 11 - 12 - 13 - 4 - 5 - 1.17 - 9.5 - 0.81 - 0.81 - 1.1 - 1 - 1 - 1 - 8.4 - 11.2 - - - - 1.11 - 0.06 - 1.86 - 0.1 - 0.02 - 1.61 - 4 - 1.0 - 1.3 - 13.2275 - 35 - 15.39 - 31 - 0.035 - 0.02 - 1.01 - 0.01 - 0.012 - 0.1 - 1.87 - 2.604 - 88 - 12 - 9 - 12 - 10 - 13 - 4 - 6 - 0.96 - 12.7 - 0.7 - 1.1 - 1 - 1 - 1 - 10.5 - 14 - - - - 0.904 - 0.08 - 1.69 - 0.1 - 0.02 - 1.79 - 3 - 0.7 - 1 - 1.65 - 10.7357 - 30.03 - 11.5 - 28.03 - 0.045 - 0.02 - 1.055 - 0.12 - 2.34 - 3.2 - 84 - 8 - 12 - 8 - 8 - 12 - 4 - 4 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 9 - 12 - - - - 1.6 - 0.06775 - 1.72 - 0.06 - 0.012 - 1.85 - 4 - 0.9 - 0.95 - 1.32 - 12.03345 - 30.5 - 14.0 - 28.5 - 0.05 - 0.015 - 0.99 - 0.006 - 0.091 - 2.28 - 2.698 - 84 - 12 - 9 - 11 - 9 - 12 - 4 - 0.95 - 0.775 - 0.775 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 1.218 - 0.07 - 1.7 - 0.1 - 0.02 - 1.9 - 4 - 0.9 - 1.4 - 11.0718 - 29.0 - 14.5 - 29.0 - 0.03 - 0.01 - 1.11 - 0.16 - 2.6 - 3.3 - 90 - 8 - 10 - 13 - 9 - 11 - 4 - 4 - 0.96 - 12.5 - true - 0.815 - 0.815 - 2.4 - 1.1 - 1 - 1 - 1 - 10.125 - 13.5 - - - - 0.072 - 1.675 - 0.09613 - 0.02 - 1.735 - 4 - 0.85 - 1.45 - 11.0825 - 33 - 13.96 - 0.06 - 0.96 - 0.015 - 0.11 - 2.42 - 3.146 - 82 - 9 - 11 - 10 - 11 - 10 - 4 - 2 - false - 0.9 - 0.9 - 1.1 - 1 - 1 - 1 - 9.75 - 13 - - - - 0.11 - 1.12 - 0.825 - 0.1 - 1.825 - 0.1 - 0.02 - 1.8 - 5 - 1 - 1.5 - 10.725 - 26 - 13 - 29.5 - 1.1 - 0.005 - 0.13 - 2.07 - 2.9 - 94 - 7 - 10 - 11 - 12 - 5 - 1.02 - 12.3 - 0.825 - 0.825 - 1.1 - 1 - 1 - 1 - 2 - 8.625 - 11.5 - - - - 0.90 - 0.0725 - 0.07621 - 0.02 - 1.72 - 4 - 0.85 - 1.3 - 10.5 - 28 - 14 - 28 - 0.04 - 1.1 - 0.013 - 0.11 - 2.23 - 3 - 96 - 9 - 10 - 12 - 8 - 18 - 4 - 1 - 12.3 - 3 - false - 0.8 - 0.8 - 1.1 - 1 - 1 - 1 - 0.902 - 0.784 - 0.333 - 9.375 - 12.5 - - - - 1.75 - 1.9 - 5 - 40 - 18 - 45 - 140 - 15 - 19 - 22 - 20 - 30 - 7 - 10 - 0.37 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - - 4 - 0.8 - 0.5 - 1 - 1 - 1 - - - + + + + + + 1.125 + 0.061 + 1.62 + 0.06 + 0.02 + 1.6 + 4 + 1.6 + 11.946 + 34 + 13 + 33.5 + 0.065 + 0.01 + 1 + 0.016 + 0.095 + 1.8 + 100 + 7 + 11 + 7 + 7 + 12 + 4 + 1 + 10 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 0.95 + 1.265 + 0.08 + 1.76 + 0.02 + 1.76 + 5 + 1 + 1.8 + 12.155 + 13 + 34.5 + 0.03 + 1.105 + 0.02 + 0.12 + 2.4 + 2.96 + 109 + 10 + 13 + 9 + 13 + 12 + 5 + false + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + 13.5 + 18 + + + + 1.217 + 0.09 + 1.5 + 0.10167 + 0.02 + 1.5 + 4 + 1 + 1.3 + 9.9385 + 12.58 + 25 + 0.02 + 1 + 0.005 + 0.11 + 2.13 + 104 + 8 + 10 + 7 + 14 + 18 + 4 + 1 + 10.4 + false + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 0.06 + 1.674 + 0.10113 + 0.02 + 1.55 + 4 + 0.95 + 1.34 + 13.2275 + 19.4 + 0.045 + 0.02 + 0.942 + 0.0125 + 0.066 + 1.43 + 2.24 + 108 + 7 + 12 + 9 + 10 + 5 + 5 + false + 0.96 + 12.2 + 0.7 + 1.1 + 1 + 1 + 1 + 10.5 + 14 + + + + 1.168 + 0.0655 + 1.45 + 0.08 + 0.02 + 1.696 + 5 + 0.93 + 1.596 + 12.9022 + 0.048 + 0.02 + 1.22 + 0.009 + 0.094 + 1.9 + 2.93 + 108 + 11 + 8 + 9 + 14 + 5 + 5 + 0.94 + 7.7 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 0.927 + 0.08 + 1.524 + 0.0805 + 0.02 + 1.6 + 4 + 1 + 1.6 + 9.07 + 0.04 + 0.02 + 1 + 0.02 + 0.082 + 1.6 + 2.217 + 74 + 7 + 10 + 9 + 12 + 4 + 0.98 + 8.9 + 3 + 25 + 2 + 0.85 + 0.85 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 1.6 + 0.08 + 1.9 + 0.1 + 0.02 + 2.2 + 3 + 0.72 + 0.83 + 1.7 + 12.5125 + 12 + 0.06 + 0.02 + 0.83 + 0.02 + 0.23 + 2.8 + 3.4 + 75 + 15 + 10 + 10 + 10 + 4 + 3 + 25 + 2 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 1.24 + 0.09 + 1.8 + 0.08 + 0.02 + 1.8 + 3 + 0.8 + 1.8 + 12.69125 + 15 + 0.03 + 0.02 + 0.901 + 0.01 + 0.11 + 1.9 + 2.7 + 80 + 7 + 8 + 9 + 12 + 13 + 4 + 1.05 + 8.5 + 0.82 + 0.82 + 1.1 + 1 + 1 + 1 + 8.625 + 11.5 + + + + 1.1 + 0.031 + 1.435 + 0.04 + 0.02 + 1.555 + 4 + 0.75 + 0.6 + 1.28 + 12.1 + 44 + 14 + 34 + 0.03 + 0.015 + 0.8 + 0.01 + 0.079 + 1.71 + 2.2 + 100 + 7 + 11 + 8 + 7 + 10 + 4 + 5 + 1 + 10.5 + true + 0.75 + 0.75 + 2.3 + 1.1 + 1 + 1 + 1 + 9.375 + 12.5 + + + + 0.877 + 0.06 + 1.45 + 0.06 + 0.02 + 1.6 + 4 + 1.5 + 1 + 12.3266 + 14.65 + 0.04 + 0.02 + 1.05 + 0.01 + 0.09 + 1.83 + 2.23 + 94 + 8 + 12 + 7 + 9 + 10 + 4 + 4 + 1.055 + 9 + false + 0.75 + 0.75 + 1.9 + 1.1 + 1 + 1 + 1 + 8.25 + 11 + + + + 0.927 + 0.08 + 2 + 0.15 + 0.01 + 2.3 + 4 + 0.95 + 2.1 + 14.4 + 40.13 + 12.95 + 29.94 + 0.04 + 0.02 + 1.12 + 0.01 + 0.13 + 2.808 + 3.5 + 99 + 12 + 10 + 9 + 14 + 4 + 1.03 + 11 + 2 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + 10.5 + 14 + + + + 0.08 + 1.45 + 0.065 + 0.02 + 5 + 8.7076 + 9.146 + 0.12 + 0.06 + 1.34 + 0.04 + 0.064 + 1.3 + 1.588 + 64 + 10 + 4 + 3 + 1 + 9.8 + 999.84 + 0.81 + 0.81 + 1 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 0.904 + 0.0886 + 1.2 + 0.02 + 0.1 + 1.5 + 4 + 0.71 + 0.73 + 1.3 + 10.7357 + 15.66 + 0.06 + 0.01 + 1.1 + 0.005 + 0.08 + 1.5 + 2.1 + 90 + 8 + 11 + 8 + 7 + 5 + 4 + 1 + 11 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 0.078 + 1.625 + 0.05428 + 0.02 + 1.735 + 5 + 0.75 + 0.8 + 1.355 + 11.7975 + 14.7 + 0.015 + 1.011 + 0.01 + 0.13 + 2.12 + 2.812 + 117 + 10 + 13 + 13 + 12 + 21 + 5 + 5 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 14.25 + 19 + + + + 0.95 + 0.035 + 1.4 + 0.05 + 0.02 + 1.4 + 4 + 0.6 + 9.7132 + 14.75 + 0.027 + 0.02 + 0.83 + 0.02 + 0.1 + 1.61 + 2.167 + 88 + 8 + 9 + 12 + 13 + 4 + 4 + 0.835 + 0.835 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 1.108 + 0.0385 + 1.4 + 0.06 + 0.02 + 1.545 + 4 + 0.6 + 9.7132 + 14.75 + 0.03105 + 0.02 + 0.87375 + 0.02 + 0.1 + 1.61 + 2.167 + 88 + 8 + 9 + 12 + 13 + 4 + 4 + 0.835 + 0.835 + 1.1 + 1 + 1 + 1 + 8.25 + 11 + + + + 1.43 + 0.082 + 1.704 + 0.1 + 0.02 + 1.83 + 3 + 0.76 + 1.4 + 13.9425 + 15.5 + 0.075 + 1.0175 + 0.0115 + 2.15 + 3.08 + 90 + 8 + 8 + 8 + 12 + 11 + 4 + 5 + 1 + 11.5 + 3 + 25 + 2 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + false + 10.5 + 14 + + + + 0.874 + 0.08 + 1.65 + 0.12025 + 0.02 + 1.4 + 5 + 0.72 + 0.7 + 1.175 + 11.2791 + 14.24 + 0.05 + 0.02 + 1.051 + 0.077 + 1.5 + 2.245 + 90 + 9 + 10 + 11 + 11 + 4 + 5 + 1 + 0.79 + 0.79 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 1.12 + 0.062 + 1.52 + 0.06 + 0.02 + 1.5 + 4 + 1.5 + 11.0398 + 30 + 12 + 29.5 + 0.03 + 0.024 + 0.95 + 0.011 + 0.0965 + 2 + 2.7 + 100 + 8 + 12 + 8 + 8 + 13 + 4 + 1 + 10 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 0.5 + 1.0 + 2.0 + 9 + 12 + + + + 1.25 + 0.096 + 1.85 + 0.08 + 0.02 + 1.82 + 3 + 1.82 + 11.63813 + 32 + 15.43 + 0.08 + 0.0055 + 1.05 + 0.01 + 0.165 + 2.65 + 3.344 + 55 + 10 + 13 + 9 + 14 + 4 + 1 + 8.3 + 0.82 + 0.82 + 1.1 + 1 + 1 + 1 + 7.875 + 10.5 + + + + 1.4 + 0.08 + 1.9 + 0.1 + 0.02 + 1.5 + 5 + 0.7 + 1 + 1.7 + 17.0573 + 12 + 41.778 + 0.06 + 0.02 + 0.83 + 0.02 + 0.17 + 3.1 + 3.5 + 80 + 7 + 9 + 10 + 9 + 10 + 4 + 3 + 25 + 2 + 0.82 + 0.82 + 3.43 + 1.1 + 1 + 1 + 1 + 9.975 + 13.3 + + + + 1.6 + 0.06 + 1.5 + 0.06 + 0.0 + 1.8 + 4 + 1 + 1.20 + 12.03345 + 13.995 + 26.24 + 0.02 + 0.02 + 0.900 + 0.005 + 0.085 + 2.2 + 2.728 + 87 + 9 + 14 + 12 + 8 + 8 + 4 + 0.95 + 12.5 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 0.08 + 1.8 + 0.0802 + 0.02 + 1.6 + 3 + 1 + 1.2 + 12.03345 + 11.0 + 1 + 0.005 + 0.11 + 2.16 + 2.9 + 85 + 8 + 9 + 9 + 12 + 16 + 4 + 1 + 10.4 + 2 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 8.625 + 11.5 + + + + 0.07 + 1.4 + 0.08 + 0.01 + 1.45 + 5 + 0.75 + 1.8 + 10.61365 + 30.5 + 14.21 + 30 + 0.05 + 0.02 + 0.9 + 0.02 + 0.13 + 2 + 109 + 11 + 12 + 12 + 10 + 15 + 5 + 0.96 + 13.4 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 11.25 + 15 + + + + 0.05 + 1.45 + 0.05 + 0.1 + 1.66 + 5 + 1.4 + 11.12183 + 14.5 + 0.03 + 0.02 + 1.2 + 0.082 + 1.5 + 2.3 + 93 + 9 + 12 + 9 + 4 + 5 + false + 2 + 20 + 1 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 11.25 + 14.3 + + + + 0.06 + 1.475 + 0.07 + 0.01 + 1.805 + 4 + 1.265 + 11.0718 + 25 + 0.95 + 0.115 + 2.4 + 3.024 + 85 + 10 + 10 + 13 + 10 + 13 + 4 + 4 + 0.96 + 12.4 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 0.06 + 1.5 + 0.08 + 0.02 + 1.5 + 4 + 1 + 1.5 + 9.8348 + 11.76 + 0.048 + 0.02 + 1 + 0.016 + 0.095 + 1.71 + 2.28 + 75 + 9 + 12 + 11 + 10 + 10 + 4 + 1 + 10 + 2 + 20 + 1 + 0.835 + 0.835 + 1.1 + 1 + 1 + 1 + 9.6 + 12.8 + + + + 0.09 + 1.765 + 0.08 + 0.02 + 2.1 + 4 + 1.5 + 11.44 + 14.32 + 0.062 + 0.01 + 1 + 0.015 + 0.13 + 2.6 + 3.281 + 79 + 9 + 11 + 13 + 9 + 10 + 4 + 5 + 1 + 10.7 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 5 + 9 + 12 + + + + 1.229 + 0.07 + 1.5 + 0.1 + 0.02 + 1.82 + 4 + 1.55 + 11.0825 + 12.96 + 0.05 + 0.01 + 1.01 + 0.01 + 0.095 + 1.9 + 2.43 + 80 + 9 + 11 + 10 + 11 + 10 + 4 + 2 + 0.9 + 0.9 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 1.35 + 0.0725 + 1.7 + 0.08 + 0.02 + 2.05 + 4 + 0.95 + 0.95 + 1.45 + 13.875 + 37.5 + 13.5 + 32.5 + 0.09 + 0.01 + 1.005 + 0.005 + 0.135 + 2.05 + 2.75 + 79 + 9 + 9 + 9 + 8 + 12 + 4 + 5 + 1 + 11.6 + 0.8 + 0.8 + 2.6 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 0.85 + 0.085 + 1.4 + 0.06 + 0.02 + 1.55 + 5 + 1.3 + 1 + 1.4 + 10.90375 + 13.7 + 0.14 + 0.03 + 1.2 + 0.04 + 0.122 + 1.93 + 2.486 + 102 + 8 + 7 + 12 + 10 + 25 + 4 + 5 + 1 + 10 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 10.35 + 13.8 + + + + 0.08 + 1.35 + 0.1 + 0.02 + 1.55 + 5 + 0.8 + 0.74 + 1.1 + 9.691 + 27.62 + 12.0 + 0.01 + 0.045 + 0.94 + 0.098 + 2.12 + 2.89 + 105 + 12 + 14 + 10 + 10 + 12 + 5 + 0.97 + 12.4 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 9.6 + 12.8 + + + + 1.2 + 0.08 + 2 + 0.065 + 0.01 + 1.55 + 5 + 0.95 + 0.75 + 1.3 + 10.6893 + 14 + 27 + 0.925 + 0.01 + 0.103 + 2.05 + 2.9 + 100 + 9 + 13 + 9 + 12 + 12 + 5 + 1 + 12.2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 9.6 + 12.8 + + + + 1.25 + 0.055 + 1.75 + 0.15 + 0.01 + 1.625 + 4 + 0.72 + 0.8 + 2.1 + 0.9 + 12.5125 + 35.0 + 12.0 + 37.0 + 0.0375 + 0.01 + 1.05 + 0.006 + 0.128 + 2.25 + 2.9 + 80 + 9 + 8 + 9 + 7 + 8 + 4 + 5 + 1.067 + 9.2 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + false + 7.725 + 10.3 + + + + 0.2 + 0.1 + 1.12 + 0.075 + 1.6 + 0.08 + 0.02 + 1.58 + 4 + 1 + 1.45 + 11.5294 + 28.0 + 16.03 + 28.0 + 0.9 + 0.018 + 0.098 + 2.0 + 2.5 + 95 + 10 + 9 + 10 + 13 + 11 + 4 + 5 + 1.14 + 10 + 4 + 25 + 2 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 10.5 + 14 + + + + 0.08 + 0.02 + 0.75 + 0.0875 + 1.5 + 0.02 + 2.09 + 4 + 0.95 + 11.44 + 34 + 15.5 + 0.04 + 0.02 + 1.09 + 0.012 + 0.092 + 1.85 + 2.51 + 110 + 11 + 12 + 14 + 12 + 12 + 5 + 5 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 12.75 + 17 + + + + 1.283 + 0.08 + 1.7 + 0.1 + 0.02 + 1.9 + 3 + 1 + 0.85 + 1.7 + 14.7326 + 17 + 33 + 0.01 + 1 + 0.012 + 2.55 + 3.023 + 85 + 11 + 8 + 12 + 4 + 5 + 1 + 9.7 + 0.815 + 0.815 + 0.0792308 + 1.15252 + 1.1 + 1 + 1 + 1 + false + 10.125 + 13.5 + + + + 0.82 + 0.0475 + 1.625 + 0.1 + 0.02 + 1.725 + 4 + 1.5 + 17.0741 + 49 + 12.5 + 0.075 + 1 + 0.125 + 2.3 + 0.0225 + 2.7 + 80 + 9 + 10 + 10 + 4 + 1.055 + 9.1 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 1.8 + 1.8 + 0.5 + 8.25 + 11 + + + + 1.414 + 0.085 + 1.7 + 0.12 + 0.02 + 3.5 + 4 + 0.85 + 0.75 + 2 + 12.5125 + 14.595 + 0.035 + 0.01 + 1.11 + 0.111 + 1.98 + 2.67 + 82 + 8 + 11 + 10 + 10 + 16 + 4 + 4 + 0.95 + 10.6 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 8.4 + 11.2 + + + + 0.975 + 0.07 + 1.48 + 0.04 + 0.02 + 1.36 + 5 + 1 + 0.7 + 1.16 + 11.7439 + 15.02 + 0.04 + 0.02 + 0.915 + 0.005 + 0.095 + 2.25 + 3.3 + 107 + 11 + 14 + 11 + 12 + 15 + 5 + 5 + 0.93 + 3 + 25 + 2 + 4 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 11.7 + 15.6 + + + + 0.925 + 0.075 + 1.56 + 0.05 + 0.02 + 1.625 + 4 + 0.7 + 1 + 1.315 + 11.9763 + 11.69 + 0.03 + 0.02 + 1.11 + 0.02 + 0.09 + 1.9 + 2.46 + 83 + 7 + 7 + 8 + 10 + 12 + 4 + 0.95 + 10.3 + true + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 7.875 + 10.5 + + + + 1.303 + 0.095 + 2.05 + 0.15 + 0.02 + 1.85 + 4 + 1.1 + 1 + 1.25 + 13.44915 + 15.19 + 0.035 + 0 + 1 + 0.005 + 0.125 + 2.02 + 2.728 + 94 + 10 + 8 + 15 + 10 + 10 + 5 + 5 + 1.05 + 10.6 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + false + 9.375 + 12.5 + + + + 1.138 + 0.07 + 1.3 + 0.02 + 0.1 + 1.66 + 4 + 0.7 + 0.8 + 1.3 + 13.585 + 17.98 + 0.025 + 0.04 + 1.08 + 0.01 + 2 + 2.648 + 104 + 9 + 7 + 12 + 11 + 4 + 6 + 0.95 + 13 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 11.625 + 15.5 + + + + 1.248 + 0.078 + 1.8 + 0.1 + 0.02 + 1.675 + 4 + 1 + 12.0835 + 14.32 + 25 + 0.05 + 0.02 + 1.035 + 0.005 + 0.11 + 2.06 + 2.831 + 85 + 9 + 7 + 11 + 22 + 4 + 4 + 1 + 9.7 + 3 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 8.7 + 11.6 + + + + 1.3 + 0.09 + 1.9 + 0.1 + 0.02 + 1.8 + 4 + 0.9 + 0.75 + 1.7 + 11.44715 + 12 + 33 + 0.06 + 0.02 + 1.2 + 0.015 + 0.16 + 2.7 + 3.4 + 80 + 7 + 10 + 10 + 11 + 12 + 4 + 1.18 + 8.7 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 9.6 + 12.8 + + + + 1.112 + 0.0835 + 1.705 + 0.08584 + 0.02 + 1.507 + 4 + 1 + 1 + 1.55 + 11.61875 + 15.09 + 0.05 + 0.01 + 0.946 + 0.0175 + 0.084 + 1.649 + 2.225 + 85 + 7 + 11 + 12 + 9 + 4 + 4 + 1.037 + 9.6 + true + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 8.1 + 10.8 + + + + 1.232 + 0.076 + 1.738 + 0.08584 + 0.02 + 1.542 + 4 + 1 + 1.5 + 11.726 + 11.99 + 0.065 + 0.01 + 1.08 + 0.025 + 0.11 + 2.18 + 2.91 + 102 + 7 + 10 + 14 + 17 + 13 + 4 + 1 + 9.8 + 3 + 20 + 20 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 8.4 + 11.2 + + + + 1.244 + 0.0835 + 1.815 + 0.08584 + 0.02 + 1.89 + 3 + 1 + 1.45 + 12.727 + 13.18 + 0.066 + 0.01 + 0.977 + 0.113 + 1.816 + 2.414 + 96 + 7 + 9 + 10 + 10 + 4 + 5 + 0.96 + 12.5 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 7.5 + 10 + + + + 0.057 + 1.735 + 0.09969 + 0.02 + 1.67 + 5 + 0.77 + 1.25 + 14.3 + 16.17 + 0.078 + 0.015 + 1 + 0.009 + 0.081 + 1.6 + 2.287 + 89 + 7 + 10 + 9 + 10 + 4 + 4 + 1 + 12.6 + 2 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 8.625 + 11.5 + + + + 0.0835 + 1.88 + 0.1252 + 0.02 + 2.046 + 5 + 0.95 + 0.8 + 1.5 + 10.725 + 28 + 27 + 0.02 + 0.014 + 1.085 + 0.01 + 0.117 + 2.165 + 3 + 90 + 8 + 9 + 9 + 7 + 10 + 4 + 4 + 1.11 + 10.7 + 2 + 0.785 + 0.785 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 0.063 + 1.775 + 0.1087 + 0.02 + 1.9 + 5 + 1 + 1.46 + 16.445 + 15.51 + 0.058 + 0.01 + 1.09 + 0.01125 + 2.49 + 3.441 + 85 + 9 + 9 + 12 + 20 + 4 + 5 + 1 + 10 + 2 + 0.65 + 0.65 + 1.1 + 1 + 1 + 1 + false + 10.5 + 14 + + + + 0.0785 + 1.845 + 0.09969 + 0.02 + 1.815 + 4 + 0.77 + 0.8 + 1.4 + 12.8343 + 14.31 + 0.08 + 0.959 + 0.0065 + 0.124 + 1.915 + 2.51 + 90 + 9 + 8 + 12 + 11 + 4 + 4 + 0.95 + 12.5 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 8.85 + 11.8 + + + + 0.07 + 1.625 + 0.08584 + 0.02 + 1.62 + 4 + 1 + 1.5 + 12.1908 + 27 + 15.48 + 28 + 0.065 + 0.015 + 1.095 + 0.0125 + 0.085 + 1.7 + 2.472 + 95 + 7 + 10 + 12 + 8 + 18 + 4 + 5 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 9.6 + 12.8 + + + + 0.089 + 0.185 + 0.998 + 0.081 + 1.71 + 0.04965 + 0.02 + 1.35 + 5 + 1 + 1.25 + 11.8726 + 14.52 + 0.04 + 0.01 + 1.03 + 0.008 + 0.099 + 2.25 + 3 + 93 + 9 + 10 + 11 + 12 + 4 + 1 + 11.8 + 22 + 2 + false + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 8.625 + 11.5 + + + + 1.175 + 0.085 + 1.6 + 0.04238 + 0.02 + 1.7 + 4 + 1 + 1.3 + 11.9763 + 16.2 + 0.022 + 0.02 + 0.982 + 0.0065 + 0.106 + 2.18 + 2.68 + 96 + 10 + 12 + 14 + 11 + 13 + 5 + 0.98 + 12 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 8.85 + 11.8 + + + + 1.124 + 0.07 + 1.745 + 0.08584 + 0.02 + 1.724 + 4 + 1 + 1.5 + 12.298 + 15.59 + 0.058 + 0.01 + 0.98 + 0.111 + 2.238 + 3.007 + 110 + 8 + 10 + 10 + 7 + 12 + 5 + 4 + 3 + 25 + 2 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 0.0605 + 1.59 + 0.08584 + 0.02 + 1.642 + 4 + 1 + 1.4 + 12.155 + 14.48 + 0.056 + 0.02 + 1.093 + 0.0135 + 0.088 + 1.91 + 2.8 + 85 + 7 + 8 + 10 + 9 + 11 + 4 + 4 + 1 + 9.5 + 2 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 0.11 + 1.12 + 0.825 + 0.1 + 1.6 + 0.1 + 0.02 + 1.578 + 5 + 1 + 1.35 + 10.725 + 26 + 13 + 29.5 + 1.1 + 0.005 + 0.12 + 1.857 + 2.6 + 103 + 7 + 9 + 10 + 12 + 5 + 1.02 + 12.3 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 8.625 + 11.5 + + + + 1.205 + 0.062 + 1.66 + 0.055 + 0.03 + 1.855 + 5 + 1 + 1.425 + 11.6188 + 36.5 + 14.0 + 34.0 + 0.045 + 0.015 + 1.01 + 0.007 + 0.135 + 2.4 + 3.25 + 101 + 10 + 12 + 11 + 13 + 13 + 4 + 5 + 1.01 + 12.6 + 0.815 + 0.815 + false + 1 + 1 + 1 + 9.375 + 12.5 + + + + 1.228 + 0.0825 + 1.7215 + 0.04238 + 0.02 + 1.7215 + 4 + 1 + 0.75 + 1.3 + 10.6071 + 0.027 + 0.015 + 0.966 + 0.00525 + 0.1 + 2.08 + 2.848 + 98 + 10 + 10 + 14 + 12 + 12 + 4 + 0.99 + 11.8 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 9.15 + 12.2 + + + + 0.975 + 0.069 + 1.806 + 0.1 + 0.02 + 1.65 + 4 + 1 + 1.5 + 13.9425 + 12.5 + 0.065 + 0.015 + 1.03 + 0.007 + 0.132 + 2.35 + 2.9 + 84 + 8 + 10 + 10 + 8 + 20 + 4 + 4 + 1.03 + 12.6 + 2 + 0.815 + 0.815 + 1 + 1 + 1.1 + 1 + 1 + 1 + false + 9 + 12 + + + + 0.0585 + 1.525 + 0.0825 + 0.02 + 1.875 + 3 + 1 + 1.6 + 11.7975 + 12.2 + 33 + 33 + 0.05 + 0.018 + 1.095 + 0.0125 + 0.095 + 2.05 + 3.15 + 94 + 7 + 9 + 8 + 8 + 11 + 4 + 1.06 + 10.3 + 2 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 0.0675 + 0.07621 + 0.02 + 1.815 + 5 + 0.85 + 1.55 + 12.155 + 12.56 + 0.05 + 0.01 + 1 + 0.02 + 0.11 + 2.19 + 2.993 + 98 + 10 + 11 + 13 + 12 + 14 + 4 + 5 + 2 + 4 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 12.225 + 16.3 + + + + 0.86 + 0.065 + 1.745 + 0.07621 + 0.02 + 1.51 + 5 + 0.85 + 1.25 + 10.5 + 15 + 30 + 0.02 + 0.965 + 0.015 + 2 + 105 + 8 + 12 + 13 + 18 + 5 + 1 + 13 + 3 + 25 + 2 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 9.375 + 12.5 + + + + 1.03 + 0.055 + 1.71 + 0.05571 + 0.02 + 1.645 + 5 + 0.95 + 0.6 + 1.567 + 11.7975 + 0.03 + 0.025 + 0.93 + 0.0175 + 0.118 + 2.3 + 3.05 + 116 + 9 + 11 + 14 + 12 + 13 + 5 + 5 + false + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + 13.875 + 18.5 + + + + 0.081 + 1.665 + 0.08584 + 0.02 + 1.58 + 4 + 1 + 1.45 + 11.6188 + 15.29 + 0.03 + 0.02 + 0.978 + 0.084 + 1.76 + 2.37 + 82 + 7 + 9 + 12 + 10 + 11 + 4 + 4 + 1.04 + 9.6 + true + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + 7.875 + 10.5 + + + + 0.87 + 0.08 + 1.6 + 0.05571 + 1.45 + 5 + 0.96 + 0.8 + 1.45 + 11.297 + 31.6 + 11 + 32.8 + 0.05 + 0.01 + 0.97 + 0.0115 + 2.2 + 2.953 + 112 + 9 + 11 + 13 + 10 + 13 + 5 + 5 + 1 + 12.3 + true + 0.805 + 0.805 + 1.1 + 1 + 1 + 1 + 9.975 + 13.3 + + + + 1 + 0.06 + 1.71 + 0.07635 + 0.02 + 1.59 + 5 + 0.95 + 0.825 + 1.5 + 13.3705 + 16 + 0.035 + 0.015 + 0.981 + 0.0125 + 2.2 + 2.3 + 109 + 8 + 8 + 14 + 7 + 11 + 5 + 2 + false + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 1.25 + 0.086 + 1.705 + 0.08 + 0.02 + 1.86 + 4 + 1 + 0.8 + 1.5 + 11.61875 + 12 + 32 + 0.055 + 0.01 + 1.01 + 0.145 + 2.45 + 3.32 + 87 + 8 + 9 + 9 + 12 + 10 + 4 + 1.03 + 12.5 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 1.1 + 0.075 + 1.65 + 0.05571 + 0.02 + 1.625 + 4 + 1 + 1.3 + 10.3675 + 14.5 + 28 + 0.05 + 0.01 + 0.96 + 0.111 + 1.98 + 2.7 + 101 + 8 + 10 + 12 + 7 + 13 + 4 + 5 + 0.96 + 12.1 + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 1.1 + 0.0595 + 1.525 + 0.08323 + 0.02 + 1.716 + 4 + 0.95 + 1.5 + 10.654 + 14.3 + 0.05 + 0.01 + 0.906 + 0.013 + 0.127 + 2.33 + 3.1 + 100 + 9 + 12 + 12 + 8 + 18 + 4 + 4 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 10.5 + 14 + + + + 0.12 + 1.2 + 0.9 + 0.0825 + 1.7 + 0.09012 + 0.02 + 1.65 + 4 + 1.0 + 0.85 + 1.35 + 0.85 + 11.85 + 12.0 + 0.04 + 1.0 + 0.011 + 0.105 + 2.05 + 2.9 + 104 + 7 + 9 + 8 + 13 + 5 + 1.05 + 12.4 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 8.625 + 11.5 + + + + 0.1 + 1.17 + 0.06 + 1.9 + 0.08323 + 1.51 + 5 + 0.85 + 1.35 + 10.47375 + 30 + 28 + 0.035 + 0.01 + 0.853 + 0.009 + 0.109 + 2.2 + 3.106 + 100 + 10 + 12 + 12 + 17 + 4 + 1.02 + 12 + 2 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 9.375 + 12.5 + + + + 1.06 + 0.084 + 1.855 + 0.08323 + 0.02 + 1.54 + 4 + 1 + 0.8 + 1.6 + 14.55 + 12 + 0.04 + 0.02 + 0.86 + 0.012 + 1.815 + 100 + 8 + 11 + 10 + 7 + 13 + 4 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 0.9 + 0.9 + 0.0675 + 1.725 + 0.07915 + 1.495 + 5 + 0.9 + 1.2 + 9 + 18.5 + 10 + 22.5 + 0.032 + 0.01 + 0.91 + 0.0065 + 0.0875 + 1.825 + 2.464 + 96 + 10 + 11 + 8 + 4 + 1.075 + 11.4 + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + true + 8.25 + 11 + + + + 0.16 + 0.7 + 0.8 + 0.1 + 1.8 + 0.08 + 0.02 + 1.75 + 5 + 1 + 1.45 + 0.91 + 1.8 + 110 + 8 + 9 + 22 + 5 + 4 + 1.067 + 12.6 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 8.625 + 11.5 + + + + 0.065 + 1.82 + 0.08382 + 0.02 + 1.85 + 4 + 1 + 1.5 + 15.8 + 33.5 + 13.2 + 0.04 + 0.01 + 1.03 + 0.0875 + 2.14 + 2.889 + 85 + 10 + 9 + 9 + 10 + 4 + false + 1.8 + 1.1 + 1 + 1 + 1 + 8.85 + 11.8 + + + + 1.12 + 1.725 + 0.06603 + 0.02 + 1.4975 + 5 + 0.85 + 1.3 + 10.328 + 14.7 + 0.04 + 0.015 + 1.05 + 0.089 + 2.02 + 2.884 + 95 + 10 + 11 + 11 + 10 + 4 + 2 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 9.375 + 12.5 + + + + 0.091 + 1.9 + 0.07635 + 1.89 + 3 + 1 + 1.7 + 10.848 + 13 + 0.05 + 0.01 + 1.125 + 0.134 + 2.62 + 3.368 + 78 + 9 + 9 + 9 + 11 + 4 + 2 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 9.375 + 12.5 + + + + 1.105 + 0.079 + 1.625 + 0.06 + 0.02 + 1.7 + 5 + 0.95 + 1.325 + 9.975 + 10 + 0.03 + 0.01 + 0.911 + 0.109 + 2.33 + 3.239 + 80 + 12 + 15 + 14 + 30 + 5 + 4 + 1 + 28 + 30 + false + 0.75 + 0.75 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 0.09 + 1.8 + 0.085 + 0.02 + 2.07 + 4 + 0.95 + 0.75 + 1.8 + 12.5125 + 30 + 13 + 30 + 0.035 + 0.018 + 1.1 + 0.01 + 0.145 + 2.5 + 3.272 + 85 + 7 + 9 + 10 + 9 + 13 + 4 + 4 + 1.19 + 9.9 + 3 + 25 + 2 + 0.815 + 0.815 + 1.1 + 1 + 1 + 1 + 9.375 + 12.5 + + + + 1.17 + 0.077 + 1.81 + 0.1009 + 0.02 + 1.6 + 4 + 1 + 1.32 + 10.114 + 28.5 + 13 + 27.5 + 0.036 + 0.015 + 1.112 + 0.005 + 0.11 + 2.06 + 2.76 + 98 + 8 + 11 + 12 + 4 + 5 + 1.17 + 9.9 + false + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 0.076 + 1.8 + 0.08584 + 0.02 + 1.26 + 5 + 1 + 1.18 + 11.0468 + 14 + 29.3 + 0.035 + 0.01 + 0.99 + 0.01 + 0.102 + 1.78 + 101 + 9 + 11 + 11 + 12 + 13 + 4 + 5 + 1.17 + 9.5 + 0.81 + 0.81 + 1.1 + 1 + 1 + 1 + 8.4 + 11.2 + + + + 1.11 + 0.06 + 1.86 + 0.1 + 0.02 + 1.61 + 4 + 1.0 + 1.3 + 13.2275 + 35 + 15.39 + 31 + 0.035 + 0.02 + 1.01 + 0.01 + 0.012 + 0.1 + 1.87 + 2.604 + 88 + 12 + 9 + 12 + 10 + 13 + 4 + 6 + 0.96 + 12.7 + 0.7 + 1.1 + 1 + 1 + 1 + 10.5 + 14 + + + + 0.904 + 0.08 + 1.69 + 0.1 + 0.02 + 1.79 + 3 + 0.7 + 1 + 1.65 + 10.7357 + 30.03 + 11.5 + 28.03 + 0.045 + 0.02 + 1.055 + 0.12 + 2.34 + 3.2 + 84 + 8 + 12 + 8 + 8 + 12 + 4 + 4 + 3 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 9 + 12 + + + + 1.6 + 0.06775 + 1.72 + 0.06 + 0.012 + 1.85 + 4 + 0.9 + 0.95 + 1.32 + 12.03345 + 30.5 + 14.0 + 28.5 + 0.05 + 0.015 + 0.99 + 0.006 + 0.091 + 2.28 + 2.698 + 84 + 12 + 9 + 11 + 9 + 12 + 4 + 0.95 + 0.775 + 0.775 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 1.218 + 0.07 + 1.7 + 0.1 + 0.02 + 1.9 + 4 + 0.9 + 1.4 + 11.0718 + 29.0 + 14.5 + 29.0 + 0.03 + 0.01 + 1.11 + 0.16 + 2.6 + 3.3 + 90 + 8 + 10 + 13 + 9 + 11 + 4 + 4 + 0.96 + 12.5 + true + 0.815 + 0.815 + 2.4 + 1.1 + 1 + 1 + 1 + 10.125 + 13.5 + + + + 0.072 + 1.675 + 0.09613 + 0.02 + 1.735 + 4 + 0.85 + 1.45 + 11.0825 + 33 + 13.96 + 0.06 + 0.96 + 0.015 + 0.11 + 2.42 + 3.146 + 82 + 9 + 11 + 10 + 11 + 10 + 4 + 2 + false + 0.9 + 0.9 + 1.1 + 1 + 1 + 1 + 9.75 + 13 + + + + 0.11 + 1.12 + 0.825 + 0.1 + 1.825 + 0.1 + 0.02 + 1.8 + 5 + 1 + 1.5 + 10.725 + 26 + 13 + 29.5 + 1.1 + 0.005 + 0.13 + 2.07 + 2.9 + 94 + 7 + 10 + 11 + 12 + 5 + 1.02 + 12.3 + 0.825 + 0.825 + 1.1 + 1 + 1 + 1 + 2 + 8.625 + 11.5 + + + + 0.90 + 0.0725 + 0.07621 + 0.02 + 1.72 + 4 + 0.85 + 1.3 + 10.5 + 28 + 14 + 28 + 0.04 + 1.1 + 0.013 + 0.11 + 2.23 + 3 + 96 + 9 + 10 + 12 + 8 + 18 + 4 + 1 + 12.3 + 3 + false + 0.8 + 0.8 + 1.1 + 1 + 1 + 1 + 0.902 + 0.784 + 0.333 + 9.375 + 12.5 + + + + 1.75 + 1.9 + 5 + 40 + 18 + 45 + 140 + 15 + 19 + 22 + 20 + 30 + 7 + 10 + 0.37 + 0.8 + 0.5 + 1 + 1 + 1 + + + + 4 + 0.8 + 0.5 + 1 + 1 + 1 + + + + 4 + 0.8 + 0.5 + 1 + 1 + 1 + + + + 4 + 0.8 + 0.5 + 1 + 1 + 1 + + + From ee87a9612fb07c8f326aa68052331b92fd23d377 Mon Sep 17 00:00:00 2001 From: xTheft Date: Thu, 26 Feb 2026 01:45:21 -0600 Subject: [PATCH 04/13] PR v2 with attributes --- fighters/younglink/src/acmd/aerials.rs | 24 ++++++++++++------- fighters/younglink/src/acmd/smashes.rs | 19 ++++++++------- fighters/younglink/src/acmd/throws.rs | 4 ++-- fighters/younglink/src/acmd/tilts.rs | 9 ++++--- .../fighter/common/param/fighter_param.prcxml | 12 ++++++---- .../younglink/motion/body/motion_patch.yaml | 4 ++-- .../source/fighter/younglink/param/vl.prcxml | 2 +- 7 files changed, 42 insertions(+), 32 deletions(-) diff --git a/fighters/younglink/src/acmd/aerials.rs b/fighters/younglink/src/acmd/aerials.rs index 7d1549b3b8..d37a9bf9b0 100644 --- a/fighters/younglink/src/acmd/aerials.rs +++ b/fighters/younglink/src/acmd/aerials.rs @@ -118,24 +118,30 @@ unsafe extern "C" fn game_attackairb(agent: &mut L2CAgentBase) { } frame(lua_state, 6.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("hip"), 5.0, 366, 100, 40, 0, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 1, 0, Hash40::new("kneel"), 5.0, 366, 100, 40, 0, 3.5, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 2, 0, Hash40::new("kneel"), 5.0, 366, 100, 40, 0, 3.5, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 3, 0, Hash40::new("hip"), 5.0, 70, 100, 40, 0, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 0, 0, Hash40::new("hip"), 5.0, 365, 100, 40, 0, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 1, 0, Hash40::new("kneel"), 5.0, 365, 100, 40, 0, 3.5, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 2, 0, Hash40::new("kneel"), 5.0, 365, 100, 40, 0, 3.5, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 3, 0, Hash40::new("hip"), 5.0, 70, 100, 40, 0, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 4, 0, Hash40::new("kneel"), 5.0, 75, 100, 40, 0, 3.5, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 5, 0, Hash40::new("kneel"), 5.0, 80, 100, 40, 0, 3.5, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); } - wait(lua_state, 3.0); + wait(lua_state, 4.0); if is_excute(agent) { AttackModule::clear_all(boma); } + frame(lua_state, 12.0); + FT_MOTION_RATE_RANGE(agent, 12.0, 16.0, 2.0); + frame(lua_state, 16.0); + FT_MOTION_RATE(agent, 1.0); frame(lua_state, 18.0); + FT_MOTION_RATE_RANGE(agent, 18.0, 21.0, 5.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("hip"), 7.0, 55, 65, 0, 35, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 1, 0, Hash40::new("kneer"), 7.0, 55, 65, 0, 35, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 2, 0, Hash40::new("kneer"), 7.0, 55, 65, 0, 35, 4.0, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 0, 0, Hash40::new("hip"), 7.0, 55, 80, 0, 35, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 1, 0, Hash40::new("kneer"), 7.0, 55, 80, 0, 35, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 2, 0, Hash40::new("kneer"), 7.0, 55, 80, 0, 35, 4.0, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); } wait(lua_state, 3.0); + FT_MOTION_RATE(agent, 1.0); if is_excute(agent) { AttackModule::clear_all(boma); } @@ -226,7 +232,7 @@ unsafe extern "C" fn game_attackairlw2attack(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("top"), 5.0, 55, 70, 0, 80, 4.0, 0.0, 3.5, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("top"), 9.0, 70, 70, 0, 50, 4.0, 0.0, 3.5, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); ATTACK(agent, 1, 0, Hash40::new("top"), 10.0, 281, 83, 0, 30, 3.0, 0.0, 9.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } } diff --git a/fighters/younglink/src/acmd/smashes.rs b/fighters/younglink/src/acmd/smashes.rs index 38c6916e7e..efcc6073d3 100644 --- a/fighters/younglink/src/acmd/smashes.rs +++ b/fighters/younglink/src/acmd/smashes.rs @@ -4,16 +4,19 @@ unsafe extern "C" fn game_attacks4(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); frame(lua_state, 6.0); - FT_MOTION_RATE_RANGE(agent, 6.0, 14.0, 7.0); + FT_MOTION_RATE_RANGE(agent, 6.0, 14.0, 10.0); if is_excute(agent) { WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_FLAG_START_SMASH_HOLD); } frame(lua_state, 14.0); FT_MOTION_RATE(agent, 2.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 14.0, 48, 110, 0, 33, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 14.0, 48, 110, 0, 33, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 14.0, 48, 110, 0, 33, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 16.0, 280, 80, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 16.0, 280, 80, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 16.0, 280, 80, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("shoulderl"), 16.0, 80, 100, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 4, 0, Hash40::new("sword"), 16.0, 80, 100, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 5, 0, Hash40::new("sword"), 16.0, 80, 100, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } frame(lua_state, 15.0); FT_MOTION_RATE(agent, 1.0); @@ -133,10 +136,10 @@ unsafe extern "C" fn game_attackhi4(agent: &mut L2CAgentBase) { } frame(lua_state, 26.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 10.0, 100, 108, 0, 75, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 10.0, 100, 108, 0, 75, 3.0, 1.0, -1.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 10.0, 100, 108, 0, 75, 3.0, 6.0, -1.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 3, 0, Hash40::new("top"), 10.0, 100, 108, 0, 75, 3.5, 0.0, 8.5, -0.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 10.0, 100, 108, 0, 75, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 10.0, 100, 108, 0, 75, 3.0, 1.0, -1.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 10.0, 100, 108, 0, 75, 3.0, 6.0, -1.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("top"), 10.0, 100, 108, 0, 75, 3.5, 0.0, 8.5, -0.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } frame(lua_state, 31.0); if is_excute(agent) { diff --git a/fighters/younglink/src/acmd/throws.rs b/fighters/younglink/src/acmd/throws.rs index d249e89834..077340d52e 100644 --- a/fighters/younglink/src/acmd/throws.rs +++ b/fighters/younglink/src/acmd/throws.rs @@ -184,7 +184,7 @@ unsafe extern "C" fn game_throwhi(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 85, 155, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 85, 155, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 26.0); @@ -239,7 +239,7 @@ unsafe extern "C" fn game_throwlw(agent: &mut L2CAgentBase) { if is_excute(agent) { FT_LEAVE_NEAR_OTTOTTO(agent, -2, 2); FT_LEAVE_NEAR_OTTOTTO(agent, 2.5, 2.5); - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 85, 85, 0, 80, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 85, 90, 0, 80, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 22.0); diff --git a/fighters/younglink/src/acmd/tilts.rs b/fighters/younglink/src/acmd/tilts.rs index 1786a8c44c..cfe163477e 100644 --- a/fighters/younglink/src/acmd/tilts.rs +++ b/fighters/younglink/src/acmd/tilts.rs @@ -79,11 +79,10 @@ unsafe extern "C" fn game_attacklw3(agent: &mut L2CAgentBase) { let boma = agent.boma(); frame(lua_state, 8.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 9.0, 80, 40, 0, 70, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 9.0, 80, 40, 0, 70, 2.5, 0.7, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 9.0, 80, 40, 0, 70, 2.5, 4.3, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 3, 0, Hash40::new("sword"), 9.0, 276, 60, 0, 30, 2.5, 8.3, 0.7, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 4, 0, Hash40::new("sword"), 9.0, 276, 60, 0, 30, 2.5, 8.3, 0.7, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 9.0, 80, 58, 0, 75, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 9.0, 80, 58, 0, 75, 2.5, 0.7, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 9.0, 80, 58, 0, 75, 2.5, 4.3, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("sword"), 10.0, 86, 58, 0, 75, 2.5, 8.3, 0.7, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } frame(lua_state, 11.0); FT_MOTION_RATE(agent, 3.0); diff --git a/romfs/source/fighter/common/param/fighter_param.prcxml b/romfs/source/fighter/common/param/fighter_param.prcxml index 569e27bae9..3da7c6e708 100644 --- a/romfs/source/fighter/common/param/fighter_param.prcxml +++ b/romfs/source/fighter/common/param/fighter_param.prcxml @@ -857,16 +857,18 @@ 1 1.2 12.03345 - 11.0 + 34.0 + 35.5 + 11.8 1 0.005 - 0.11 - 2.16 - 2.9 + 0.13 + 2.4 + 3.1 85 8 9 - 9 + 7 12 16 4 diff --git a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml index 54d7dc52c6..af5490451b 100644 --- a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml +++ b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml @@ -130,7 +130,7 @@ attack_air_hi: cancel_frame: 50 attack_air_b: extra: - cancel_frame: 29 + cancel_frame: 28 special_s1: extra: cancel_frame: 43 @@ -142,7 +142,7 @@ appeal_lw_l: cancel_frame: 0 attack_s4_s: extra: - cancel_frame: 48 + cancel_frame: 45 attack_s4_s2: extra: cancel_frame: 53 diff --git a/romfs/source/fighter/younglink/param/vl.prcxml b/romfs/source/fighter/younglink/param/vl.prcxml index 0f1137bd04..68b4f3ecb7 100644 --- a/romfs/source/fighter/younglink/param/vl.prcxml +++ b/romfs/source/fighter/younglink/param/vl.prcxml @@ -58,7 +58,7 @@ 1 2.5 - 0.7 + 0.582 0.025 0.8 26 From 008b028442f783f77b1565ba2b5012501e510766 Mon Sep 17 00:00:00 2001 From: xTheft Date: Thu, 26 Feb 2026 17:47:42 -0600 Subject: [PATCH 05/13] bair hip hitbox fix --- fighters/younglink/src/acmd/aerials.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fighters/younglink/src/acmd/aerials.rs b/fighters/younglink/src/acmd/aerials.rs index d37a9bf9b0..09089decf7 100644 --- a/fighters/younglink/src/acmd/aerials.rs +++ b/fighters/younglink/src/acmd/aerials.rs @@ -118,10 +118,10 @@ unsafe extern "C" fn game_attackairb(agent: &mut L2CAgentBase) { } frame(lua_state, 6.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("hip"), 5.0, 365, 100, 40, 0, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 0, 0, Hash40::new("hip"), 5.0, 365, 100, 40, 0, 4.0, 2.5, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 1, 0, Hash40::new("kneel"), 5.0, 365, 100, 40, 0, 3.5, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 2, 0, Hash40::new("kneel"), 5.0, 365, 100, 40, 0, 3.5, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); - ATTACK(agent, 3, 0, Hash40::new("hip"), 5.0, 70, 100, 40, 0, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 3, 0, Hash40::new("hip"), 5.0, 70, 100, 40, 0, 4.0, 2.5, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 4, 0, Hash40::new("kneel"), 5.0, 75, 100, 40, 0, 3.5, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 5, 0, Hash40::new("kneel"), 5.0, 80, 100, 40, 0, 3.5, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); } @@ -136,7 +136,7 @@ unsafe extern "C" fn game_attackairb(agent: &mut L2CAgentBase) { frame(lua_state, 18.0); FT_MOTION_RATE_RANGE(agent, 18.0, 21.0, 5.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("hip"), 7.0, 55, 80, 0, 35, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 0, 0, Hash40::new("hip"), 7.0, 55, 80, 0, 35, 2.5, 3.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 1, 0, Hash40::new("kneer"), 7.0, 55, 80, 0, 35, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 2, 0, Hash40::new("kneer"), 7.0, 55, 80, 0, 35, 4.0, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); } From 0bb862dacdd79834156554ca8df6162d9033101a Mon Sep 17 00:00:00 2001 From: xTheft Date: Thu, 5 Mar 2026 00:53:59 -0600 Subject: [PATCH 06/13] aerials and throws --- fighters/younglink/src/acmd/aerials.rs | 14 +++++++------- fighters/younglink/src/acmd/smashes.rs | 2 +- fighters/younglink/src/acmd/throws.rs | 4 ++-- .../younglink/motion/body/motion_patch.yaml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fighters/younglink/src/acmd/aerials.rs b/fighters/younglink/src/acmd/aerials.rs index 09089decf7..c2c7f65c27 100644 --- a/fighters/younglink/src/acmd/aerials.rs +++ b/fighters/younglink/src/acmd/aerials.rs @@ -38,9 +38,9 @@ unsafe extern "C" fn game_attackairf(agent: &mut L2CAgentBase) { FT_MOTION_RATE(agent, 1.0); frame(lua_state, 13.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 6.0, 367, 30, 0, 35, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 6.0, 367, 30, 0, 35, 4.0, 1.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 6.0, 367, 30, 0, 35, 3.0, 6.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 6.0, 70, 90, 75, 0, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 6.0, 80, 90, 75, 0, 4.0, 1.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 6.0, 83, 90, 75, 0, 3.0, 6.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } frame(lua_state, 16.0); FT_MOTION_RATE_RANGE(agent, 16.0, 24.0, 3.0); @@ -51,9 +51,9 @@ unsafe extern "C" fn game_attackairf(agent: &mut L2CAgentBase) { FT_MOTION_RATE(agent, 1.0); frame(lua_state, 29.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 8.0, 50, 100, 0, 45, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 8.0, 50, 100, 0, 45, 4.0, 1.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 8.0, 50, 100, 0, 45, 3.0, 6.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 8.0, 58, 85, 0, 50, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 8.0, 58, 85, 0, 50, 4.0, 1.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 8.0, 58, 85, 0, 50, 3.0, 6.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } wait(lua_state, 3.0); if is_excute(agent) { @@ -203,7 +203,7 @@ unsafe extern "C" fn game_attackairlw(agent: &mut L2CAgentBase) { if is_excute(agent) { WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING); WorkModule::on_flag(boma, *FIGHTER_LINK_INSTANCE_WORK_ID_FLAG_ATTACK_AIR_LW_SET_ATTACK); - ATTACK(agent, 0, 0, Hash40::new("top"), 16.0, 70, 92, 0, 35, 4.5, 0.0, 3.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("top"), 16.0, 70, 96, 0, 35, 4.5, 0.0, 3.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); ATTACK(agent, 1, 0, Hash40::new("top"), 16.0, 281, 50, 0, 30, 3.5, 0.0, 9.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } frame(lua_state, 17.0); diff --git a/fighters/younglink/src/acmd/smashes.rs b/fighters/younglink/src/acmd/smashes.rs index efcc6073d3..08ce25ed8a 100644 --- a/fighters/younglink/src/acmd/smashes.rs +++ b/fighters/younglink/src/acmd/smashes.rs @@ -37,7 +37,7 @@ unsafe extern "C" fn effect_attacks4(agent: &mut L2CAgentBase) { if is_excute(agent) { LANDING_EFFECT(agent, Hash40::new("sys_atk_smoke"), Hash40::new("top"), -2, 0, 0, 0, 0, 0, 0.6, 0, 0, 0, 0, 0, 0, false); } - frame(lua_state, 12.5); + frame(lua_state, 13.5); if is_excute(agent) { AFTER_IMAGE4_ON_arg29(agent, Hash40::new("tex_younglink_sword_hdr"), Hash40::new("younglink_sword2"), 4, Hash40::new("sword"), 0.5, 0.0, 0.0, Hash40::new("sword"), 9.7, 0.0, -0.25, true, Hash40::new("null"), Hash40::new("sword"), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0, *EFFECT_AXIS_X, 0, *TRAIL_BLEND_ALPHA, 101, *TRAIL_CULL_NONE, 1.6, 0.2); EFFECT_FOLLOW(agent, Hash40::new("younglink_sword_flare"), Hash40::new("sword"), 0, 0, 0, 0, 0, 0, 1, true); diff --git a/fighters/younglink/src/acmd/throws.rs b/fighters/younglink/src/acmd/throws.rs index 077340d52e..c2dee510a3 100644 --- a/fighters/younglink/src/acmd/throws.rs +++ b/fighters/younglink/src/acmd/throws.rs @@ -184,7 +184,7 @@ unsafe extern "C" fn game_throwhi(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 85, 155, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 90, 155, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 26.0); @@ -239,7 +239,7 @@ unsafe extern "C" fn game_throwlw(agent: &mut L2CAgentBase) { if is_excute(agent) { FT_LEAVE_NEAR_OTTOTTO(agent, -2, 2); FT_LEAVE_NEAR_OTTOTTO(agent, 2.5, 2.5); - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 85, 90, 0, 80, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 88, 90, 0, 80, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 22.0); diff --git a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml index cf9f8a1040..cec0907221 100644 --- a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml +++ b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml @@ -88,7 +88,7 @@ catch_turn: cancel_frame: 61 throw_lw: extra: - cancel_frame: 52 + cancel_frame: 50 throw_hi: extra: cancel_frame: 42 From 8ad2208e9779b2ecfd99e68b9d8bd0667837e446 Mon Sep 17 00:00:00 2001 From: xTheft Date: Thu, 5 Mar 2026 13:43:44 -0600 Subject: [PATCH 07/13] fair and upsmash fixes --- fighters/younglink/src/acmd/aerials.rs | 6 +++--- fighters/younglink/src/acmd/smashes.rs | 17 ++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fighters/younglink/src/acmd/aerials.rs b/fighters/younglink/src/acmd/aerials.rs index c2c7f65c27..e1fed6ac30 100644 --- a/fighters/younglink/src/acmd/aerials.rs +++ b/fighters/younglink/src/acmd/aerials.rs @@ -38,9 +38,9 @@ unsafe extern "C" fn game_attackairf(agent: &mut L2CAgentBase) { FT_MOTION_RATE(agent, 1.0); frame(lua_state, 13.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 6.0, 70, 90, 75, 0, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 6.0, 80, 90, 75, 0, 4.0, 1.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 6.0, 83, 90, 75, 0, 3.0, 6.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 6.0, 367, 30, 0, 50, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 6.0, 367, 30, 0, 50, 4.0, 1.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 6.0, 367, 30, 0, 50, 3.0, 6.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } frame(lua_state, 16.0); FT_MOTION_RATE_RANGE(agent, 16.0, 24.0, 3.0); diff --git a/fighters/younglink/src/acmd/smashes.rs b/fighters/younglink/src/acmd/smashes.rs index 08ce25ed8a..30f37f434d 100644 --- a/fighters/younglink/src/acmd/smashes.rs +++ b/fighters/younglink/src/acmd/smashes.rs @@ -119,22 +119,25 @@ unsafe extern "C" fn game_attackhi4(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); frame(lua_state, 6.0); + FT_MOTION_RATE_RANGE(agent, 6.0, 9.0, 4.0); if is_excute(agent) { WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_FLAG_START_SMASH_HOLD); } - frame(lua_state, 10.0); + frame(lua_state, 9.0); + FT_MOTION_RATE(agent, 1.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 4.0, 105, 100, 33, 0, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 4.0, 95, 100, 23, 0, 3.0, 1.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 4.0, 105, 100, 48, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 3, 0, Hash40::new("sword"), 4.0, 149, 100, 23, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - AttackModule::set_add_reaction_frame(boma, 0, 6.0, false); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 4.0, 105, 100, 50, 0, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 4.0, 95, 100, 38, 0, 3.0, 1.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 4.0, 105, 100, 33, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("sword"), 4.0, 149, 100, 31, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } frame(lua_state, 14.0); + FT_MOTION_RATE_RANGE(agent, 14.0, 25.0, 10.0); if is_excute(agent) { AttackModule::clear_all(boma); } - frame(lua_state, 26.0); + frame(lua_state, 25.0); + FT_MOTION_RATE(agent, 1.0); if is_excute(agent) { ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 10.0, 100, 108, 0, 75, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); ATTACK(agent, 1, 0, Hash40::new("sword"), 10.0, 100, 108, 0, 75, 3.0, 1.0, -1.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); From ec07edcfa01728762037e71ce0a97314157d1d17 Mon Sep 17 00:00:00 2001 From: xTheft Date: Thu, 5 Mar 2026 19:15:32 -0600 Subject: [PATCH 08/13] test 1 --- fighters/younglink/src/acmd/throws.rs | 2 +- romfs/source/fighter/common/hdr/param/common.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fighters/younglink/src/acmd/throws.rs b/fighters/younglink/src/acmd/throws.rs index c2dee510a3..117e224a0c 100644 --- a/fighters/younglink/src/acmd/throws.rs +++ b/fighters/younglink/src/acmd/throws.rs @@ -239,7 +239,7 @@ unsafe extern "C" fn game_throwlw(agent: &mut L2CAgentBase) { if is_excute(agent) { FT_LEAVE_NEAR_OTTOTTO(agent, -2, 2); FT_LEAVE_NEAR_OTTOTTO(agent, 2.5, 2.5); - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 88, 90, 0, 80, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 87, 70, 0, 85, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 22.0); diff --git a/romfs/source/fighter/common/hdr/param/common.xml b/romfs/source/fighter/common/hdr/param/common.xml index 45892b1d24..e98f3ee0e9 100644 --- a/romfs/source/fighter/common/hdr/param/common.xml +++ b/romfs/source/fighter/common/hdr/param/common.xml @@ -61,6 +61,6 @@ 4.5 4.0 - 3 + 5 6 \ No newline at end of file From 1c9d11f55f6f209d8ee02111f15b1b8d3dba28f4 Mon Sep 17 00:00:00 2001 From: xTheft Date: Thu, 5 Mar 2026 19:58:21 -0600 Subject: [PATCH 09/13] test 2 --- romfs/source/fighter/common/hdr/param/common.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/romfs/source/fighter/common/hdr/param/common.xml b/romfs/source/fighter/common/hdr/param/common.xml index e98f3ee0e9..45892b1d24 100644 --- a/romfs/source/fighter/common/hdr/param/common.xml +++ b/romfs/source/fighter/common/hdr/param/common.xml @@ -61,6 +61,6 @@ 4.5 4.0 - 5 + 3 6 \ No newline at end of file From ab8c9a43641283a94209421bf7e7c2c3bf2f687f Mon Sep 17 00:00:00 2001 From: xTheft Date: Mon, 9 Mar 2026 00:15:51 -0500 Subject: [PATCH 10/13] aerials, jab, fthrow/bthrow, wall jump comp --- fighters/younglink/src/acmd/aerials.rs | 17 +++++++++------- fighters/younglink/src/acmd/ground.rs | 6 +++--- fighters/younglink/src/acmd/smashes.rs | 20 +++++++++---------- fighters/younglink/src/acmd/throws.rs | 9 ++++----- fighters/younglink/src/acmd/tilts.rs | 6 +++--- .../fighter/common/param/fighter_param.prcxml | 1 + .../younglink/motion/body/motion_patch.yaml | 2 +- 7 files changed, 32 insertions(+), 29 deletions(-) diff --git a/fighters/younglink/src/acmd/aerials.rs b/fighters/younglink/src/acmd/aerials.rs index e1fed6ac30..5bf3d417e0 100644 --- a/fighters/younglink/src/acmd/aerials.rs +++ b/fighters/younglink/src/acmd/aerials.rs @@ -38,9 +38,12 @@ unsafe extern "C" fn game_attackairf(agent: &mut L2CAgentBase) { FT_MOTION_RATE(agent, 1.0); frame(lua_state, 13.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 6.0, 367, 30, 0, 50, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 6.0, 367, 30, 0, 50, 4.0, 1.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 6.0, 367, 30, 0, 50, 3.0, 6.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 6.0, 366, 50, 0, 35, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 6.0, 366, 50, 0, 35, 4.0, 1.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 6.0, 366, 50, 0, 35, 3.0, 6.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("shoulderl"), 6.0, 80, 50, 0, 35, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 4, 0, Hash40::new("sword"), 6.0, 80, 50, 0, 35, 4.0, 1.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent,5, 0, Hash40::new("sword"), 6.0, 80, 50, 0, 35, 3.0, 6.0, 0.0, 1.0, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } frame(lua_state, 16.0); FT_MOTION_RATE_RANGE(agent, 16.0, 24.0, 3.0); @@ -51,9 +54,9 @@ unsafe extern "C" fn game_attackairf(agent: &mut L2CAgentBase) { FT_MOTION_RATE(agent, 1.0); frame(lua_state, 29.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 8.0, 58, 85, 0, 50, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 8.0, 58, 85, 0, 50, 4.0, 1.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 8.0, 58, 85, 0, 50, 3.0, 6.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 8.0, 52, 80, 0, 50, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 8.0, 52, 80, 0, 50, 4.0, 1.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 8.0, 52, 80, 0, 50, 3.0, 6.0, 0.0, 1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } wait(lua_state, 3.0); if is_excute(agent) { @@ -232,7 +235,7 @@ unsafe extern "C" fn game_attackairlw2attack(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("top"), 9.0, 70, 70, 0, 50, 4.0, 0.0, 3.5, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("top"), 9.0, 70, 77, 0, 50, 4.0, 0.0, 3.5, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); ATTACK(agent, 1, 0, Hash40::new("top"), 10.0, 281, 83, 0, 30, 3.0, 0.0, 9.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } } diff --git a/fighters/younglink/src/acmd/ground.rs b/fighters/younglink/src/acmd/ground.rs index 9466cec91a..83bfb00775 100644 --- a/fighters/younglink/src/acmd/ground.rs +++ b/fighters/younglink/src/acmd/ground.rs @@ -70,9 +70,9 @@ unsafe extern "C" fn game_attack13(agent: &mut L2CAgentBase) { let boma = agent.boma(); frame(lua_state, 6.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("arml"), 3.5, 361, 70, 0, 70, 2.5, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 3.5, 361, 70, 0, 70, 3.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 3.5, 361, 70, 0, 70, 3.0, 5.5, 0.0,0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("arml"), 3.5, 361, 75, 0, 50, 2.5, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 3.5, 361, 75, 0, 50, 3.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 3.5, 361, 75, 0, 50, 3.0, 5.5, 0.0,0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_sting"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } wait(lua_state, 2.0); if is_excute(agent) { diff --git a/fighters/younglink/src/acmd/smashes.rs b/fighters/younglink/src/acmd/smashes.rs index 30f37f434d..afe664aea0 100644 --- a/fighters/younglink/src/acmd/smashes.rs +++ b/fighters/younglink/src/acmd/smashes.rs @@ -11,12 +11,12 @@ unsafe extern "C" fn game_attacks4(agent: &mut L2CAgentBase) { frame(lua_state, 14.0); FT_MOTION_RATE(agent, 2.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 16.0, 280, 80, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 16.0, 280, 80, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 16.0, 280, 80, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 3, 0, Hash40::new("shoulderl"), 16.0, 80, 100, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 4, 0, Hash40::new("sword"), 16.0, 80, 100, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 5, 0, Hash40::new("sword"), 16.0, 80, 100, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 16.0, 280, 85, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 16.0, 280, 85, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 16.0, 280, 85, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("shoulderl"), 16.0, 80, 85, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 4, 0, Hash40::new("sword"), 16.0, 80, 85, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 5, 0, Hash40::new("sword"), 16.0, 80, 85, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } frame(lua_state, 15.0); FT_MOTION_RATE(agent, 1.0); @@ -126,10 +126,10 @@ unsafe extern "C" fn game_attackhi4(agent: &mut L2CAgentBase) { frame(lua_state, 9.0); FT_MOTION_RATE(agent, 1.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 4.0, 105, 100, 50, 0, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 4.0, 95, 100, 38, 0, 3.0, 1.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 4.0, 105, 100, 33, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 3, 0, Hash40::new("sword"), 4.0, 149, 100, 31, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 4.0, 121, 100, 40, 0, 3.0, 0.0, 0.0, 0.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 4.0, 132, 100, 46, 0, 3.0, 1.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 4.0, 149, 100, 51, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("sword"), 4.0, 149, 100, 51, 0, 3.0, 6.0, -1.0, 1.0, None, None, None, 0.8, 0.4, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } frame(lua_state, 14.0); FT_MOTION_RATE_RANGE(agent, 14.0, 25.0, 10.0); diff --git a/fighters/younglink/src/acmd/throws.rs b/fighters/younglink/src/acmd/throws.rs index 117e224a0c..e9e47e055d 100644 --- a/fighters/younglink/src/acmd/throws.rs +++ b/fighters/younglink/src/acmd/throws.rs @@ -136,13 +136,10 @@ unsafe extern "C" fn game_throwf(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 48, 105, 0, 35, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 38, 93, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 60, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } - frame(lua_state, 2.0); - FT_MOTION_RATE_RANGE(agent, 2.0, 11.0, 8.0); frame(lua_state, 11.0); - FT_MOTION_RATE(agent, 1.0); if is_excute(agent) { ATTACK(agent, 0, 0, Hash40::new("kneer"), 3.0, 361, 0, 120, 0, 3.1, 0.0, 0.0, 0.0, None, None, None, 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 1, 0, Hash40::new("kneer"), 3.0, 361, 0, 120, 0, 3.1, 3.5, 0.0, 0.0, None, None, None, 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); @@ -160,7 +157,7 @@ unsafe extern "C" fn game_throwb(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); if is_excute(agent) { - ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 130, 105, 0, 35, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); + ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 146, 57, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } frame(lua_state, 11.0); @@ -177,6 +174,8 @@ unsafe extern "C" fn game_throwb(agent: &mut L2CAgentBase) { let target_group = WorkModule::get_int64(boma, *FIGHTER_STATUS_THROW_WORK_INT_TARGET_HIT_GROUP); let target_no = WorkModule::get_int64(boma, *FIGHTER_STATUS_THROW_WORK_INT_TARGET_HIT_NO); ATK_HIT_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, Hash40::new("throw"), target, target_group, target_no); + let opponent_boma = agent.get_grabbed_opponent_boma(); + VarModule::on_flag(opponent_boma.object(), vars::common::instance::IS_KNOCKDOWN_THROW); } } diff --git a/fighters/younglink/src/acmd/tilts.rs b/fighters/younglink/src/acmd/tilts.rs index cfe163477e..f61b9063b5 100644 --- a/fighters/younglink/src/acmd/tilts.rs +++ b/fighters/younglink/src/acmd/tilts.rs @@ -45,9 +45,9 @@ unsafe extern "C" fn game_attackhi3(agent: &mut L2CAgentBase) { let boma = agent.boma(); frame(lua_state, 9.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 8.0, 85, 88, 0, 50, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 1, 0, Hash40::new("sword"), 8.0, 85, 88, 0, 50, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); - ATTACK(agent, 2, 0, Hash40::new("sword"), 8.0, 85, 88, 0, 50, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 8.0, 85, 100, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("sword"), 8.0, 85, 100, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 2, 0, Hash40::new("sword"), 8.0, 85, 100, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); } wait(lua_state, 6.0); if is_excute(agent) { diff --git a/romfs/source/fighter/common/param/fighter_param.prcxml b/romfs/source/fighter/common/param/fighter_param.prcxml index 36f5c6e556..8aa55ba725 100644 --- a/romfs/source/fighter/common/param/fighter_param.prcxml +++ b/romfs/source/fighter/common/param/fighter_param.prcxml @@ -877,6 +877,7 @@ 2 0.8 0.8 + 2.65 1.1 1 1 diff --git a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml index cec0907221..2863aa38c0 100644 --- a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml +++ b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml @@ -97,7 +97,7 @@ throw_f: cancel_frame: 32 throw_b: extra: - cancel_frame: 36 + cancel_frame: 29 attack_13: extra: cancel_frame: 32 From 00bd1b4cd1b662b440cedb92c0a5c45fd852e70a Mon Sep 17 00:00:00 2001 From: xTheft Date: Mon, 9 Mar 2026 22:27:29 -0500 Subject: [PATCH 11/13] touch ups and double jump revert --- fighters/younglink/src/acmd/aerials.rs | 2 +- fighters/younglink/src/acmd/smashes.rs | 6 +++--- romfs/source/fighter/common/param/fighter_param.prcxml | 2 +- .../source/fighter/younglink/motion/body/motion_patch.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fighters/younglink/src/acmd/aerials.rs b/fighters/younglink/src/acmd/aerials.rs index 5bf3d417e0..aaee665bde 100644 --- a/fighters/younglink/src/acmd/aerials.rs +++ b/fighters/younglink/src/acmd/aerials.rs @@ -139,7 +139,7 @@ unsafe extern "C" fn game_attackairb(agent: &mut L2CAgentBase) { frame(lua_state, 18.0); FT_MOTION_RATE_RANGE(agent, 18.0, 21.0, 5.0); if is_excute(agent) { - ATTACK(agent, 0, 0, Hash40::new("hip"), 7.0, 55, 80, 0, 35, 2.5, 3.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); + ATTACK(agent, 0, 0, Hash40::new("hip"), 7.0, 55, 80, 0, 35, 4.0, 3.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 1, 0, Hash40::new("kneer"), 7.0, 55, 80, 0, 35, 4.0, 1.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 2, 0, Hash40::new("kneer"), 7.0, 55, 80, 0, 35, 4.0, 5.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); } diff --git a/fighters/younglink/src/acmd/smashes.rs b/fighters/younglink/src/acmd/smashes.rs index afe664aea0..3e97cb10cb 100644 --- a/fighters/younglink/src/acmd/smashes.rs +++ b/fighters/younglink/src/acmd/smashes.rs @@ -14,9 +14,9 @@ unsafe extern "C" fn game_attacks4(agent: &mut L2CAgentBase) { ATTACK(agent, 0, 0, Hash40::new("shoulderl"), 16.0, 280, 85, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); ATTACK(agent, 1, 0, Hash40::new("sword"), 16.0, 280, 85, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); ATTACK(agent, 2, 0, Hash40::new("sword"), 16.0, 280, 85, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 3, 0, Hash40::new("shoulderl"), 16.0, 80, 85, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 4, 0, Hash40::new("sword"), 16.0, 80, 85, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); - ATTACK(agent, 5, 0, Hash40::new("sword"), 16.0, 80, 85, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 3, 0, Hash40::new("shoulderl"), 16.0, 80, 97, 0, 40, 3.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 4, 0, Hash40::new("sword"), 16.0, 80, 97, 0, 40, 3.0, 1.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); + ATTACK(agent, 5, 0, Hash40::new("sword"), 16.0, 80, 97, 0, 40, 3.0, 6.0, 0.0, -1.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 10, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_SWORD); } frame(lua_state, 15.0); FT_MOTION_RATE(agent, 1.0); diff --git a/romfs/source/fighter/common/param/fighter_param.prcxml b/romfs/source/fighter/common/param/fighter_param.prcxml index 8aa55ba725..7e231a4f07 100644 --- a/romfs/source/fighter/common/param/fighter_param.prcxml +++ b/romfs/source/fighter/common/param/fighter_param.prcxml @@ -858,7 +858,7 @@ 1.2 12.03345 34.0 - 35.5 + 33.66 11.8 1 0.005 diff --git a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml index 2863aa38c0..1e2f16c037 100644 --- a/romfs/source/fighter/younglink/motion/body/motion_patch.yaml +++ b/romfs/source/fighter/younglink/motion/body/motion_patch.yaml @@ -88,10 +88,10 @@ catch_turn: cancel_frame: 61 throw_lw: extra: - cancel_frame: 50 + cancel_frame: 48 throw_hi: extra: - cancel_frame: 42 + cancel_frame: 41 throw_f: extra: cancel_frame: 32 From d361d395dd7e864aad9c21f5a2109fa8d8334fc4 Mon Sep 17 00:00:00 2001 From: xTheft Date: Thu, 12 Mar 2026 23:50:04 -0500 Subject: [PATCH 12/13] rapid jab fix --- fighters/younglink/src/acmd/ground.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fighters/younglink/src/acmd/ground.rs b/fighters/younglink/src/acmd/ground.rs index 83bfb00775..f77ea84c0f 100644 --- a/fighters/younglink/src/acmd/ground.rs +++ b/fighters/younglink/src/acmd/ground.rs @@ -80,6 +80,20 @@ unsafe extern "C" fn game_attack13(agent: &mut L2CAgentBase) { } } +unsafe extern "C" fn game_attack100end(agent: &mut L2CAgentBase) { + let lua_state = agent.lua_state_agent; + let boma = agent.boma(); + wait(lua_state, 4.0); + if is_excute(agent) { + ATTACK(agent, 0, 0, Hash40::new("top"), 2.5, 45, 77, 0, 50, 4.0, 0.0, 12.0, 11.0, Some(0.0), Some(5.0), Some(11.0), 2.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + ATTACK(agent, 1, 0, Hash40::new("top"), 2.5, 45, 77, 0, 50, 4.0, 0.0, 12.0, 17.5, Some(0.0), Some(5.0), Some(17.5), 2.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD); + } + wait(lua_state, 2.0); + if is_excute(agent) { + AttackModule::clear_all(boma); + } +} + unsafe extern "C" fn effect_attack100end(agent: &mut L2CAgentBase) { let lua_state = agent.lua_state_agent; let boma = agent.boma(); From cb7505844c217d9f66a649f5d10b9164183272e9 Mon Sep 17 00:00:00 2001 From: xTheft Date: Fri, 20 Mar 2026 13:26:04 -0500 Subject: [PATCH 13/13] fthrow fix --- fighters/younglink/src/acmd/throws.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fighters/younglink/src/acmd/throws.rs b/fighters/younglink/src/acmd/throws.rs index e9e47e055d..a4ff874e4a 100644 --- a/fighters/younglink/src/acmd/throws.rs +++ b/fighters/younglink/src/acmd/throws.rs @@ -139,7 +139,10 @@ unsafe extern "C" fn game_throwf(agent: &mut L2CAgentBase) { ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 3.0, 38, 93, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); ATTACK_ABS(agent, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 60, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW); } + frame(lua_state, 2.0); + FT_MOTION_RATE_RANGE(agent, 2.0, 11.0, 8.0); frame(lua_state, 11.0); + FT_MOTION_RATE(agent, 1.0); if is_excute(agent) { ATTACK(agent, 0, 0, Hash40::new("kneer"), 3.0, 361, 0, 120, 0, 3.1, 0.0, 0.0, 0.0, None, None, None, 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK); ATTACK(agent, 1, 0, Hash40::new("kneer"), 3.0, 361, 0, 120, 0, 3.1, 3.5, 0.0, 0.0, None, None, None, 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);