Skip to content

Commit 49c81e0

Browse files
blu-devblu-dev
committed
shulk, issa, sheik, (dark) samus
1 parent 580d43d commit 49c81e0

Some content is hidden

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

61 files changed

+1055
-957
lines changed

‎Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,11 @@ default = [
302302
# "rosetta",
303303
# "roy",
304304
# "ryu",
305-
# "samus",
306-
# "samusd",
307-
# "sheik",
308-
# "shizue",
309-
# "shulk",
305+
"samus",
306+
"samusd",
307+
"sheik",
308+
"shizue",
309+
"shulk",
310310
"simon",
311311
"snake",
312312
"sonic",

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

+42-40
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
use super::*;
33

4-
#[acmd_script( agent = "samus", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
5-
unsafe fn attack_air_n(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn attack_air_n(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 2.0);
@@ -47,8 +47,8 @@ unsafe fn attack_air_n(fighter: &mut L2CAgentBase) {
4747

4848
}
4949

50-
#[acmd_script( agent = "samus", script = "effect_attackairn" , category = ACMD_EFFECT , low_priority)]
51-
unsafe fn attack_air_n_effect(fighter: &mut L2CAgentBase) {
50+
51+
unsafe extern "C" fn attack_air_n_effect(fighter: &mut L2CAgentBase) {
5252
let lua_state = fighter.lua_state_agent;
5353
let boma = fighter.boma();
5454
frame(lua_state, 3.0);
@@ -63,8 +63,8 @@ unsafe fn attack_air_n_effect(fighter: &mut L2CAgentBase) {
6363

6464
}
6565

66-
#[acmd_script( agent = "samus", script = "sound_attackairn" , category = ACMD_SOUND , low_priority)]
67-
unsafe fn attack_air_n_sound(fighter: &mut L2CAgentBase) {
66+
67+
unsafe extern "C" fn attack_air_n_sound(fighter: &mut L2CAgentBase) {
6868
let lua_state = fighter.lua_state_agent;
6969
let boma = fighter.boma();
7070
frame(lua_state, 6.0);
@@ -75,8 +75,8 @@ unsafe fn attack_air_n_sound(fighter: &mut L2CAgentBase) {
7575

7676
}
7777

78-
#[acmd_script( agent = "samus", script = "expression_attackairn", category = ACMD_EXPRESSION, low_priority )]
79-
unsafe fn attack_air_n_expression(fighter: &mut L2CAgentBase) {
78+
79+
unsafe extern "C" fn attack_air_n_expression(fighter: &mut L2CAgentBase) {
8080
let lua_state = fighter.lua_state_agent;
8181
let boma = fighter.boma();
8282
frame(lua_state, 4.0);
@@ -89,8 +89,8 @@ unsafe fn attack_air_n_expression(fighter: &mut L2CAgentBase) {
8989
}
9090
}
9191

92-
#[acmd_script( agent = "samus", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
93-
unsafe fn attack_air_f(fighter: &mut L2CAgentBase) {
92+
93+
unsafe extern "C" fn attack_air_f(fighter: &mut L2CAgentBase) {
9494
let lua_state = fighter.lua_state_agent;
9595
let boma = fighter.boma();
9696
frame(lua_state, 4.0);
@@ -138,8 +138,8 @@ unsafe fn attack_air_f(fighter: &mut L2CAgentBase) {
138138

139139
}
140140

141-
#[acmd_script( agent = "samus", script = "effect_attackairf", category = ACMD_EFFECT, low_priority )]
142-
unsafe fn samus_attack_air_f_effect(fighter: &mut L2CAgentBase) {
141+
142+
unsafe extern "C" fn samus_attack_air_f_effect(fighter: &mut L2CAgentBase) {
143143
let lua_state = fighter.lua_state_agent;
144144
let boma = fighter.boma();
145145
frame(lua_state, 4.0);
@@ -164,8 +164,8 @@ unsafe fn samus_attack_air_f_effect(fighter: &mut L2CAgentBase) {
164164
}
165165
}
166166

167-
#[acmd_script( agent = "samus", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
168-
unsafe fn attack_air_b(fighter: &mut L2CAgentBase) {
167+
168+
unsafe extern "C" fn attack_air_b(fighter: &mut L2CAgentBase) {
169169
let lua_state = fighter.lua_state_agent;
170170
let boma = fighter.boma();
171171
frame(lua_state, 9.0);
@@ -191,8 +191,8 @@ unsafe fn attack_air_b(fighter: &mut L2CAgentBase) {
191191

192192
}
193193

194-
#[acmd_script( agent = "samus", script = "effect_attackairb" , category = ACMD_EFFECT , low_priority)]
195-
unsafe fn effect_air_b(fighter: &mut L2CAgentBase) {
194+
195+
unsafe extern "C" fn effect_air_b(fighter: &mut L2CAgentBase) {
196196
let lua_state = fighter.lua_state_agent;
197197
let boma = fighter.boma();
198198
frame(lua_state, 8.0);
@@ -206,8 +206,8 @@ unsafe fn effect_air_b(fighter: &mut L2CAgentBase) {
206206
}
207207
}
208208

209-
#[acmd_script( agent = "samus", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
210-
unsafe fn attack_air_hi(fighter: &mut L2CAgentBase) {
209+
210+
unsafe extern "C" fn attack_air_hi(fighter: &mut L2CAgentBase) {
211211
let lua_state = fighter.lua_state_agent;
212212
let boma = fighter.boma();
213213
frame(lua_state, 3.0);
@@ -254,8 +254,8 @@ unsafe fn attack_air_hi(fighter: &mut L2CAgentBase) {
254254

255255
}
256256

257-
#[acmd_script( agent = "samus", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
258-
unsafe fn attack_air_lw(fighter: &mut L2CAgentBase) {
257+
258+
unsafe extern "C" fn attack_air_lw(fighter: &mut L2CAgentBase) {
259259
let lua_state = fighter.lua_state_agent;
260260
let boma = fighter.boma();
261261
frame(lua_state, 1.0);
@@ -292,8 +292,8 @@ unsafe fn attack_air_lw(fighter: &mut L2CAgentBase) {
292292
}
293293

294294

295-
#[acmd_script( agent = "samus", script = "effect_attackairlw" , category = ACMD_EFFECT , low_priority)]
296-
unsafe fn samus_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
295+
296+
unsafe extern "C" fn samus_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
297297
let lua_state = fighter.lua_state_agent;
298298
let boma = fighter.boma();
299299
frame(lua_state, 9.0);
@@ -309,8 +309,8 @@ unsafe fn samus_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
309309
}
310310

311311

312-
#[acmd_script( agent = "samus", script = "game_aircatchlanding" , category = ACMD_GAME , low_priority)]
313-
unsafe fn samus_landing_air_catch_game(fighter: &mut L2CAgentBase) {
312+
313+
unsafe extern "C" fn samus_landing_air_catch_game(fighter: &mut L2CAgentBase) {
314314
let lua_state = fighter.lua_state_agent;
315315
let boma = fighter.boma();
316316
if is_excute(fighter) {
@@ -319,19 +319,21 @@ unsafe fn samus_landing_air_catch_game(fighter: &mut L2CAgentBase) {
319319

320320
}
321321

322-
pub fn install() {
323-
install_acmd_scripts!(
324-
attack_air_n,
325-
attack_air_n_effect,
326-
attack_air_n_sound,
327-
attack_air_n_expression,
328-
attack_air_f,
329-
samus_attack_air_f_effect,
330-
attack_air_b,
331-
effect_air_b,
332-
attack_air_hi,
333-
attack_air_lw,
334-
samus_attack_air_lw_effect,
335-
samus_landing_air_catch_game,
336-
);
337-
}
322+
323+
324+
pub fn install() {
325+
smashline::Agent::new("samus")
326+
.acmd("game_attackairn", attack_air_n)
327+
.acmd("effect_attackairn", attack_air_n_effect)
328+
.acmd("sound_attackairn", attack_air_n_sound)
329+
.acmd("expression_attackairn", attack_air_n_expression)
330+
.acmd("game_attackairf", attack_air_f)
331+
.acmd("effect_attackairf", samus_attack_air_f_effect)
332+
.acmd("game_attackairb", attack_air_b)
333+
.acmd("effect_attackairb", effect_air_b)
334+
.acmd("game_attackairhi", attack_air_hi)
335+
.acmd("game_attackairlw", attack_air_lw)
336+
.acmd("effect_attackairlw", samus_attack_air_lw_effect)
337+
.acmd("game_aircatchlanding", samus_landing_air_catch_game)
338+
.install();
339+
}

‎fighters/samus/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 = "samus", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
5-
unsafe fn attack_dash(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn attack_dash(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
sv_kinetic_energy!(set_speed_mul, fighter, FIGHTER_KINETIC_ENERGY_ID_MOTION, 0.85);
@@ -80,8 +80,8 @@ unsafe fn attack_dash(fighter: &mut L2CAgentBase) {
8080

8181
}
8282

83-
#[acmd_script( agent = "samus", script = "sound_attackdash" , category = ACMD_SOUND , low_priority)]
84-
unsafe fn attack_dash_sound(fighter: &mut L2CAgentBase) {
83+
84+
unsafe extern "C" fn attack_dash_sound(fighter: &mut L2CAgentBase) {
8585
let lua_state = fighter.lua_state_agent;
8686
let boma = fighter.boma();
8787

@@ -104,8 +104,8 @@ unsafe fn attack_dash_sound(fighter: &mut L2CAgentBase) {
104104

105105
}
106106

107-
#[acmd_script( agent = "samus", script = "game_attack11" , category = ACMD_GAME , low_priority)]
108-
unsafe fn attack_11(fighter: &mut L2CAgentBase) {
107+
108+
unsafe extern "C" fn attack_11(fighter: &mut L2CAgentBase) {
109109
let lua_state = fighter.lua_state_agent;
110110
let boma = fighter.boma();
111111
frame(lua_state, 3.0);
@@ -128,8 +128,8 @@ unsafe fn attack_11(fighter: &mut L2CAgentBase) {
128128

129129
}
130130

131-
#[acmd_script( agent = "samus", script = "effect_attack11" , category = ACMD_EFFECT , low_priority)]
132-
unsafe fn samus_attack_11_effect(fighter: &mut L2CAgentBase) {
131+
132+
unsafe extern "C" fn samus_attack_11_effect(fighter: &mut L2CAgentBase) {
133133
let lua_state = fighter.lua_state_agent;
134134
let boma = fighter.boma();
135135
if is_excute(fighter) {
@@ -145,8 +145,8 @@ unsafe fn samus_attack_11_effect(fighter: &mut L2CAgentBase) {
145145
}
146146
}
147147

148-
#[acmd_script( agent = "samus", script = "expression_attack12", category = ACMD_EXPRESSION, low_priority )]
149-
unsafe fn samus_attack_12_expression(fighter: &mut L2CAgentBase) {
148+
149+
unsafe extern "C" fn samus_attack_12_expression(fighter: &mut L2CAgentBase) {
150150
let lua_state = fighter.lua_state_agent;
151151
let boma = fighter.boma();
152152
if is_excute(fighter) {
@@ -162,13 +162,15 @@ unsafe fn samus_attack_12_expression(fighter: &mut L2CAgentBase) {
162162
}
163163
}
164164

165+
166+
167+
165168
pub fn install() {
166-
install_acmd_scripts!(
167-
attack_dash,
168-
attack_dash_sound,
169-
attack_11,
170-
samus_attack_11_effect,
171-
samus_attack_12_expression
172-
);
169+
smashline::Agent::new("samus")
170+
.acmd("game_attackdash", attack_dash)
171+
.acmd("sound_attackdash", attack_dash_sound)
172+
.acmd("game_attack11", attack_11)
173+
.acmd("effect_attack11", samus_attack_11_effect)
174+
.acmd("expression_attack12", samus_attack_12_expression)
175+
.install();
173176
}
174-

‎fighters/samus/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)