Skip to content

Commit e2a3d0b

Browse files
SkewedAskewSkewedAskew
committed
Merge branch 'feature/smashline-2' of https://github.com/HDR-Development/HewDraw-Remix into feature/smashline-2
2 parents c241a15 + 304d3b4 commit e2a3d0b

39 files changed

+794
-717
lines changed

‎Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ default = [
266266
# "lucario",
267267
# "lucas",
268268
# "lucina",
269-
# "luigi",
269+
"luigi",
270270
"mario",
271-
# "mariod",
272-
# "marth",
271+
"mariod",
272+
"marth",
273273
# "master",
274274
# "metaknight",
275275
# "mewtwo",

‎fighters/common/src/function_hooks/energy/control.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ unsafe fn control_initialize(energy: &mut FighterKineticEnergyControl, boma: &mu
411411
-1.0
412412
}
413413
};
414-
energy.speed_limit = PaddedVec2::new(dbg!(air_x_speed_max), 0.0);
414+
energy.speed_limit = PaddedVec2::new(air_x_speed_max, 0.0);
415415
energy.accel_mul_x = WorkModule::get_param_float(boma, smash::hash40("air_accel_x_mul"), 0);
416416
energy.accel_add_x = WorkModule::get_param_float(boma, smash::hash40("air_accel_x_add"), 0);
417417
VarModule::set_float(boma.object(), vars::common::instance::JUMP_SPEED_MAX_MUL, 1.0);

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

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

44

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

2929
}
3030

31-
#[acmd_script( agent = "luigi", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
32-
unsafe fn game_attackairf(fighter: &mut L2CAgentBase) {
31+
32+
unsafe extern "C" fn game_attackairf(fighter: &mut L2CAgentBase) {
3333
let lua_state = fighter.lua_state_agent;
3434
let boma = fighter.boma();
3535
frame(lua_state, 3.0);
@@ -59,8 +59,8 @@ unsafe fn game_attackairf(fighter: &mut L2CAgentBase) {
5959

6060
}
6161

62-
#[acmd_script( agent = "luigi", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
63-
unsafe fn game_attackairb(fighter: &mut L2CAgentBase) {
62+
63+
unsafe extern "C" fn game_attackairb(fighter: &mut L2CAgentBase) {
6464
let lua_state = fighter.lua_state_agent;
6565
let boma = fighter.boma();
6666
frame(lua_state, 3.0);
@@ -92,8 +92,8 @@ unsafe fn game_attackairb(fighter: &mut L2CAgentBase) {
9292

9393
}
9494

95-
#[acmd_script( agent = "luigi", script = "effect_attackairb" , category = ACMD_EFFECT , low_priority)]
96-
unsafe fn effect_attackairb(agent: &mut L2CAgentBase) {
95+
96+
unsafe extern "C" fn effect_attackairb(agent: &mut L2CAgentBase) {
9797
let lua_state = agent.lua_state_agent;
9898
let boma = agent.boma();
9999
frame(lua_state, 5.0);
@@ -107,8 +107,8 @@ unsafe fn effect_attackairb(agent: &mut L2CAgentBase) {
107107
}
108108
}
109109

110-
#[acmd_script( agent = "luigi", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
111-
unsafe fn game_attackairhi(fighter: &mut L2CAgentBase) {
110+
111+
unsafe extern "C" fn game_attackairhi(fighter: &mut L2CAgentBase) {
112112
let lua_state = fighter.lua_state_agent;
113113
let boma = fighter.boma();
114114
frame(lua_state, 3.0);
@@ -131,8 +131,8 @@ unsafe fn game_attackairhi(fighter: &mut L2CAgentBase) {
131131

132132
}
133133

134-
#[acmd_script( agent = "luigi", script = "effect_attackairhi", category = ACMD_EFFECT, low_priority )]
135-
unsafe fn effect_attackairhi(agent: &mut L2CAgentBase) {
134+
135+
unsafe extern "C" fn effect_attackairhi(agent: &mut L2CAgentBase) {
136136
let lua_state = agent.lua_state_agent;
137137
let boma = agent.boma();
138138
frame(lua_state, 5.0);
@@ -141,8 +141,8 @@ unsafe fn effect_attackairhi(agent: &mut L2CAgentBase) {
141141
}
142142
}
143143

144-
#[acmd_script( agent = "luigi", script = "expression_attackairhi", category = ACMD_EXPRESSION, low_priority )]
145-
unsafe fn expression_attackairhi(fighter: &mut L2CAgentBase) {
144+
145+
unsafe extern "C" fn expression_attackairhi(fighter: &mut L2CAgentBase) {
146146
let lua_state = fighter.lua_state_agent;
147147
let boma = fighter.boma();
148148
frame(lua_state, 3.0);
@@ -156,8 +156,8 @@ unsafe fn expression_attackairhi(fighter: &mut L2CAgentBase) {
156156
}
157157

158158

159-
#[acmd_script( agent = "luigi", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
160-
unsafe fn game_attackairlw(fighter: &mut L2CAgentBase) {
159+
160+
unsafe extern "C" fn game_attackairlw(fighter: &mut L2CAgentBase) {
161161
let lua_state = fighter.lua_state_agent;
162162
let boma = fighter.boma();
163163
frame(lua_state, 6.0);
@@ -194,16 +194,17 @@ unsafe fn game_attackairlw(fighter: &mut L2CAgentBase) {
194194

195195
}
196196

197+
198+
197199
pub fn install() {
198-
install_acmd_scripts!(
199-
game_attackairn,
200-
game_attackairf,
201-
game_attackairb,
202-
effect_attackairb,
203-
game_attackairhi,
204-
effect_attackairhi,
205-
expression_attackairhi,
206-
game_attackairlw,
207-
);
200+
smashline::Agent::new("luigi")
201+
.acmd("game_attackairn", game_attackairn)
202+
.acmd("game_attackairf", game_attackairf)
203+
.acmd("game_attackairb", game_attackairb)
204+
.acmd("effect_attackairb", effect_attackairb)
205+
.acmd("game_attackairhi", game_attackairhi)
206+
.acmd("effect_attackairhi", effect_attackairhi)
207+
.acmd("expression_attackairhi", expression_attackairhi)
208+
.acmd("game_attackairlw", game_attackairlw)
209+
.install();
208210
}
209-

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

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

44

5-
#[acmd_script( agent = "luigi", script = "game_attack11" , category = ACMD_GAME , low_priority)]
6-
unsafe fn game_attack11(fighter: &mut L2CAgentBase) {
5+
6+
unsafe extern "C" fn game_attack11(fighter: &mut L2CAgentBase) {
77
let lua_state = fighter.lua_state_agent;
88
let boma = fighter.boma();
99
frame(lua_state, 2.0);
@@ -25,8 +25,8 @@ unsafe fn game_attack11(fighter: &mut L2CAgentBase) {
2525

2626
}
2727

28-
#[acmd_script( agent = "luigi", script = "game_attack12" , category = ACMD_GAME , low_priority)]
29-
unsafe fn game_attack12(fighter: &mut L2CAgentBase) {
28+
29+
unsafe extern "C" fn game_attack12(fighter: &mut L2CAgentBase) {
3030
let lua_state = fighter.lua_state_agent;
3131
let boma = fighter.boma();
3232
frame(lua_state, 3.0);
@@ -48,8 +48,8 @@ unsafe fn game_attack12(fighter: &mut L2CAgentBase) {
4848

4949
}
5050

51-
#[acmd_script( agent = "luigi", script = "game_attack13" , category = ACMD_GAME , low_priority)]
52-
unsafe fn game_attack13(fighter: &mut L2CAgentBase) {
51+
52+
unsafe extern "C" fn game_attack13(fighter: &mut L2CAgentBase) {
5353
let lua_state = fighter.lua_state_agent;
5454
let boma = fighter.boma();
5555
frame(lua_state, 5.0);
@@ -63,8 +63,8 @@ unsafe fn game_attack13(fighter: &mut L2CAgentBase) {
6363
}
6464
}
6565

66-
#[acmd_script( agent = "luigi", script = "expression_attack13" , category = ACMD_EXPRESSION , low_priority)]
67-
unsafe fn expression_attack13(fighter: &mut L2CAgentBase) {
66+
67+
unsafe extern "C" fn expression_attack13(fighter: &mut L2CAgentBase) {
6868
let lua_state = fighter.lua_state_agent;
6969
let boma = fighter.boma();
7070
if is_excute(fighter) {
@@ -89,8 +89,8 @@ unsafe fn expression_attack13(fighter: &mut L2CAgentBase) {
8989
}
9090
}
9191

92-
#[acmd_script( agent = "luigi", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
93-
unsafe fn game_attack_dash(fighter: &mut L2CAgentBase) {
92+
93+
unsafe extern "C" fn game_attack_dash(fighter: &mut L2CAgentBase) {
9494
let lua_state = fighter.lua_state_agent;
9595
let boma = fighter.boma();
9696
sv_kinetic_energy!(set_speed_mul, fighter, FIGHTER_KINETIC_ENERGY_ID_MOTION, 0.81);
@@ -142,13 +142,14 @@ unsafe fn game_attack_dash(fighter: &mut L2CAgentBase) {
142142

143143
}
144144

145+
146+
145147
pub fn install() {
146-
install_acmd_scripts!(
147-
game_attack11,
148-
game_attack12,
149-
game_attack13,
150-
expression_attack13,
151-
game_attack_dash
152-
);
148+
smashline::Agent::new("luigi")
149+
.acmd("game_attack11", game_attack11)
150+
.acmd("game_attack12", game_attack12)
151+
.acmd("game_attack13", game_attack13)
152+
.acmd("expression_attack13", expression_attack13)
153+
.acmd("game_attackdash", game_attack_dash)
154+
.install();
153155
}
154-

‎fighters/luigi/src/acmd/other.rs

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

22
use super::*;
33

4-
#[acmd_script( agent = "luigi", script = "sound_damageflyhi" , category = ACMD_SOUND , low_priority)]
5-
unsafe fn damageflyhi_sound(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn damageflyhi_sound(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 1.0);
@@ -27,8 +27,8 @@ unsafe fn damageflyhi_sound(fighter: &mut L2CAgentBase) {
2727
}
2828
}
2929

30-
#[acmd_script( agent = "luigi", script = "sound_damageflylw" , category = ACMD_SOUND , low_priority)]
31-
unsafe fn damageflylw_sound(fighter: &mut L2CAgentBase) {
30+
31+
unsafe extern "C" fn damageflylw_sound(fighter: &mut L2CAgentBase) {
3232
let lua_state = fighter.lua_state_agent;
3333
let boma = fighter.boma();
3434
frame(lua_state, 1.0);
@@ -53,8 +53,8 @@ unsafe fn damageflylw_sound(fighter: &mut L2CAgentBase) {
5353
}
5454
}
5555

56-
#[acmd_script( agent = "luigi", script = "sound_damageflyn" , category = ACMD_SOUND , low_priority)]
57-
unsafe fn damageflyn_sound(fighter: &mut L2CAgentBase) {
56+
57+
unsafe extern "C" fn damageflyn_sound(fighter: &mut L2CAgentBase) {
5858
let lua_state = fighter.lua_state_agent;
5959
let boma = fighter.boma();
6060
frame(lua_state, 1.0);
@@ -79,8 +79,8 @@ unsafe fn damageflyn_sound(fighter: &mut L2CAgentBase) {
7979
}
8080
}
8181

82-
#[acmd_script( agent = "luigi", script = "sound_damageflyroll" , category = ACMD_SOUND , low_priority)]
83-
unsafe fn damageflyroll_sound(fighter: &mut L2CAgentBase) {
82+
83+
unsafe extern "C" fn damageflyroll_sound(fighter: &mut L2CAgentBase) {
8484
let lua_state = fighter.lua_state_agent;
8585
let boma = fighter.boma();
8686
frame(lua_state, 1.0);
@@ -95,8 +95,8 @@ unsafe fn damageflyroll_sound(fighter: &mut L2CAgentBase) {
9595
}
9696
}
9797

98-
#[acmd_script( agent = "luigi", script = "sound_damageflytop" , category = ACMD_SOUND , low_priority)]
99-
unsafe fn damageflytop_sound(fighter: &mut L2CAgentBase) {
98+
99+
unsafe extern "C" fn damageflytop_sound(fighter: &mut L2CAgentBase) {
100100
let lua_state = fighter.lua_state_agent;
101101
let boma = fighter.boma();
102102
frame(lua_state, 1.0);
@@ -121,8 +121,8 @@ unsafe fn damageflytop_sound(fighter: &mut L2CAgentBase) {
121121
}
122122
}
123123

124-
#[acmd_script( agent = "luigi", script = "sound_dash" , category = ACMD_SOUND , low_priority)]
125-
unsafe fn dash_sound(fighter: &mut L2CAgentBase) {
124+
125+
unsafe extern "C" fn dash_sound(fighter: &mut L2CAgentBase) {
126126
let lua_state = fighter.lua_state_agent;
127127
let boma = fighter.boma();
128128
frame(lua_state, 4.0);
@@ -132,8 +132,8 @@ unsafe fn dash_sound(fighter: &mut L2CAgentBase) {
132132
}
133133
}
134134

135-
#[acmd_script( agent = "luigi", script = "game_turndash" , category = ACMD_GAME , low_priority)]
136-
unsafe fn luigi_turn_dash_game(fighter: &mut L2CAgentBase) {
135+
136+
unsafe extern "C" fn luigi_turn_dash_game(fighter: &mut L2CAgentBase) {
137137
let lua_state = fighter.lua_state_agent;
138138
let boma = fighter.boma();
139139
frame(lua_state, 3.0);
@@ -147,8 +147,8 @@ unsafe fn luigi_turn_dash_game(fighter: &mut L2CAgentBase) {
147147

148148
}
149149

150-
#[acmd_script( agent = "luigi", script = "game_escapeair" , category = ACMD_GAME , low_priority)]
151-
unsafe fn escape_air_game(fighter: &mut L2CAgentBase) {
150+
151+
unsafe extern "C" fn escape_air_game(fighter: &mut L2CAgentBase) {
152152
let lua_state = fighter.lua_state_agent;
153153
let boma = fighter.boma();
154154
let escape_air_cancel_frame = WorkModule::get_param_float(boma, hash40("param_motion"), hash40("escape_air_cancel_frame"));
@@ -163,8 +163,8 @@ unsafe fn escape_air_game(fighter: &mut L2CAgentBase) {
163163
}
164164
}
165165

166-
#[acmd_script( agent = "luigi", script = "game_escapeairslide" , category = ACMD_GAME , low_priority)]
167-
unsafe fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
166+
167+
unsafe extern "C" fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
168168
let lua_state = fighter.lua_state_agent;
169169
let boma = fighter.boma();
170170

@@ -178,8 +178,8 @@ unsafe fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
178178
}
179179
}
180180

181-
#[acmd_script( agent = "luigi", script = "game_catch" , category = ACMD_GAME , low_priority)]
182-
unsafe fn luigi_catch_game(fighter: &mut L2CAgentBase) {
181+
182+
unsafe extern "C" fn luigi_catch_game(fighter: &mut L2CAgentBase) {
183183
let lua_state = fighter.lua_state_agent;
184184
let boma = fighter.boma();
185185
if is_excute(fighter) {
@@ -226,8 +226,8 @@ unsafe fn luigi_catch_game(fighter: &mut L2CAgentBase) {
226226

227227
}
228228

229-
#[acmd_script( agent = "luigi", script = "sound_catch" , category = ACMD_SOUND , low_priority)]
230-
unsafe fn luigi_catch_sound(fighter: &mut L2CAgentBase) {
229+
230+
unsafe extern "C" fn luigi_catch_sound(fighter: &mut L2CAgentBase) {
231231
let lua_state = fighter.lua_state_agent;
232232
let boma = fighter.boma();
233233
frame(lua_state, 7.0);
@@ -236,8 +236,8 @@ unsafe fn luigi_catch_sound(fighter: &mut L2CAgentBase) {
236236
}
237237
}
238238

239-
#[acmd_script( agent = "luigi_obakyumu", script = "effect_catch" , category = ACMD_EFFECT , low_priority)]
240-
unsafe fn luigi_obakyumu_catch_effect(fighter: &mut L2CAgentBase) {
239+
240+
unsafe extern "C" fn luigi_obakyumu_catch_effect(fighter: &mut L2CAgentBase) {
241241
let lua_state = fighter.lua_state_agent;
242242
let boma = fighter.boma();
243243
frame(lua_state, 14.0);
@@ -247,20 +247,23 @@ unsafe fn luigi_obakyumu_catch_effect(fighter: &mut L2CAgentBase) {
247247
}
248248
}
249249

250+
251+
250252
pub fn install() {
251-
install_acmd_scripts!(
252-
escape_air_game,
253-
escape_air_slide_game,
254-
dash_sound,
255-
luigi_catch_game,
256-
luigi_catch_sound,
257-
luigi_obakyumu_catch_effect,
258-
luigi_turn_dash_game,
259-
damageflyhi_sound,
260-
damageflylw_sound,
261-
damageflyn_sound,
262-
damageflyroll_sound,
263-
damageflytop_sound
264-
);
253+
smashline::Agent::new("luigi")
254+
.acmd("sound_damageflyhi", damageflyhi_sound)
255+
.acmd("sound_damageflylw", damageflylw_sound)
256+
.acmd("sound_damageflyn", damageflyn_sound)
257+
.acmd("sound_damageflyroll", damageflyroll_sound)
258+
.acmd("sound_damageflytop", damageflytop_sound)
259+
.acmd("sound_dash", dash_sound)
260+
.acmd("game_turndash", luigi_turn_dash_game)
261+
.acmd("game_escapeair", escape_air_game)
262+
.acmd("game_escapeairslide", escape_air_slide_game)
263+
.acmd("game_catch", luigi_catch_game)
264+
.acmd("sound_catch", luigi_catch_sound)
265+
.install();
266+
smashline::Agent::new("luigi_obakyumu")
267+
.acmd("effect_catch", luigi_obakyumu_catch_effect)
268+
.install();
265269
}
266-

0 commit comments

Comments
 (0)