Skip to content

Commit 62f0404

Browse files
blu-devblu-dev
committed
feature: Begin smashline 2 migration
1 parent 61f75a2 commit 62f0404

13 files changed

+312
-296
lines changed

‎fighters/mario/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/mario/src/acmd/aerials.rs

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

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

2727
}
2828

29-
#[acmd_script( agent = "mario", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
30-
unsafe fn mario_attack_air_f_game(fighter: &mut L2CAgentBase) {
29+
30+
unsafe extern "C" fn mario_attack_air_f_game(fighter: &mut L2CAgentBase) {
3131
let lua_state = fighter.lua_state_agent;
3232
let boma = fighter.boma();
3333
frame(lua_state, 4.0);
@@ -71,8 +71,8 @@ unsafe fn mario_attack_air_f_game(fighter: &mut L2CAgentBase) {
7171
}
7272
}
7373

74-
#[acmd_script( agent = "mario", script = "effect_attackairf" , category = ACMD_EFFECT , low_priority)]
75-
unsafe fn mario_attack_air_f_effect(fighter: &mut L2CAgentBase) {
74+
75+
unsafe extern "C" fn mario_attack_air_f_effect(fighter: &mut L2CAgentBase) {
7676
let lua_state = fighter.lua_state_agent;
7777
let boma = fighter.boma();
7878
frame(lua_state, 4.0);
@@ -104,8 +104,8 @@ unsafe fn mario_attack_air_f_effect(fighter: &mut L2CAgentBase) {
104104
}
105105
}
106106

107-
#[acmd_script( agent = "mario", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
108-
unsafe fn mario_attack_air_b_game(fighter: &mut L2CAgentBase) {
107+
108+
unsafe extern "C" fn mario_attack_air_b_game(fighter: &mut L2CAgentBase) {
109109
let lua_state = fighter.lua_state_agent;
110110
let boma = fighter.boma();
111111
frame(lua_state, 6.0);
@@ -133,8 +133,8 @@ unsafe fn mario_attack_air_b_game(fighter: &mut L2CAgentBase) {
133133

134134
}
135135

136-
#[acmd_script( agent = "mario", script = "effect_attackairb" , category = ACMD_EFFECT , low_priority)]
137-
unsafe fn mario_attack_air_b_effect(fighter: &mut L2CAgentBase) {
136+
137+
unsafe extern "C" fn mario_attack_air_b_effect(fighter: &mut L2CAgentBase) {
138138
let lua_state = fighter.lua_state_agent;
139139
let boma = fighter.boma();
140140
frame(lua_state, 4.0);
@@ -149,8 +149,8 @@ unsafe fn mario_attack_air_b_effect(fighter: &mut L2CAgentBase) {
149149
}
150150
}
151151

152-
#[acmd_script( agent = "mario", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
153-
unsafe fn mario_attack_air_hi_game(fighter: &mut L2CAgentBase) {
152+
153+
unsafe extern "C" fn mario_attack_air_hi_game(fighter: &mut L2CAgentBase) {
154154
let lua_state = fighter.lua_state_agent;
155155
let boma = fighter.boma();
156156
frame(lua_state, 1.0);
@@ -183,8 +183,8 @@ unsafe fn mario_attack_air_hi_game(fighter: &mut L2CAgentBase) {
183183

184184
}
185185

186-
#[acmd_script( agent = "mario", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
187-
unsafe fn mario_attack_air_lw_game(fighter: &mut L2CAgentBase) {
186+
187+
unsafe extern "C" fn mario_attack_air_lw_game(fighter: &mut L2CAgentBase) {
188188
let lua_state = fighter.lua_state_agent;
189189
let boma = fighter.boma();
190190
frame(lua_state, 3.0);
@@ -207,8 +207,8 @@ unsafe fn mario_attack_air_lw_game(fighter: &mut L2CAgentBase) {
207207
}
208208

209209
}
210-
#[acmd_script( agent = "mario", script = "effect_attackairlw", category = ACMD_EFFECT, low_priority )]
211-
unsafe fn effect_attackairlw(agent: &mut L2CAgentBase) {
210+
211+
unsafe extern "C" fn effect_attackairlw(agent: &mut L2CAgentBase) {
212212
let lua_state = agent.lua_state_agent;
213213
let boma = agent.boma();
214214
frame(lua_state, 7.0);
@@ -225,8 +225,8 @@ unsafe fn effect_attackairlw(agent: &mut L2CAgentBase) {
225225
}
226226
}
227227

228-
#[acmd_script( agent = "mario", script = "sound_attackairlw", category = ACMD_SOUND, low_priority )]
229-
unsafe fn sound_attackairlw(agent: &mut L2CAgentBase) {
228+
229+
unsafe extern "C" fn sound_attackairlw(agent: &mut L2CAgentBase) {
230230
let lua_state = agent.lua_state_agent;
231231
let boma = agent.boma();
232232
frame(lua_state, 7.0);
@@ -235,8 +235,8 @@ unsafe fn sound_attackairlw(agent: &mut L2CAgentBase) {
235235
}
236236
}
237237

238-
#[acmd_script( agent = "mario", script = "expression_attackairlw", category = ACMD_EXPRESSION, low_priority )]
239-
unsafe fn expression_attackairlw(fighter: &mut L2CAgentBase) {
238+
239+
unsafe extern "C" fn expression_attackairlw(fighter: &mut L2CAgentBase) {
240240
let lua_state = fighter.lua_state_agent;
241241
let boma = fighter.boma();
242242
frame(lua_state, 5.0);
@@ -253,8 +253,8 @@ unsafe fn expression_attackairlw(fighter: &mut L2CAgentBase) {
253253
}
254254
}
255255

256-
#[acmd_script( agent = "mario", script = "game_landingairlw" , category = ACMD_GAME , low_priority)]
257-
unsafe fn mario_landing_air_lw_game(fighter: &mut L2CAgentBase) {
256+
257+
unsafe extern "C" fn mario_landing_air_lw_game(fighter: &mut L2CAgentBase) {
258258
let lua_state = fighter.lua_state_agent;
259259
let boma = fighter.boma();
260260
/*
@@ -270,17 +270,17 @@ unsafe fn mario_landing_air_lw_game(fighter: &mut L2CAgentBase) {
270270
}
271271

272272
pub fn install() {
273-
install_acmd_scripts!(
274-
mario_attack_air_n_game,
275-
mario_attack_air_f_game,
276-
mario_attack_air_f_effect,
277-
mario_attack_air_b_game,
278-
mario_attack_air_b_effect,
279-
mario_attack_air_hi_game,
280-
mario_attack_air_lw_game,
281-
effect_attackairlw,
282-
sound_attackairlw,
283-
expression_attackairlw,
284-
mario_landing_air_lw_game,
285-
);
286-
}
273+
smashline::Agent::new("mario")
274+
.game_acmd("game_attackairn", mario_attack_air_n_game)
275+
.game_acmd("game_attackairf", mario_attack_air_f_game)
276+
.effect_acmd("effect_attackairf", mario_attack_air_f_effect)
277+
.game_acmd("game_attackairb", mario_attack_air_b_game)
278+
.effect_acmd("effect_attackairb", mario_attack_air_b_effect)
279+
.game_acmd("game_attackairhi", mario_attack_air_hi_game)
280+
.game_acmd("game_attackairlw", mario_attack_air_lw_game)
281+
.effect_acmd("effect_attackairlw", effect_attackairlw)
282+
.sound_acmd("sound_attackairlw", sound_attackairlw)
283+
.expression_acmd("expression_attackairlw", expression_attackairlw)
284+
.game_acmd("game_landingairlw", mario_landing_air_lw_game)
285+
.install();
286+
}

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

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

3-
#[acmd_script( agent = "mario", script = "game_attack11" , category = ACMD_GAME , low_priority)]
4-
unsafe fn mario_attack_11_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn mario_attack_11_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
frame(lua_state, 2.0);
@@ -23,8 +23,8 @@ unsafe fn mario_attack_11_game(fighter: &mut L2CAgentBase) {
2323

2424
}
2525

26-
#[acmd_script( agent = "mario", script = "game_attack12" , category = ACMD_GAME , low_priority)]
27-
unsafe fn mario_attack_12_game(fighter: &mut L2CAgentBase) {
26+
27+
unsafe extern "C" fn mario_attack_12_game(fighter: &mut L2CAgentBase) {
2828
let lua_state = fighter.lua_state_agent;
2929
let boma = fighter.boma();
3030
frame(lua_state, 2.0);
@@ -49,8 +49,8 @@ unsafe fn mario_attack_12_game(fighter: &mut L2CAgentBase) {
4949

5050
}
5151

52-
#[acmd_script( agent = "mario", script = "game_attack13" , category = ACMD_GAME , low_priority)]
53-
unsafe fn mario_attack_13_game(fighter: &mut L2CAgentBase) {
52+
53+
unsafe extern "C" fn mario_attack_13_game(fighter: &mut L2CAgentBase) {
5454
let lua_state = fighter.lua_state_agent;
5555
let boma = fighter.boma();
5656
frame(lua_state, 2.0);
@@ -71,8 +71,8 @@ unsafe fn mario_attack_13_game(fighter: &mut L2CAgentBase) {
7171

7272
}
7373

74-
#[acmd_script( agent = "mario", script = "expression_attack13" , category = ACMD_EXPRESSION , low_priority)]
75-
unsafe fn mario_attack_13_expression(fighter: &mut L2CAgentBase) {
74+
75+
unsafe extern "C" fn mario_attack_13_expression(fighter: &mut L2CAgentBase) {
7676
let lua_state = fighter.lua_state_agent;
7777
let boma = fighter.boma();
7878
if is_excute(fighter) {
@@ -97,8 +97,8 @@ unsafe fn mario_attack_13_expression(fighter: &mut L2CAgentBase) {
9797
}
9898
}
9999

100-
#[acmd_script( agent = "mario", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
101-
unsafe fn mario_attack_dash_game(fighter: &mut L2CAgentBase) {
100+
101+
unsafe extern "C" fn mario_attack_dash_game(fighter: &mut L2CAgentBase) {
102102
let lua_state = fighter.lua_state_agent;
103103
let boma = fighter.boma();
104104
sv_kinetic_energy!(set_speed_mul, fighter, FIGHTER_KINETIC_ENERGY_ID_MOTION, 1.09);
@@ -130,13 +130,14 @@ unsafe fn mario_attack_dash_game(fighter: &mut L2CAgentBase) {
130130

131131
}
132132

133+
134+
133135
pub fn install() {
134-
install_acmd_scripts!(
135-
mario_attack_11_game,
136-
mario_attack_12_game,
137-
mario_attack_13_game,
138-
mario_attack_13_expression,
139-
mario_attack_dash_game,
140-
);
136+
smashline::Agent::new("mario")
137+
.game_acmd("game_attack11", mario_attack_11_game)
138+
.game_acmd("game_attack12", mario_attack_12_game)
139+
.game_acmd("game_attack13", mario_attack_13_game)
140+
.expression_acmd("expression_attack13", mario_attack_13_expression)
141+
.game_acmd("game_attackdash", mario_attack_dash_game)
142+
.install();
141143
}
142-

‎fighters/mario/src/acmd/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ pub fn install() {
1515
specials::install();
1616
throws::install();
1717
ground::install();
18-
}
18+
}

0 commit comments

Comments
 (0)