Make triggers be bound to airdodge on non-gamecube controllers

Reviewed-on: #64
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>

src/debug_tools/save_state.rs

@@ -153,7 +153,7 @@ pub(super) fn save_or_restore(world: &mut World) {
         entity.insert(saved.hitboxes.clone());
         entity.insert(saved.solved_hurtboxes.clone());
         entity.insert(saved.bone_matrices.clone());
-        entity.insert(saved.surface);
+        entity.insert(saved.surface.clone());
     }
     world.insert_resource(checkpoint.pending_hits.clone());
     world.insert_resource(checkpoint.stage_collision);
@@ -187,7 +187,7 @@ fn capture_fighter(world: &World, entity: Entity) -> Option<FighterCheckpoint> {
         hitboxes: fighter.get::<FighterHitboxes>()?.clone(),
         solved_hurtboxes: fighter.get::<FighterSolvedHurtboxes>()?.clone(),
         bone_matrices: fighter.get::<FighterBoneMatrices>()?.clone(),
-        surface: *fighter.get::<FighterSurfaceState>()?,
+        surface: fighter.get::<FighterSurfaceState>()?.clone(),
     })
 }
 

src/fighter/animation.rs

@@ -84,6 +84,11 @@ pub enum AnimKind {
     AirDodge,
     Fall,
     Turn,
+    CrouchEnter,
+    CrouchIdle,
+    CrouchExit,
+
+    PlatformPass,
 
     FlinchGround,
     FlinchAir,

src/fighter/collision.rs

@@ -44,6 +44,7 @@ pub fn air_collide_with_stage(
     prev_ecb: &FighterPreviousECB,
     ecb: &FighterECB,
     stage_collision: &StageCollision,
+    ignored_polys: &[usize],
 ) -> Option<AirCollisionWithStageResult> {
     let ray_segment = FGSegment2d::new(
         prev_translation.0 + prev_ecb.get_bottom_point(),
@@ -54,6 +55,7 @@ pub fn air_collide_with_stage(
         .stage_polys
         .iter()
         .enumerate()
+        .filter(|(poly_idx, _)| !ignored_polys.contains(poly_idx))
         .filter_map(|(poly_idx, poly)| {
             poly.intersect_ray(ray_segment).map(|intersect_result| {
                 (
@@ -76,3 +78,54 @@ pub fn air_collide_with_stage(
         .max_by(|(_, a), (_, b)| a.cmp(b))
         .map(|(result, _)| result)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::fighter::ecb::{FighterECB, FighterPreviousECB};
+    use crate::stage::line::{StagePoly, StagePolyLineSegmentType, StagePolyType};
+
+    fn horizontal_platform(y: &str) -> StagePoly {
+        StagePoly::build(
+            StagePolyType::Platform,
+            &[
+                (FGVec2::lit("-2", y), StagePolyLineSegmentType::Floor),
+                (FGVec2::lit("2", y), StagePolyLineSegmentType::Floor),
+            ],
+        )
+    }
+
+    #[test]
+    fn airborne_collision_skips_ignored_polygons() {
+        let stage_collision = StageCollision {
+            stage_polys: vec![horizontal_platform("0"), horizontal_platform("1")],
+        };
+        let previous_translation = FighterPreviousTranslation(FGVec2::lit("0", "2"));
+        let translation = FighterTranslation(FGVec2::lit("0", "-1"));
+        let previous_ecb = FighterPreviousECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+        let ecb = FighterECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+
+        let collision = air_collide_with_stage(
+            &previous_translation,
+            &translation,
+            &previous_ecb,
+            &ecb,
+            &stage_collision,
+            &[1],
+        )
+        .expect("the non-ignored platform should still be collidable");
+
+        assert_eq!(collision.line_id.polygon, 0);
+        assert_eq!(collision.hit_position, FGVec2::lit("0", "0"));
+    }
+}

src/fighter/ecb.rs

@@ -105,8 +105,8 @@ pub fn update_ecb(
         let left = FGVec2::new(min_x, midpoint_height);
         let right = FGVec2::new(max_x, midpoint_height);
 
-        let ecb_lock_frames_remaining = if let FighterSurfaceState::Airborne { ecb_lock_frames_remaining } = *surface_state {
-            ecb_lock_frames_remaining
+        let ecb_lock_frames_remaining = if let FighterSurfaceState::Airborne { ecb_lock_frames_remaining, .. } = surface_state {
+            *ecb_lock_frames_remaining
         } else {
             0
         };
@@ -129,6 +129,7 @@ pub fn update_ecb(
 pub fn decrement_ecb_lockout(surface_states: Query<&mut FighterSurfaceState>) {
     for mut state in surface_states {
         state.tick_ecb_lock();
+        state.tick_ignored_polygons();
     }
 }
 

src/fighter/mod.rs

@@ -206,7 +206,7 @@ impl Plugin for FighterPlugin {
             .checksum_component_with_hash::<FighterPreviousFacingDirection>()
             .rollback_component_with_copy::<animation::FighterAnimationFrame>()
             .checksum_component_with_hash::<animation::FighterAnimationFrame>()
-            .rollback_component_with_copy::<FighterSurfaceState>()
+            .rollback_component_with_clone::<FighterSurfaceState>()
             .checksum_component_with_hash::<FighterSurfaceState>()
             .rollback_component_with_copy::<FighterFacingDirection>()
             .rollback_component_with_copy::<FighterDamage>()

src/fighter/state/crouch.rs

@@ -0,0 +1,160 @@
+use super::{
+    CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, ground,
+};
+use crate::fighter::FighterSurfaceState;
+use crate::fighter::animation::AnimKind;
+use crate::fighter::state::air::AirborneStateCommon;
+use crate::fighter::state::ground::{
+    grounded_movement_common_interrupts, grounded_movement_standstill_common_interrupts,
+};
+use crate::fighter::state::platform_pass::PlatformPassState;
+use crate::fighter::state::{FighterState, dash, ground_attack, turn, walk};
+use crate::input::FighterCommands;
+use crate::stage::line::StagePolyType;
+
+#[derive(Debug, Clone, Hash)]
+pub enum CrouchSubState {
+    Entering { pass_queued: bool },
+    Idle,
+    Exiting,
+}
+
+#[derive(Debug, Clone, Hash)]
+pub struct CrouchState {
+    sub_state: CrouchSubState,
+}
+
+pub fn crouch_idle_interrupts(state_context: &InterruptContext) -> Option<FighterState> {
+    if let Some(state) = ground_attack::check_interrupt(state_context) {
+        Some(state)
+    } else if let Some(state) = dash::check_input(state_context) {
+        Some(state)
+    } else if let Some(state) = turn::check_input(state_context) {
+        Some(state)
+    } else if let Some(state) = walk::check_input(state_context) {
+        Some(state)
+    } else {
+        None
+    }
+}
+
+pub fn crouch_entering_interrupts(state_context: &InterruptContext) -> Option<FighterState> {
+    if let Some(state) = ground_attack::check_interrupt(state_context) {
+        Some(state)
+    } else {
+        None
+    }
+}
+
+impl FighterStateImpl for CrouchState {
+    const NAME: &'static str = "Crouch";
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
+        if let Some(state) = grounded_movement_common_interrupts(state_context) {
+            return Some(state);
+        }
+
+        match self.sub_state {
+            CrouchSubState::Entering { pass_queued } => {
+                // pass
+                if let FighterSurfaceState::Grounded { line_id } = state_context.surface {
+                    if let Some(stage_poly) = state_context
+                        .stage_collision
+                        .stage_polys
+                        .get(line_id.polygon)
+                    {
+                        let is_inputting_crouch = -state_context.game_settings.input_common.run_stick_threshold > state_context.input.get_last_frame().movement.y;
+                        let is_on_a_soft_platform = matches!(stage_poly.poly_type, StagePolyType::Platform);
+                        if pass_queued && is_inputting_crouch && is_on_a_soft_platform 
+                        {
+                            return Some(FighterState::PlatformPass(PlatformPassState::new(
+                                AirborneStateCommon::default(),
+                                line_id.polygon,
+                            )));
+                        }
+                    }
+                }
+
+                // While entering the crouch animation we do not allow movement inputs, but we do allow attacks and jumps
+                if state_context.is_current_animation_finished() {
+                    return Some(FighterState::Crouch(CrouchState {
+                        sub_state: CrouchSubState::Idle,
+                    }));
+                } else {
+                    return crouch_entering_interrupts(state_context);
+                }
+            }
+            CrouchSubState::Idle => {
+                if state_context.input.get_last_frame().movement.y
+                    > -state_context.game_settings.input_common.run_stick_threshold
+                {
+                    return Some(FighterState::Crouch(CrouchState {
+                        sub_state: CrouchSubState::Exiting,
+                    }));
+                } else {
+                    return crouch_idle_interrupts(state_context);
+                }
+            }
+            CrouchSubState::Exiting => {
+                if state_context.is_current_animation_finished() {
+                    return grounded_movement_standstill_common_interrupts(state_context);
+                } else {
+                    return crouch_idle_interrupts(state_context);
+                }
+            }
+        }
+    }
+
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
+        match self.sub_state {
+            CrouchSubState::Entering { .. } => {
+                state_context.play_animation(AnimKind::CrouchEnter, false);
+            }
+            CrouchSubState::Idle => {
+                state_context.play_animation(AnimKind::CrouchIdle, true);
+            }
+            CrouchSubState::Exiting => {
+                state_context.play_animation(AnimKind::CrouchExit, false);
+            }
+        }
+    }
+
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        if let CrouchSubState::Entering {
+            pass_queued,
+        } = &mut self.sub_state
+        {
+            if state_context
+                .input
+                .has_command(FighterCommands::SmashMoveDown)
+            {
+                state_context
+                    .input
+                    .clear_command(FighterCommands::SmashMoveDown);
+                *pass_queued = true;
+            }
+        }
+        ground::update_friction_motion(state_context);
+    }
+
+    fn check_collision_interrupt(
+        &mut self,
+        state_context: &mut CollisionContext,
+    ) -> Option<FighterState> {
+        ground::collision_interrupt(state_context, false)
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
+    }
+}
+
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
+    let input_frame = state_context.input.get_last_frame();
+
+    if input_frame.movement.y <= -state_context.game_settings.input_common.run_stick_threshold {
+        return Some(FighterState::Crouch(CrouchState {
+            sub_state: CrouchSubState::Entering { pass_queued: false },
+        }));
+    }
+    None
+}

src/fighter/state/ground.rs

@@ -3,8 +3,7 @@
 //! bit-for-bit deterministic for rollback.
 
 use crate::fighter::state::{
-    CollisionContext, FighterState, InterruptContext, air, dash, fall, ground_attack, turn, wait,
-    walk,
+    CollisionContext, FighterState, InterruptContext, air, crouch, dash, fall, ground_attack, turn, wait, walk,
 };
 use crate::fighter::{
     FighterAttributes, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
@@ -461,6 +460,8 @@ pub fn grounded_movement_standstill_common_interrupts(
         Some(state)
     } else if let Some(state) = turn::check_input(state_context) {
         Some(state)
+    } else if let Some(state) = crouch::check_input(state_context) {
+        Some(state)
     } else if let Some(state) = walk::check_input(state_context) {
         Some(state)
     } else if let Some(state) = wait::check_input(state_context) {

src/fighter/state/mod.rs

@@ -41,6 +41,8 @@ pub mod run;
 pub mod turn;
 pub mod wait;
 pub mod walk;
+pub mod crouch;
+pub mod platform_pass;
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
 pub enum SurfacePolicy {
@@ -126,7 +128,9 @@ pub struct InterruptContext<'a> {
     pub facing_direction: &'a mut FighterFacingDirection,
     pub game_settings: &'a GameSettings,
     pub fighter_attributes: &'a FighterAttributes,
+    pub surface: &'a FighterSurfaceState,
     pub animation: AnimationStatus,
+    pub stage_collision: &'a StageCollision,
 }
 
 impl InterruptContext<'_> {
@@ -147,8 +151,10 @@ pub struct EnterContext<'a> {
     pub stale_move_queue: &'a mut FighterStaleMoveQueue,
     pub facing_direction: &'a mut FighterFacingDirection,
     pub animation_frame: &'a mut FighterAnimationFrame,
+    pub surface: &'a mut FighterSurfaceState,
     pub fighter_attributes: &'a FighterAttributes,
     pub attack_script_assets: &'a FighterAttackScriptAssets,
+    pub game_settings: &'a GameSettings,
 }
 
 impl EnterContext<'_> {
@@ -159,6 +165,7 @@ impl EnterContext<'_> {
 
 pub struct ExitContext<'a> {
     pub hitboxes: &'a mut FighterHitboxes,
+    pub surface: &'a mut FighterSurfaceState,
 }
 
 pub struct UpdateContext<'a> {
@@ -198,12 +205,14 @@ impl CollisionContext<'_> {
     pub fn air_collide_with_stage(
         &self,
     ) -> Option<crate::fighter::collision::AirCollisionWithStageResult> {
+        let ignored_polys = self.surface.ignored_polygon_ids();
         crate::fighter::collision::air_collide_with_stage(
             self.prev_translation,
             self.translation,
             self.prev_ecb,
             self.ecb,
             self.stage_collision,
+            &ignored_polys,
         )
     }
 }
@@ -211,6 +220,8 @@ impl CollisionContext<'_> {
 fighter_states! {
     Wait => wait::WaitState,
     Walk => walk::WalkState,
+    PlatformPass => platform_pass::PlatformPassState,
+    Crouch => crouch::CrouchState,
     Dash => dash::DashState,
     Run => run::RunState,
     Fall => fall::FallState,
@@ -264,6 +275,7 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         animations: &'a FighterAnimations,
         baked_animations: &'a Assets<BakedFighterAnimations>,
         attributes: &'a FighterAttributes,
+        stage_collision: &'a StageCollision,
     ) -> InterruptContext<'a> {
         let animation = self.animation_status(animations, baked_animations);
         InterruptContext {
@@ -272,6 +284,8 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             game_settings,
             fighter_attributes: attributes,
             animation,
+            surface: &self.surface,
+            stage_collision,
         }
     }
 
@@ -279,6 +293,7 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         &'a mut self,
         attributes: &'a FighterAttributes,
         attack_script_assets: &'a FighterAttackScriptAssets,
+        game_settings: &'a GameSettings,
     ) -> EnterContext<'a> {
         EnterContext {
             input: &mut self.input,
@@ -288,14 +303,17 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             stale_move_queue: &mut self.stale_move_queue,
             facing_direction: &mut self.facing_direction,
             animation_frame: &mut self.animation_frame,
+            surface: &mut self.surface,
             fighter_attributes: attributes,
             attack_script_assets,
+            game_settings
         }
     }
 
     fn exit_context(&mut self) -> ExitContext<'_> {
         ExitContext {
             hitboxes: &mut self.hitboxes,
+            surface: &mut self.surface,
         }
     }
 
@@ -403,7 +421,7 @@ fn transition_state(
             game_settings.fighter_common.leave_ground_ecb_frame_lock_duration,
         );
     }
-    next.on_enter(&mut frame.enter_context(attributes, attack_script_assets));
+    next.on_enter(&mut frame.enter_context(attributes, attack_script_assets, game_settings));
     *current = next;
     info!("{} -> {}", old_name, new_name);
 }
@@ -413,6 +431,7 @@ pub fn state_interrupt_system(
     game_settings: Res<GameSettings>,
     baked_animations: Res<Assets<BakedFighterAnimations>>,
     fighter_manifests: Res<Assets<FighterManifest>>,
+    stage_collision: Res<StageCollision>,
 ) {
     for fighter in &mut query {
         let StatefulFighterQueryItem {
@@ -486,6 +505,7 @@ pub fn state_interrupt_system(
                 animations,
                 &baked_animations,
                 &manifest.attributes,
+                &stage_collision
             ))
         };
 

src/fighter/state/platform_pass.rs

@@ -0,0 +1,61 @@
+use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
+use crate::fighter::animation::AnimKind;
+use crate::fighter::state::air::AirborneStateCommon;
+use crate::fighter::state::{ExitContext, FighterState, air, jump};
+
+#[derive(Debug, Clone, Copy, Hash, Default)]
+pub struct PlatformPassState {
+    airborne_state_common: AirborneStateCommon,
+    ignored_polygon: usize,
+}
+
+impl PlatformPassState {
+    pub fn new(airborne_state_common: AirborneStateCommon, ignored_polygon: usize) -> Self {
+        Self {
+            airborne_state_common,
+            ignored_polygon
+        }
+    }
+}
+
+impl FighterStateImpl for PlatformPassState {
+    const NAME: &'static str = "PlatformPass";
+    
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
+        jump::check_input_double_jump(state_context)
+    }
+
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
+        state_context.surface.ignore_polygon(self.ignored_polygon, state_context.game_settings.fighter_common.platform_pass_platform_ignore_duration_frames);
+        state_context.velocity.y = state_context.game_settings.fighter_common.platform_pass_initial_downwards_velocity;
+        state_context.play_animation(AnimKind::PlatformPass, false);
+    }
+
+    fn on_exit(&mut self, state_context: &mut ExitContext) {
+        state_context.surface.clear_polygon_ignore(self.ignored_polygon);
+    }
+
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        air::update_standard_motion(state_context, &mut self.airborne_state_common);
+    }
+
+    fn check_collision_interrupt(
+        &mut self,
+        state_context: &mut CollisionContext,
+    ) -> Option<FighterState> {
+        air::collision_interrupt(
+            state_context,
+            crate::fighter::state::land::LandingType::Normal,
+        )
+    }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        false
+    }
+
+    fn surface_policy(&self) -> super::SurfacePolicy {
+        super::SurfacePolicy::Airborne(crate::fighter::surface::EcbLockPolicy::StartOnDetach)
+    }
+}

src/fighter/surface.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{stage::line::StageLineID};
+use crate::stage::line::StageLineID;
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
 pub enum EcbLockPolicy {
@@ -15,10 +15,17 @@ pub enum EcbLockPolicy {
 /// This is physics state rather than fighter-state-machine state. Keeping it
 /// separate means grounded, landing, and hitstun states all share one source
 /// of truth for stage contact.
-#[derive(Component, Clone, Copy, Debug, Hash, PartialEq, Eq)]
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
+pub struct IgnoredPolygon {
+    pub polygon: usize,
+    pub frames_remaining: u32,
+}
+
+#[derive(Component, Clone, Debug, Hash, PartialEq, Eq)]
 pub enum FighterSurfaceState {
     Airborne {
-        ecb_lock_frames_remaining: u32
+        ecb_lock_frames_remaining: u32,
+        ignored_polys: Vec<IgnoredPolygon>,
     },
     Grounded {
         line_id: StageLineID,
@@ -28,20 +35,21 @@ pub enum FighterSurfaceState {
 impl Default for FighterSurfaceState {
     fn default() -> Self {
         Self::Airborne {
-            ecb_lock_frames_remaining: 0
+            ecb_lock_frames_remaining: 0,
+            ignored_polys: vec![],
         }
     }
 }
 
 impl FighterSurfaceState {
-    pub fn is_grounded(self) -> bool {
+    pub fn is_grounded(&self) -> bool {
         matches!(self, Self::Grounded { .. })
     }
 
-    pub fn line_id(self) -> Option<StageLineID> {
+    pub fn line_id(&self) -> Option<StageLineID> {
         match self {
             Self::Airborne { .. } => None,
-            Self::Grounded { line_id } => Some(line_id),
+            Self::Grounded { line_id } => Some(*line_id),
         }
     }
 
@@ -49,13 +57,54 @@ impl FighterSurfaceState {
         *self = Self::Grounded { line_id };
     }
 
+    pub fn clear_polygon_ignore(&mut self, polygon: usize) {
+        let Self::Airborne { ignored_polys, .. } = self else {
+            return;
+        };
+
+        ignored_polys.retain(|element| element.polygon != polygon);
+    }
+    
+    pub fn ignore_polygon(&mut self, polygon: usize, duration_frames: u32) {
+        let Self::Airborne { ignored_polys, .. } = self else {
+            return;
+        };
+
+        if duration_frames == 0 {
+            return;
+        }
+
+        if let Some(ignored) = ignored_polys.iter_mut().find(|ignored| ignored.polygon == polygon) {
+            ignored.frames_remaining = duration_frames;
+        } else {
+            ignored_polys.push(IgnoredPolygon {
+                polygon,
+                frames_remaining: duration_frames,
+            });
+        }
+    }
+
+    pub fn is_polygon_ignored(&self, polygon: usize) -> bool {
+        matches!(self, Self::Airborne { ignored_polys, .. }
+            if ignored_polys.iter().any(|ignored| ignored.polygon == polygon))
+    }
+
+    pub(crate) fn ignored_polygon_ids(&self) -> Vec<usize> {
+        match self {
+            Self::Airborne { ignored_polys, .. } => {
+                ignored_polys.iter().map(|ignored| ignored.polygon).collect()
+            }
+            Self::Grounded { .. } => vec![],
+        }
+    }
+
     pub(crate) fn apply_airborne_policy(
         &mut self,
         policy: EcbLockPolicy,
         ecb_lock_duration: u32,
     ) {
-        let current_lock = match *self {
-            Self::Airborne { ecb_lock_frames_remaining } => ecb_lock_frames_remaining,
+        let current_lock = match self {
+            Self::Airborne { ecb_lock_frames_remaining, .. } => *ecb_lock_frames_remaining,
             Self::Grounded { .. } => 0,
         };
         let ecb_lock_frames_remaining = match policy {
@@ -65,14 +114,27 @@ impl FighterSurfaceState {
             EcbLockPolicy::Preserve => current_lock,
             EcbLockPolicy::Clear => 0,
         };
-        *self = Self::Airborne { ecb_lock_frames_remaining };
+        let ignored_polys = match self {
+            Self::Airborne { ignored_polys, .. } => ignored_polys.clone(),
+            Self::Grounded { .. } => vec![],
+        };
+        *self = Self::Airborne { ecb_lock_frames_remaining, ignored_polys };
     }
 
     pub(crate) fn tick_ecb_lock(&mut self) {
-        if let Self::Airborne { ecb_lock_frames_remaining } = self {
+        if let Self::Airborne { ecb_lock_frames_remaining, .. } = self {
             *ecb_lock_frames_remaining = ecb_lock_frames_remaining.saturating_sub(1);
         }
     }
+
+    pub(crate) fn tick_ignored_polygons(&mut self) {
+        if let Self::Airborne { ignored_polys, .. } = self {
+            for ignored in ignored_polys.iter_mut() {
+                ignored.frames_remaining = ignored.frames_remaining.saturating_sub(1);
+            }
+            ignored_polys.retain(|ignored| ignored.frames_remaining > 0);
+        }
+    }
 }
 
 #[cfg(test)]
@@ -109,6 +171,7 @@ mod tests {
             surface,
             FighterSurfaceState::Airborne {
                 ecb_lock_frames_remaining: 4,
+                ignored_polys: vec![],
             }
         );
     }
@@ -124,7 +187,41 @@ mod tests {
             surface,
             FighterSurfaceState::Airborne {
                 ecb_lock_frames_remaining: 5,
+                ignored_polys: vec![],
             }
         );
     }
+
+    #[test]
+    fn ignored_polygon_expires_after_requested_frames() {
+        let mut surface = FighterSurfaceState::default();
+        surface.ignore_polygon(3, 2);
+
+        assert!(surface.is_polygon_ignored(3));
+        surface.tick_ignored_polygons();
+        assert!(surface.is_polygon_ignored(3));
+        surface.tick_ignored_polygons();
+        assert!(!surface.is_polygon_ignored(3));
+    }
+
+    #[test]
+    fn ignoring_polygon_refreshes_existing_entry() {
+        let mut surface = FighterSurfaceState::default();
+        surface.ignore_polygon(3, 2);
+        surface.ignore_polygon(3, 5);
+        surface.tick_ignored_polygons();
+        surface.tick_ignored_polygons();
+        assert!(surface.is_polygon_ignored(3));
+    }
+
+    #[test]
+    fn airborne_policy_preserves_ignored_polygons_and_landing_clears_them() {
+        let mut surface = FighterSurfaceState::default();
+        surface.ignore_polygon(3, 5);
+        surface.apply_airborne_policy(EcbLockPolicy::Restart, 2);
+        assert!(surface.is_polygon_ignored(3));
+
+        surface.land(StageLineID { polygon: 0, segment: 0 });
+        assert!(!surface.is_polygon_ignored(3));
+    }
 }

src/game_settings.rs

@@ -39,7 +39,9 @@ pub struct FighterSettingsCommon {
     
     /// Maximum angle changed caused by directional influence
     pub di_max_angle: FGi32,
-    pub leave_ground_ecb_frame_lock_duration: u32
+    pub leave_ground_ecb_frame_lock_duration: u32,
+    pub platform_pass_platform_ignore_duration_frames: u32,
+    pub platform_pass_initial_downwards_velocity: FGi32,
 }
 #[derive(Reflect, Serialize, Deserialize, Clone)]
 #[reflect(opaque)]

src/input/buffer.rs

@@ -233,6 +233,8 @@ pub fn postprocess_input(
             input.clear_command(FighterCommands::SmashMoveUp);
             input.clear_command(FighterCommands::SmashMoveDown);
 
+            input.frames_in_y_flick_deadzone = 0xFF;
+
             let command_to_set = if input.current_frame.movement.y > 0.0 {
                 FighterCommands::SmashMoveUp
             } else {

src/input/mod.rs

@@ -116,13 +116,12 @@ impl Plugin for FighterInputPlugin {
                     binding: GamepadBinding::Button(GamepadButton::North),
                     action: InputMapAction::Jump,
                 },
-                // shield/airdodge -- both shoulder buttons, Melee-style
                 GamepadInputMapElement {
-                    binding: GamepadBinding::Button(GamepadButton::LeftTrigger),
+                    binding: GamepadBinding::Button(GamepadButton::LeftTrigger2),
                     action: InputMapAction::Shield,
                 },
                 GamepadInputMapElement {
-                    binding: GamepadBinding::Button(GamepadButton::RightTrigger),
+                    binding: GamepadBinding::Button(GamepadButton::RightTrigger2),
                     action: InputMapAction::Shield,
                 },
                 // attack

src/stage/line.rs

@@ -34,7 +34,7 @@ pub struct StageLineID {
 
 #[derive(Reflect, Clone, Default)]
 pub struct StagePoly {
-    poly_type: StagePolyType,
+    pub poly_type: StagePolyType,
     pub segments: Vec<StagePolyLineSegment>,
 }