Skip to content

Commit d3ec0d1

Browse files
authored
Merge pull request #2256 from robertyur/Pitb-taunt
Dark Pit side taunt fix
2 parents b17edb2 + e08fb67 commit d3ec0d1

File tree

1 file changed

+52
-1
lines changed

1 file changed

+52
-1
lines changed

fighters/pitb/src/acmd/other.rs

+52-1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,55 @@ unsafe fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
229229
}
230230
}
231231

232+
#[acmd_script( agent = "pitb", script = "effect_appealsl" , category = ACMD_EFFECT , low_priority)]
233+
unsafe fn appeal_sl_effect(fighter: &mut L2CAgentBase) {
234+
let lua_state = fighter.lua_state_agent;
235+
let boma = fighter.boma();
236+
frame(lua_state, 20.0);
237+
if is_excute(fighter) {
238+
EFFECT_FOLLOW_ALPHA(fighter, Hash40::new("pitb_atk_air_n"), Hash40::new("swordr2"), 0, -1, 0, -90, -90, 0, 1, true, 0.3);
239+
EFFECT_FOLLOW(fighter, Hash40::new("pitb_sword"), Hash40::new("swordr1"), 0, 0, 0, 0, -90, 0, 1, true);
240+
EFFECT_FOLLOW(fighter, Hash40::new("pitb_sword"), Hash40::new("swordl"), 0, -0.06, 0, 180, 90, 0, 1, true);
241+
}
242+
frame(lua_state, 30.0);
243+
if is_excute(fighter) {
244+
EFFECT_OFF_KIND(fighter, Hash40::new("pitb_atk_air_n"), false, false);
245+
}
246+
frame(lua_state, 32.0);
247+
if is_excute(fighter) {
248+
EFFECT_OFF_KIND(fighter, Hash40::new("pitb_sword"), false, false);
249+
}
250+
frame(lua_state, 58.0);
251+
if is_excute(fighter) {
252+
EFFECT(fighter, Hash40::new("sys_smash_flash"), Hash40::new("top"), -5, 5, 13, 0, 0, 0, 0.4, 0, 0, 0, 0, 0, 0, false);
253+
}
254+
}
255+
256+
#[acmd_script( agent = "pitb", script = "effect_appealsr" , category = ACMD_EFFECT , low_priority)]
257+
unsafe fn appeal_sr_effect(fighter: &mut L2CAgentBase) {
258+
let lua_state = fighter.lua_state_agent;
259+
let boma = fighter.boma();
260+
frame(lua_state, 20.0);
261+
if is_excute(fighter) {
262+
EFFECT_FOLLOW_ALPHA(fighter, Hash40::new("pitb_atk_air_n"), Hash40::new("swordr2"), 0, -1, 0, -90, -90, 0, 1, true, 0.3);
263+
EFFECT_FOLLOW(fighter, Hash40::new("pitb_sword"), Hash40::new("swordr1"), 0, 0, 0, 0, -90, 0, 1, true);
264+
EFFECT_FOLLOW(fighter, Hash40::new("pitb_sword"), Hash40::new("swordl"), 0, -0.06, 0, 180, 90, 0, 1, true);
265+
}
266+
frame(lua_state, 30.0);
267+
if is_excute(fighter) {
268+
EFFECT_OFF_KIND(fighter, Hash40::new("pitb_atk_air_n"), false, false);
269+
}
270+
frame(lua_state, 32.0);
271+
if is_excute(fighter) {
272+
EFFECT_OFF_KIND(fighter, Hash40::new("pitb_sword"), false, false);
273+
}
274+
frame(lua_state, 58.0);
275+
if is_excute(fighter) {
276+
EFFECT(fighter, Hash40::new("sys_smash_flash"), Hash40::new("top"), 5, 5, 13, 0, 0, 0, 0.4, 0, 0, 0, 0, 0, 0, false);
277+
}
278+
}
279+
280+
232281
pub fn install() {
233282
install_acmd_scripts!(
234283
escape_air_game,
@@ -241,6 +290,8 @@ pub fn install() {
241290
damageflylw_sound,
242291
damageflyn_sound,
243292
damageflyroll_sound,
244-
damageflytop_sound
293+
damageflytop_sound,
294+
appeal_sl_effect,
295+
appeal_sr_effect
245296
);
246297
}

0 commit comments

Comments
 (0)