Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3877e36777 | ||
|
|
c390f4945f |
Generated
+2
-2
@@ -3468,9 +3468,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gc-adapter-neo"
|
name = "gc-adapter-neo"
|
||||||
version = "1.1.0"
|
version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "120a5b3858ae854c4674ae41a38173e8ea04b814fb3212fd3bdd1b04d414a9d7"
|
checksum = "bd350c081bf33e501e9a5a11732294dfe266683d6b58a366b097146f3e633cb5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"binread",
|
"binread",
|
||||||
"modular-bitfield",
|
"modular-bitfield",
|
||||||
|
|||||||
+1
-1
@@ -30,7 +30,7 @@ strum = "0.28.0"
|
|||||||
strum_macros = "0.28.0"
|
strum_macros = "0.28.0"
|
||||||
bevy_asset_loader = "0.27.0"
|
bevy_asset_loader = "0.27.0"
|
||||||
ron_asset_manager = "0.9.0"
|
ron_asset_manager = "0.9.0"
|
||||||
gc-adapter-neo = { version = "1.1.0", features = ["libusb"] }
|
gc-adapter-neo = { version = "1.0.0", features = ["libusb"] }
|
||||||
rhai = "1.26.0"
|
rhai = "1.26.0"
|
||||||
enum_cycling = "0.2.1"
|
enum_cycling = "0.2.1"
|
||||||
enum_cycling_derive = "0.2.1"
|
enum_cycling_derive = "0.2.1"
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ pub enum HitReactionKind {
|
|||||||
#[derive(Debug, Hash, Clone)]
|
#[derive(Debug, Hash, Clone)]
|
||||||
pub struct FighterHitReaction {
|
pub struct FighterHitReaction {
|
||||||
pub launch_velocity: FGVec2,
|
pub launch_velocity: FGVec2,
|
||||||
pub launch_angle: FGi32,
|
|
||||||
pub hitstop_frames: HitStop,
|
pub hitstop_frames: HitStop,
|
||||||
pub hitstun_frames: u32,
|
pub hitstun_frames: u32,
|
||||||
pub kind: HitReactionKind,
|
pub kind: HitReactionKind,
|
||||||
@@ -63,13 +62,10 @@ pub struct FighterLastAttackDebug {
|
|||||||
pub trajectory_points: Vec<Vec3>,
|
pub trajectory_points: Vec<Vec3>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Default, Clone, Deref, DerefMut, Hash, PartialEq, PartialOrd)]
|
#[derive(Debug, Default, Clone, Deref, DerefMut, Hash)]
|
||||||
pub struct HitStop(u32);
|
pub struct HitStop(u32);
|
||||||
|
|
||||||
impl HitStop {
|
impl HitStop {
|
||||||
pub fn new(hitstop: u32) -> Self {
|
|
||||||
HitStop(hitstop)
|
|
||||||
}
|
|
||||||
pub fn calculate(attack_damage_stalled: FighterDamage, crouch_cancelling: bool) -> Self {
|
pub fn calculate(attack_damage_stalled: FighterDamage, crouch_cancelling: bool) -> Self {
|
||||||
let a = (attack_damage_stalled.0 / FGi32::lit("3.0") + FGi32::lit("4.0")).round_to_zero();
|
let a = (attack_damage_stalled.0 / FGi32::lit("3.0") + FGi32::lit("4.0")).round_to_zero();
|
||||||
let crouch_cancelling_factor = if crouch_cancelling {
|
let crouch_cancelling_factor = if crouch_cancelling {
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ pub fn resolve_fighter_hits(
|
|||||||
attacker_slot,
|
attacker_slot,
|
||||||
FighterHitReaction {
|
FighterHitReaction {
|
||||||
launch_velocity: launch_direction * knockback.get_launch_speed(&game_settings),
|
launch_velocity: launch_direction * knockback.get_launch_speed(&game_settings),
|
||||||
launch_angle,
|
|
||||||
hitstun_frames: knockback.get_hitstun_frames(&game_settings),
|
hitstun_frames: knockback.get_hitstun_frames(&game_settings),
|
||||||
hitstop_frames: hitstop,
|
hitstop_frames: hitstop,
|
||||||
kind: HitReactionKind::Flinch,
|
kind: HitReactionKind::Flinch,
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ use bevy::prelude::*;
|
|||||||
|
|
||||||
use crate::fighter::animation::{AnimKind, FighterAnimationFrame};
|
use crate::fighter::animation::{AnimKind, FighterAnimationFrame};
|
||||||
use crate::fighter::attack::{
|
use crate::fighter::attack::{
|
||||||
FighterAttackScriptAssets, FighterKnockbackVelocity, FighterPendingHitReaction, FighterStaleMoveQueue, HitStop,
|
FighterAttackScriptAssets, FighterKnockbackVelocity, FighterPendingHitReaction,
|
||||||
|
FighterStaleMoveQueue,
|
||||||
};
|
};
|
||||||
use crate::fighter::attributes::FighterAttributes;
|
use crate::fighter::attributes::FighterAttributes;
|
||||||
use crate::fighter::baked_animation::BakedFighterAnimations;
|
use crate::fighter::baked_animation::BakedFighterAnimations;
|
||||||
@@ -21,7 +22,6 @@ use crate::fighter::{
|
|||||||
};
|
};
|
||||||
use crate::game_settings::GameSettings;
|
use crate::game_settings::GameSettings;
|
||||||
use crate::input::FighterInput;
|
use crate::input::FighterInput;
|
||||||
use crate::math::int::FGi32;
|
|
||||||
use crate::scripting::FighterAttackScript;
|
use crate::scripting::FighterAttackScript;
|
||||||
use crate::stage::line::StageCollision;
|
use crate::stage::line::StageCollision;
|
||||||
|
|
||||||
@@ -391,7 +391,7 @@ pub fn state_interrupt_system(
|
|||||||
|
|
||||||
let new_state = if let Some(reaction) = pending_hit_reaction.take() {
|
let new_state = if let Some(reaction) = pending_hit_reaction.take() {
|
||||||
hitstop.remaining_frames = *reaction.hitstop_frames;
|
hitstop.remaining_frames = *reaction.hitstop_frames;
|
||||||
let mut hitstop_kind = match &*state {
|
let hitstop_kind = match &*state {
|
||||||
FighterState::Wait(value) => {
|
FighterState::Wait(value) => {
|
||||||
hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
|
hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
|
||||||
}
|
}
|
||||||
@@ -412,26 +412,6 @@ pub fn state_interrupt_system(
|
|||||||
}
|
}
|
||||||
_ => hitstun::HitstopStateKind::Airborne,
|
_ => hitstun::HitstopStateKind::Airborne,
|
||||||
};
|
};
|
||||||
|
|
||||||
if let hitstun::HitstopStateKind::Grounded(_) = hitstop_kind {
|
|
||||||
let straight_up_angle = FGi32::lit("90.0");
|
|
||||||
if reaction.hitstop_frames >= HitStop::new(game_settings.fighter_common.tumble_bounce_hitstop_threshold) {
|
|
||||||
hitstop_kind = hitstun::HitstopStateKind::Airborne;
|
|
||||||
// TODO: Use floor normal here
|
|
||||||
} else if reaction.launch_angle.abs_diff(straight_up_angle) < game_settings.fighter_common.attack_ground_to_airborne_transition_vertical_angle_threshold {
|
|
||||||
hitstop_kind = hitstun::HitstopStateKind::Airborne;
|
|
||||||
} else {
|
|
||||||
// straight down is 270
|
|
||||||
let straight_down_angle = FGi32::lit("270.0");
|
|
||||||
let meteor_threshold = game_settings.fighter_common.meteor_angle_threshold;
|
|
||||||
if (reaction.launch_angle - straight_down_angle).abs() <= meteor_threshold {
|
|
||||||
// TODO: Floor bounce
|
|
||||||
hitstop_kind = hitstun::HitstopStateKind::Airborne;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Entering hitstop kind: {:?}", hitstop_kind);
|
|
||||||
Some(FighterState::Hitstun(HitstunState {
|
Some(FighterState::Hitstun(HitstunState {
|
||||||
hit_reaction: reaction,
|
hit_reaction: reaction,
|
||||||
hitstop_kind,
|
hitstop_kind,
|
||||||
|
|||||||
@@ -9,28 +9,12 @@ use crate::{math::int::FGi32, menus::style::FGUiStyle};
|
|||||||
#[reflect(opaque)]
|
#[reflect(opaque)]
|
||||||
pub struct FighterSettingsCommon {
|
pub struct FighterSettingsCommon {
|
||||||
pub walk_speed_ease: FGi32,
|
pub walk_speed_ease: FGi32,
|
||||||
|
|
||||||
/// Maximum allowed horizontal velocity
|
|
||||||
pub ground_max_horizontal_velocity: FGi32,
|
pub ground_max_horizontal_velocity: FGi32,
|
||||||
|
|
||||||
/// Ground friction applied when the fighter is above the walk speed
|
|
||||||
pub ground_friction_over_walk_speed_multiplier: FGi32,
|
pub ground_friction_over_walk_speed_multiplier: FGi32,
|
||||||
pub knockback_stacking_window: u32,
|
pub knockback_stacking_window: u32,
|
||||||
pub knockback_decay_per_frame: FGi32,
|
pub knockback_decay_per_frame: FGi32,
|
||||||
|
|
||||||
/// Multiplier that translates knockback -> game unit velocity
|
|
||||||
pub knockback_launch_velocity_multiplier: FGi32,
|
pub knockback_launch_velocity_multiplier: FGi32,
|
||||||
pub hitstun_frames_per_unit_knockback: FGi32,
|
pub hitstun_frames_per_unit_knockback: FGi32,
|
||||||
|
|
||||||
/// If an attack's hitstop > this value it will cause a grounded fighter to either bounce (if a meteor/spike)
|
|
||||||
/// or to become airborne
|
|
||||||
pub tumble_bounce_hitstop_threshold: u32,
|
|
||||||
|
|
||||||
/// Angle diff from straight down under which the attack will count as a meteor
|
|
||||||
pub meteor_angle_threshold: FGi32,
|
|
||||||
|
|
||||||
/// Angle diff from straight up under which the attack will force an airborne state
|
|
||||||
pub attack_ground_to_airborne_transition_vertical_angle_threshold: FGi32,
|
|
||||||
}
|
}
|
||||||
#[derive(Reflect, Serialize, Deserialize, Clone)]
|
#[derive(Reflect, Serialize, Deserialize, Clone)]
|
||||||
#[reflect(opaque)]
|
#[reflect(opaque)]
|
||||||
|
|||||||
@@ -45,8 +45,8 @@ impl GcPortState {
|
|||||||
dpad_right: b.dpad_right(),
|
dpad_right: b.dpad_right(),
|
||||||
left_trigger_digital: b.left_trigger(),
|
left_trigger_digital: b.left_trigger(),
|
||||||
right_trigger_digital: b.right_trigger(),
|
right_trigger_digital: b.right_trigger(),
|
||||||
left_stick: cal.left_stick_coords(&c),
|
left_stick: cal.left_stick(&c),
|
||||||
right_stick: cal.right_stick_coords(&c),
|
right_stick: cal.right_stick(&c),
|
||||||
triggers: (c.triggers.left.raw(), c.triggers.right.raw()),
|
triggers: (c.triggers.left.raw(), c.triggers.right.raw()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user