Skip to content

Commit d022e2a

Browse files
WuBoytHWuBoytH
committed
Robin/Richter
1 parent dfdb39e commit d022e2a

25 files changed

+474
-413
lines changed

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ default = [
294294
"popo",
295295
"purin",
296296
"pzenigame",
297-
# "reflet",
298-
# "richter",
297+
"reflet",
298+
"richter",
299299
"ridley",
300300
"robot",
301301
"rockman",

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

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

3-
#[acmd_script( agent = "reflet", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
4-
unsafe fn reflet_attack_air_n_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn reflet_attack_air_n_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
frame(lua_state, 1.0);
@@ -69,8 +69,8 @@ unsafe fn reflet_attack_air_n_game(fighter: &mut L2CAgentBase) {
6969

7070
}
7171

72-
#[acmd_script( agent = "reflet", script = "effect_attackairn", category = ACMD_EFFECT, low_priority )]
73-
unsafe fn reflet_attack_air_n_effect(fighter: &mut L2CAgentBase) {
72+
73+
unsafe extern "C" fn reflet_attack_air_n_effect(fighter: &mut L2CAgentBase) {
7474
let lua_state = fighter.lua_state_agent;
7575
let boma = fighter.boma();
7676
frame(lua_state, 6.0);
@@ -111,8 +111,8 @@ unsafe fn reflet_attack_air_n_effect(fighter: &mut L2CAgentBase) {
111111
}
112112
}
113113

114-
#[acmd_script( agent = "reflet", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
115-
unsafe fn reflet_attack_air_f_game(fighter: &mut L2CAgentBase) {
114+
115+
unsafe extern "C" fn reflet_attack_air_f_game(fighter: &mut L2CAgentBase) {
116116
let lua_state = fighter.lua_state_agent;
117117
let boma = fighter.boma();
118118
frame(lua_state, 1.0);
@@ -166,8 +166,8 @@ unsafe fn reflet_attack_air_f_game(fighter: &mut L2CAgentBase) {
166166

167167
}
168168

169-
#[acmd_script( agent = "reflet", script = "expression_attackairf", category = ACMD_EXPRESSION, low_priority )]
170-
unsafe fn reflet_attack_air_f_expression(fighter: &mut L2CAgentBase) {
169+
170+
unsafe extern "C" fn reflet_attack_air_f_expression(fighter: &mut L2CAgentBase) {
171171
let lua_state = fighter.lua_state_agent;
172172
let boma = fighter.boma();
173173
if WorkModule::is_flag(boma, *FIGHTER_REFLET_INSTANCE_WORK_ID_FLAG_THUNDER_SWORD_ON) {
@@ -190,8 +190,8 @@ unsafe fn reflet_attack_air_f_expression(fighter: &mut L2CAgentBase) {
190190
}
191191
}
192192

193-
#[acmd_script( agent = "reflet", script = "effect_attackairf", category = ACMD_EFFECT, low_priority )]
194-
unsafe fn reflet_attack_air_f_effect(fighter: &mut L2CAgentBase) {
193+
194+
unsafe extern "C" fn reflet_attack_air_f_effect(fighter: &mut L2CAgentBase) {
195195
let lua_state = fighter.lua_state_agent;
196196
let boma = fighter.boma();
197197
frame(lua_state, 10.0);
@@ -218,8 +218,8 @@ unsafe fn reflet_attack_air_f_effect(fighter: &mut L2CAgentBase) {
218218
}
219219
}
220220

221-
#[acmd_script( agent = "reflet", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
222-
unsafe fn reflet_attack_air_b_game(fighter: &mut L2CAgentBase) {
221+
222+
unsafe extern "C" fn reflet_attack_air_b_game(fighter: &mut L2CAgentBase) {
223223
let lua_state = fighter.lua_state_agent;
224224
let boma = fighter.boma();
225225
if is_excute(fighter) {
@@ -269,8 +269,8 @@ unsafe fn reflet_attack_air_b_game(fighter: &mut L2CAgentBase) {
269269

270270
}
271271

272-
#[acmd_script( agent = "reflet", script = "effect_attackairb" , category = ACMD_EFFECT , low_priority)]
273-
unsafe fn reflet_attack_air_b_effect(fighter: &mut L2CAgentBase) {
272+
273+
unsafe extern "C" fn reflet_attack_air_b_effect(fighter: &mut L2CAgentBase) {
274274
let lua_state = fighter.lua_state_agent;
275275
let boma = fighter.boma();
276276
frame(lua_state, 7.0);
@@ -299,8 +299,8 @@ unsafe fn reflet_attack_air_b_effect(fighter: &mut L2CAgentBase) {
299299

300300
}
301301

302-
#[acmd_script( agent = "reflet", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
303-
unsafe fn reflet_attack_air_hi_game(fighter: &mut L2CAgentBase) {
302+
303+
unsafe extern "C" fn reflet_attack_air_hi_game(fighter: &mut L2CAgentBase) {
304304
let lua_state = fighter.lua_state_agent;
305305
let boma = fighter.boma();
306306
frame(lua_state, 1.0);
@@ -354,8 +354,8 @@ unsafe fn reflet_attack_air_hi_game(fighter: &mut L2CAgentBase) {
354354
}
355355
}
356356

357-
#[acmd_script( agent = "reflet", script = "effect_attackairhi", category = ACMD_EFFECT, low_priority )]
358-
unsafe fn reflet_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
357+
358+
unsafe extern "C" fn reflet_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
359359
let lua_state = fighter.lua_state_agent;
360360
let boma = fighter.boma();
361361
frame(lua_state, 9.0);
@@ -380,8 +380,8 @@ unsafe fn reflet_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
380380
}
381381
}
382382

383-
#[acmd_script( agent = "reflet", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
384-
unsafe fn reflet_attack_air_lw_game(fighter: &mut L2CAgentBase) {
383+
384+
unsafe extern "C" fn reflet_attack_air_lw_game(fighter: &mut L2CAgentBase) {
385385
let lua_state = fighter.lua_state_agent;
386386
let boma = fighter.boma();
387387
frame(lua_state, 2.0);
@@ -449,8 +449,8 @@ unsafe fn reflet_attack_air_lw_game(fighter: &mut L2CAgentBase) {
449449
}
450450
}
451451

452-
#[acmd_script( agent = "reflet", script = "effect_attackairlw" , category = ACMD_EFFECT , low_priority)]
453-
unsafe fn reflet_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
452+
453+
unsafe extern "C" fn reflet_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
454454
let lua_state = fighter.lua_state_agent;
455455
let boma = fighter.boma();
456456
frame(lua_state, 5.0);
@@ -498,18 +498,19 @@ unsafe fn reflet_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
498498

499499
}
500500

501+
501502
pub fn install() {
502-
install_acmd_scripts!(
503-
reflet_attack_air_n_game,
504-
reflet_attack_air_n_effect,
505-
reflet_attack_air_f_game,
506-
reflet_attack_air_f_effect,
507-
reflet_attack_air_f_expression,
508-
reflet_attack_air_b_game,
509-
reflet_attack_air_b_effect,
510-
reflet_attack_air_hi_game,
511-
reflet_attack_air_hi_effect,
512-
reflet_attack_air_lw_game,
513-
reflet_attack_air_lw_effect,
514-
);
515-
}
503+
smashline::Agent::new("reflet")
504+
.acmd("game_attackairn", reflet_attack_air_n_game)
505+
.acmd("effect_attackairn", reflet_attack_air_n_effect)
506+
.acmd("game_attackairf", reflet_attack_air_f_game)
507+
.acmd("expression_attackairf", reflet_attack_air_f_expression)
508+
.acmd("effect_attackairf", reflet_attack_air_f_effect)
509+
.acmd("game_attackairb", reflet_attack_air_b_game)
510+
.acmd("effect_attackairb", reflet_attack_air_b_effect)
511+
.acmd("game_attackairhi", reflet_attack_air_hi_game)
512+
.acmd("effect_attackairhi", reflet_attack_air_hi_effect)
513+
.acmd("game_attackairlw", reflet_attack_air_lw_game)
514+
.acmd("effect_attackairlw", reflet_attack_air_lw_effect)
515+
.install();
516+
}

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

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

44

5-
#[acmd_script(agent = "reflet", script = "game_attack11" , category = ACMD_GAME , low_priority)]
6-
unsafe fn reflet_attack_11_game(fighter: &mut L2CAgentBase) {
5+
6+
unsafe extern "C" fn reflet_attack_11_game(fighter: &mut L2CAgentBase) {
77
let lua_state = fighter.lua_state_agent;
88
let boma = fighter.boma();
99
if is_excute(fighter) {
@@ -36,8 +36,8 @@ unsafe fn reflet_attack_11_game(fighter: &mut L2CAgentBase) {
3636
}
3737
}
3838

39-
#[acmd_script( agent = "reflet", script = "expression_attack11", category = ACMD_EXPRESSION, low_priority )]
40-
unsafe fn reflet_attack_11_expression(fighter: &mut L2CAgentBase) {
39+
40+
unsafe extern "C" fn reflet_attack_11_expression(fighter: &mut L2CAgentBase) {
4141
let lua_state = fighter.lua_state_agent;
4242
let boma = fighter.boma();
4343
if is_excute(fighter) {
@@ -55,8 +55,8 @@ unsafe fn reflet_attack_11_expression(fighter: &mut L2CAgentBase) {
5555
}
5656
}
5757

58-
#[acmd_script(agent = "reflet", script = "game_attack12" , category = ACMD_GAME , low_priority)]
59-
unsafe fn reflet_attack_12_game(fighter: &mut L2CAgentBase) {
58+
59+
unsafe extern "C" fn reflet_attack_12_game(fighter: &mut L2CAgentBase) {
6060
let lua_state = fighter.lua_state_agent;
6161
let boma = fighter.boma();
6262
frame(lua_state, 3.0);
@@ -92,8 +92,8 @@ unsafe fn reflet_attack_12_game(fighter: &mut L2CAgentBase) {
9292
}
9393
}
9494

95-
#[acmd_script( agent = "reflet", script = "expression_attack12", category = ACMD_EXPRESSION, low_priority )]
96-
unsafe fn reflet_attack_12_expression(fighter: &mut L2CAgentBase) {
95+
96+
unsafe extern "C" fn reflet_attack_12_expression(fighter: &mut L2CAgentBase) {
9797
let lua_state = fighter.lua_state_agent;
9898
let boma = fighter.boma();
9999
if is_excute(fighter) {
@@ -111,8 +111,8 @@ unsafe fn reflet_attack_12_expression(fighter: &mut L2CAgentBase) {
111111
}
112112
}
113113

114-
#[acmd_script(agent = "reflet", script = "game_attack13" , category = ACMD_GAME , low_priority)]
115-
unsafe fn reflet_attack_13_game(fighter: &mut L2CAgentBase) {
114+
115+
unsafe extern "C" fn reflet_attack_13_game(fighter: &mut L2CAgentBase) {
116116
let lua_state = fighter.lua_state_agent;
117117
let boma = fighter.boma();
118118
frame(lua_state, 6.0);
@@ -125,8 +125,8 @@ unsafe fn reflet_attack_13_game(fighter: &mut L2CAgentBase) {
125125
}
126126
}
127127

128-
#[acmd_script( agent = "reflet", script = "game_attack100", category = ACMD_GAME, low_priority )]
129-
unsafe fn reflet_attack_100_game(fighter: &mut L2CAgentBase) {
128+
129+
unsafe extern "C" fn reflet_attack_100_game(fighter: &mut L2CAgentBase) {
130130
for _ in 0..99 {
131131
if is_excute(fighter) {
132132
ATTACK(fighter, 0, 0, Hash40::new("top"), 0.9, 65, 10, 0, 9, 8.0, 0.0, 9.0, 12.0, Some(0.0), Some(9.0), Some(8.0), 0.4, 0.4, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 3, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_MAGIC);
@@ -138,8 +138,8 @@ unsafe fn reflet_attack_100_game(fighter: &mut L2CAgentBase) {
138138
}
139139
}
140140

141-
#[acmd_script( agent = "reflet", script = "game_attack100end", category = ACMD_GAME, low_priority )]
142-
unsafe fn reflet_attack_100_end_game(fighter: &mut L2CAgentBase) {
141+
142+
unsafe extern "C" fn reflet_attack_100_end_game(fighter: &mut L2CAgentBase) {
143143
let lua_state = fighter.lua_state_agent;
144144
frame(lua_state, 5.0);
145145
if is_excute(fighter) {
@@ -155,8 +155,8 @@ unsafe fn reflet_attack_100_end_game(fighter: &mut L2CAgentBase) {
155155
}
156156
}
157157

158-
#[acmd_script( agent = "reflet", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
159-
unsafe fn reflet_attack_dash_game(fighter: &mut L2CAgentBase) {
158+
159+
unsafe extern "C" fn reflet_attack_dash_game(fighter: &mut L2CAgentBase) {
160160
let lua_state = fighter.lua_state_agent;
161161
let boma = fighter.boma();
162162
frame(lua_state, 8.0);
@@ -178,16 +178,18 @@ unsafe fn reflet_attack_dash_game(fighter: &mut L2CAgentBase) {
178178
}
179179

180180

181+
182+
183+
181184
pub fn install() {
182-
install_acmd_scripts!(
183-
reflet_attack_11_game,
184-
reflet_attack_11_expression,
185-
reflet_attack_12_game,
186-
reflet_attack_12_expression,
187-
reflet_attack_13_game,
188-
reflet_attack_100_game,
189-
reflet_attack_100_end_game,
190-
reflet_attack_dash_game,
191-
);
185+
smashline::Agent::new("reflet")
186+
.acmd("game_attack11", reflet_attack_11_game)
187+
.acmd("expression_attack11", reflet_attack_11_expression)
188+
.acmd("game_attack12", reflet_attack_12_game)
189+
.acmd("expression_attack12", reflet_attack_12_expression)
190+
.acmd("game_attack13", reflet_attack_13_game)
191+
.acmd("game_attack100", reflet_attack_100_game)
192+
.acmd("game_attack100end", reflet_attack_100_end_game)
193+
.acmd("game_attackdash", reflet_attack_dash_game)
194+
.install();
192195
}
193-

0 commit comments

Comments
 (0)