Skip to content

Commit 169fa26

Browse files
moklmarumoklmaru
authored
Merge pull request #2212 from jaccob101/ness-maybe
Ness Tweaks: QoL
2 parents 60ce7a2 + 34fd777 commit 169fa26

File tree

9 files changed

+224
-102
lines changed

9 files changed

+224
-102
lines changed

‎dynamic/src/consts.rs

+7
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,13 @@ pub mod vars {
856856
}
857857
}
858858

859+
pub mod ness {
860+
pub mod status {
861+
// flags
862+
pub const THUNDER_LOOSE: i32 = 0x1100;
863+
}
864+
}
865+
859866
pub mod pickel {
860867
pub mod instance {
861868
// flags

‎fighters/ness/src/acmd/aerials.rs

+36-47
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,30 @@ unsafe fn game_attackairf(fighter: &mut L2CAgentBase) {
3737
frame(lua_state, 8.0);
3838
if is_excute(fighter) {
3939
WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
40-
ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 361, 83, 0, 19, 4.9, 0.0, 4.8, 10.5, None, None, None, 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 5, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
41-
ATTACK(fighter, 1, 0, Hash40::new("top"), 1.5, 361, 83, 0, 19, 2.5, 0.0, 3.8, 6.0, Some(0.0), Some(3.8), Some(3.0), 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 5, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
40+
ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 361, 83, 0, 19, 4.9, 0.0, 4.8, 10.5, 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
41+
ATTACK(fighter, 1, 0, Hash40::new("top"), 1.5, 361, 83, 0, 19, 2.5, 0.0, 3.8, 6.0, Some(0.0), Some(3.8), Some(3.0), 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
4242
}
4343
frame(lua_state, 11.0);
4444
if is_excute(fighter) {
4545
AttackModule::clear_all(boma);
46+
ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 361, 83, 0, 19, 4.9, 0.0, 4.8, 10.5, 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
47+
ATTACK(fighter, 1, 0, Hash40::new("top"), 1.5, 361, 83, 0, 19, 2.5, 0.0, 3.8, 6.0, Some(0.0), Some(3.8), Some(3.0), 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
4648
}
47-
frame(lua_state, 12.0);
48-
if is_excute(fighter) {
49-
WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
50-
ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 361, 125, 0, 12, 4.9, 0.0, 4.8, 10.5, None, None, None, 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 5, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
51-
ATTACK(fighter, 1, 0, Hash40::new("top"), 1.5, 361, 125, 0, 12, 2.5, 0.0, 3.8, 6.0, Some(0.0), Some(3.8), Some(3.0), 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 5, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
52-
}
53-
frame(lua_state, 15.0);
49+
frame(lua_state, 14.0);
5450
if is_excute(fighter) {
5551
AttackModule::clear_all(boma);
52+
ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 361, 125, 0, 12, 4.9, 0.0, 4.8, 10.5, 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
53+
ATTACK(fighter, 1, 0, Hash40::new("top"), 1.5, 361, 125, 0, 12, 2.5, 0.0, 3.8, 6.0, Some(0.0), Some(3.8), Some(3.0), 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 05, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
5654
}
57-
frame(lua_state, 16.0);
58-
if is_excute(fighter) {
59-
WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
60-
ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 361, 108, 0, 24, 4.9, 0.0, 4.8, 10.5, None, None, None, 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 5, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
61-
ATTACK(fighter, 1, 0, Hash40::new("top"), 1.5, 361, 108, 0, 24, 2.5, 0.0, 3.8, 6.0, Some(0.0), Some(3.8), Some(3.0), 0.6, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 5, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
62-
}
63-
frame(lua_state, 19.0);
55+
frame(lua_state, 17.0);
6456
if is_excute(fighter) {
6557
AttackModule::clear_all(boma);
58+
ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 361, 125, 0, 12, 4.9, 0.0, 4.8, 10.5, 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
59+
ATTACK(fighter, 1, 0, Hash40::new("top"), 1.5, 361, 125, 0, 12, 2.5, 0.0, 3.8, 6.0, Some(0.0), Some(3.8), Some(3.0), 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
6660
}
6761
frame(lua_state, 20.0);
6862
if is_excute(fighter) {
63+
AttackModule::clear_all(boma);
6964
ATTACK(fighter, 0, 0, Hash40::new("top"), 5.5, 361, 140, 0, 32, 8.0, 0.0, 4.8, 9.6, None, None, None, 1.2, 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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
7065
}
7166
wait(lua_state, 2.0);
@@ -104,12 +99,10 @@ unsafe fn game_attackairb(fighter: &mut L2CAgentBase) {
10499
let lua_state = fighter.lua_state_agent;
105100
let boma = fighter.boma();
106101
frame(lua_state, 1.0);
107-
if is_excute(fighter) {
108-
MotionModule::set_rate(boma, 11.0/(10.0-1.0));
109-
}
102+
MotionModule::set_rate(boma, 11.0/(10.0-1.0));
110103
frame(lua_state, 10.0);
104+
MotionModule::set_rate(boma, 1.0);
111105
if is_excute(fighter) {
112-
MotionModule::set_rate(boma, 1.0);
113106
WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
114107
ATTACK(fighter, 0, 0, Hash40::new("kneer"), 16.0, 361, 100, 0, 16, 4.0, -1.0, 0.0, 1.5, 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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
115108
ATTACK(fighter, 1, 0, Hash40::new("kneer"), 16.0, 361, 100, 0, 16, 5.0, 3.7, 2.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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
@@ -139,21 +132,21 @@ unsafe fn game_attackairhi(fighter: &mut L2CAgentBase) {
139132
frame(lua_state, 7.5);
140133
MotionModule::set_rate(boma, 1.0);
141134
frame(lua_state, 8.5);
135+
MotionModule::set_rate(boma, (14.0 - 8.5) / 2.0);
142136
if is_excute(fighter) {
143137
WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
144138
ATTACK(fighter, 0, 0, Hash40::new("handr"), 13.0, 85, 118, 0, 13, 5.9, 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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
145139
}
146-
MotionModule::set_rate(boma, (14.0 - 8.5) / 2.0);
147140
frame(lua_state, 14.0);
141+
MotionModule::set_rate(boma, 1.0);
148142
if is_excute(fighter) {
149143
ATTACK(fighter, 0, 0, Hash40::new("handr"), 13.0, 85, 118, 0, 13, 5.9, 0.0, 0.0, 3.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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
150144
}
151-
MotionModule::set_rate(boma, 1.0);
152145
frame(lua_state, 16.0);
146+
MotionModule::set_rate(boma, (37.0 - 16.0) / 28.0);//43
153147
if is_excute(fighter) {
154148
AttackModule::clear_all(boma);
155149
}
156-
MotionModule::set_rate(boma, (37.0 - 16.0) / 30.0);
157150
frame(lua_state, 26.5);
158151
if is_excute(fighter) {
159152
WorkModule::off_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
@@ -165,25 +158,21 @@ unsafe fn game_attackairlw(fighter: &mut L2CAgentBase) {
165158
let lua_state = fighter.lua_state_agent;
166159
let boma = fighter.boma();
167160
frame(lua_state, 1.0);
168-
if is_excute(fighter) {
169-
MotionModule::set_rate(boma, 2.72);
170-
}
161+
MotionModule::set_rate(boma, 2.72);
171162
frame(lua_state, 19.0);
172-
if is_excute(fighter) {
173-
MotionModule::set_rate(boma, 1.0);
174-
}
163+
MotionModule::set_rate(boma, 1.0);
175164
frame(lua_state, 20.0);
176165
if is_excute(fighter) {
177166
WorkModule::on_flag(boma, *FIGHTER_STATUS_ATTACK_AIR_FLAG_ENABLE_LANDING);
178167
ATTACK(fighter, 0, 0, Hash40::new("kneer"), 14.0, 270, 74, 0, 37, 6.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_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_PSI);
179168
ATTACK(fighter, 1, 0, Hash40::new("kneer"), 14.0, 270, 37, 0, 37, 6.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_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_PSI);
180169
}
181-
wait(lua_state, 4.0);
170+
frame(lua_state, 24.0);
182171
if is_excute(fighter) {
183172
ATTACK(fighter, 0, 0, Hash40::new("kneer"), 12.0, 45, 74, 0, 30, 4.5, 2.5, 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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_PSI);
184173
AttackModule::clear(boma, 1, false);
185174
}
186-
wait(lua_state, 5.0);
175+
frame(lua_state, 27.0);
187176
if is_excute(fighter) {
188177
AttackModule::clear_all(boma);
189178
}
@@ -223,17 +212,17 @@ unsafe fn effect_attackairn (fighter: &mut L2CAgentBase) {
223212
}
224213

225214
#[acmd_script( agent = "ness", script = "effect_attackairb", category = ACMD_EFFECT, low_priority )]
226-
unsafe fn effect_attackairb(agent: &mut L2CAgentBase) {
227-
let lua_state = agent.lua_state_agent;
228-
let boma = agent.boma();
215+
unsafe fn effect_attackairb(fighter: &mut L2CAgentBase) {
216+
let lua_state = fighter.lua_state_agent;
217+
let boma = fighter.boma();
229218
frame(lua_state, 9.0);
230-
if is_excute(agent) {
231-
EFFECT_FOLLOW_FLIP(agent, Hash40::new("sys_attack_speedline"), Hash40::new("sys_attack_speedline"), Hash40::new("top"), -2, 3.7, 3, 0, 180, 0, 0.85, true, *EF_FLIP_YZ);
232-
LAST_PARTICLE_SET_COLOR(agent, 0.2, 1, 0.8);
219+
if is_excute(fighter) {
220+
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_speedline"), Hash40::new("sys_attack_speedline"), Hash40::new("top"), -2, 3.7, 3, 0, 180, 0, 0.85, true, *EF_FLIP_YZ);
221+
LAST_PARTICLE_SET_COLOR(fighter, 0.2, 1, 0.8);
233222
}
234223
frame(lua_state, 10.0);
235-
if is_excute(agent) {
236-
EFFECT_FOLLOW_FLIP(agent, Hash40::new("ness_psi_atk"), Hash40::new("ness_psi_atk"), Hash40::new("top"), -3.0, 4, -8.45, 0, 180, 0, 1.24, true, *EF_FLIP_YZ);
224+
if is_excute(fighter) {
225+
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("ness_psi_atk"), Hash40::new("ness_psi_atk"), Hash40::new("top"), -3.0, 4, -8.45, 0, 180, 0, 1.24, true, *EF_FLIP_YZ);
237226
}
238227
}
239228

@@ -276,17 +265,17 @@ unsafe fn effect_attackairhi(fighter: &mut L2CAgentBase) {
276265
}
277266

278267
#[acmd_script( agent = "ness", script = "effect_attackairlw", category = ACMD_EFFECT, low_priority )]
279-
unsafe fn effect_attackairlw(agent: &mut L2CAgentBase) {
280-
let lua_state = agent.lua_state_agent;
281-
let boma = agent.boma();
268+
unsafe fn effect_attackairlw(fighter: &mut L2CAgentBase) {
269+
let lua_state = fighter.lua_state_agent;
270+
let boma = fighter.boma();
282271
frame(lua_state, 3.0);
283-
if is_excute(agent) {
284-
EFFECT(agent, Hash40::new("sys_smash_flash"), Hash40::new("top"), 0, -4.0, 0, 0, 0, 0, 0.27, 0, 0, 0, 0, 0, 0, true);
285-
LAST_EFFECT_SET_RATE(agent, 1.3);
272+
if is_excute(fighter) {
273+
EFFECT(fighter, Hash40::new("sys_smash_flash"), Hash40::new("top"), 0, -4.0, 0, 0, 0, 0, 0.27, 0, 0, 0, 0, 0, 0, true);
274+
LAST_EFFECT_SET_RATE(fighter, 1.3);
286275
}
287276
frame(lua_state, 20.0);
288-
if is_excute(agent) {
289-
EFFECT_FOLLOW_FLIP(agent, Hash40::new("ness_psi_atk"), Hash40::new("ness_psi_atk"), Hash40::new("top"), 0.3, -0.9, 0, 0, 0, 0, 1.5, true, *EF_FLIP_YZ);
277+
if is_excute(fighter) {
278+
EFFECT_FOLLOW(fighter, Hash40::new("ness_psi_atk"), Hash40::new("top"), 0.3 * PostureModule::lr(boma), -0.9, 0, 0, 0, 0, 1.5, true);
290279
}
291280
}
292281

‎fighters/ness/src/acmd/ground.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ unsafe fn game_attackdash(fighter: &mut L2CAgentBase) {
5656
if is_excute(fighter) {
5757
ATTACK(fighter, 0, 0, Hash40::new("top"), 4.0, 0, 100, 57, 0, 5.5, 0.0, 5.5, 9.0, None, None, None, 1.0, 0.5, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 1, 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
5858
ATTACK(fighter, 1, 0, Hash40::new("top"), 8.0, 80, 70, 0, 60, 5.5, 0.0, 5.5, 9.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 1, 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_magic"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
59-
ATTACK(fighter, 2, 0, Hash40::new("top"), 4.0, 361, 100, 0, 80, 4.2, 0.0, 4.3, 3.0, None, None, None, 1.0, 0.5, *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_S, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
59+
ATTACK(fighter, 2, 0, Hash40::new("top"), 4.0, 361, 100, 80, 0, 4.2, 0.0, 4.3, 3.0, None, None, None, 1.0, 0.5, *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_S, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
6060
}
6161
wait(lua_state, 2.0);
6262
if is_excute(fighter) {
@@ -72,13 +72,12 @@ unsafe fn game_attackdash(fighter: &mut L2CAgentBase) {
7272
}
7373
wait(lua_state, 5.0);
7474
if is_excute(fighter) {
75-
ATTACK(fighter, 0, 0, Hash40::new("top"), 4.0, 95, 90, 0, 80, 6.5, 0.0, 4.8, 21.2, None, None, None, 1.3, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 1, 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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
75+
ATTACK(fighter, 0, 0, Hash40::new("top"), 4.0, 95, 90, 0, 80, 6.5, 0.0, 4.8, 21.2, Some(0.0), Some(4.8), Some(19.2), 1.3, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 1, 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_magic"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_MAGIC, *ATTACK_REGION_PSI);
7676
}
7777
wait(lua_state, 3.0);
7878
if is_excute(fighter) {
7979
AttackModule::clear_all(boma);
8080
}
81-
8281
}
8382

8483
pub fn install() {

0 commit comments

Comments
 (0)