Skip to content

Commit c241a15

Browse files
SkewedAskewSkewedAskew
committed
Bayonetta, Hero
1 parent f5fffe1 commit c241a15

31 files changed

+683
-625
lines changed

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ utils.workspace = true
228228

229229
[features]
230230
default = [
231-
# "bayonetta",
232-
# "brave",
231+
"bayonetta",
232+
"brave",
233233
# "buddy",
234234
# "captain",
235235
# "chrom",

‎dynamic/src/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,6 @@ pub mod statuses {
14931493
}
14941494

14951495
pub mod bayonetta {
1496-
pub const SPECIAL_S_KICK: i32 = 0;
1496+
pub const SPECIAL_S_KICK: i32 = 0x1F2;
14971497
}
14981498
}

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

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

44

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

5353
}
5454

55-
#[acmd_script( agent = "bayonetta", script = "game_attackairnhold" , category = ACMD_GAME , low_priority)]
56-
unsafe fn bayonetta_attack_air_n_hold_game(fighter: &mut L2CAgentBase) {
55+
56+
unsafe extern "C" fn bayonetta_attack_air_n_hold_game(fighter: &mut L2CAgentBase) {
5757
let lua_state = fighter.lua_state_agent;
5858
let boma = fighter.boma();
5959
FT_MOTION_RATE(fighter, 1.0);
@@ -91,8 +91,8 @@ unsafe fn bayonetta_attack_air_n_hold_game(fighter: &mut L2CAgentBase) {
9191

9292
}
9393

94-
#[acmd_script( agent = "bayonetta", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
95-
unsafe fn bayonetta_attack_air_f_game(fighter: &mut L2CAgentBase) {
94+
95+
unsafe extern "C" fn bayonetta_attack_air_f_game(fighter: &mut L2CAgentBase) {
9696
let lua_state = fighter.lua_state_agent;
9797
let boma = fighter.boma();
9898
frame(lua_state, 1.0);
@@ -137,8 +137,8 @@ unsafe fn bayonetta_attack_air_f_game(fighter: &mut L2CAgentBase) {
137137
}
138138
}
139139

140-
#[acmd_script( agent = "bayonetta", script = "game_attackairf2" , category = ACMD_GAME , low_priority)]
141-
unsafe fn bayonetta_attack_air_f2_game(fighter: &mut L2CAgentBase) {
140+
141+
unsafe extern "C" fn bayonetta_attack_air_f2_game(fighter: &mut L2CAgentBase) {
142142
let lua_state = fighter.lua_state_agent;
143143
let boma = fighter.boma();
144144
frame(lua_state, 1.0);
@@ -185,8 +185,8 @@ unsafe fn bayonetta_attack_air_f2_game(fighter: &mut L2CAgentBase) {
185185
}
186186
}
187187

188-
#[acmd_script( agent = "bayonetta", script = "game_attackairf3" , category = ACMD_GAME , low_priority)]
189-
unsafe fn bayonetta_attack_air_f3_game(fighter: &mut L2CAgentBase) {
188+
189+
unsafe extern "C" fn bayonetta_attack_air_f3_game(fighter: &mut L2CAgentBase) {
190190
let lua_state = fighter.lua_state_agent;
191191
let boma = fighter.boma();
192192
frame(lua_state, 1.0);
@@ -229,8 +229,8 @@ unsafe fn bayonetta_attack_air_f3_game(fighter: &mut L2CAgentBase) {
229229
}
230230
}
231231

232-
#[acmd_script( agent = "bayonetta", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
233-
unsafe fn bayonetta_attack_air_b_game(fighter: &mut L2CAgentBase) {
232+
233+
unsafe extern "C" fn bayonetta_attack_air_b_game(fighter: &mut L2CAgentBase) {
234234
let lua_state = fighter.lua_state_agent;
235235
let boma = fighter.boma();
236236
frame(lua_state, 1.0);
@@ -266,8 +266,8 @@ unsafe fn bayonetta_attack_air_b_game(fighter: &mut L2CAgentBase) {
266266
}
267267
}
268268

269-
#[acmd_script( agent = "bayonetta", script = "expression_attackairb", category = ACMD_EXPRESSION, low_priority )]
270-
unsafe fn bayonetta_attack_air_b_expression(fighter: &mut L2CAgentBase) {
269+
270+
unsafe extern "C" fn bayonetta_attack_air_b_expression(fighter: &mut L2CAgentBase) {
271271
let lua_state = fighter.lua_state_agent;
272272
let boma = fighter.boma();
273273
frame(lua_state, 17.0);
@@ -280,8 +280,8 @@ unsafe fn bayonetta_attack_air_b_expression(fighter: &mut L2CAgentBase) {
280280
}
281281
}
282282

283-
#[acmd_script( agent = "bayonetta", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
284-
unsafe fn bayonetta_attack_air_hi_game(fighter: &mut L2CAgentBase) {
283+
284+
unsafe extern "C" fn bayonetta_attack_air_hi_game(fighter: &mut L2CAgentBase) {
285285
let lua_state = fighter.lua_state_agent;
286286
let boma = fighter.boma();
287287
frame(lua_state, 1.0);
@@ -325,8 +325,8 @@ unsafe fn bayonetta_attack_air_hi_game(fighter: &mut L2CAgentBase) {
325325
}
326326
}
327327

328-
#[acmd_script( agent = "bayonetta", script = "effect_attackairhi", category = ACMD_EFFECT, low_priority )]
329-
unsafe fn bayonetta_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
328+
329+
unsafe extern "C" fn bayonetta_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
330330
frame(fighter.lua_state_agent, 10.0);
331331
if is_excute(fighter) {
332332
EFFECT_FOLLOW_WORK(fighter, *FIGHTER_BAYONETTA_INSTANCE_WORK_ID_INT_EFFECT_KIND_BAYONETTA_ATTACK_ARC1, Hash40::new("top"), 0, 14.6, -0.1, 0, -55, -90, 1.14, true);
@@ -339,8 +339,8 @@ unsafe fn bayonetta_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
339339
}
340340

341341

342-
#[acmd_script( agent = "bayonetta", script = "expression_attackairhi", category = ACMD_EXPRESSION, low_priority )]
343-
unsafe fn bayonetta_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
342+
343+
unsafe extern "C" fn bayonetta_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
344344
let lua_state = fighter.lua_state_agent;
345345
let boma = fighter.boma();
346346
frame(lua_state, 8.0);
@@ -357,8 +357,8 @@ unsafe fn bayonetta_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
357357
}
358358
}
359359

360-
#[acmd_script( agent = "bayonetta", script = "game_attackairhihold" , category = ACMD_GAME , low_priority)]
361-
unsafe fn bayonetta_attack_air_hi_hold_game(fighter: &mut L2CAgentBase) {
360+
361+
unsafe extern "C" fn bayonetta_attack_air_hi_hold_game(fighter: &mut L2CAgentBase) {
362362
let lua_state = fighter.lua_state_agent;
363363
let boma = fighter.boma();
364364
frame(lua_state, 1.0);
@@ -372,8 +372,8 @@ unsafe fn bayonetta_attack_air_hi_hold_game(fighter: &mut L2CAgentBase) {
372372
}
373373
}
374374

375-
#[acmd_script( agent = "bayonetta", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
376-
unsafe fn bayonetta_attack_air_lw_game(fighter: &mut L2CAgentBase) {
375+
376+
unsafe extern "C" fn bayonetta_attack_air_lw_game(fighter: &mut L2CAgentBase) {
377377
let lua_state = fighter.lua_state_agent;
378378
let boma = fighter.boma();
379379
frame(lua_state, 1.0);
@@ -432,8 +432,8 @@ unsafe fn bayonetta_attack_air_lw_game(fighter: &mut L2CAgentBase) {
432432
}
433433
}
434434

435-
#[acmd_script( agent = "bayonetta", script = "game_landingairlw" , category = ACMD_GAME , low_priority)]
436-
unsafe fn bayonetta_landing_air_lw_game(fighter: &mut L2CAgentBase) {
435+
436+
unsafe extern "C" fn bayonetta_landing_air_lw_game(fighter: &mut L2CAgentBase) {
437437
let lua_state = fighter.lua_state_agent;
438438
let boma = fighter.boma();
439439
frame(lua_state, 1.0);
@@ -454,19 +454,19 @@ unsafe fn bayonetta_landing_air_lw_game(fighter: &mut L2CAgentBase) {
454454

455455

456456
pub fn install() {
457-
install_acmd_scripts!(
458-
bayonetta_attack_air_n_game,
459-
bayonetta_attack_air_n_hold_game,
460-
bayonetta_attack_air_f_game,
461-
bayonetta_attack_air_f2_game,
462-
bayonetta_attack_air_f3_game,
463-
bayonetta_attack_air_b_game,
464-
bayonetta_attack_air_b_expression,
465-
bayonetta_attack_air_hi_game,
466-
bayonetta_attack_air_hi_effect,
467-
bayonetta_attack_air_hi_expression,
468-
bayonetta_attack_air_hi_hold_game,
469-
bayonetta_attack_air_lw_game,
470-
bayonetta_landing_air_lw_game
471-
);
472-
}
457+
smashline::Agent::new("bayonetta")
458+
.acmd("game_attackairn", bayonetta_attack_air_n_game)
459+
.acmd("game_attackairnhold", bayonetta_attack_air_n_hold_game)
460+
.acmd("game_attackairf", bayonetta_attack_air_f_game)
461+
.acmd("game_attackairf2", bayonetta_attack_air_f2_game)
462+
.acmd("game_attackairf3", bayonetta_attack_air_f3_game)
463+
.acmd("game_attackairb", bayonetta_attack_air_b_game)
464+
.acmd("expression_attackairb", bayonetta_attack_air_b_expression)
465+
.acmd("game_attackairhi", bayonetta_attack_air_hi_game)
466+
.acmd("effect_attackairhi", bayonetta_attack_air_hi_effect)
467+
.acmd("expression_attackairhi", bayonetta_attack_air_hi_expression)
468+
.acmd("game_attackairhihold", bayonetta_attack_air_hi_hold_game)
469+
.acmd("game_attackairlw", bayonetta_attack_air_lw_game)
470+
.acmd("game_landingairlw", bayonetta_landing_air_lw_game)
471+
.install();
472+
}

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

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

44

5-
#[acmd_script( agent = "bayonetta", script = "game_attack11" , category = ACMD_GAME , low_priority)]
6-
unsafe fn bayonetta_attack_11_game(fighter: &mut L2CAgentBase) {
5+
6+
unsafe extern "C" fn bayonetta_attack_11_game(fighter: &mut L2CAgentBase) {
77
let lua_state = fighter.lua_state_agent;
88
let boma = fighter.boma();
99
frame(lua_state, 1.0);
@@ -39,8 +39,8 @@ unsafe fn bayonetta_attack_11_game(fighter: &mut L2CAgentBase) {
3939
}
4040
}
4141

42-
#[acmd_script( agent = "bayonetta", script = "game_attack12" , category = ACMD_GAME , low_priority)]
43-
unsafe fn bayonetta_attack_12_game(fighter: &mut L2CAgentBase) {
42+
43+
unsafe extern "C" fn bayonetta_attack_12_game(fighter: &mut L2CAgentBase) {
4444
let lua_state = fighter.lua_state_agent;
4545
let boma = fighter.boma();
4646
frame(lua_state, 1.0);
@@ -82,8 +82,8 @@ unsafe fn bayonetta_attack_12_game(fighter: &mut L2CAgentBase) {
8282
}
8383
}
8484

85-
#[acmd_script( agent = "bayonetta", script = "game_attack13" , category = ACMD_GAME , low_priority)]
86-
unsafe fn bayonetta_attack_13_game(fighter: &mut L2CAgentBase) {
85+
86+
unsafe extern "C" fn bayonetta_attack_13_game(fighter: &mut L2CAgentBase) {
8787
let lua_state = fighter.lua_state_agent;
8888
let boma = fighter.boma();
8989
frame(lua_state, 1.0);
@@ -109,8 +109,8 @@ unsafe fn bayonetta_attack_13_game(fighter: &mut L2CAgentBase) {
109109
}
110110
}
111111

112-
#[acmd_script( agent = "bayonetta", script = "game_attack100", category = ACMD_GAME, low_priority )]
113-
unsafe fn bayonetta_attack_100_game(fighter: &mut L2CAgentBase) {
112+
113+
unsafe extern "C" fn bayonetta_attack_100_game(fighter: &mut L2CAgentBase) {
114114
let lua_state = fighter.lua_state_agent;
115115
let boma = fighter.boma();
116116
for _ in 0..99 {
@@ -174,8 +174,8 @@ unsafe fn bayonetta_attack_100_game(fighter: &mut L2CAgentBase) {
174174
}
175175
}
176176

177-
#[acmd_script( agent = "bayonetta", script = "game_attack100end" , category = ACMD_GAME , low_priority)]
178-
unsafe fn bayonetta_attack_100_end_game(fighter: &mut L2CAgentBase) {
177+
178+
unsafe extern "C" fn bayonetta_attack_100_end_game(fighter: &mut L2CAgentBase) {
179179
let lua_state = fighter.lua_state_agent;
180180
let boma = fighter.boma();
181181
frame(lua_state, 1.0);
@@ -213,8 +213,8 @@ unsafe fn bayonetta_attack_100_end_game(fighter: &mut L2CAgentBase) {
213213
FT_MOTION_RATE(fighter, 18/(41-30));
214214
}
215215

216-
#[acmd_script( agent = "bayonetta", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
217-
unsafe fn bayonetta_attack_dash_game(fighter: &mut L2CAgentBase) {
216+
217+
unsafe extern "C" fn bayonetta_attack_dash_game(fighter: &mut L2CAgentBase) {
218218
let lua_state = fighter.lua_state_agent;
219219
let boma = fighter.boma();
220220
sv_kinetic_energy!(set_speed_mul, fighter, FIGHTER_KINETIC_ENERGY_ID_MOTION, 0.93);
@@ -252,12 +252,12 @@ unsafe fn bayonetta_attack_dash_game(fighter: &mut L2CAgentBase) {
252252
}
253253

254254
pub fn install() {
255-
install_acmd_scripts!(
256-
bayonetta_attack_11_game,
257-
bayonetta_attack_12_game,
258-
bayonetta_attack_13_game,
259-
bayonetta_attack_100_game,
260-
bayonetta_attack_100_end_game,
261-
bayonetta_attack_dash_game,
262-
);
263-
}
255+
smashline::Agent::new("bayonetta")
256+
.acmd("game_attack11", bayonetta_attack_11_game)
257+
.acmd("game_attack12", bayonetta_attack_12_game)
258+
.acmd("game_attack13", bayonetta_attack_13_game)
259+
.acmd("game_attack100", bayonetta_attack_100_game)
260+
.acmd("game_attack100end", bayonetta_attack_100_end_game)
261+
.acmd("game_attackdash", bayonetta_attack_dash_game)
262+
.install();
263+
}

0 commit comments

Comments
 (0)