Skip to content

Commit 6455fc4

Browse files
blu-devblu-dev
committed
toonlink, minmin, zss
1 parent 757bf0a commit 6455fc4

36 files changed

+1021
-877
lines changed

‎Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,9 @@ default = [
310310
# "simon",
311311
# "snake",
312312
# "sonic",
313-
# "szerosuit",
314-
# "tantan",
315-
# "toonlink",
313+
"szerosuit",
314+
"tantan",
315+
"toonlink",
316316
"trail",
317317
"wario",
318318
"wiifit",

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

+52-45
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
use super::*;
33

44

5-
#[acmd_script( agent = "szerosuit", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
6-
unsafe fn szerosuit_attack_air_n_game(fighter: &mut L2CAgentBase) {
5+
6+
unsafe extern "C" fn szerosuit_attack_air_n_game(fighter: &mut L2CAgentBase) {
77
let lua_state = fighter.lua_state_agent;
88
let boma = fighter.boma();
99
FT_MOTION_RATE(fighter, 4.0/(8.0-1.0));
@@ -58,8 +58,8 @@ unsafe fn szerosuit_attack_air_n_game(fighter: &mut L2CAgentBase) {
5858

5959
}
6060

61-
#[acmd_script( agent = "szerosuit_whip", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
62-
unsafe fn szerosuit_whip_attack_air_n_game(fighter: &mut L2CAgentBase) {
61+
62+
unsafe extern "C" fn szerosuit_whip_attack_air_n_game(fighter: &mut L2CAgentBase) {
6363
let lua_state = fighter.lua_state_agent;
6464
let boma = fighter.boma();
6565
FT_MOTION_RATE(fighter, 4.0/(8.0-1.0));
@@ -78,8 +78,8 @@ unsafe fn szerosuit_whip_attack_air_n_game(fighter: &mut L2CAgentBase) {
7878
}
7979

8080

81-
#[acmd_script( agent = "szerosuit", script = "expression_attackairn", category = ACMD_EXPRESSION, low_priority )]
82-
unsafe fn szerosuit_attack_air_n_expression(fighter: &mut L2CAgentBase) {
81+
82+
unsafe extern "C" fn szerosuit_attack_air_n_expression(fighter: &mut L2CAgentBase) {
8383
let lua_state = fighter.lua_state_agent;
8484
let boma = fighter.boma();
8585
frame(lua_state, 8.0);
@@ -92,8 +92,8 @@ unsafe fn szerosuit_attack_air_n_expression(fighter: &mut L2CAgentBase) {
9292
}
9393
}
9494

95-
#[acmd_script( agent = "szerosuit", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
96-
unsafe fn szerosuit_attack_air_f_game(fighter: &mut L2CAgentBase) {
95+
96+
unsafe extern "C" fn szerosuit_attack_air_f_game(fighter: &mut L2CAgentBase) {
9797
let lua_state = fighter.lua_state_agent;
9898
let boma = fighter.boma();
9999
frame(lua_state, 4.0);
@@ -140,8 +140,8 @@ unsafe fn szerosuit_attack_air_f_game(fighter: &mut L2CAgentBase) {
140140

141141
}
142142

143-
#[acmd_script( agent = "szerosuit", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
144-
unsafe fn szerosuit_attack_air_b_game(fighter: &mut L2CAgentBase) {
143+
144+
unsafe extern "C" fn szerosuit_attack_air_b_game(fighter: &mut L2CAgentBase) {
145145
let lua_state = fighter.lua_state_agent;
146146
let boma = fighter.boma();
147147
frame(lua_state, 1.0);
@@ -168,8 +168,8 @@ unsafe fn szerosuit_attack_air_b_game(fighter: &mut L2CAgentBase) {
168168

169169
}
170170

171-
#[acmd_script( agent = "szerosuit", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
172-
unsafe fn szerosuit_attack_air_hi_game(fighter: &mut L2CAgentBase) {
171+
172+
unsafe extern "C" fn szerosuit_attack_air_hi_game(fighter: &mut L2CAgentBase) {
173173
let lua_state = fighter.lua_state_agent;
174174
let boma = fighter.boma();
175175
frame(lua_state, 1.0);
@@ -212,8 +212,8 @@ unsafe fn szerosuit_attack_air_hi_game(fighter: &mut L2CAgentBase) {
212212

213213
}
214214

215-
#[acmd_script( agent = "szerosuit", script = "effect_attackairhi" , category = ACMD_EFFECT , low_priority)]
216-
unsafe fn szerosuit_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
215+
216+
unsafe extern "C" fn szerosuit_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
217217
let lua_state = fighter.lua_state_agent;
218218
let boma = fighter.boma();
219219
frame(lua_state, 6.0);
@@ -228,8 +228,8 @@ unsafe fn szerosuit_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
228228
}
229229
}
230230

231-
#[acmd_script( agent = "szerosuit", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
232-
unsafe fn szerosuit_attack_air_lw_game(fighter: &mut L2CAgentBase) {
231+
232+
unsafe extern "C" fn szerosuit_attack_air_lw_game(fighter: &mut L2CAgentBase) {
233233
let lua_state = fighter.lua_state_agent;
234234
let boma = fighter.boma();
235235
let dive_motion_rate = 10.0/(50.0-14.0);
@@ -267,8 +267,8 @@ unsafe fn szerosuit_attack_air_lw_game(fighter: &mut L2CAgentBase) {
267267

268268
}
269269

270-
#[acmd_script( agent = "szerosuit", script = "effect_attackairlw" , category = ACMD_EFFECT , low_priority)]
271-
unsafe fn szerosuit_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
270+
271+
unsafe extern "C" fn szerosuit_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
272272
let lua_state = fighter.lua_state_agent;
273273
let boma = fighter.boma();
274274
let dive_motion_rate = 15.0/(50.0-14.0);
@@ -288,24 +288,24 @@ unsafe fn szerosuit_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
288288
}
289289
}
290290

291-
#[acmd_script( agent = "szerosuit", script = "game_landingairlw" , category = ACMD_GAME , low_priority)]
292-
unsafe fn szerosuit_landing_air_lw_game(fighter: &mut L2CAgentBase) {
291+
292+
unsafe extern "C" fn szerosuit_landing_air_lw_game(fighter: &mut L2CAgentBase) {
293293
let lua_state = fighter.lua_state_agent;
294294
let boma = fighter.boma();
295295

296296
}
297297

298-
#[acmd_script( agent = "szerosuit", script = "effect_landingairlw" , category = ACMD_EFFECT , low_priority)]
299-
unsafe fn szerosuit_landing_air_lw_effect(fighter: &mut L2CAgentBase) {
298+
299+
unsafe extern "C" fn szerosuit_landing_air_lw_effect(fighter: &mut L2CAgentBase) {
300300
let lua_state = fighter.lua_state_agent;
301301
let boma = fighter.boma();
302302
if is_excute(fighter) {
303303
LANDING_EFFECT(fighter, Hash40::new("sys_down_smoke"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
304304
}
305305
}
306306

307-
#[acmd_script( agent = "szerosuit", script = "expression_landingairlw" , category = ACMD_EXPRESSION , low_priority)]
308-
unsafe fn szerosuit_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
307+
308+
unsafe extern "C" fn szerosuit_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
309309
let lua_state = fighter.lua_state_agent;
310310
let boma = fighter.boma();
311311
if is_excute(fighter) {
@@ -315,8 +315,8 @@ unsafe fn szerosuit_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
315315
}
316316

317317

318-
#[acmd_script( agent = "szerosuit", script = "game_aircatch", category = ACMD_GAME, low_priority )]
319-
unsafe fn szerosuit_air_catch_game(fighter: &mut L2CAgentBase) {
318+
319+
unsafe extern "C" fn szerosuit_air_catch_game(fighter: &mut L2CAgentBase) {
320320
let lua_state = fighter.lua_state_agent;
321321
let boma = fighter.boma();
322322
if is_excute(fighter) {
@@ -357,28 +357,35 @@ unsafe fn szerosuit_air_catch_game(fighter: &mut L2CAgentBase) {
357357
}
358358

359359

360-
#[acmd_script( agent = "szerosuit", script = "game_aircatchlanding" , category = ACMD_GAME , low_priority)]
361-
unsafe fn szerosuit_landing_air_catch_game(fighter: &mut L2CAgentBase) {
360+
361+
unsafe extern "C" fn szerosuit_landing_air_catch_game(fighter: &mut L2CAgentBase) {
362362
let lua_state = fighter.lua_state_agent;
363363
let boma = fighter.boma();
364364
}
365365

366+
367+
368+
366369
pub fn install() {
367-
install_acmd_scripts!(
368-
szerosuit_attack_air_n_game,
369-
szerosuit_whip_attack_air_n_game,
370-
szerosuit_attack_air_n_expression,
371-
szerosuit_attack_air_f_game,
372-
szerosuit_attack_air_b_game,
373-
szerosuit_attack_air_hi_game,
374-
szerosuit_attack_air_hi_effect,
375-
szerosuit_attack_air_lw_game,
376-
szerosuit_attack_air_lw_effect,
377-
szerosuit_landing_air_lw_game,
378-
szerosuit_landing_air_lw_expression,
379-
szerosuit_landing_air_lw_effect,
380-
szerosuit_landing_air_catch_game,
381-
szerosuit_landing_air_catch_game,
382-
);
370+
smashline::Agent::new("szerosuit")
371+
.acmd("game_attackairn", szerosuit_attack_air_n_game)
372+
.acmd("expression_attackairn", szerosuit_attack_air_n_expression)
373+
.acmd("game_attackairf", szerosuit_attack_air_f_game)
374+
.acmd("game_attackairb", szerosuit_attack_air_b_game)
375+
.acmd("game_attackairhi", szerosuit_attack_air_hi_game)
376+
.acmd("effect_attackairhi", szerosuit_attack_air_hi_effect)
377+
.acmd("game_attackairlw", szerosuit_attack_air_lw_game)
378+
.acmd("effect_attackairlw", szerosuit_attack_air_lw_effect)
379+
.acmd("game_landingairlw", szerosuit_landing_air_lw_game)
380+
.acmd("effect_landingairlw", szerosuit_landing_air_lw_effect)
381+
.acmd(
382+
"expression_landingairlw",
383+
szerosuit_landing_air_lw_expression,
384+
)
385+
.acmd("game_aircatch", szerosuit_air_catch_game)
386+
.acmd("game_aircatchlanding", szerosuit_landing_air_catch_game)
387+
.install();
388+
smashline::Agent::new("szerosuit_whip")
389+
.acmd("game_attackairn", szerosuit_whip_attack_air_n_game)
390+
.install();
383391
}
384-

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

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
use super::*;
33

4-
#[acmd_script( agent = "szerosuit", script = "game_attack11" , category = ACMD_GAME , low_priority)]
5-
unsafe fn szerosuit_attack_11_game(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn szerosuit_attack_11_game(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 2.0);
@@ -33,8 +33,8 @@ unsafe fn szerosuit_attack_11_game(fighter: &mut L2CAgentBase) {
3333
}
3434

3535

36-
#[acmd_script( agent = "szerosuit", script = "game_attack12" , category = ACMD_GAME , low_priority)]
37-
unsafe fn szerosuit_attack_12_game(fighter: &mut L2CAgentBase) {
36+
37+
unsafe extern "C" fn szerosuit_attack_12_game(fighter: &mut L2CAgentBase) {
3838
let lua_state = fighter.lua_state_agent;
3939
let boma = fighter.boma();
4040
frame(lua_state, 2.0);
@@ -56,8 +56,8 @@ unsafe fn szerosuit_attack_12_game(fighter: &mut L2CAgentBase) {
5656
}
5757

5858

59-
#[acmd_script( agent = "szerosuit", script = "game_attack13" , category = ACMD_GAME , low_priority)]
60-
unsafe fn szerosuit_attack_13_game(fighter: &mut L2CAgentBase) {
59+
60+
unsafe extern "C" fn szerosuit_attack_13_game(fighter: &mut L2CAgentBase) {
6161
let lua_state = fighter.lua_state_agent;
6262
let boma = fighter.boma();
6363
frame(lua_state, 3.0);
@@ -73,8 +73,8 @@ unsafe fn szerosuit_attack_13_game(fighter: &mut L2CAgentBase) {
7373
}
7474

7575

76-
#[acmd_script( agent = "szerosuit", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
77-
unsafe fn szerosuit_attack_dash_game(fighter: &mut L2CAgentBase) {
76+
77+
unsafe extern "C" fn szerosuit_attack_dash_game(fighter: &mut L2CAgentBase) {
7878
let lua_state = fighter.lua_state_agent;
7979
let boma = fighter.boma();
8080
let attack_motion_rate = 11.0/(20.0-6.0);
@@ -107,8 +107,8 @@ unsafe fn szerosuit_attack_dash_game(fighter: &mut L2CAgentBase) {
107107

108108
}
109109

110-
#[acmd_script( agent = "szerosuit", script = "expression_attackdash", category = ACMD_EXPRESSION, low_priority )]
111-
unsafe fn szerosuit_attack_dash_expression(fighter: &mut L2CAgentBase) {
110+
111+
unsafe extern "C" fn szerosuit_attack_dash_expression(fighter: &mut L2CAgentBase) {
112112
let lua_state = fighter.lua_state_agent;
113113
let boma = fighter.boma();
114114
if is_excute(fighter) {
@@ -132,13 +132,15 @@ unsafe fn szerosuit_attack_dash_expression(fighter: &mut L2CAgentBase) {
132132
}
133133
}
134134

135+
136+
137+
135138
pub fn install() {
136-
install_acmd_scripts!(
137-
szerosuit_attack_11_game,
138-
szerosuit_attack_12_game,
139-
szerosuit_attack_13_game,
140-
szerosuit_attack_dash_game,
141-
szerosuit_attack_dash_expression,
142-
);
139+
smashline::Agent::new("szerosuit")
140+
.acmd("game_attack11", szerosuit_attack_11_game)
141+
.acmd("game_attack12", szerosuit_attack_12_game)
142+
.acmd("game_attack13", szerosuit_attack_13_game)
143+
.acmd("game_attackdash", szerosuit_attack_dash_game)
144+
.acmd("expression_attackdash", szerosuit_attack_dash_expression)
145+
.install();
143146
}
144-

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ mod specials;
77
mod throws;
88
mod ground;
99

10+
1011
pub fn install() {
1112
aerials::install();
1213
tilts::install();
@@ -15,4 +16,4 @@ pub fn install() {
1516
specials::install();
1617
throws::install();
1718
ground::install();
18-
}
19+
}

0 commit comments

Comments
 (0)