Skip to content

Commit 9fbf1c8

Browse files
SkewedAskewWuBoytH
SkewedAskew
authored and
WuBoytH
committed
Duck Hunt, Sephiroth, Aegis
1 parent 4c42f5e commit 9fbf1c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+944
-866
lines changed

‎Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@ default = [
241241
"diddy",
242242
"dolly",
243243
"donkey",
244-
# "duckhunt",
245-
# "edge",
246-
# "eflame",
247-
# "elight",
244+
"duckhunt",
245+
"edge",
246+
"eflame",
247+
"elight",
248248
"falco",
249249
"fox",
250250
# "gamewatch",

‎fighters/buddy/src/opff.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ unsafe fn breegull_bayonet(fighter: &mut L2CFighterCommon, boma: &mut BattleObje
276276
let can_cancel = fighter.motion_frame() >= transition_frame;
277277
if (!can_cancel) {return;}
278278

279-
fighter.change_to_custom_status(statuses::buddy::BUDDY_BAYONET_END, false, false);
279+
fighter.change_status(statuses::buddy::BUDDY_BAYONET_END.into(), false.into());
280280

281281
let currentEggs=
282282
//VarModule::get_int(boma.object(), vars::buddy::instance::BAYONET_EGGS);

‎fighters/diddy/src/opff.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ unsafe fn nspecial_cancels(fighter: &mut smash::lua2cpp::L2CFighterCommon, boma:
1717
if fighter.is_situation(*SITUATION_KIND_GROUND) {
1818
if fighter.is_cat_flag(Cat2::StickEscape) {
1919
VarModule::set_int(fighter.battle_object, vars::diddy::status::SPECIAL_N_CANCEL_TYPE, vars::diddy::SPECIAL_N_CANCEL_TYPE_ESCAPE);
20-
fighter.change_to_custom_status(statuses::diddy::SPECIAL_N_CANCEL, true, false);
20+
fighter.change_status(statuses::diddy::SPECIAL_N_CANCEL.into(), true.into());
2121
}
2222
else if fighter.is_cat_flag(Cat2::StickEscapeF) {
2323
VarModule::set_int(fighter.battle_object, vars::diddy::status::SPECIAL_N_CANCEL_TYPE, vars::diddy::SPECIAL_N_CANCEL_TYPE_ESCAPE_F);
24-
fighter.change_to_custom_status(statuses::diddy::SPECIAL_N_CANCEL, true, false);
24+
fighter.change_status(statuses::diddy::SPECIAL_N_CANCEL.into(), true.into());
2525
}
2626
else if fighter.is_cat_flag(Cat2::StickEscapeB) {
2727
VarModule::set_int(fighter.battle_object, vars::diddy::status::SPECIAL_N_CANCEL_TYPE, vars::diddy::SPECIAL_N_CANCEL_TYPE_ESCAPE_B);
28-
fighter.change_to_custom_status(statuses::diddy::SPECIAL_N_CANCEL, true, false);
28+
fighter.change_status(statuses::diddy::SPECIAL_N_CANCEL.into(), true.into());
2929
}
3030
else if (fighter.is_cat_flag(Cat1::JumpButton) || (ControlModule::is_enable_flick_jump(fighter.module_accessor) && fighter.is_cat_flag(Cat1::Jump) && fighter.sub_check_button_frick().get_bool())) {
3131
VarModule::set_int(fighter.battle_object, vars::diddy::status::SPECIAL_N_CANCEL_TYPE, vars::diddy::SPECIAL_N_CANCEL_TYPE_GROUND_JUMP);
32-
fighter.change_to_custom_status(statuses::diddy::SPECIAL_N_CANCEL, true, false);
32+
fighter.change_status(statuses::diddy::SPECIAL_N_CANCEL.into(), true.into());
3333
}
3434
if fighter.sub_check_command_guard().get_bool() {
3535
VarModule::set_int(fighter.battle_object, vars::diddy::status::SPECIAL_N_CANCEL_TYPE, vars::diddy::SPECIAL_N_CANCEL_TYPE_GUARD);
36-
fighter.change_to_custom_status(statuses::diddy::SPECIAL_N_CANCEL, true, false);
36+
fighter.change_status(statuses::diddy::SPECIAL_N_CANCEL.into(), true.into());
3737
}
3838
}
3939
else {
4040
if fighter.is_cat_flag(Cat1::AirEscape) {
4141
VarModule::set_int(fighter.battle_object, vars::diddy::status::SPECIAL_N_CANCEL_TYPE, vars::diddy::SPECIAL_N_CANCEL_TYPE_ESCAPE_AIR);
42-
fighter.change_to_custom_status(statuses::diddy::SPECIAL_N_CANCEL, true, false);
42+
fighter.change_status(statuses::diddy::SPECIAL_N_CANCEL.into(), true.into());
4343
}
4444
else if (fighter.is_cat_flag(Cat1::JumpButton) || (ControlModule::is_enable_flick_jump(fighter.module_accessor) && fighter.is_cat_flag(Cat1::Jump)))
4545
&& fighter.get_num_used_jumps() < fighter.get_jump_count_max()
4646
{
4747
VarModule::set_int(fighter.battle_object, vars::diddy::status::SPECIAL_N_CANCEL_TYPE, vars::diddy::SPECIAL_N_CANCEL_TYPE_JUMP_AERIAL);
48-
fighter.change_to_custom_status(statuses::diddy::SPECIAL_N_CANCEL_JUMP, true, false);
48+
fighter.change_status(statuses::diddy::SPECIAL_N_CANCEL_JUMP.into(), true.into());
4949
}
5050
}
5151
}

‎fighters/dolly/src/opff.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,6 @@ pub unsafe fn dolly_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
874874
pub fn install() {
875875
smashline::Agent::new("dolly")
876876
.on_line(Main, dolly_frame_wrapper)
877-
.on_line(Exec, dolly_meter)
877+
.on_line(Main, dolly_meter)
878878
.install();
879879
}

‎fighters/duckhunt/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ utils = { package = "dynamic", path = "../../dynamic" }
1010
skyline = "0.2.1"
1111
skyline_smash = { git = "https://github.com/blu-dev/skyline-smash", features = ["weak_l2cvalue"] }
1212
smash_script = { git = "https://github.com/blu-dev/smash-script", branch = "development" }
13-
smashline = { git = "https://github.com/blu-dev/smashline", branch = "development" }
13+
smashline = { git = "https://github.com/HDR-Development/smashline" }

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

+21-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::*;
22

3-
#[acmd_script( agent = "duckhunt", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
4-
unsafe fn duckhunt_attack_air_n_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn duckhunt_attack_air_n_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
frame(lua_state, 4.0);
@@ -33,8 +33,8 @@ unsafe fn duckhunt_attack_air_n_game(fighter: &mut L2CAgentBase) {
3333

3434
}
3535

36-
#[acmd_script( agent = "duckhunt", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
37-
unsafe fn duckhunt_attack_air_f_game(fighter: &mut L2CAgentBase) {
36+
37+
unsafe extern "C" fn duckhunt_attack_air_f_game(fighter: &mut L2CAgentBase) {
3838
let lua_state = fighter.lua_state_agent;
3939
let boma = fighter.boma();
4040
frame(lua_state, 6.0);
@@ -64,8 +64,8 @@ unsafe fn duckhunt_attack_air_f_game(fighter: &mut L2CAgentBase) {
6464

6565
}
6666

67-
#[acmd_script( agent = "duckhunt", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
68-
unsafe fn duckhunt_attack_air_b_game(fighter: &mut L2CAgentBase) {
67+
68+
unsafe extern "C" fn duckhunt_attack_air_b_game(fighter: &mut L2CAgentBase) {
6969
let lua_state = fighter.lua_state_agent;
7070
let boma = fighter.boma();
7171
frame(lua_state, 4.0);
@@ -95,8 +95,8 @@ unsafe fn duckhunt_attack_air_b_game(fighter: &mut L2CAgentBase) {
9595

9696
}
9797

98-
#[acmd_script( agent = "duckhunt", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
99-
unsafe fn duckhunt_attack_air_hi_game(fighter: &mut L2CAgentBase) {
98+
99+
unsafe extern "C" fn duckhunt_attack_air_hi_game(fighter: &mut L2CAgentBase) {
100100
let lua_state = fighter.lua_state_agent;
101101
let boma = fighter.boma();
102102
frame(lua_state, 2.0);
@@ -149,8 +149,8 @@ unsafe fn duckhunt_attack_air_hi_game(fighter: &mut L2CAgentBase) {
149149

150150
}
151151

152-
#[acmd_script( agent = "duckhunt", script = "effect_attackairhi", category = ACMD_EFFECT, low_priority )]
153-
unsafe fn duckhunt_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
152+
153+
unsafe extern "C" fn duckhunt_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
154154
let lua_state = fighter.lua_state_agent;
155155
let boma = fighter.boma();
156156
frame(lua_state, 6.0);
@@ -167,8 +167,8 @@ unsafe fn duckhunt_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
167167
}
168168
}
169169

170-
#[acmd_script( agent = "duckhunt", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
171-
unsafe fn duckhunt_attack_air_lw_game(fighter: &mut L2CAgentBase) {
170+
171+
unsafe extern "C" fn duckhunt_attack_air_lw_game(fighter: &mut L2CAgentBase) {
172172
let lua_state = fighter.lua_state_agent;
173173
let boma = fighter.boma();
174174
frame(lua_state, 4.0);
@@ -206,13 +206,14 @@ unsafe fn duckhunt_attack_air_lw_game(fighter: &mut L2CAgentBase) {
206206

207207
}
208208

209+
209210
pub fn install() {
210-
install_acmd_scripts!(
211-
duckhunt_attack_air_n_game,
212-
duckhunt_attack_air_f_game,
213-
duckhunt_attack_air_b_game,
214-
duckhunt_attack_air_hi_game,
215-
duckhunt_attack_air_hi_effect,
216-
duckhunt_attack_air_lw_game,
217-
);
211+
smashline::Agent::new("duckhunt")
212+
.acmd("game_attackairn", duckhunt_attack_air_n_game)
213+
.acmd("game_attackairf", duckhunt_attack_air_f_game)
214+
.acmd("game_attackairb", duckhunt_attack_air_b_game)
215+
.acmd("game_attackairhi", duckhunt_attack_air_hi_game)
216+
.acmd("effect_attackairhi", duckhunt_attack_air_hi_effect)
217+
.acmd("game_attackairlw", duckhunt_attack_air_lw_game)
218+
.install();
218219
}

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

+23-21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
use super::*;
3-
#[acmd_script( agent = "duckhunt", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
4-
unsafe fn duckhunt_attackdash_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn duckhunt_attackdash_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
sv_kinetic_energy!(set_speed_mul, fighter, FIGHTER_KINETIC_ENERGY_ID_MOTION, 0.8);
@@ -28,8 +28,8 @@ unsafe fn duckhunt_attackdash_game(fighter: &mut L2CAgentBase) {
2828
}
2929

3030

31-
#[acmd_script( agent = "duckhunt", script = "game_attack11" , category = ACMD_GAME , low_priority)]
32-
unsafe fn duckhunt_attack_11_game(fighter: &mut L2CAgentBase) {
31+
32+
unsafe extern "C" fn duckhunt_attack_11_game(fighter: &mut L2CAgentBase) {
3333
let lua_state = fighter.lua_state_agent;
3434
let boma = fighter.boma();
3535

@@ -55,8 +55,8 @@ unsafe fn duckhunt_attack_11_game(fighter: &mut L2CAgentBase) {
5555
}
5656

5757

58-
#[acmd_script( agent = "duckhunt", script = "game_attack12" , category = ACMD_GAME , low_priority)]
59-
unsafe fn duckhunt_attack_12_game(fighter: &mut L2CAgentBase) {
58+
59+
unsafe extern "C" fn duckhunt_attack_12_game(fighter: &mut L2CAgentBase) {
6060
let lua_state = fighter.lua_state_agent;
6161
let boma = fighter.boma();
6262
frame(lua_state, 5.0);
@@ -79,8 +79,8 @@ unsafe fn duckhunt_attack_12_game(fighter: &mut L2CAgentBase) {
7979
}
8080
}
8181

82-
#[acmd_script( agent = "duckhunt", script = "game_attack13" , category = ACMD_GAME , low_priority)]
83-
unsafe fn duckhunt_attack_13_game(fighter: &mut L2CAgentBase) {
82+
83+
unsafe extern "C" fn duckhunt_attack_13_game(fighter: &mut L2CAgentBase) {
8484
let lua_state = fighter.lua_state_agent;
8585
let boma = fighter.boma();
8686
frame(lua_state, 6.0);
@@ -95,8 +95,8 @@ unsafe fn duckhunt_attack_13_game(fighter: &mut L2CAgentBase) {
9595
}
9696
}
9797

98-
#[acmd_script( agent = "duckhunt", script = "game_attack100sub" , category = ACMD_GAME , low_priority)]
99-
unsafe fn duckhunt_attack_100_sub_game(fighter: &mut L2CAgentBase) {
98+
99+
unsafe extern "C" fn duckhunt_attack_100_sub_game(fighter: &mut L2CAgentBase) {
100100
let lua_state = fighter.lua_state_agent;
101101
let boma = fighter.boma();
102102
if is_excute(fighter) {
@@ -114,8 +114,8 @@ unsafe fn duckhunt_attack_100_sub_game(fighter: &mut L2CAgentBase) {
114114
}
115115
}
116116

117-
#[acmd_script( agent = "duckhunt", script = "game_attack100end" , category = ACMD_GAME , low_priority)]
118-
unsafe fn duckhunt_attack_100_end_game(fighter: &mut L2CAgentBase) {
117+
118+
unsafe extern "C" fn duckhunt_attack_100_end_game(fighter: &mut L2CAgentBase) {
119119
let lua_state = fighter.lua_state_agent;
120120
let boma = fighter.boma();
121121
frame(lua_state, 1.0);
@@ -135,14 +135,16 @@ unsafe fn duckhunt_attack_100_end_game(fighter: &mut L2CAgentBase) {
135135
}
136136
}
137137

138+
139+
140+
138141
pub fn install() {
139-
install_acmd_scripts!(
140-
duckhunt_attackdash_game,
141-
duckhunt_attack_11_game,
142-
duckhunt_attack_12_game,
143-
duckhunt_attack_13_game,
144-
duckhunt_attack_100_sub_game,
145-
duckhunt_attack_100_end_game,
146-
);
142+
smashline::Agent::new("duckhunt")
143+
.acmd("game_attackdash", duckhunt_attackdash_game)
144+
.acmd("game_attack11", duckhunt_attack_11_game)
145+
.acmd("game_attack12", duckhunt_attack_12_game)
146+
.acmd("game_attack13", duckhunt_attack_13_game)
147+
.acmd("game_attack100sub", duckhunt_attack_100_sub_game)
148+
.acmd("game_attack100end", duckhunt_attack_100_end_game)
149+
.install();
147150
}
148-

0 commit comments

Comments
 (0)