Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fox weight dependent shine/Upsmash FAF reduction. (slight weight adjustments) #2232

Merged
merged 5 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fighters/fox/src/acmd/smashes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ unsafe fn game_attackhi4(fighter: &mut L2CAgentBase) {
if is_excute(fighter) {
AttackModule::clear_all(boma);
}
frame(lua_state, 30.0);
FT_MOTION_RATE(fighter, 0.7);

}

Expand Down
2 changes: 1 addition & 1 deletion fighters/fox/src/acmd/specials.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ unsafe fn game_speciallwstart(fighter: &mut L2CAgentBase) {
frame(lua_state, 1.0);
FT_MOTION_RATE_RANGE(fighter, 1.0, 4.0, 4.0);
if is_excute(fighter) {
ATTACK(fighter, 0, 0, Hash40::new("top"), 3.0, 360, 42, 0, 62, 8.0, 0.0, 6.5, 0.0, None, None, None, 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, -1, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_elec"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_ENERGY);
ATTACK(fighter, 0, 0, Hash40::new("top"), 3.0, 360, 100, 80, 0, 8.0, 0.0, 6.5, 0.0, None, None, None, 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, -1, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_elec"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_ENERGY);
ATTACK(fighter, 1, 0, Hash40::new("top"), 3.0, 24, 24, 0, 66, 8.0, 0.0, 6.5, 0.0, None, None, None, 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, -1, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_elec"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_FIRE, *ATTACK_REGION_ENERGY);
AttackModule::set_add_reaction_frame(boma, 0, 2.0, false);
ReflectorModule::set_status(boma, *FIGHTER_FOX_REFLECTOR_KIND_REFLECTOR, app::ShieldStatus(*SHIELD_STATUS_NORMAL), *FIGHTER_REFLECTOR_GROUP_EXTEND);
Expand Down
12 changes: 6 additions & 6 deletions romfs/source/fighter/common/param/fighter_param.prcxml
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@
<float hash="damage_fly_top_air_accel_y">0.11</float>
<float hash="damage_fly_top_speed_y_stable">2.16</float>
<float hash="dive_speed_y">2.9</float>
<float hash="weight">86</float>
<float hash="weight">85</float>
<float hash="landing_attack_air_frame_n">8</float>
<float hash="landing_attack_air_frame_f">9</float>
<float hash="landing_attack_air_frame_b">7</float>
Expand Down Expand Up @@ -1617,7 +1617,7 @@
<float hash="damage_fly_top_air_accel_y">0.09</float>
<float hash="damage_fly_top_speed_y_stable">1.649</float>
<float hash="dive_speed_y">2.225</float>
<float hash="weight">86</float>
<float hash="weight">85</float>
<float hash="landing_attack_air_frame_n">7</float>
<float hash="landing_attack_air_frame_f">11</float>
<float hash="landing_attack_air_frame_b">12</float>
Expand Down Expand Up @@ -1798,7 +1798,7 @@
<float hash="damage_fly_top_air_accel_y">0.15</float>
<float hash="damage_fly_top_speed_y_stable">2.49</float>
<float hash="dive_speed_y">3.441</float>
<float hash="weight">86</float>
<float hash="weight">85</float>
<float hash="landing_attack_air_frame_n">9</float>
<float hash="landing_attack_air_frame_b">9</float>
<float hash="landing_attack_air_frame_hi">12</float>
Expand Down Expand Up @@ -2008,7 +2008,7 @@
<float hash="damage_fly_top_air_accel_y">0.09</float>
<float hash="damage_fly_top_speed_y_stable">1.91</float>
<float hash="dive_speed_y">2.8</float>
<float hash="weight">86</float>
<float hash="weight">85</float>
<float hash="landing_attack_air_frame_n">8</float>
<float hash="landing_attack_air_frame_f">8</float>
<float hash="landing_attack_air_frame_b">10</float>
Expand Down Expand Up @@ -2720,7 +2720,7 @@
<float hash="damage_fly_top_air_accel_y">0.09</float>
<float hash="damage_fly_top_speed_y_stable">2.14</float>
<float hash="dive_speed_y">2.889</float>
<float hash="weight">86</float>
<float hash="weight">85</float>
<float hash="landing_attack_air_frame_n">10</float>
<float hash="landing_attack_air_frame_f">9</float>
<float hash="landing_attack_air_frame_hi">9</float>
Expand Down Expand Up @@ -2854,7 +2854,7 @@
<float hash="damage_fly_top_air_accel_y">0.145</float>
<float hash="damage_fly_top_speed_y_stable">2.5</float>
<float hash="dive_speed_y">3.272</float>
<float hash="weight">86</float>
<float hash="weight">85</float>
<float hash="landing_attack_air_frame_n">7</float>
<float hash="landing_attack_air_frame_f">9</float>
<float hash="landing_attack_air_frame_b">10</float>
Expand Down
Loading