Skip to content

Commit 580d43d

Browse files
blu-devblu-dev
committed
sonic, snake, simon
1 parent 6455fc4 commit 580d43d

Some content is hidden

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

51 files changed

+1116
-914
lines changed

‎Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ default = [
307307
# "sheik",
308308
# "shizue",
309309
# "shulk",
310-
# "simon",
311-
# "snake",
312-
# "sonic",
310+
"simon",
311+
"snake",
312+
"sonic",
313313
"szerosuit",
314314
"tantan",
315315
"toonlink",

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

+64-60
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
use super::*;
33

4-
#[acmd_script( agent = "simon", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
5-
unsafe fn simon_attack_air_n_game(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn simon_attack_air_n_game(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 6.0);
@@ -38,8 +38,8 @@ unsafe fn simon_attack_air_n_game(fighter: &mut L2CAgentBase) {
3838
}
3939
}
4040

41-
#[acmd_script( agent = "simon_whip", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
42-
unsafe fn simon_whip_attack_air_n_game(fighter: &mut L2CAgentBase) {
41+
42+
unsafe extern "C" fn simon_whip_attack_air_n_game(fighter: &mut L2CAgentBase) {
4343
let lua_state = fighter.lua_state_agent;
4444
let boma = fighter.boma();
4545
frame(lua_state, 6.0);
@@ -55,16 +55,16 @@ unsafe fn simon_whip_attack_air_n_game(fighter: &mut L2CAgentBase) {
5555

5656
}
5757

58-
#[acmd_script( agent = "simon_whip", script = "game_landingairn" , category = ACMD_GAME , low_priority)]
59-
unsafe fn simon_whip_landing_air_n_game(fighter: &mut L2CAgentBase) {
58+
59+
unsafe extern "C" fn simon_whip_landing_air_n_game(fighter: &mut L2CAgentBase) {
6060
let boma = fighter.boma();
6161
if is_excute(fighter) {
6262
AttackModule::clear_all(boma);
6363
}
6464
}
6565

66-
#[acmd_script( agent = "simon", script = "game_attackairfhi" , category = ACMD_GAME , low_priority)]
67-
unsafe fn simon_attack_air_f_hi_game(fighter: &mut L2CAgentBase) {
66+
67+
unsafe extern "C" fn simon_attack_air_f_hi_game(fighter: &mut L2CAgentBase) {
6868
let lua_state = fighter.lua_state_agent;
6969
let boma = fighter.boma();
7070
frame(lua_state, 1.0);
@@ -103,8 +103,8 @@ unsafe fn simon_attack_air_f_hi_game(fighter: &mut L2CAgentBase) {
103103

104104
}
105105

106-
#[acmd_script( agent = "simon_whip", script = "game_attackairfhi" , category = ACMD_GAME , low_priority)]
107-
unsafe fn simon_whip_attack_air_f_hi_game(fighter: &mut L2CAgentBase) {
106+
107+
unsafe extern "C" fn simon_whip_attack_air_f_hi_game(fighter: &mut L2CAgentBase) {
108108
let lua_state = fighter.lua_state_agent;
109109
let boma = fighter.boma();
110110
frame(lua_state, 1.0);
@@ -125,8 +125,8 @@ unsafe fn simon_whip_attack_air_f_hi_game(fighter: &mut L2CAgentBase) {
125125

126126
}
127127

128-
#[acmd_script( agent = "simon", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
129-
unsafe fn simon_attack_air_f_game(fighter: &mut L2CAgentBase) {
128+
129+
unsafe extern "C" fn simon_attack_air_f_game(fighter: &mut L2CAgentBase) {
130130
let lua_state = fighter.lua_state_agent;
131131
let boma = fighter.boma();
132132
frame(lua_state, 1.0);
@@ -165,8 +165,8 @@ unsafe fn simon_attack_air_f_game(fighter: &mut L2CAgentBase) {
165165

166166
}
167167

168-
#[acmd_script( agent = "simon_whip", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
169-
unsafe fn simon_whip_attack_air_f_game(fighter: &mut L2CAgentBase) {
168+
169+
unsafe extern "C" fn simon_whip_attack_air_f_game(fighter: &mut L2CAgentBase) {
170170
let lua_state = fighter.lua_state_agent;
171171
let boma = fighter.boma();
172172
frame(lua_state, 1.0);
@@ -187,8 +187,8 @@ unsafe fn simon_whip_attack_air_f_game(fighter: &mut L2CAgentBase) {
187187

188188
}
189189

190-
#[acmd_script( agent = "simon", script = "game_attackairflw" , category = ACMD_GAME , low_priority)]
191-
unsafe fn simon_attack_air_f_lw_game(fighter: &mut L2CAgentBase) {
190+
191+
unsafe extern "C" fn simon_attack_air_f_lw_game(fighter: &mut L2CAgentBase) {
192192
let lua_state = fighter.lua_state_agent;
193193
let boma = fighter.boma();
194194
frame(lua_state, 1.0);
@@ -227,8 +227,8 @@ unsafe fn simon_attack_air_f_lw_game(fighter: &mut L2CAgentBase) {
227227

228228
}
229229

230-
#[acmd_script( agent = "simon_whip", script = "game_attackairflw" , category = ACMD_GAME , low_priority)]
231-
unsafe fn simon_whip_attack_air_f_lw_game(fighter: &mut L2CAgentBase) {
230+
231+
unsafe extern "C" fn simon_whip_attack_air_f_lw_game(fighter: &mut L2CAgentBase) {
232232
let lua_state = fighter.lua_state_agent;
233233
let boma = fighter.boma();
234234
frame(lua_state, 1.0);
@@ -249,8 +249,8 @@ unsafe fn simon_whip_attack_air_f_lw_game(fighter: &mut L2CAgentBase) {
249249

250250
}
251251

252-
#[acmd_script( agent = "simon", script = "game_attackairbhi" , category = ACMD_GAME , low_priority)]
253-
unsafe fn simon_attack_air_b_hi_game(fighter: &mut L2CAgentBase) {
252+
253+
unsafe extern "C" fn simon_attack_air_b_hi_game(fighter: &mut L2CAgentBase) {
254254
let lua_state = fighter.lua_state_agent;
255255
let boma = fighter.boma();
256256
frame(lua_state, 1.0);
@@ -284,8 +284,8 @@ unsafe fn simon_attack_air_b_hi_game(fighter: &mut L2CAgentBase) {
284284

285285
}
286286

287-
#[acmd_script( agent = "simon_whip", script = "game_attackairbhi" , category = ACMD_GAME , low_priority)]
288-
unsafe fn simon_whip_attack_air_b_hi_game(fighter: &mut L2CAgentBase) {
287+
288+
unsafe extern "C" fn simon_whip_attack_air_b_hi_game(fighter: &mut L2CAgentBase) {
289289
let lua_state = fighter.lua_state_agent;
290290
let boma = fighter.boma();
291291
frame(lua_state, 1.0);
@@ -302,8 +302,8 @@ unsafe fn simon_whip_attack_air_b_hi_game(fighter: &mut L2CAgentBase) {
302302

303303
}
304304

305-
#[acmd_script( agent = "simon", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
306-
unsafe fn simon_attack_air_b_game(fighter: &mut L2CAgentBase) {
305+
306+
unsafe extern "C" fn simon_attack_air_b_game(fighter: &mut L2CAgentBase) {
307307
let lua_state = fighter.lua_state_agent;
308308
let boma = fighter.boma();
309309
frame(lua_state, 1.0);
@@ -337,8 +337,8 @@ unsafe fn simon_attack_air_b_game(fighter: &mut L2CAgentBase) {
337337

338338
}
339339

340-
#[acmd_script( agent = "simon_whip", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
341-
unsafe fn simon_whip_attack_air_b_game(fighter: &mut L2CAgentBase) {
340+
341+
unsafe extern "C" fn simon_whip_attack_air_b_game(fighter: &mut L2CAgentBase) {
342342
let lua_state = fighter.lua_state_agent;
343343
let boma = fighter.boma();
344344
frame(lua_state, 1.0);
@@ -355,8 +355,8 @@ unsafe fn simon_whip_attack_air_b_game(fighter: &mut L2CAgentBase) {
355355

356356
}
357357

358-
#[acmd_script( agent = "simon", script = "game_attackairblw" , category = ACMD_GAME , low_priority)]
359-
unsafe fn simon_attack_air_b_lw_game(fighter: &mut L2CAgentBase) {
358+
359+
unsafe extern "C" fn simon_attack_air_b_lw_game(fighter: &mut L2CAgentBase) {
360360
let lua_state = fighter.lua_state_agent;
361361
let boma = fighter.boma();
362362
frame(lua_state, 1.0);
@@ -390,8 +390,8 @@ unsafe fn simon_attack_air_b_lw_game(fighter: &mut L2CAgentBase) {
390390

391391
}
392392

393-
#[acmd_script( agent = "simon_whip", script = "game_attackairblw" , category = ACMD_GAME , low_priority)]
394-
unsafe fn simon_whip_attack_air_b_lw_game(fighter: &mut L2CAgentBase) {
393+
394+
unsafe extern "C" fn simon_whip_attack_air_b_lw_game(fighter: &mut L2CAgentBase) {
395395
let lua_state = fighter.lua_state_agent;
396396
let boma = fighter.boma();
397397
frame(lua_state, 1.0);
@@ -408,8 +408,8 @@ unsafe fn simon_whip_attack_air_b_lw_game(fighter: &mut L2CAgentBase) {
408408

409409
}
410410

411-
#[acmd_script( agent = "simon", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
412-
unsafe fn simon_attack_air_hi_game(fighter: &mut L2CAgentBase) {
411+
412+
unsafe extern "C" fn simon_attack_air_hi_game(fighter: &mut L2CAgentBase) {
413413
let lua_state = fighter.lua_state_agent;
414414
let boma = fighter.boma();
415415
frame(lua_state, 1.0);
@@ -442,8 +442,8 @@ unsafe fn simon_attack_air_hi_game(fighter: &mut L2CAgentBase) {
442442

443443
}
444444

445-
#[acmd_script( agent = "simon_whip", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
446-
unsafe fn simon_whip_attack_air_hi_game(fighter: &mut L2CAgentBase) {
445+
446+
unsafe extern "C" fn simon_whip_attack_air_hi_game(fighter: &mut L2CAgentBase) {
447447
let lua_state = fighter.lua_state_agent;
448448
let boma = fighter.boma();
449449
frame(lua_state, 1.0);
@@ -460,8 +460,8 @@ unsafe fn simon_whip_attack_air_hi_game(fighter: &mut L2CAgentBase) {
460460

461461
}
462462

463-
#[acmd_script( agent = "simon", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
464-
unsafe fn simon_attack_air_lw_game(fighter: &mut L2CAgentBase) {
463+
464+
unsafe extern "C" fn simon_attack_air_lw_game(fighter: &mut L2CAgentBase) {
465465
let lua_state = fighter.lua_state_agent;
466466
let boma = fighter.boma();
467467
if is_excute(fighter) {
@@ -510,8 +510,8 @@ unsafe fn simon_attack_air_lw_game(fighter: &mut L2CAgentBase) {
510510
}
511511
}
512512

513-
#[acmd_script( agent = "simon", script = "game_attackairlw2", category = ACMD_GAME, low_priority )]
514-
unsafe fn simon_attack_air_lw2_game(fighter: &mut L2CAgentBase) {
513+
514+
unsafe extern "C" fn simon_attack_air_lw2_game(fighter: &mut L2CAgentBase) {
515515
let lua_state = fighter.lua_state_agent;
516516
let boma = fighter.boma();
517517
FT_MOTION_RATE(fighter, 0.75);
@@ -527,27 +527,31 @@ unsafe fn simon_attack_air_lw2_game(fighter: &mut L2CAgentBase) {
527527
}
528528
}
529529

530+
531+
532+
530533
pub fn install() {
531-
install_acmd_scripts!(
532-
simon_attack_air_n_game,
533-
//simon_whip_attack_air_n_game,
534-
//simon_whip_landing_air_n_game,
535-
simon_attack_air_f_hi_game,
536-
simon_whip_attack_air_f_hi_game,
537-
simon_attack_air_f_game,
538-
simon_whip_attack_air_f_game,
539-
simon_attack_air_f_lw_game,
540-
simon_whip_attack_air_f_lw_game,
541-
simon_attack_air_b_hi_game,
542-
simon_whip_attack_air_b_hi_game,
543-
simon_attack_air_b_game,
544-
simon_whip_attack_air_b_game,
545-
simon_attack_air_b_lw_game,
546-
simon_whip_attack_air_b_lw_game,
547-
simon_attack_air_hi_game,
548-
simon_whip_attack_air_hi_game,
549-
simon_attack_air_lw_game,
550-
simon_attack_air_lw2_game,
551-
);
534+
smashline::Agent::new("simon_whip")
535+
.acmd("game_attackairn", simon_whip_attack_air_n_game)
536+
.acmd("game_landingairn", simon_whip_landing_air_n_game)
537+
.acmd("game_attackairfhi", simon_whip_attack_air_f_hi_game)
538+
.acmd("game_attackairf", simon_whip_attack_air_f_game)
539+
.acmd("game_attackairflw", simon_whip_attack_air_f_lw_game)
540+
.acmd("game_attackairbhi", simon_whip_attack_air_b_hi_game)
541+
.acmd("game_attackairb", simon_whip_attack_air_b_game)
542+
.acmd("game_attackairblw", simon_whip_attack_air_b_lw_game)
543+
.acmd("game_attackairhi", simon_whip_attack_air_hi_game)
544+
.install();
545+
smashline::Agent::new("simon")
546+
.acmd("game_attackairn", simon_attack_air_n_game)
547+
.acmd("game_attackairfhi", simon_attack_air_f_hi_game)
548+
.acmd("game_attackairf", simon_attack_air_f_game)
549+
.acmd("game_attackairflw", simon_attack_air_f_lw_game)
550+
.acmd("game_attackairbhi", simon_attack_air_b_hi_game)
551+
.acmd("game_attackairb", simon_attack_air_b_game)
552+
.acmd("game_attackairblw", simon_attack_air_b_lw_game)
553+
.acmd("game_attackairhi", simon_attack_air_hi_game)
554+
.acmd("game_attackairlw", simon_attack_air_lw_game)
555+
.acmd("game_attackairlw2", simon_attack_air_lw2_game)
556+
.install();
552557
}
553-

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

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
use super::*;
33

4-
#[acmd_script( agent = "simon", script = "game_attack11", category = ACMD_GAME, low_priority )]
5-
unsafe fn game_attack11(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn game_attack11(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 5.0);
@@ -29,8 +29,8 @@ unsafe fn game_attack11(fighter: &mut L2CAgentBase) {
2929
}
3030
}
3131

32-
#[acmd_script( agent = "simon", script = "game_attack12", category = ACMD_GAME, low_priority )]
33-
unsafe fn game_attack12(fighter: &mut L2CAgentBase) {
32+
33+
unsafe extern "C" fn game_attack12(fighter: &mut L2CAgentBase) {
3434
let lua_state = fighter.lua_state_agent;
3535
let boma = fighter.boma();
3636
frame(lua_state, 3.0);
@@ -57,8 +57,8 @@ unsafe fn game_attack12(fighter: &mut L2CAgentBase) {
5757
}
5858
}
5959

60-
#[acmd_script( agent = "simon", script = "game_attackdash", category = ACMD_GAME, low_priority )]
61-
unsafe fn game_attackdash(fighter: &mut L2CAgentBase) {
60+
61+
unsafe extern "C" fn game_attackdash(fighter: &mut L2CAgentBase) {
6262
let lua_state = fighter.lua_state_agent;
6363
let boma = fighter.boma();
6464
frame(lua_state, 10.0);
@@ -86,11 +86,13 @@ unsafe fn game_attackdash(fighter: &mut L2CAgentBase) {
8686
}
8787
}
8888

89+
90+
91+
8992
pub fn install() {
90-
install_acmd_scripts!(
91-
game_attack11,
92-
game_attack12,
93-
game_attackdash
94-
);
93+
smashline::Agent::new("simon")
94+
.acmd("game_attack11", game_attack11)
95+
.acmd("game_attack12", game_attack12)
96+
.acmd("game_attackdash", game_attackdash)
97+
.install();
9598
}
96-

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

+2-9
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,5 @@ mod specials;
77
mod throws;
88
mod ground;
99

10-
pub fn install() {
11-
aerials::install();
12-
tilts::install();
13-
other::install();
14-
smashes::install();
15-
specials::install();
16-
throws::install();
17-
ground::install();
18-
}
10+
11+
pub fn install() {}

0 commit comments

Comments
 (0)