Skip to content

Commit dfdb39e

Browse files
WuBoytHWuBoytH
committed
P's
1 parent 3b38b82 commit dfdb39e

File tree

150 files changed

+2488
-2100
lines changed

Some content is hidden

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

150 files changed

+2488
-2100
lines changed

‎Cargo.toml

+15-15
Original file line numberDiff line numberDiff line change
@@ -279,21 +279,21 @@ default = [
279279
# "murabito",
280280
# "nana",
281281
# "ness",
282-
# "packun",
283-
# "pacman",
284-
# "palutena",
285-
# "peach",
286-
# "pfushigisou",
287-
# "pichu",
288-
# "pickel",
289-
# "pikachu",
290-
# "pikmin",
291-
# "pit",
292-
# "pitb",
293-
# "plizardon",
294-
# "popo",
295-
# "purin",
296-
# "pzenigame",
282+
"packun",
283+
"pacman",
284+
"palutena",
285+
"peach",
286+
"pfushigisou",
287+
"pichu",
288+
"pickel",
289+
"pikachu",
290+
"pikmin",
291+
"pit",
292+
"pitb",
293+
"plizardon",
294+
"popo",
295+
"purin",
296+
"pzenigame",
297297
# "reflet",
298298
# "richter",
299299
"ridley",

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

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

3-
#[acmd_script(agent = "peach", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
4-
unsafe fn peach_attack_air_n_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn peach_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) {
@@ -34,8 +34,8 @@ unsafe fn peach_attack_air_n_game(fighter: &mut L2CAgentBase) {
3434
}
3535
}
3636

37-
#[acmd_script(agent = "peach", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
38-
unsafe fn peach_attack_air_f_game(fighter: &mut L2CAgentBase) {
37+
38+
unsafe extern "C" fn peach_attack_air_f_game(fighter: &mut L2CAgentBase) {
3939
let lua_state = fighter.lua_state_agent;
4040
let boma = fighter.boma();
4141
frame(lua_state, 10.0);
@@ -58,8 +58,8 @@ unsafe fn peach_attack_air_f_game(fighter: &mut L2CAgentBase) {
5858

5959
}
6060

61-
#[acmd_script(agent = "peach", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
62-
unsafe fn peach_attack_air_b_game(fighter: &mut L2CAgentBase) {
61+
62+
unsafe extern "C" fn peach_attack_air_b_game(fighter: &mut L2CAgentBase) {
6363
let lua_state = fighter.lua_state_agent;
6464
let boma = fighter.boma();
6565
frame(lua_state, 5.0);
@@ -85,8 +85,8 @@ unsafe fn peach_attack_air_b_game(fighter: &mut L2CAgentBase) {
8585

8686
}
8787

88-
#[acmd_script(agent = "peach", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
89-
unsafe fn peach_attack_air_hi_game(fighter: &mut L2CAgentBase) {
88+
89+
unsafe extern "C" fn peach_attack_air_hi_game(fighter: &mut L2CAgentBase) {
9090
let lua_state = fighter.lua_state_agent;
9191
let boma = fighter.boma();
9292
if is_excute(fighter) {
@@ -156,8 +156,8 @@ unsafe fn peach_attack_air_hi_game(fighter: &mut L2CAgentBase) {
156156

157157
}
158158

159-
#[acmd_script( agent = "peach", script = "expression_attackairhi", category = ACMD_EXPRESSION, low_priority )]
160-
unsafe fn peach_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
159+
160+
unsafe extern "C" fn peach_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
161161
let lua_state = fighter.lua_state_agent;
162162
let boma = fighter.boma();
163163
frame(lua_state, 7.0);
@@ -174,8 +174,8 @@ unsafe fn peach_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
174174
}
175175
}
176176

177-
#[acmd_script(agent = "peach", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
178-
unsafe fn peach_attack_air_lw_game(fighter: &mut L2CAgentBase) {
177+
178+
unsafe extern "C" fn peach_attack_air_lw_game(fighter: &mut L2CAgentBase) {
179179
let lua_state = fighter.lua_state_agent;
180180
let boma = fighter.boma();
181181
frame(lua_state, 11.0);
@@ -208,13 +208,15 @@ unsafe fn peach_attack_air_lw_game(fighter: &mut L2CAgentBase) {
208208
}
209209
}
210210

211+
212+
211213
pub fn install() {
212-
install_acmd_scripts!(
213-
peach_attack_air_n_game,
214-
peach_attack_air_f_game,
215-
peach_attack_air_b_game,
216-
peach_attack_air_hi_game,
217-
peach_attack_air_hi_expression,
218-
peach_attack_air_lw_game,
219-
);
214+
smashline::Agent::new("peach")
215+
.acmd("game_attackairn", peach_attack_air_n_game)
216+
.acmd("game_attackairf", peach_attack_air_f_game)
217+
.acmd("game_attackairb", peach_attack_air_b_game)
218+
.acmd("game_attackairhi", peach_attack_air_hi_game)
219+
.acmd("expression_attackairhi", peach_attack_air_hi_expression)
220+
.acmd("game_attackairlw", peach_attack_air_lw_game)
221+
.install();
220222
}

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

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

3-
#[acmd_script(agent = "peach", script = "game_attack11" , category = ACMD_GAME , low_priority)]
4-
unsafe fn peach_attack_11_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn peach_attack_11_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
frame(lua_state, 3.0);
@@ -30,8 +30,8 @@ unsafe fn peach_attack_11_game(fighter: &mut L2CAgentBase) {
3030
}
3131
}
3232

33-
#[acmd_script(agent = "peach", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
34-
unsafe fn peach_attack_dash_game(fighter: &mut L2CAgentBase) {
33+
34+
unsafe extern "C" fn peach_attack_dash_game(fighter: &mut L2CAgentBase) {
3535
let lua_state = fighter.lua_state_agent;
3636
let boma = fighter.boma();
3737
frame(lua_state, 2.0);
@@ -60,8 +60,8 @@ unsafe fn peach_attack_dash_game(fighter: &mut L2CAgentBase) {
6060
}
6161
}
6262

63-
#[acmd_script( agent = "peach", script = "effect_attackdash", category = ACMD_EFFECT, low_priority )]
64-
unsafe fn peach_attack_dash_effect(fighter: &mut L2CAgentBase) {
63+
64+
unsafe extern "C" fn peach_attack_dash_effect(fighter: &mut L2CAgentBase) {
6565
let lua_state = fighter.lua_state_agent;
6666
let boma = fighter.boma();
6767
frame(lua_state, 5.0);
@@ -80,10 +80,12 @@ unsafe fn peach_attack_dash_effect(fighter: &mut L2CAgentBase) {
8080
}
8181
}
8282

83+
84+
8385
pub fn install() {
84-
install_acmd_scripts!(
85-
peach_attack_11_game,
86-
peach_attack_dash_game,
87-
peach_attack_dash_effect
88-
);
86+
smashline::Agent::new("peach")
87+
.acmd("game_attack11", peach_attack_11_game)
88+
.acmd("game_attackdash", peach_attack_dash_game)
89+
.acmd("effect_attackdash", peach_attack_dash_effect)
90+
.install();
8991
}

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

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

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

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

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

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

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

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

134-
#[acmd_script(agent = "peach", script = "game_turndash" , category = ACMD_GAME , low_priority)]
135-
unsafe fn peach_turn_dash_game(fighter: &mut L2CAgentBase) {
134+
135+
unsafe extern "C" fn peach_turn_dash_game(fighter: &mut L2CAgentBase) {
136136
let lua_state = fighter.lua_state_agent;
137137
let boma = fighter.boma();
138138
frame(lua_state, 3.0);
@@ -146,8 +146,8 @@ unsafe fn peach_turn_dash_game(fighter: &mut L2CAgentBase) {
146146

147147
}
148148

149-
#[acmd_script(agent = "peach", script = "game_catch" , category = ACMD_GAME , low_priority)]
150-
unsafe fn peach_catch_game(fighter: &mut L2CAgentBase) {
149+
150+
unsafe extern "C" fn peach_catch_game(fighter: &mut L2CAgentBase) {
151151
let lua_state = fighter.lua_state_agent;
152152
let boma = fighter.boma();
153153
frame(lua_state, 1.0);
@@ -173,8 +173,8 @@ unsafe fn peach_catch_game(fighter: &mut L2CAgentBase) {
173173

174174
}
175175

176-
#[acmd_script( agent = "peach", script = "game_escapeair" , category = ACMD_GAME , low_priority)]
177-
unsafe fn escape_air_game(fighter: &mut L2CAgentBase) {
176+
177+
unsafe extern "C" fn escape_air_game(fighter: &mut L2CAgentBase) {
178178
let lua_state = fighter.lua_state_agent;
179179
let boma = fighter.boma();
180180
let escape_air_cancel_frame = WorkModule::get_param_float(boma, hash40("param_motion"), hash40("escape_air_cancel_frame"));
@@ -189,8 +189,8 @@ unsafe fn escape_air_game(fighter: &mut L2CAgentBase) {
189189
}
190190
}
191191

192-
#[acmd_script( agent = "peach", script = "game_escapeairslide" , category = ACMD_GAME , low_priority)]
193-
unsafe fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
192+
193+
unsafe extern "C" fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
194194
let lua_state = fighter.lua_state_agent;
195195
let boma = fighter.boma();
196196

@@ -204,17 +204,18 @@ unsafe fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
204204
}
205205
}
206206

207+
207208
pub fn install() {
208-
install_acmd_scripts!(
209-
escape_air_game,
210-
escape_air_slide_game,
211-
dash_sound,
212-
peach_turn_dash_game,
213-
peach_catch_game,
214-
damageflyhi_sound,
215-
damageflylw_sound,
216-
damageflyn_sound,
217-
damageflyroll_sound,
218-
damageflytop_sound
219-
);
220-
}
209+
smashline::Agent::new("peach")
210+
.acmd("sound_damageflyhi", damageflyhi_sound)
211+
.acmd("sound_damageflylw", damageflylw_sound)
212+
.acmd("sound_damageflyn", damageflyn_sound)
213+
.acmd("sound_damageflyroll", damageflyroll_sound)
214+
.acmd("sound_damageflytop", damageflytop_sound)
215+
.acmd("sound_dash", dash_sound)
216+
.acmd("game_turndash", peach_turn_dash_game)
217+
.acmd("game_catch", peach_catch_game)
218+
.acmd("game_escapeair", escape_air_game)
219+
.acmd("game_escapeairslide", escape_air_slide_game)
220+
.install();
221+
}

‎fighters/peach/src/acmd/smashes.rs

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

3-
#[acmd_script( agent = "peach", script = "game_attacklw4" , category = ACMD_GAME , low_priority)]
4-
unsafe fn peach_attack_lw4_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn peach_attack_lw4_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
frame(lua_state, 4.0);
@@ -33,8 +33,9 @@ unsafe fn peach_attack_lw4_game(fighter: &mut L2CAgentBase) {
3333

3434
}
3535

36+
3637
pub fn install() {
37-
install_acmd_scripts!(
38-
peach_attack_lw4_game,
39-
);
40-
}
38+
smashline::Agent::new("peach")
39+
.acmd("game_attacklw4", peach_attack_lw4_game)
40+
.install();
41+
}

0 commit comments

Comments
 (0)