Skip to content

Commit 79afe79

Browse files
SkewedAskewWuBoytH
SkewedAskew
authored and
WuBoytH
committed
Too many cooks
1 parent 20aa2c9 commit 79afe79

File tree

239 files changed

+6009
-5352
lines changed

Some content is hidden

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

239 files changed

+6009
-5352
lines changed

‎Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,15 @@ default = [
257257
"kamui",
258258
"ken",
259259
"kirby",
260-
# "koopa",
260+
"koopa",
261261
# "koopag",
262-
# "koopajr",
263-
# "krool",
264-
# "link",
265-
# "littlemac",
266-
# "lucario",
267-
# "lucas",
268-
# "lucina",
262+
"koopajr",
263+
"krool",
264+
"link",
265+
"littlemac",
266+
"lucario",
267+
"lucas",
268+
"lucina",
269269
"luigi",
270270
"mario",
271271
"mariod",

‎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(Main, dolly_meter)
877+
.on_line(Exec, dolly_meter)
878878
.install();
879879
}

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

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

3-
#[acmd_script( agent = "koopa", script = "game_attackairn", category = ACMD_GAME, low_priority )]
4-
unsafe fn koopa_attack_air_n_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn koopa_attack_air_n_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
if is_excute(fighter) {
@@ -35,8 +35,8 @@ unsafe fn koopa_attack_air_n_game(fighter: &mut L2CAgentBase) {
3535
}
3636
}
3737

38-
#[acmd_script( agent = "koopa", script = "effect_attackairn", category = ACMD_EFFECT, low_priority )]
39-
unsafe fn koopa_attack_air_n_effect(fighter: &mut L2CAgentBase) {
38+
39+
unsafe extern "C" fn koopa_attack_air_n_effect(fighter: &mut L2CAgentBase) {
4040
let lua_state = fighter.lua_state_agent;
4141
let boma = fighter.boma();
4242
frame(lua_state, 8.0);
@@ -55,8 +55,8 @@ unsafe fn koopa_attack_air_n_effect(fighter: &mut L2CAgentBase) {
5555
}
5656
}
5757

58-
#[acmd_script( agent = "koopa", script = "sound_attackairn", category = ACMD_SOUND, low_priority )]
59-
unsafe fn koopa_attack_air_n_sound(fighter: &mut L2CAgentBase) {
58+
59+
unsafe extern "C" fn koopa_attack_air_n_sound(fighter: &mut L2CAgentBase) {
6060
let lua_state = fighter.lua_state_agent;
6161
let boma = fighter.boma();
6262
frame(lua_state, 8.0);
@@ -65,8 +65,8 @@ unsafe fn koopa_attack_air_n_sound(fighter: &mut L2CAgentBase) {
6565
}
6666
}
6767

68-
#[acmd_script( agent = "koopa", script = "expression_attackairn", category = ACMD_EXPRESSION, low_priority )]
69-
unsafe fn koopa_attack_air_n_expression(fighter: &mut L2CAgentBase) {
68+
69+
unsafe extern "C" fn koopa_attack_air_n_expression(fighter: &mut L2CAgentBase) {
7070
let lua_state = fighter.lua_state_agent;
7171
let boma = fighter.boma();
7272
if is_excute(fighter) {
@@ -98,8 +98,8 @@ unsafe fn koopa_attack_air_n_expression(fighter: &mut L2CAgentBase) {
9898
}
9999
}
100100

101-
#[acmd_script( agent = "koopa", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
102-
unsafe fn koopa_attack_air_f_game(fighter: &mut L2CAgentBase) {
101+
102+
unsafe extern "C" fn koopa_attack_air_f_game(fighter: &mut L2CAgentBase) {
103103
let lua_state = fighter.lua_state_agent;
104104
let boma = fighter.boma();
105105
frame(lua_state, 4.0);
@@ -128,8 +128,8 @@ unsafe fn koopa_attack_air_f_game(fighter: &mut L2CAgentBase) {
128128

129129
}
130130

131-
#[acmd_script( agent = "koopa", script = "effect_attackairf", category = ACMD_EFFECT, low_priority )]
132-
unsafe fn koopa_attack_air_f_effect(fighter: &mut L2CAgentBase) {
131+
132+
unsafe extern "C" fn koopa_attack_air_f_effect(fighter: &mut L2CAgentBase) {
133133
let lua_state = fighter.lua_state_agent;
134134
let boma = fighter.boma();
135135
frame(lua_state, 11.0);
@@ -139,8 +139,8 @@ unsafe fn koopa_attack_air_f_effect(fighter: &mut L2CAgentBase) {
139139
}
140140
}
141141

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

169169
}
170170

171-
#[acmd_script( agent = "koopa", script = "expression_attackairb", category = ACMD_EXPRESSION, low_priority )]
172-
unsafe fn koopa_attack_air_b_expression(fighter: &mut L2CAgentBase) {
171+
172+
unsafe extern "C" fn koopa_attack_air_b_expression(fighter: &mut L2CAgentBase) {
173173
let lua_state = fighter.lua_state_agent;
174174
let boma = fighter.boma();
175175
frame(lua_state, 7.0);
@@ -182,8 +182,8 @@ unsafe fn koopa_attack_air_b_expression(fighter: &mut L2CAgentBase) {
182182
}
183183
}
184184

185-
#[acmd_script( agent = "koopa", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
186-
unsafe fn koopa_attack_air_hi_game(fighter: &mut L2CAgentBase) {
185+
186+
unsafe extern "C" fn koopa_attack_air_hi_game(fighter: &mut L2CAgentBase) {
187187
let lua_state = fighter.lua_state_agent;
188188
let boma = fighter.boma();
189189
frame(lua_state, 1.0);
@@ -214,8 +214,8 @@ unsafe fn koopa_attack_air_hi_game(fighter: &mut L2CAgentBase) {
214214

215215
}
216216

217-
#[acmd_script( agent = "koopa", script = "effect_attackairhi", category = ACMD_EFFECT, low_priority )]
218-
unsafe fn koopa_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
217+
218+
unsafe extern "C" fn koopa_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
219219
let lua_state = fighter.lua_state_agent;
220220
let boma = fighter.boma();
221221
frame(lua_state, 9.0);
@@ -229,8 +229,8 @@ unsafe fn koopa_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
229229
}
230230
}
231231

232-
#[acmd_script( agent = "koopa", script = "expression_attackairhi", category = ACMD_EXPRESSION, low_priority )]
233-
unsafe fn koopa_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
232+
233+
unsafe extern "C" fn koopa_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
234234
let lua_state = fighter.lua_state_agent;
235235
let boma = fighter.boma();
236236

@@ -240,8 +240,8 @@ unsafe fn koopa_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
240240
}
241241
}
242242

243-
#[acmd_script( agent = "koopa", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
244-
unsafe fn koopa_attack_air_lw_game(fighter: &mut L2CAgentBase) {
243+
244+
unsafe extern "C" fn koopa_attack_air_lw_game(fighter: &mut L2CAgentBase) {
245245
let lua_state = fighter.lua_state_agent;
246246
let boma = fighter.boma();
247247
frame(lua_state, 1.0);
@@ -273,8 +273,8 @@ unsafe fn koopa_attack_air_lw_game(fighter: &mut L2CAgentBase) {
273273

274274
}
275275

276-
#[acmd_script( agent = "koopa", script = "effect_attackairlw", category = ACMD_EFFECT, low_priority )]
277-
unsafe fn koopa_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
276+
277+
unsafe extern "C" fn koopa_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
278278
let lua_state = fighter.lua_state_agent;
279279
let boma = fighter.boma();
280280
frame(lua_state, 5.0);
@@ -291,8 +291,8 @@ unsafe fn koopa_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
291291
}
292292
}
293293

294-
#[acmd_script( agent = "koopa", script = "game_landingairlw", category = ACMD_GAME, low_priority )]
295-
unsafe fn koopa_landing_air_lw_game(fighter: &mut L2CAgentBase) {
294+
295+
unsafe extern "C" fn koopa_landing_air_lw_game(fighter: &mut L2CAgentBase) {
296296
let lua_state = fighter.lua_state_agent;
297297
let boma = fighter.boma();
298298
if is_excute(fighter) {
@@ -321,22 +321,22 @@ unsafe fn koopa_landing_air_lw_game(fighter: &mut L2CAgentBase) {
321321
}
322322
}
323323

324+
324325
pub fn install() {
325-
install_acmd_scripts!(
326-
koopa_attack_air_n_game,
327-
koopa_attack_air_n_effect,
328-
koopa_attack_air_n_sound,
329-
koopa_attack_air_n_expression,
330-
koopa_attack_air_f_game,
331-
koopa_attack_air_f_effect,
332-
koopa_attack_air_b_game,
333-
koopa_attack_air_b_expression,
334-
335-
koopa_attack_air_hi_game,
336-
koopa_attack_air_hi_effect,
337-
koopa_attack_air_hi_expression,
338-
koopa_attack_air_lw_game,
339-
koopa_attack_air_lw_effect,
340-
koopa_landing_air_lw_game,
341-
);
342-
}
326+
smashline::Agent::new("koopa")
327+
.acmd("game_attackairn", koopa_attack_air_n_game)
328+
.acmd("effect_attackairn", koopa_attack_air_n_effect)
329+
.acmd("sound_attackairn", koopa_attack_air_n_sound)
330+
.acmd("expression_attackairn", koopa_attack_air_n_expression)
331+
.acmd("game_attackairf", koopa_attack_air_f_game)
332+
.acmd("effect_attackairf", koopa_attack_air_f_effect)
333+
.acmd("game_attackairb", koopa_attack_air_b_game)
334+
.acmd("expression_attackairb", koopa_attack_air_b_expression)
335+
.acmd("game_attackairhi", koopa_attack_air_hi_game)
336+
.acmd("effect_attackairhi", koopa_attack_air_hi_effect)
337+
.acmd("expression_attackairhi", koopa_attack_air_hi_expression)
338+
.acmd("game_attackairlw", koopa_attack_air_lw_game)
339+
.acmd("effect_attackairlw", koopa_attack_air_lw_effect)
340+
.acmd("game_landingairlw", koopa_landing_air_lw_game)
341+
.install();
342+
}

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

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

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

2525
}
2626

27-
#[acmd_script( agent = "koopa", script = "effect_attack11", category = ACMD_EFFECT, low_priority )]
28-
unsafe fn koopa_attack_11_effect(fighter: &mut L2CAgentBase) {
27+
28+
unsafe extern "C" fn koopa_attack_11_effect(fighter: &mut L2CAgentBase) {
2929
let lua_state = fighter.lua_state_agent;
3030
let boma = fighter.boma();
3131
frame(lua_state, 6.0);
@@ -42,8 +42,8 @@ unsafe fn koopa_attack_11_effect(fighter: &mut L2CAgentBase) {
4242
}
4343
}
4444

45-
#[acmd_script( agent = "koopa", script = "game_attack12" , category = ACMD_GAME , low_priority)]
46-
unsafe fn koopa_attack_12_game(fighter: &mut L2CAgentBase) {
45+
46+
unsafe extern "C" fn koopa_attack_12_game(fighter: &mut L2CAgentBase) {
4747
let lua_state = fighter.lua_state_agent;
4848
let boma = fighter.boma();
4949
frame(lua_state, 9.0);
@@ -61,8 +61,8 @@ unsafe fn koopa_attack_12_game(fighter: &mut L2CAgentBase) {
6161

6262
}
6363

64-
#[acmd_script( agent = "koopa", script = "effect_attack12", category = ACMD_EFFECT, low_priority )]
65-
unsafe fn koopa_attack_12_effect(fighter: &mut L2CAgentBase) {
64+
65+
unsafe extern "C" fn koopa_attack_12_effect(fighter: &mut L2CAgentBase) {
6666
let lua_state = fighter.lua_state_agent;
6767
let boma = fighter.boma();
6868
frame(lua_state, 8.0);
@@ -79,8 +79,8 @@ unsafe fn koopa_attack_12_effect(fighter: &mut L2CAgentBase) {
7979
}
8080
}
8181

82-
#[acmd_script( agent = "koopa", script = "game_attackdash", category = ACMD_GAME, low_priority )]
83-
unsafe fn koopa_attack_dash_game(fighter: &mut L2CAgentBase) {
82+
83+
unsafe extern "C" fn koopa_attack_dash_game(fighter: &mut L2CAgentBase) {
8484
let lua_state = fighter.lua_state_agent;
8585
let boma = fighter.boma();
8686
sv_kinetic_energy!(set_speed_mul, fighter, FIGHTER_KINETIC_ENERGY_ID_MOTION, 0.7);
@@ -101,8 +101,8 @@ unsafe fn koopa_attack_dash_game(fighter: &mut L2CAgentBase) {
101101

102102
}
103103

104-
#[acmd_script( agent = "koopa", script = "effect_attackdash", category = ACMD_EFFECT, low_priority )]
105-
unsafe fn koopa_attack_dash_effect(fighter: &mut L2CAgentBase) {
104+
105+
unsafe extern "C" fn koopa_attack_dash_effect(fighter: &mut L2CAgentBase) {
106106
let lua_state = fighter.lua_state_agent;
107107
let boma = fighter.boma();
108108

@@ -136,8 +136,8 @@ unsafe fn koopa_attack_dash_effect(fighter: &mut L2CAgentBase) {
136136
}
137137
}
138138

139-
#[acmd_script( agent = "koopa", script = "sound_attackdash", category = ACMD_SOUND, low_priority )]
140-
unsafe fn koopa_attack_dash_sound(fighter: &mut L2CAgentBase) {
139+
140+
unsafe extern "C" fn koopa_attack_dash_sound(fighter: &mut L2CAgentBase) {
141141
let lua_state = fighter.lua_state_agent;
142142
let boma = fighter.boma();
143143

@@ -155,8 +155,8 @@ unsafe fn koopa_attack_dash_sound(fighter: &mut L2CAgentBase) {
155155

156156
}
157157

158-
#[acmd_script( agent = "koopa", script = "expression_attackdash", category = ACMD_EXPRESSION, low_priority )]
159-
unsafe fn koopa_attack_dash_expression(fighter: &mut L2CAgentBase) {
158+
159+
unsafe extern "C" fn koopa_attack_dash_expression(fighter: &mut L2CAgentBase) {
160160
let lua_state = fighter.lua_state_agent;
161161
let boma = fighter.boma();
162162

@@ -169,15 +169,16 @@ unsafe fn koopa_attack_dash_expression(fighter: &mut L2CAgentBase) {
169169
}
170170
}
171171

172+
172173
pub fn install() {
173-
install_acmd_scripts!(
174-
koopa_attack_11_game,
175-
koopa_attack_11_effect,
176-
koopa_attack_12_game,
177-
koopa_attack_12_effect,
178-
koopa_attack_dash_game,
179-
koopa_attack_dash_effect,
180-
koopa_attack_dash_sound,
181-
koopa_attack_dash_expression,
182-
);
183-
}
174+
smashline::Agent::new("koopa")
175+
.acmd("game_attack11", koopa_attack_11_game)
176+
.acmd("effect_attack11", koopa_attack_11_effect)
177+
.acmd("game_attack12", koopa_attack_12_game)
178+
.acmd("effect_attack12", koopa_attack_12_effect)
179+
.acmd("game_attackdash", koopa_attack_dash_game)
180+
.acmd("effect_attackdash", koopa_attack_dash_effect)
181+
.acmd("sound_attackdash", koopa_attack_dash_sound)
182+
.acmd("expression_attackdash", koopa_attack_dash_expression)
183+
.install();
184+
}

0 commit comments

Comments
 (0)