Skip to content

Commit 7b6e6ae

Browse files
committed
Revert "Merge branch 'dev' into PMRoyProject"
This reverts commit 1f78fe1, reversing changes made to 4796aa0.
1 parent 0b9f3ac commit 7b6e6ae

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

fighters/cloud/src/acmd/tilts.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ unsafe fn cloud_attack_lw3_game(fighter: &mut L2CAgentBase) {
112112
//HIT_NODE(fighter, Hash40::new("kneel"), *HIT_STATUS_XLU);
113113
//HIT_NODE(fighter, Hash40::new("legl"), *HIT_STATUS_XLU);
114114
}
115-
frame(lua_state, 11.0);
115+
frame(lua_state, 12.0);
116116
if is_excute(fighter) {
117-
ATTACK(fighter, 0, 0, Hash40::new("legr"), 6.0, 78, 75, 0, 40, 2.0, 0.0, -1.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.2, 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);
118-
ATTACK(fighter, 1, 0, Hash40::new("kneer"), 6.0, 78, 75, 0, 40, 2.5, 0.0, -1.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.2, 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);
119-
ATTACK(fighter, 2, 0, Hash40::new("kneer"), 7.0, 78, 75, 0, 40, 3.0, 6.0, -1.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.2, 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);
117+
ATTACK(fighter, 0, 0, Hash40::new("legr"), 6.0, 78, 75, 0, 85, 2.0, 0.0, -1.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.2, 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);
118+
ATTACK(fighter, 1, 0, Hash40::new("kneer"), 6.0, 78, 75, 0, 85, 2.5, 0.0, -1.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.2, 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);
119+
ATTACK(fighter, 2, 0, Hash40::new("kneer"), 7.0, 78, 75, 0, 85, 3.0, 6.0, -1.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.2, 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);
120120
}
121121
frame(lua_state, 20.0);
122122
if is_excute(fighter) {

0 commit comments

Comments
 (0)