Skip to content

Commit 3452291

Browse files
4Lukaska4Lukaska
committed
fixes and additions
- Changed coloring to apply from the fighter_param file rather than ACMD scripts - Mario jab VFX adjustments - Recolored up special VFX - Slightly tweaked uptilt effect coloring - Fixed new animations not playing on non-default alts (oops)
1 parent ad83a27 commit 3452291

File tree

6 files changed

+46
-12
lines changed

6 files changed

+46
-12
lines changed

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

+43
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@ unsafe extern "C" fn mario_attack_11_game(fighter: &mut L2CAgentBase) {
2222

2323
}
2424

25+
unsafe extern "C" fn mario_attack_11_effect(fighter: &mut L2CAgentBase) {
26+
let lua_state = fighter.lua_state_agent;
27+
let boma = fighter.boma();
28+
frame(lua_state, 1.0);
29+
if is_excute(fighter) {
30+
EFFECT_FLIP(fighter, Hash40::new("sys_attack_line"), Hash40::new("sys_attack_line"), Hash40::new("top"), -4, 6.7, 1, 0, 0, 0, 0.95, 0, 1, 0, 0, 0, 0, false, *EF_FLIP_YZ);
31+
}
32+
frame(lua_state, 2.0);
33+
if is_excute(fighter) {
34+
EFFECT(fighter, Hash40::new("sys_attack_impact"), Hash40::new("top"), 12, 6.7, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 360, false);
35+
LAST_EFFECT_SET_ALPHA(fighter, 0.7);
36+
}
37+
}
38+
2539
unsafe extern "C" fn mario_attack_12_game(fighter: &mut L2CAgentBase) {
2640
let lua_state = fighter.lua_state_agent;
2741
let boma = fighter.boma();
@@ -47,6 +61,20 @@ unsafe extern "C" fn mario_attack_12_game(fighter: &mut L2CAgentBase) {
4761

4862
}
4963

64+
unsafe extern "C" fn mario_attack_12_effect(fighter: &mut L2CAgentBase) {
65+
let lua_state = fighter.lua_state_agent;
66+
let boma = fighter.boma();
67+
frame(lua_state, 1.0);
68+
if is_excute(fighter) {
69+
EFFECT_FLIP(fighter, Hash40::new("sys_attack_line"), Hash40::new("sys_attack_line"), Hash40::new("top"), -3, 5.9, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false, *EF_FLIP_YZ);
70+
}
71+
frame(lua_state, 2.0);
72+
if is_excute(fighter) {
73+
EFFECT(fighter, Hash40::new("sys_attack_impact"), Hash40::new("top"), 12, 6.7, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 360, false);
74+
LAST_EFFECT_SET_ALPHA(fighter, 0.7);
75+
}
76+
}
77+
5078
unsafe extern "C" fn mario_attack_13_game(fighter: &mut L2CAgentBase) {
5179
let lua_state = fighter.lua_state_agent;
5280
let boma = fighter.boma();
@@ -68,6 +96,18 @@ unsafe extern "C" fn mario_attack_13_game(fighter: &mut L2CAgentBase) {
6896

6997
}
7098

99+
unsafe extern "C" fn mario_attack_13_effect(fighter: &mut L2CAgentBase) {
100+
let lua_state = fighter.lua_state_agent;
101+
let boma = fighter.boma();
102+
if is_excute(fighter) {
103+
FOOT_EFFECT(fighter, Hash40::new("null"), Hash40::new("top"), -2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
104+
}
105+
frame(lua_state, 2.0);
106+
if is_excute(fighter) {
107+
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc_b"), Hash40::new("sys_attack_arc_b"), Hash40::new("top"), -1, 8.5, 4.5, 0, -25, 80, 0.85, true, *EF_FLIP_YZ);
108+
}
109+
}
110+
71111
unsafe extern "C" fn mario_attack_13_expression(fighter: &mut L2CAgentBase) {
72112
let lua_state = fighter.lua_state_agent;
73113
let boma = fighter.boma();
@@ -128,8 +168,11 @@ unsafe extern "C" fn mario_attack_dash_game(fighter: &mut L2CAgentBase) {
128168
pub fn install() {
129169
smashline::Agent::new("mario")
130170
.game_acmd("game_attack11", mario_attack_11_game)
171+
.effect_acmd("effect_attack11", mario_attack_11_effect)
131172
.game_acmd("game_attack12", mario_attack_12_game)
173+
.effect_acmd("effect_attack12", mario_attack_12_effect)
132174
.game_acmd("game_attack13", mario_attack_13_game)
175+
.effect_acmd("effect_attack13", mario_attack_13_effect)
133176
.expression_acmd("expression_attack13", mario_attack_13_expression)
134177
.game_acmd("game_attackdash", mario_attack_dash_game)
135178
.install();

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

-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ unsafe extern "C" fn mariod_attack_air_f_effect(fighter: &mut L2CAgentBase) {
117117
if is_excute(fighter) {
118118
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc_b"), Hash40::new("sys_attack_arc_b"), Hash40::new("top"), 0, 7, -1, -3, -20, -113, 1.1, true, *EF_FLIP_YZ);
119119
LAST_EFFECT_SET_RATE(fighter, 0.5);
120-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
121120
}
122121
frame(lua_state, 20.0);
123122
if is_excute(fighter){
@@ -218,7 +217,6 @@ unsafe extern "C" fn mariod_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
218217
frame(lua_state, 5.0);
219218
if is_excute(fighter) {
220219
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc"), Hash40::new("sys_attack_arc"), Hash40::new("top"), 0, 10, 0, -4, 80, 96, 0.95, true, *EF_FLIP_YZ);
221-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
222220
}
223221
}
224222

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

-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ unsafe extern "C" fn mariod_attack_11_effect(fighter: &mut L2CAgentBase) {
2727
frame(lua_state, 1.0);
2828
if is_excute(fighter) {
2929
EFFECT_FLIP(fighter, Hash40::new("sys_attack_line"), Hash40::new("sys_attack_line"), Hash40::new("top"), -4, 6.7, 1, 0, 0, 0, 0.95, 0, 1, 0, 0, 0, 0, false, *EF_FLIP_YZ);
30-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
3130
}
3231
frame(lua_state, 2.0);
3332
if is_excute(fighter) {
@@ -63,7 +62,6 @@ unsafe extern "C" fn mariod_attack_12_effect(fighter: &mut L2CAgentBase) {
6362
frame(lua_state, 1.0);
6463
if is_excute(fighter) {
6564
EFFECT_FLIP(fighter, Hash40::new("sys_attack_line"), Hash40::new("sys_attack_line"), Hash40::new("top"), -3, 5.9, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false, *EF_FLIP_YZ);
66-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
6765
}
6866
frame(lua_state, 2.0);
6967
if is_excute(fighter) {
@@ -102,7 +100,6 @@ unsafe extern "C" fn mariod_attack_13_effect(fighter: &mut L2CAgentBase) {
102100
frame(lua_state, 2.0);
103101
if is_excute(fighter) {
104102
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc_b"), Hash40::new("sys_attack_arc_b"), Hash40::new("top"), -1, 8.5, 4.5, 0, -25, 80, 0.85, true, *EF_FLIP_YZ);
105-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
106103
}
107104
}
108105

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

-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ unsafe extern "C" fn mariod_attack_s4_hi_effect(fighter: &mut L2CAgentBase) {
3434
frame(lua_state, 14.0);
3535
if is_excute(fighter) {
3636
EFFECT_FLIP(fighter, Hash40::new("sys_attack_line"), Hash40::new("sys_attack_line"), Hash40::new("top"), 1, 7, -1, -15, -2, 0, 0.8, 0, 0, 0, 0, 0, 0, true, *EF_FLIP_YZ);
37-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
3837
}
3938
frame(lua_state, 15.0);
4039
if is_excute(fighter) {
@@ -93,7 +92,6 @@ unsafe extern "C" fn mariod_attack_s4_s_effect(fighter: &mut L2CAgentBase) {
9392
frame(lua_state, 14.0);
9493
if is_excute(fighter) {
9594
EFFECT_FLIP(fighter, Hash40::new("sys_attack_line"), Hash40::new("sys_attack_line"), Hash40::new("top"), 1, 7, -1, 0, -2, 0, 0.8, 0, 0, 0, 0, 0, 0, true, *EF_FLIP_YZ);
96-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
9795
}
9896
frame(lua_state, 15.0);
9997
if is_excute(fighter) {
@@ -152,7 +150,6 @@ unsafe extern "C" fn mariod_attack_s4_lw_effect(fighter: &mut L2CAgentBase) {
152150
frame(lua_state, 14.0);
153151
if is_excute(fighter) {
154152
EFFECT_FLIP(fighter, Hash40::new("sys_attack_line"), Hash40::new("sys_attack_line"), Hash40::new("top"), 1, 7, -1, 18, -2, 0, 0.8, 0, 0, 0, 0, 0, 0, true, *EF_FLIP_YZ);
155-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
156153
}
157154
frame(lua_state, 15.0);
158155
if is_excute(fighter) {

‎fighters/mariod/src/acmd/tilts.rs

-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ unsafe extern "C" fn mariod_attack_s3_hi_effect(fighter: &mut L2CAgentBase) {
2222
frame(lua_state, 3.0);
2323
if is_excute(fighter) {
2424
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc"), Hash40::new("sys_attack_arc"), Hash40::new("top"), 1, 7, 7.5, 30, -60, 135, 0.95, true, *EF_FLIP_YZ);
25-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
2625
}
2726
frame(lua_state, 5.0);
2827
if is_excute(fighter) {
@@ -52,7 +51,6 @@ unsafe extern "C" fn mariod_attack_s3_s_effect(fighter: &mut L2CAgentBase) {
5251
frame(lua_state, 3.0);
5352
if is_excute(fighter) {
5453
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc"), Hash40::new("sys_attack_arc"), Hash40::new("top"), 1, 5, 9.0, 10, -39, 154, 0.95, true, *EF_FLIP_YZ);
55-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
5654
}
5755
frame(lua_state, 5.0);
5856
if is_excute(fighter) {
@@ -83,7 +81,6 @@ unsafe extern "C" fn mariod_attack_s3_lw_effect(fighter: &mut L2CAgentBase) {
8381
frame(lua_state, 3.0);
8482
if is_excute(fighter) {
8583
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc"), Hash40::new("sys_attack_arc"), Hash40::new("top"), -2, 3, 9.0, 5, -90, 170, 0.95, true, *EF_FLIP_YZ);
86-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
8784
}
8885
frame(lua_state, 5.0);
8986
if is_excute(fighter) {
@@ -137,7 +134,6 @@ unsafe extern "C" fn mariod_attack_lw3_effect(fighter: &mut L2CAgentBase) {
137134
if is_excute(fighter) {
138135
FOOT_EFFECT(fighter, Hash40::new("sys_run_smoke"), Hash40::new("top"), 3, 0, -3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
139136
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("sys_attack_arc"), Hash40::new("sys_attack_arc"), Hash40::new("top"), -2, 3, 4, -1, 12, -172, 0.95, true, *EF_FLIP_YZ);
140-
LAST_EFFECT_SET_COLOR(fighter, 0.5, 1.0, 2.0);
141137
}
142138
frame(lua_state, 10.0);
143139
if is_excute(fighter) {

‎romfs/source/fighter/common/param/fighter_param.prcxml

+3
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,9 @@
669669
<int hash="attack_hi4_hold_keep_frame">1</int>
670670
<int hash="attack_s4_hold_keep_frame">1</int>
671671
<int hash="attack_lw4_hold_keep_frame">1</int>
672+
<float hash="common_effect_0_r">0.5</float>
673+
<float hash="common_effect_0_g">1.0</float>
674+
<float hash="common_effect_0_b">2.0</float>
672675
</struct>
673676
<!-- PICHU -->
674677
<struct index="19">

0 commit comments

Comments
 (0)