Skip to content

Commit 80389dc

Browse files
blu-devblu-dev
committed
wolf, yoshi, yink
1 parent 49fe0ce commit 80389dc

Some content is hidden

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

53 files changed

+760
-692
lines changed

‎Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ default = [
316316
# "trail",
317317
# "wario",
318318
# "wiifit",
319-
# "wolf",
320-
# "yoshi",
321-
# "younglink",
319+
"wolf",
320+
"yoshi",
321+
"younglink",
322322
# "zelda",
323323
]
324324
dev = ["utils/no-offset-search"]

‎fighters/bayonetta/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use utils::{
3838
};
3939
use smashline::*;
4040

41-
pub fn install(_: bool) {
41+
pub fn install() {
4242
acmd::install();
4343
opff::install();
4444
status::install();

‎fighters/brave/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extern "C" fn brave_init(fighter: &mut L2CFighterCommon) {
6060
}
6161
}
6262

63-
pub fn install(_: bool) {
63+
pub fn install() {
6464
acmd::install();
6565
opff::install();
6666
smashline::Agent::new("brave").on_init(brave_init).install();

‎fighters/buddy/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use utils::{
3939
use smashline::*;
4040

4141

42-
pub fn install(_: bool) {
42+
pub fn install() {
4343
acmd::install();
4444
opff::install();
4545
status::install();

‎fighters/captain/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use utils::{
3939
use smashline::*;
4040

4141

42-
pub fn install(_: bool) {
42+
pub fn install() {
4343
acmd::install();
4444
opff::install();
4545
status::install();

‎fighters/chrom/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use utils::{
3838
use smashline::*;
3939

4040

41-
pub fn install(_: bool) {
41+
pub fn install() {
4242
acmd::install();
4343
opff::install();
4444
status::install();

‎fighters/donkey/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use utils::{
3939
use smashline::*;
4040

4141

42-
pub fn install(_: bool) {
42+
pub fn install() {
4343
acmd::install();
4444
opff::install();
4545
status::install();

‎fighters/falco/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use utils::{
3838
};
3939
use smashline::*;
4040

41-
pub fn install(_: bool) {
41+
pub fn install() {
4242
acmd::install();
4343
opff::install();
4444
status::install();

‎fighters/fox/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use utils::{
3939
use smashline::*;
4040

4141

42-
pub fn install(_: bool) {
42+
pub fn install() {
4343
acmd::install();
4444
opff::install();
4545
status::install();

‎fighters/luigi/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pub fn calculate_misfire_number(fighter: &mut L2CFighterCommon) {
6969
}
7070
}
7171

72-
pub fn install(_: bool) {
72+
pub fn install() {
7373
status::install();
7474
acmd::install();
7575
opff::install();

‎fighters/mario/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use smash_script::{macros::*, *};
2424
use smashline::*;
2525
use utils::{consts::*, ext::*, util::*, *};
2626

27-
pub fn install(_: bool) {
27+
pub fn install() {
2828
acmd::install();
2929
status::install();
3030
opff::install();

‎fighters/mariod/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use utils::{
3838
};
3939
use smashline::*;
4040

41-
pub fn install(_: bool) {
41+
pub fn install() {
4242
acmd::install();
4343
opff::install();
4444
status::install();

‎fighters/marth/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use utils::{
3838
};
3939
use smashline::*;
4040

41-
pub fn install(_: bool) {
41+
pub fn install() {
4242
acmd::install();
4343
status::install();
4444
opff::install();

‎fighters/wolf/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ 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" }
1414
smash_rs = { package = "smash", git = "https://github.com/blu-dev/smash-rs" }

‎fighters/wolf/src/acmd/aerials.rs

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

44

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

3333
}
3434

35-
#[acmd_script( agent = "wolf", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
36-
unsafe fn wolf_attack_air_f_game(fighter: &mut L2CAgentBase) {
35+
36+
unsafe extern "C" fn wolf_attack_air_f_game(fighter: &mut L2CAgentBase) {
3737
let lua_state = fighter.lua_state_agent;
3838
let boma = fighter.boma();
3939
frame(lua_state, 1.0);
@@ -60,8 +60,8 @@ unsafe fn wolf_attack_air_f_game(fighter: &mut L2CAgentBase) {
6060

6161
}
6262

63-
#[acmd_script( agent = "wolf", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
64-
unsafe fn wolf_attack_air_b_game(fighter: &mut L2CAgentBase) {
63+
64+
unsafe extern "C" fn wolf_attack_air_b_game(fighter: &mut L2CAgentBase) {
6565
let lua_state = fighter.lua_state_agent;
6666
let boma = fighter.boma();
6767
frame(lua_state, 1.0);
@@ -88,8 +88,8 @@ unsafe fn wolf_attack_air_b_game(fighter: &mut L2CAgentBase) {
8888

8989
}
9090

91-
#[acmd_script( agent = "wolf", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
92-
unsafe fn wolf_attack_air_hi_game(fighter: &mut L2CAgentBase) {
91+
92+
unsafe extern "C" fn wolf_attack_air_hi_game(fighter: &mut L2CAgentBase) {
9393
let lua_state = fighter.lua_state_agent;
9494
let boma = fighter.boma();
9595
frame(lua_state, 1.0);
@@ -116,8 +116,8 @@ unsafe fn wolf_attack_air_hi_game(fighter: &mut L2CAgentBase) {
116116

117117
}
118118

119-
#[acmd_script( agent = "wolf", script = "expression_attackairhi", category = ACMD_EXPRESSION, low_priority )]
120-
unsafe fn wolf_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
119+
120+
unsafe extern "C" fn wolf_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
121121
let lua_state = fighter.lua_state_agent;
122122
let boma = fighter.boma();
123123
if is_excute(fighter) {
@@ -133,8 +133,8 @@ unsafe fn wolf_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
133133
}
134134
}
135135

136-
#[acmd_script( agent = "wolf", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
137-
unsafe fn wolf_attack_air_lw_game(fighter: &mut L2CAgentBase) {
136+
137+
unsafe extern "C" fn wolf_attack_air_lw_game(fighter: &mut L2CAgentBase) {
138138
let lua_state = fighter.lua_state_agent;
139139
let boma = fighter.boma();
140140
frame(lua_state, 5.0);
@@ -164,14 +164,16 @@ unsafe fn wolf_attack_air_lw_game(fighter: &mut L2CAgentBase) {
164164

165165
}
166166

167+
168+
169+
167170
pub fn install() {
168-
install_acmd_scripts!(
169-
wolf_attack_air_n_game,
170-
wolf_attack_air_f_game,
171-
wolf_attack_air_b_game,
172-
wolf_attack_air_hi_game,
173-
wolf_attack_air_hi_expression,
174-
wolf_attack_air_lw_game,
175-
);
171+
smashline::Agent::new("wolf")
172+
.acmd("game_attackairn", wolf_attack_air_n_game)
173+
.acmd("game_attackairf", wolf_attack_air_f_game)
174+
.acmd("game_attackairb", wolf_attack_air_b_game)
175+
.acmd("game_attackairhi", wolf_attack_air_hi_game)
176+
.acmd("expression_attackairhi", wolf_attack_air_hi_expression)
177+
.acmd("game_attackairlw", wolf_attack_air_lw_game)
178+
.install();
176179
}
177-

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

+26-24
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
use super::*;
33

4-
#[acmd_script(agent = "wolf", script = "game_attack11" , category = ACMD_GAME , low_priority)]
5-
unsafe fn wolf_attack_11_game(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn wolf_attack_11_game(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 3.0);
@@ -32,8 +32,8 @@ unsafe fn wolf_attack_11_game(fighter: &mut L2CAgentBase) {
3232
}
3333
}
3434

35-
#[acmd_script( agent = "wolf", script = "effect_attack11", category = ACMD_EFFECT, low_priority )]
36-
unsafe fn effect_attack11(agent: &mut L2CAgentBase) {
35+
36+
unsafe extern "C" fn effect_attack11(agent: &mut L2CAgentBase) {
3737
let lua_state = agent.lua_state_agent;
3838
let boma = agent.boma();
3939
frame(lua_state, 2.0);
@@ -42,8 +42,8 @@ unsafe fn effect_attack11(agent: &mut L2CAgentBase) {
4242
}
4343
}
4444

45-
#[acmd_script( agent = "wolf", script = "expression_attack11", category = ACMD_EXPRESSION, low_priority )]
46-
unsafe fn wolf_attack_11_expression(fighter: &mut L2CAgentBase) {
45+
46+
unsafe extern "C" fn wolf_attack_11_expression(fighter: &mut L2CAgentBase) {
4747
let lua_state = fighter.lua_state_agent;
4848
let boma = fighter.boma();
4949
if is_excute(fighter) {
@@ -59,8 +59,8 @@ unsafe fn wolf_attack_11_expression(fighter: &mut L2CAgentBase) {
5959
}
6060
}
6161

62-
#[acmd_script(agent = "wolf", script = "game_attack12" , category = ACMD_GAME , low_priority)]
63-
unsafe fn wolf_attack_12_game(fighter: &mut L2CAgentBase) {
62+
63+
unsafe extern "C" fn wolf_attack_12_game(fighter: &mut L2CAgentBase) {
6464
let lua_state = fighter.lua_state_agent;
6565
frame(lua_state, 4.0);
6666
let boma = fighter.boma();
@@ -81,8 +81,8 @@ unsafe fn wolf_attack_12_game(fighter: &mut L2CAgentBase) {
8181
}
8282

8383

84-
#[acmd_script(agent = "wolf", script = "game_attack13" , category = ACMD_GAME , low_priority)]
85-
unsafe fn wolf_attack_13_game(fighter: &mut L2CAgentBase) {
84+
85+
unsafe extern "C" fn wolf_attack_13_game(fighter: &mut L2CAgentBase) {
8686
let lua_state = fighter.lua_state_agent;
8787
let boma = fighter.boma();
8888
frame(lua_state, 4.0);
@@ -103,8 +103,8 @@ unsafe fn wolf_attack_13_game(fighter: &mut L2CAgentBase) {
103103
}
104104
}
105105

106-
#[acmd_script( agent = "wolf", script = "expression_attack13", category = ACMD_EXPRESSION, low_priority )]
107-
unsafe fn wolf_attack_13_expression(fighter: &mut L2CAgentBase) {
106+
107+
unsafe extern "C" fn wolf_attack_13_expression(fighter: &mut L2CAgentBase) {
108108
let lua_state = fighter.lua_state_agent;
109109
let boma = fighter.boma();
110110
if is_excute(fighter) {
@@ -121,8 +121,8 @@ unsafe fn wolf_attack_13_expression(fighter: &mut L2CAgentBase) {
121121
}
122122
}
123123

124-
#[acmd_script(agent = "wolf", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
125-
unsafe fn wolf_attack_dash_game(fighter: &mut L2CAgentBase) {
124+
125+
unsafe extern "C" fn wolf_attack_dash_game(fighter: &mut L2CAgentBase) {
126126
let lua_state = fighter.lua_state_agent;
127127
let boma = fighter.boma();
128128
frame(lua_state, 11.0);
@@ -145,15 +145,17 @@ unsafe fn wolf_attack_dash_game(fighter: &mut L2CAgentBase) {
145145
}
146146

147147

148+
149+
150+
148151
pub fn install() {
149-
install_acmd_scripts!(
150-
wolf_attack_11_game,
151-
effect_attack11,
152-
wolf_attack_11_expression,
153-
wolf_attack_12_game,
154-
wolf_attack_13_game,
155-
wolf_attack_13_expression,
156-
wolf_attack_dash_game,
157-
);
152+
smashline::Agent::new("wolf")
153+
.acmd("game_attack11", wolf_attack_11_game)
154+
.acmd("effect_attack11", effect_attack11)
155+
.acmd("expression_attack11", wolf_attack_11_expression)
156+
.acmd("game_attack12", wolf_attack_12_game)
157+
.acmd("game_attack13", wolf_attack_13_game)
158+
.acmd("expression_attack13", wolf_attack_13_expression)
159+
.acmd("game_attackdash", wolf_attack_dash_game)
160+
.install();
158161
}
159-

‎fighters/wolf/src/acmd/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ pub fn install() {
1515
specials::install();
1616
throws::install();
1717
ground::install();
18-
}
18+
}

0 commit comments

Comments
 (0)