Skip to content

Commit 65acdd9

Browse files
committed
Small tweaks
1 parent 0dc348a commit 65acdd9

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

fighters/edge/src/acmd/other.rs

+21
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,26 @@ unsafe fn edge_fire_special_n2_game(fighter: &mut L2CAgentBase) {
203203

204204
}
205205

206+
#[acmd_script( agent = "edge_fire", script = "game_bursts" , category = ACMD_GAME , low_priority)]
207+
unsafe fn edge_fire_burst_s_game(fighter: &mut L2CAgentBase) {
208+
let lua_state = fighter.lua_state_agent;
209+
let boma = fighter.boma();
210+
if is_excute(fighter) {
211+
ControlModule::set_rumble(boma, Hash40::new("rbkind_furafura"), 9, false, *BATTLE_OBJECT_ID_INVALID as u32);
212+
}
213+
frame(lua_state, 2.0);
214+
if is_excute(fighter) {
215+
ControlModule::set_rumble(boma, Hash40::new("rbkind_explosionm"), 6, false, *BATTLE_OBJECT_ID_INVALID as u32);
216+
QUAKE(fighter, *CAMERA_QUAKE_KIND_S);
217+
AttackModule::disable_tip(boma);
218+
ATTACK(fighter, 0, 0, Hash40::new("top"), 10.5, 70, 64, 0, 77, 12.5, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, -5, 0.0, 0, false, true, false, false, false, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_MAGIC);
219+
}
220+
frame(lua_state, 6.0);
221+
if is_excute(fighter) {
222+
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x199c462b5d));
223+
}
224+
}
225+
206226
#[acmd_script( agent = "edge_flare1", script = "game_fly" , category = ACMD_GAME , low_priority)]
207227
unsafe fn edge_flare1_fly_game(fighter: &mut L2CAgentBase) {
208228
let lua_state = fighter.lua_state_agent;
@@ -324,6 +344,7 @@ pub fn install() {
324344
turn_dash_game,
325345
edge_fire_special_n1_game,
326346
edge_fire_special_n2_game,
347+
edge_fire_burst_s_game,
327348
edge_flare1_fly_game,
328349
edge_flare2_exp_game,
329350
edge_flare2_fly_game,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ attack_air_hi:
6262
cancel_frame: 51
6363
special_n1:
6464
extra:
65-
cancel_frame: 46
65+
cancel_frame: 44
6666
special_air_n1:
6767
extra:
68-
cancel_frame: 46
68+
cancel_frame: 44
6969
special_n2:
7070
extra:
7171
cancel_frame: 60

romfs/source/fighter/edge/param/hdr.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</struct>
1010
<struct hash="charged_special_hi">
1111
<float hash="p1_x">16</float>
12-
<float hash="p1_y">16</float>
12+
<float hash="p1_y">19.5</float>
1313
<float hash="p2_x">-9.6</float>
1414
<float hash="p2_y">8.5</float>
1515
</struct>

0 commit comments

Comments
 (0)