Skip to content

Commit 1d6a0bc

Browse files
blu-devblu-dev
committed
ryu, roy, rosetta, rockman, robot, ridley
1 parent 764aa0f commit 1d6a0bc

Some content is hidden

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

97 files changed

+1993
-1666
lines changed

‎Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,12 @@ default = [
296296
# "pzenigame",
297297
# "reflet",
298298
# "richter",
299-
# "ridley",
300-
# "robot",
301-
# "rockman",
302-
# "rosetta",
303-
# "roy",
304-
# "ryu",
299+
"ridley",
300+
"robot",
301+
"rockman",
302+
"rosetta",
303+
"roy",
304+
"ryu",
305305
"samus",
306306
"samusd",
307307
"sheik",

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

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

44

5-
#[acmd_script( agent = "ridley", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
6-
unsafe fn ridley_attack_air_n_game(fighter: &mut L2CAgentBase) {
5+
6+
unsafe extern "C" fn ridley_attack_air_n_game(fighter: &mut L2CAgentBase) {
77
let lua_state = fighter.lua_state_agent;
88
let boma = fighter.boma();
99
frame(lua_state, 3.0);
@@ -37,8 +37,8 @@ unsafe fn ridley_attack_air_n_game(fighter: &mut L2CAgentBase) {
3737

3838
}
3939

40-
#[acmd_script( agent = "ridley", script = "effect_attackairn" , category = ACMD_EFFECT , low_priority)]
41-
unsafe fn ridley_attack_air_n_effect(fighter: &mut L2CAgentBase) {
40+
41+
unsafe extern "C" fn ridley_attack_air_n_effect(fighter: &mut L2CAgentBase) {
4242
let lua_state = fighter.lua_state_agent;
4343
let boma = fighter.boma();
4444
frame(lua_state, 8.0);
@@ -48,8 +48,8 @@ unsafe fn ridley_attack_air_n_effect(fighter: &mut L2CAgentBase) {
4848
}
4949
}
5050

51-
#[acmd_script( agent = "ridley", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
52-
unsafe fn ridley_attack_air_f_game(fighter: &mut L2CAgentBase) {
51+
52+
unsafe extern "C" fn ridley_attack_air_f_game(fighter: &mut L2CAgentBase) {
5353
let lua_state = fighter.lua_state_agent;
5454
let boma = fighter.boma();
5555
frame(lua_state, 3.0);
@@ -109,8 +109,8 @@ unsafe fn ridley_attack_air_f_game(fighter: &mut L2CAgentBase) {
109109

110110
}
111111

112-
#[acmd_script( agent = "ridley", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
113-
unsafe fn ridley_attack_air_b_game(fighter: &mut L2CAgentBase) {
112+
113+
unsafe extern "C" fn ridley_attack_air_b_game(fighter: &mut L2CAgentBase) {
114114
let lua_state = fighter.lua_state_agent;
115115
let boma = fighter.boma();
116116
frame(lua_state, 1.0);
@@ -145,8 +145,8 @@ unsafe fn ridley_attack_air_b_game(fighter: &mut L2CAgentBase) {
145145

146146
}
147147

148-
#[acmd_script( agent = "ridley", script = "effect_attackairb" , category = ACMD_EFFECT , low_priority)]
149-
unsafe fn ridley_attack_air_b_effect(fighter: &mut L2CAgentBase) {
148+
149+
unsafe extern "C" fn ridley_attack_air_b_effect(fighter: &mut L2CAgentBase) {
150150
let lua_state = fighter.lua_state_agent;
151151
let boma = fighter.boma();
152152
frame(lua_state, 10.0);
@@ -155,8 +155,8 @@ unsafe fn ridley_attack_air_b_effect(fighter: &mut L2CAgentBase) {
155155
}
156156
}
157157

158-
#[acmd_script( agent = "ridley", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
159-
unsafe fn ridley_attack_air_hi_game(fighter: &mut L2CAgentBase) {
158+
159+
unsafe extern "C" fn ridley_attack_air_hi_game(fighter: &mut L2CAgentBase) {
160160
let lua_state = fighter.lua_state_agent;
161161
let boma = fighter.boma();
162162
frame(lua_state, 4.0);
@@ -194,8 +194,8 @@ unsafe fn ridley_attack_air_hi_game(fighter: &mut L2CAgentBase) {
194194

195195
}
196196

197-
#[acmd_script( agent = "ridley", script = "game_attackairlw", category = ACMD_GAME , low_priority )]
198-
unsafe fn ridley_attack_air_lw_game(fighter : &mut L2CAgentBase) {
197+
198+
unsafe extern "C" fn ridley_attack_air_lw_game(fighter : &mut L2CAgentBase) {
199199
let lua_state = fighter.lua_state_agent;
200200
let boma = fighter.boma();
201201
frame(lua_state, 1.0);
@@ -240,8 +240,8 @@ unsafe fn ridley_attack_air_lw_game(fighter : &mut L2CAgentBase) {
240240
}
241241
}
242242

243-
#[acmd_script( agent = "ridley", script = "effect_attackairlw", category = ACMD_EFFECT , low_priority )]
244-
unsafe fn ridley_attack_air_lw_effect(fighter : &mut L2CAgentBase) {
243+
244+
unsafe extern "C" fn ridley_attack_air_lw_effect(fighter : &mut L2CAgentBase) {
245245
let lua_state = fighter.lua_state_agent;
246246
let boma = fighter.boma();
247247
frame(lua_state, 20.0);
@@ -251,8 +251,8 @@ unsafe fn ridley_attack_air_lw_effect(fighter : &mut L2CAgentBase) {
251251
}
252252
}
253253

254-
#[acmd_script( agent = "ridley", script = "sound_attackairlw", category = ACMD_SOUND , low_priority )]
255-
unsafe fn ridley_attack_air_lw_sound(fighter : &mut L2CAgentBase) {
254+
255+
unsafe extern "C" fn ridley_attack_air_lw_sound(fighter : &mut L2CAgentBase) {
256256
let lua_state = fighter.lua_state_agent;
257257
let boma = fighter.boma();
258258
frame(lua_state, 16.0);
@@ -261,8 +261,8 @@ unsafe fn ridley_attack_air_lw_sound(fighter : &mut L2CAgentBase) {
261261
}
262262
}
263263

264-
#[acmd_script( agent = "ridley", script = "expression_attackairlw", category = ACMD_EXPRESSION , low_priority )]
265-
unsafe fn ridley_attack_air_lw_expression(fighter : &mut L2CAgentBase) {
264+
265+
unsafe extern "C" fn ridley_attack_air_lw_expression(fighter : &mut L2CAgentBase) {
266266
let lua_state = fighter.lua_state_agent;
267267
let boma = fighter.boma();
268268
if is_excute(fighter) {
@@ -275,8 +275,8 @@ unsafe fn ridley_attack_air_lw_expression(fighter : &mut L2CAgentBase) {
275275
}
276276
}
277277

278-
#[acmd_script( agent = "ridley", script = "sound_landingairlw", category = ACMD_SOUND , low_priority )]
279-
unsafe fn ridley_landing_air_lw_sound(fighter : &mut L2CAgentBase) {
278+
279+
unsafe extern "C" fn ridley_landing_air_lw_sound(fighter : &mut L2CAgentBase) {
280280
let lua_state = fighter.lua_state_agent;
281281
let boma = fighter.boma();
282282
frame(lua_state, 2.0);
@@ -285,8 +285,8 @@ unsafe fn ridley_landing_air_lw_sound(fighter : &mut L2CAgentBase) {
285285
}
286286
}
287287

288-
#[acmd_script( agent = "ridley", script = "expression_landingairlw", category = ACMD_EXPRESSION , low_priority )]
289-
unsafe fn ridley_landing_air_lw_expression(fighter : &mut L2CAgentBase) {
288+
289+
unsafe extern "C" fn ridley_landing_air_lw_expression(fighter : &mut L2CAgentBase) {
290290
let lua_state = fighter.lua_state_agent;
291291
let boma = fighter.boma();
292292
if is_excute(fighter) {
@@ -295,20 +295,22 @@ unsafe fn ridley_landing_air_lw_expression(fighter : &mut L2CAgentBase) {
295295
}
296296
}
297297

298+
299+
300+
298301
pub fn install() {
299-
install_acmd_scripts!(
300-
ridley_attack_air_n_game,
301-
ridley_attack_air_n_effect,
302-
ridley_attack_air_f_game,
303-
ridley_attack_air_b_game,
304-
ridley_attack_air_b_effect,
305-
ridley_attack_air_hi_game,
306-
ridley_attack_air_lw_game,
307-
ridley_attack_air_lw_effect,
308-
ridley_attack_air_lw_sound,
309-
ridley_attack_air_lw_expression,
310-
ridley_landing_air_lw_sound,
311-
ridley_landing_air_lw_expression,
312-
);
302+
smashline::Agent::new("ridley")
303+
.acmd("game_attackairn", ridley_attack_air_n_game)
304+
.acmd("effect_attackairn", ridley_attack_air_n_effect)
305+
.acmd("game_attackairf", ridley_attack_air_f_game)
306+
.acmd("game_attackairb", ridley_attack_air_b_game)
307+
.acmd("effect_attackairb", ridley_attack_air_b_effect)
308+
.acmd("game_attackairhi", ridley_attack_air_hi_game)
309+
.acmd("game_attackairlw", ridley_attack_air_lw_game)
310+
.acmd("effect_attackairlw", ridley_attack_air_lw_effect)
311+
.acmd("sound_attackairlw", ridley_attack_air_lw_sound)
312+
.acmd("expression_attackairlw", ridley_attack_air_lw_expression)
313+
.acmd("sound_landingairlw", ridley_landing_air_lw_sound)
314+
.acmd("expression_landingairlw", ridley_landing_air_lw_expression)
315+
.install();
313316
}
314-

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

+23-21
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
use super::*;
33

4-
#[acmd_script(agent = "ridley", script = "game_attack11" , category = ACMD_GAME , low_priority)]
5-
unsafe fn ridley_attack_11_game(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn ridley_attack_11_game(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 4.0);
@@ -22,8 +22,8 @@ unsafe fn ridley_attack_11_game(fighter: &mut L2CAgentBase) {
2222
}
2323
}
2424

25-
#[acmd_script( agent = "ridley", script = "effect_attack11", category = ACMD_EFFECT, low_priority)]
26-
unsafe fn ridley_attack11_effect(fighter: &mut L2CAgentBase) {
25+
26+
unsafe extern "C" fn ridley_attack11_effect(fighter: &mut L2CAgentBase) {
2727
let lua_state = fighter.lua_state_agent;
2828
frame(lua_state, 3.0);
2929
if is_excute(fighter) {
@@ -32,8 +32,8 @@ unsafe fn ridley_attack11_effect(fighter: &mut L2CAgentBase) {
3232
}
3333
}
3434

35-
#[acmd_script(agent = "ridley", script = "game_attack12" , category = ACMD_GAME , low_priority)]
36-
unsafe fn ridley_attack_12_game(fighter: &mut L2CAgentBase) {
35+
36+
unsafe extern "C" fn ridley_attack_12_game(fighter: &mut L2CAgentBase) {
3737
let lua_state = fighter.lua_state_agent;
3838
let boma = fighter.boma();
3939
frame(lua_state, 5.0);
@@ -61,8 +61,8 @@ unsafe fn ridley_attack_12_game(fighter: &mut L2CAgentBase) {
6161
}
6262
}
6363

64-
#[acmd_script( agent = "ridley", script = "effect_attack12", category = ACMD_EFFECT, low_priority)]
65-
unsafe fn ridley_attack12_effect(fighter: &mut L2CAgentBase) {
64+
65+
unsafe extern "C" fn ridley_attack12_effect(fighter: &mut L2CAgentBase) {
6666
let lua_state = fighter.lua_state_agent;
6767
frame(lua_state, 5.0);
6868
if is_excute(fighter) {
@@ -72,8 +72,8 @@ unsafe fn ridley_attack12_effect(fighter: &mut L2CAgentBase) {
7272
}
7373
}
7474

75-
#[acmd_script(agent = "ridley", script = "game_attack13" , category = ACMD_GAME , low_priority)]
76-
unsafe fn ridley_attack_13_game(fighter: &mut L2CAgentBase) {
75+
76+
unsafe extern "C" fn ridley_attack_13_game(fighter: &mut L2CAgentBase) {
7777
let lua_state = fighter.lua_state_agent;
7878
let boma = fighter.boma();
7979
frame(lua_state, 4.0);
@@ -88,8 +88,8 @@ unsafe fn ridley_attack_13_game(fighter: &mut L2CAgentBase) {
8888
}
8989

9090

91-
#[acmd_script( agent = "ridley", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
92-
unsafe fn ridley_attack_dash_game(fighter: &mut L2CAgentBase) {
91+
92+
unsafe extern "C" fn ridley_attack_dash_game(fighter: &mut L2CAgentBase) {
9393
let lua_state = fighter.lua_state_agent;
9494
let boma = fighter.boma();
9595
// base 0.9
@@ -105,14 +105,16 @@ unsafe fn ridley_attack_dash_game(fighter: &mut L2CAgentBase) {
105105

106106
}
107107

108+
109+
110+
108111
pub fn install() {
109-
install_acmd_scripts!(
110-
ridley_attack_11_game,
111-
ridley_attack11_effect,
112-
ridley_attack_12_game,
113-
ridley_attack12_effect,
114-
ridley_attack_13_game,
115-
ridley_attack_dash_game,
116-
);
112+
smashline::Agent::new("ridley")
113+
.acmd("game_attack11", ridley_attack_11_game)
114+
.acmd("effect_attack11", ridley_attack11_effect)
115+
.acmd("game_attack12", ridley_attack_12_game)
116+
.acmd("effect_attack12", ridley_attack12_effect)
117+
.acmd("game_attack13", ridley_attack_13_game)
118+
.acmd("game_attackdash", ridley_attack_dash_game)
119+
.install();
117120
}
118-

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