Skip to content

Commit 92d078c

Browse files
committed
other changes
1 parent f15d739 commit 92d078c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fighters/mario/src/acmd/aerials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ unsafe fn mario_attack_air_n_game(fighter: &mut L2CAgentBase) {
1515
ATTACK(fighter, 0, 0, Hash40::new("kneer"), 8.0, 361, 100, 0, 15, 3.0, 0.8, 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_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
1616
ATTACK(fighter, 1, 0, Hash40::new("kneel"), 8.0, 361, 100, 0, 15, 3.0, 0.9, 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_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
1717
}
18-
frame(lua_state, 28.0);
18+
frame(lua_state, 27.0);
1919
if is_excute(fighter) {
2020
AttackModule::clear_all(boma);
2121
}
@@ -113,7 +113,7 @@ unsafe fn mario_attack_air_b_game(fighter: &mut L2CAgentBase) {
113113
FT_MOTION_RATE(fighter, 3.0/(8.0-6.0));
114114
WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
115115
ATTACK(fighter, 0, 0, Hash40::new("legr"), 8.0, 35, 70, 0, 40, 4.7, 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_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
116-
ATTACK(fighter, 1, 0, Hash40::new("kneer"), 11.0, 38, 112, 0, 25, 3.7, 5.5, 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_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
116+
ATTACK(fighter, 1, 0, Hash40::new("kneer"), 11.0, 38, 112, 0, 25, 3.5, 5.1, 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_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
117117
}
118118
frame(lua_state, 8.0);
119119
if is_excute(fighter) {

romfs/source/fighter/mario/motion/body/motion_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ attack_air_b:
5252
cancel_frame: 30
5353
attack_air_hi:
5454
extra:
55-
cancel_frame: 28
55+
cancel_frame: 30
5656
throw_f:
5757
extra:
5858
cancel_frame: 28

0 commit comments

Comments
 (0)