double fix physics (should speedup), fix restart hint, fix dialogue padding, light UI, some levels

Author: raybbian

assets/levels/lightborne.ldtk

@@ -92,30 +92,30 @@ fn build_rects_by_row(width: i32, height: i32, tiles: &HashSet<GridCoords>) -> V
     rects
 }
 
-fn transpose_coords_set(tiles: &HashSet<GridCoords>) -> HashSet<GridCoords> {
-    tiles
-        .iter()
-        .map(|&GridCoords { x, y }| GridCoords { x: y, y: x })
-        .collect()
-}
-
-fn build_rects_by_column(width: i32, height: i32, tiles: &HashSet<GridCoords>) -> Vec<Rect> {
-    let tset = transpose_coords_set(tiles);
-    let mut rects_t = build_rects_by_row(height, width, &tset);
-
-    for r in &mut rects_t {
-        let left = r.bottom;
-        let right = r.top;
-        let bottom = r.left;
-        let top = r.right;
-        r.left = left;
-        r.right = right;
-        r.bottom = bottom;
-        r.top = top;
-    }
-
-    rects_t
-}
+// fn transpose_coords_set(tiles: &HashSet<GridCoords>) -> HashSet<GridCoords> {
+//     tiles
+//         .iter()
+//         .map(|&GridCoords { x, y }| GridCoords { x: y, y: x })
+//         .collect()
+// }
+//
+// fn build_rects_by_column(width: i32, height: i32, tiles: &HashSet<GridCoords>) -> Vec<Rect> {
+//     let tset = transpose_coords_set(tiles);
+//     let mut rects_t = build_rects_by_row(height, width, &tset);
+//
+//     for r in &mut rects_t {
+//         let left = r.bottom;
+//         let right = r.top;
+//         let bottom = r.left;
+//         let top = r.right;
+//         r.left = left;
+//         r.right = right;
+//         r.bottom = bottom;
+//         r.top = top;
+//     }
+//
+//     rects_t
+// }
 
 pub fn spawn_merged_tiles<Tile>(
     mut commands: Commands,
@@ -166,12 +166,12 @@ pub fn spawn_merged_tiles<Tile>(
 
         for (compare_data, tile_coords) in level_tiles.iter() {
             let rects_h = build_rects_by_row(width, height, tile_coords);
-            let rects_v = build_rects_by_column(width, height, tile_coords);
+            // let rects_v = build_rects_by_column(width, height, tile_coords);
 
             commands.entity(level_entity).with_children(|level| {
                 for r in rects_h.iter() {
                     let extent = Vec2::new(
-                        (r.right - r.left + 1) as f32 * grid - 0.1,
+                        (r.right - r.left + 1) as f32 * grid,
                         (r.top - r.bottom + 1) as f32 * grid,
                     )
                     .abs();
@@ -184,20 +184,20 @@ pub fn spawn_merged_tiles<Tile>(
                     Tile::bundle(&mut level.spawn_empty(), center, extent, compare_data);
                 }
                 //cover gaps because sadge
-                for r in rects_v.iter() {
-                    let extent = Vec2::new(
-                        (r.right - r.left + 1) as f32 * grid,
-                        (r.top - r.bottom + 1) as f32 * grid - 0.1,
-                    )
-                    .abs();
-
-                    let center = Vec2::new(
-                        (r.left + r.right + 1) as f32 * grid / 2.0,
-                        (r.bottom + r.top + 1) as f32 * grid / 2.0,
-                    );
-
-                    Tile::bundle(&mut level.spawn_empty(), center, extent, compare_data);
-                }
+                // for r in rects_v.iter() {
+                //     let extent = Vec2::new(
+                //         (r.right - r.left + 1) as f32 * grid,
+                //         (r.top - r.bottom + 1) as f32 * grid - 0.1,
+                //     )
+                //     .abs();
+                //
+                //     let center = Vec2::new(
+                //         (r.left + r.right + 1) as f32 * grid / 2.0,
+                //         (r.bottom + r.top + 1) as f32 * grid / 2.0,
+                //     );
+                //
+                //     Tile::bundle(&mut level.spawn_empty(), center, extent, compare_data);
+                // }
             });
         }
     });

src/game/defs/merge_tile.rs

@@ -54,7 +54,7 @@ impl MergedTile for OneWayMarker {
             )]))
             .insert(Friction::new(0.))
             .insert(CollisionLayers::new(
-                Layers::Terrain,
+                Layers::Platform,
                 [
                     Layers::PlayerCollider,
                     Layers::LightRay,

src/game/defs/one_way_platform.rs

@@ -122,7 +122,7 @@ pub fn handle_start_dialogue(
             margin: UiRect::new(
                 Val::Percent(20.),
                 Val::Percent(20.),
-                Val::Percent(6.),
+                Val::Percent(7.),
                 Val::Percent(5.),
             ),
             ..default()

src/game/dialogue.rs

@@ -119,6 +119,7 @@ pub fn play_light_beam(
                 Layers::LightSensor,
                 Layers::Spike,
                 Layers::BlueCrystal,
+                Layers::Platform,
             ],
         ),
         // LightColor::Black => {
@@ -131,6 +132,7 @@ pub fn play_light_beam(
                 Layers::LightSensor,
                 Layers::WhiteRay,
                 Layers::Spike,
+                Layers::Platform,
             ],
         ),
         _ => CollisionLayers::new(
@@ -141,6 +143,7 @@ pub fn play_light_beam(
                 Layers::WhiteRay,
                 Layers::Spike,
                 Layers::BlueCrystal,
+                Layers::Platform,
             ],
         ),
     };

src/game/light/segments.rs

@@ -127,7 +127,7 @@ pub fn flip_player_direction(
     //     return;
     // }
 
-    const PLAYER_FACING_EPSILON: f32 = 0.01;
+    const PLAYER_FACING_EPSILON: f32 = 0.5;
     if lin_vel.0.x < -PLAYER_FACING_EPSILON {
         player_sprite.flip_x = true;
     } else if lin_vel.0.x > PLAYER_FACING_EPSILON {

src/game/lyra/animation.rs

@@ -68,6 +68,10 @@ pub fn reset_light_inventory(
             inventory.current_color = old_color;
         }
     }
+    // if select none, make sure to select some
+    if old_color.is_none() && allowed_cols[LightColor::Green] {
+        inventory.current_color = Some(LightColor::Green);
+    }
 }
 
 #[derive(Message)]

src/game/lyra/beam.rs

@@ -2,7 +2,10 @@ use avian2d::{math::*, prelude::*};
 use bevy::{ecs::query::Has, prelude::*};
 
 use crate::{
-    game::{lyra::Lyra, LevelSystems},
+    game::{
+        lyra::{Lyra, LyraWallCaster},
+        LevelSystems,
+    },
     shared::PlayState,
 };
 
@@ -107,10 +110,10 @@ pub fn keyboard_input(
     if keyboard_input.just_released(KeyCode::Space) {
         movement_writer.write(MovementAction::JumpCut);
     }
-    if keyboard_input.just_pressed(KeyCode::ShiftLeft) {
+    if keyboard_input.just_pressed(KeyCode::ControlLeft) {
         movement_writer.write(MovementAction::Crouch);
     }
-    if keyboard_input.just_released(KeyCode::ShiftLeft) {
+    if keyboard_input.just_released(KeyCode::ControlLeft) {
         movement_writer.write(MovementAction::Stand);
     }
 }
@@ -130,78 +133,99 @@ pub fn update_grounded(
 }
 
 pub fn movement(
-    time: Res<Time>,
     mut movement_reader: MessageReader<MovementAction>,
-    mut controllers: Query<(
-        &mut MovementInfo,
-        &mut LinearVelocity,
-        &ShapeHits,
-        Has<Grounded>,
-    )>,
+    lyra: Single<
+        (
+            &mut MovementInfo,
+            &mut LinearVelocity,
+            &ShapeHits,
+            Has<Grounded>,
+        ),
+        With<Lyra>,
+    >,
+    wall_casters: Query<(&ShapeHits, &LyraWallCaster), Without<Lyra>>,
 ) {
-    let delta = time.delta_secs() * 64.;
-    for (mut movement_info, mut linear_velocity, shape_hits, is_grounded) in &mut controllers {
-        if is_grounded {
-            movement_info.coyote_time_ticks = COYOTE_TIME_TICKS;
-        }
+    let (mut movement_info, mut linear_velocity, shape_hits, is_grounded) = lyra.into_inner();
+    if is_grounded {
+        movement_info.coyote_time_ticks = COYOTE_TIME_TICKS;
+    }
 
-        let mut moved = false;
-        let mut crouch = false;
-        for event in movement_reader.read() {
-            match event {
-                MovementAction::Move(direction) => {
-                    linear_velocity.x += *direction * PLAYER_MOVE_VEL * 64. * delta;
-                    moved = true;
-                }
-                MovementAction::Jump => {
-                    movement_info.should_jump_ticks = SHOULD_JUMP_TICKS;
-                }
-                MovementAction::JumpCut => {
-                    if linear_velocity.y > 0. {
-                        linear_velocity.y /= 3.;
-                        movement_info.jump_boost_ticks = 0;
-                        movement_info.should_jump_ticks = 0;
-                    }
+    let mut moved = false;
+    for event in movement_reader.read() {
+        match event {
+            MovementAction::Move(direction) => {
+                linear_velocity.x += *direction * PLAYER_MOVE_VEL * 64.;
+                moved = true;
+            }
+            MovementAction::Jump => {
+                movement_info.should_jump_ticks = SHOULD_JUMP_TICKS;
+            }
+            MovementAction::JumpCut => {
+                if linear_velocity.y > 0. {
+                    linear_velocity.y /= 3.;
+                    movement_info.jump_boost_ticks = 0;
+                    movement_info.should_jump_ticks = 0;
                 }
-                MovementAction::Crouch => crouch = true,
-                MovementAction::Stand => crouch = false,
             }
+            MovementAction::Crouch => movement_info.crouched = true,
+            MovementAction::Stand => movement_info.crouched = false,
         }
+    }
 
-        if movement_info.should_jump_ticks > 0 && movement_info.coyote_time_ticks > 0 {
-            movement_info.jump_boost_ticks = JUMP_BOOST_TICKS;
-        }
+    if movement_info.should_jump_ticks > 0 && movement_info.coyote_time_ticks > 0 {
+        movement_info.jump_boost_ticks = JUMP_BOOST_TICKS;
+    }
 
-        let too_close = shape_hits.iter().any(|hit| hit.distance < 0.25);
-        if movement_info.jump_boost_ticks > 0 {
-            linear_velocity.y = PLAYER_JUMP_VEL * 64.;
-        } else if too_close && linear_velocity.y < 0.5 {
-            linear_velocity.y = 0.45;
-        } else if is_grounded && linear_velocity.y < 0.5 {
-            linear_velocity.y = 0.;
-        } else {
-            linear_velocity.y -= PLAYER_GRAVITY * 64. * delta;
-        }
+    let too_close = shape_hits.iter().any(|hit| hit.distance < 0.25);
+    if movement_info.jump_boost_ticks > 0 {
+        linear_velocity.y = PLAYER_JUMP_VEL * 64.;
+    } else if too_close && linear_velocity.y < 0.5 {
+        linear_velocity.y = 0.45;
+    } else if is_grounded && linear_velocity.y < 0.5 {
+        linear_velocity.y = 0.;
+    } else {
+        linear_velocity.y -= PLAYER_GRAVITY * 64.;
+    }
 
-        linear_velocity.y = linear_velocity
-            .y
-            .clamp(-PLAYER_MAX_Y_VEL * 64., PLAYER_MAX_Y_VEL * 64.);
+    linear_velocity.y = linear_velocity
+        .y
+        .clamp(-PLAYER_MAX_Y_VEL * 64., PLAYER_MAX_Y_VEL * 64.);
 
-        let crouch_modif = if crouch { 0.5 } else { 1.0 };
-        linear_velocity.x = linear_velocity.x.clamp(
-            -PLAYER_MAX_H_VEL * 64. * crouch_modif,
-            PLAYER_MAX_H_VEL * 64. * crouch_modif,
-        );
+    if !moved {
+        linear_velocity.x *= 0.6;
+        if linear_velocity.x.abs() < 0.1 {
+            linear_velocity.x = 0.;
+        }
+    }
 
-        if !moved {
-            linear_velocity.x *= 0.6;
-            if linear_velocity.x.abs() < 0.1 {
-                linear_velocity.x = 0.;
+    for (wall_hits, side) in wall_casters.iter() {
+        let too_close = wall_hits.iter().any(|hit| hit.distance < 0.25);
+        let any_hit = wall_hits.iter().next().is_some();
+        match side {
+            LyraWallCaster::Left => {
+                if too_close && linear_velocity.x < 0.5 {
+                    linear_velocity.x = 0.45;
+                } else if any_hit && linear_velocity.x < 0.5 {
+                    linear_velocity.x = 0.;
+                }
+            }
+            LyraWallCaster::Right => {
+                if too_close && linear_velocity.x > -0.5 {
+                    linear_velocity.x = -0.45;
+                } else if any_hit && linear_velocity.x > -0.5 {
+                    linear_velocity.x = 0.;
+                }
             }
         }
-
-        movement_info.should_jump_ticks -= 1;
-        movement_info.jump_boost_ticks -= 1;
-        movement_info.coyote_time_ticks -= 1;
     }
+
+    let crouch_modif = if movement_info.crouched { 0.5 } else { 1.0 };
+    linear_velocity.x = linear_velocity.x.clamp(
+        -PLAYER_MAX_H_VEL * 64. * crouch_modif,
+        PLAYER_MAX_H_VEL * 64. * crouch_modif,
+    );
+
+    movement_info.should_jump_ticks -= 1;
+    movement_info.jump_boost_ticks -= 1;
+    movement_info.coyote_time_ticks -= 1;
 }