Skip to content

Commit bb03551

Browse files
WuBoytHWuBoytH
authored
Merge pull request #2308 from 4Lukaska/Mario-Visuals
Mario/Doc Aesthetic Tweaks
2 parents 44bb0d4 + 3452291 commit bb03551

File tree

8 files changed

+347
-20
lines changed

8 files changed

+347
-20
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/mario/src/acmd/smashes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ unsafe extern "C" fn mario_attack_hi4_effect(fighter: &mut L2CAgentBase) {
101101
}
102102
frame(lua_state, 10.0);
103103
if is_excute(fighter) {
104-
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("mario_smash_arc"), Hash40::new("mario_smash_arc"), Hash40::new("top"), 1.0, 7.0, 0.0, -30, -100, -80, 0.95, true, *EF_FLIP_YZ);
104+
EFFECT_FOLLOW_FLIP(fighter, Hash40::new("mario_smash_arc"), Hash40::new("mario_smash_arc"), Hash40::new("top"), 1.0, 7.0, 0.0, -30, -100, -80, 0.90, true, *EF_FLIP_YZ);
105105
LAST_EFFECT_SET_RATE(fighter, 1.5);
106106
}
107107
frame(lua_state, 13.0);

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

+10-1
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.25, 0.5, 1.0);
121120
}
122121
frame(lua_state, 20.0);
123122
if is_excute(fighter){
@@ -212,6 +211,15 @@ unsafe extern "C" fn mariod_attack_air_hi_game(fighter: &mut L2CAgentBase) {
212211
}
213212
}
214213

214+
unsafe extern "C" fn mariod_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
215+
let lua_state = fighter.lua_state_agent;
216+
let boma = fighter.boma();
217+
frame(lua_state, 5.0);
218+
if is_excute(fighter) {
219+
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);
220+
}
221+
}
222+
215223
unsafe extern "C" fn mariod_attack_air_lw_game(fighter: &mut L2CAgentBase) {
216224
let lua_state = fighter.lua_state_agent;
217225
let boma = fighter.boma();
@@ -285,6 +293,7 @@ pub fn install() {
285293
.acmd("game_attackairb", mariod_attack_air_b_game)
286294
.acmd("effect_attackairb", mariod_attack_air_b_effect)
287295
.acmd("game_attackairhi", mariod_attack_air_hi_game)
296+
.acmd("effect_attackairhi", mariod_attack_air_hi_effect)
288297
.acmd("game_attackairlw", mariod_attack_air_lw_game)
289298
.acmd("effect_attackairlw", mariod_attack_air_lw_effect)
290299
.install();

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

+28
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@ unsafe extern "C" fn mariod_attack_12_game(fighter: &mut L2CAgentBase) {
5656

5757
}
5858

59+
unsafe extern "C" fn mariod_attack_12_effect(fighter: &mut L2CAgentBase) {
60+
let lua_state = fighter.lua_state_agent;
61+
let boma = fighter.boma();
62+
frame(lua_state, 1.0);
63+
if is_excute(fighter) {
64+
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);
65+
}
66+
frame(lua_state, 2.0);
67+
if is_excute(fighter) {
68+
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);
69+
LAST_EFFECT_SET_ALPHA(fighter, 0.7);
70+
}
71+
}
72+
5973
unsafe extern "C" fn mariod_attack_13_game(fighter: &mut L2CAgentBase) {
6074
let lua_state = fighter.lua_state_agent;
6175
let boma = fighter.boma();
@@ -77,6 +91,18 @@ unsafe extern "C" fn mariod_attack_13_game(fighter: &mut L2CAgentBase) {
7791

7892
}
7993

94+
unsafe extern "C" fn mariod_attack_13_effect(fighter: &mut L2CAgentBase) {
95+
let lua_state = fighter.lua_state_agent;
96+
let boma = fighter.boma();
97+
if is_excute(fighter) {
98+
FOOT_EFFECT(fighter, Hash40::new("null"), Hash40::new("top"), -2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
99+
}
100+
frame(lua_state, 2.0);
101+
if is_excute(fighter) {
102+
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);
103+
}
104+
}
105+
80106
unsafe extern "C" fn mariod_attack_13_expression(fighter: &mut L2CAgentBase) {
81107
let lua_state = fighter.lua_state_agent;
82108
let boma = fighter.boma();
@@ -139,7 +165,9 @@ pub fn install() {
139165
.acmd("game_attack11", mariod_attack_11_game)
140166
.acmd("effect_attack11", mariod_attack_11_effect)
141167
.acmd("game_attack12", mariod_attack_12_game)
168+
.acmd("effect_attack12", mariod_attack_12_effect)
142169
.acmd("game_attack13", mariod_attack_13_game)
170+
.acmd("effect_attack13", mariod_attack_13_effect)
143171
.acmd("expression_attack13", mariod_attack_13_expression)
144172
.acmd("game_attackdash", mariod_attack_dash_game)
145173
.install();

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

+133
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,130 @@ unsafe extern "C" fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
214214
}
215215
}
216216

217+
unsafe extern "C" fn mariod_jumpback_sound(fighter: &mut L2CAgentBase) {
218+
let lua_state = fighter.lua_state_agent;
219+
let boma = fighter.boma();
220+
frame(lua_state, 3.0);
221+
if is_excute(fighter) {
222+
PLAY_SE(fighter, Hash40::new("vc_mariod_passive"));
223+
}
224+
}
225+
226+
unsafe extern "C" fn mariod_jumpfront_sound(fighter: &mut L2CAgentBase) {
227+
let lua_state = fighter.lua_state_agent;
228+
let boma = fighter.boma();
229+
frame(lua_state, 3.0);
230+
if is_excute(fighter) {
231+
PLAY_SE(fighter, Hash40::new("vc_mariod_passive"));
232+
}
233+
}
234+
235+
unsafe extern "C" fn mariod_jumpbackmini_sound(fighter: &mut L2CAgentBase) {
236+
let lua_state = fighter.lua_state_agent;
237+
let boma = fighter.boma();
238+
frame(lua_state, 3.0);
239+
if is_excute(fighter) {
240+
PLAY_SE(fighter, Hash40::new("vc_mariod_attack05"));
241+
}
242+
}
243+
244+
unsafe extern "C" fn mariod_jumpfrontmini_sound(fighter: &mut L2CAgentBase) {
245+
let lua_state = fighter.lua_state_agent;
246+
let boma = fighter.boma();
247+
frame(lua_state, 3.0);
248+
if is_excute(fighter) {
249+
PLAY_SE(fighter, Hash40::new("vc_mariod_attack05"));
250+
}
251+
}
252+
253+
unsafe extern "C" fn mariod_jumpaerialback_sound(fighter: &mut L2CAgentBase) {
254+
let lua_state = fighter.lua_state_agent;
255+
let boma = fighter.boma();
256+
frame(lua_state, 2.0);
257+
if is_excute(fighter) {
258+
PLAY_SE(fighter, Hash40::new("vc_mariod_007"));
259+
}
260+
wait(lua_state, 9.0);
261+
if is_excute(fighter) {
262+
PLAY_SE(fighter, Hash40::new("se_common_swing_04"));
263+
}
264+
wait(lua_state, 12.0);
265+
if is_excute(fighter) {
266+
PLAY_SE(fighter, Hash40::new("se_common_swing_04"));
267+
}
268+
wait(lua_state, 12.0);
269+
if is_excute(fighter) {
270+
PLAY_SE(fighter, Hash40::new("se_common_swing_04"));
271+
}
272+
wait(lua_state, 12.0);
273+
if is_excute(fighter) {
274+
PLAY_SE(fighter, Hash40::new("se_common_swing_05"));
275+
}
276+
wait(lua_state, 12.0);
277+
if is_excute(fighter) {
278+
PLAY_SE(fighter, Hash40::new("se_common_swing_05"));
279+
}
280+
wait(lua_state, 12.0);
281+
if is_excute(fighter) {
282+
PLAY_SE(fighter, Hash40::new("se_common_swing_05"));
283+
}
284+
}
285+
286+
unsafe extern "C" fn mariod_jumpaerialfront_sound(fighter: &mut L2CAgentBase) {
287+
let lua_state = fighter.lua_state_agent;
288+
let boma = fighter.boma();
289+
frame(lua_state, 2.0);
290+
if is_excute(fighter) {
291+
PLAY_SE(fighter, Hash40::new("vc_mariod_007"));
292+
}
293+
wait(lua_state, 11.0);
294+
if is_excute(fighter) {
295+
PLAY_SE(fighter, Hash40::new("se_common_swing_04"));
296+
}
297+
wait(lua_state, 12.0);
298+
if is_excute(fighter) {
299+
PLAY_SE(fighter, Hash40::new("se_common_swing_04"));
300+
}
301+
wait(lua_state, 12.0);
302+
if is_excute(fighter) {
303+
PLAY_SE(fighter, Hash40::new("se_common_swing_04"));
304+
}
305+
wait(lua_state, 12.0);
306+
if is_excute(fighter) {
307+
PLAY_SE(fighter, Hash40::new("se_common_swing_05"));
308+
}
309+
}
310+
311+
unsafe extern "C" fn mariod_cliffjump2_sound(fighter: &mut L2CAgentBase) {
312+
let lua_state = fighter.lua_state_agent;
313+
let boma = fighter.boma();
314+
frame(lua_state, 1.0);
315+
if is_excute(fighter) {
316+
PLAY_SE(fighter, Hash40::new("vc_mariod_passive"));
317+
}
318+
frame(lua_state, 18.0);
319+
if is_excute(fighter) {
320+
PLAY_SE(fighter, Hash40::new("se_common_swing_04"));
321+
}
322+
}
323+
324+
unsafe extern "C" fn mariod_passivewalljump_sound(fighter: &mut L2CAgentBase) {
325+
let lua_state = fighter.lua_state_agent;
326+
let boma = fighter.boma();
327+
if is_excute(fighter) {
328+
PLAY_SE(fighter, Hash40::new("vc_mariod_009"));
329+
}
330+
}
331+
332+
unsafe extern "C" fn mariod_shootlegsjumpsquat_sound(fighter: &mut L2CAgentBase) {
333+
let lua_state = fighter.lua_state_agent;
334+
let boma = fighter.boma();
335+
frame(lua_state, 2.0);
336+
if is_excute(fighter) {
337+
PLAY_SE(fighter, Hash40::new("vc_mariod_passive"));
338+
}
339+
}
340+
217341
pub fn install() {
218342
smashline::Agent::new("mariod")
219343
.acmd("sound_damageflyhi", damageflyhi_sound)
@@ -226,6 +350,15 @@ pub fn install() {
226350
.acmd("game_turndash", mariod_turn_dash_game)
227351
.acmd("game_escapeair", escape_air_game)
228352
.acmd("game_escapeairslide", escape_air_slide_game)
353+
.acmd("sound_jumpback", mariod_jumpback_sound)
354+
.acmd("sound_jumpfront", mariod_jumpfront_sound)
355+
.acmd("sound_jumpbackmini", mariod_jumpbackmini_sound)
356+
.acmd("sound_jumpfrontmini", mariod_jumpfrontmini_sound)
357+
.acmd("sound_jumpaerialback", mariod_jumpaerialback_sound)
358+
.acmd("sound_jumpaerialfront", mariod_jumpaerialfront_sound)
359+
.acmd("sound_cliffjump2", mariod_cliffjump2_sound)
360+
.acmd("sound_passivewalljump", mariod_passivewalljump_sound)
361+
.acmd("sound_shootlegsjumpsquat", mariod_shootlegsjumpsquat_sound)
229362
.install();
230363
smashline::Agent::new("mariod_drcapsule")
231364
.acmd("game_regular", mariod_drcapsule_regular_game)

0 commit comments

Comments
 (0)