fix: typo

This commit is contained in:
Kristofers Solo 2025-01-09 21:13:31 +02:00
parent e9f02e362a
commit 95b173c504
5 changed files with 26 additions and 12 deletions

1
Cargo.lock generated
View File

@ -3146,6 +3146,7 @@ dependencies = [
"hexx", "hexx",
"log", "log",
"rand", "rand",
"rayon",
"rstest", "rstest",
"rstest_reuse", "rstest_reuse",
"strum", "strum",

View File

@ -27,6 +27,7 @@ strum = { version = "0.26", features = ["derive"] }
[dev-dependencies] [dev-dependencies]
claims = "0.8.0" claims = "0.8.0"
rayon = "1.10.0"
rstest = "0.24" rstest = "0.24"
rstest_reuse = "0.7" rstest_reuse = "0.7"
test-log = { version = "0.2.16", default-features = false, features = [ test-log = { version = "0.2.16", default-features = false, features = [

View File

@ -20,8 +20,8 @@ web-release:
# Run tests # Run tests
test: test:
RUSTC_WRAPPER=sccache RUST_BACKTRACE=full cargo test --doc --locked --workspace --no-default-features RUSTC_WRAPPER=sccache cargo test --doc --locked --workspace --no-default-features
RUSTC_WRAPPER=sccache RUST_BACKTRACE=full cargo nextest run --no-default-features --all-targets RUSTC_WRAPPER=sccache cargo nextest run --no-default-features --all-targets
# Run CI localy # Run CI localy
ci: ci:

View File

@ -4,7 +4,7 @@ use crate::{
components::{CurrentFloor, Floor, FloorYTarget}, components::{CurrentFloor, Floor, FloorYTarget},
events::TransitionFloor, events::TransitionFloor,
}, },
maze::components::HexMaze, maze::components::{HexMaze, MazeConfig},
player::components::{MovementSpeed, Player}, player::components::{MovementSpeed, Player},
}; };
@ -18,13 +18,22 @@ use bevy::prelude::*;
/// - Removes FloorYTarget component when floor reaches destination /// - Removes FloorYTarget component when floor reaches destination
pub fn move_floors( pub fn move_floors(
mut commands: Commands, mut commands: Commands,
mut maze_query: Query<(Entity, &mut Transform, &FloorYTarget), With<FloorYTarget>>, mut maze_query: Query<
(
Entity,
&mut Transform,
&FloorYTarget,
&MazeConfig,
Has<CurrentFloor>,
),
With<FloorYTarget>,
>,
player_query: Query<&MovementSpeed, With<Player>>, player_query: Query<&MovementSpeed, With<Player>>,
time: Res<Time>, time: Res<Time>,
) { ) {
let speed = player_query.get_single().map_or(100., |s| s.0); let speed = player_query.get_single().map_or(100., |s| s.0);
let movement_distance = speed * time.delta_secs(); let movement_distance = speed * time.delta_secs();
for (entity, mut transform, movement_state) in maze_query.iter_mut() { for (entity, mut transform, movement_state, config, is_current_floor) in maze_query.iter_mut() {
let delta = movement_state.0 - transform.translation.y; let delta = movement_state.0 - transform.translation.y;
if delta.abs() > MOVEMENT_THRESHOLD { if delta.abs() > MOVEMENT_THRESHOLD {
let movement = delta.signum() * movement_distance.min(delta.abs()); let movement = delta.signum() * movement_distance.min(delta.abs());
@ -32,6 +41,13 @@ pub fn move_floors(
} else { } else {
transform.translation.y = movement_state.0; transform.translation.y = movement_state.0;
commands.entity(entity).remove::<FloorYTarget>(); commands.entity(entity).remove::<FloorYTarget>();
if is_current_floor {
info!("Current floor seed: {}", config.seed);
info!(
"Start pos: (q={}, r={}). End pos: (q={}, r={})",
config.start_pos.x, config.start_pos.y, config.end_pos.x, config.end_pos.y,
);
}
} }
} }
} }

View File

@ -49,7 +49,7 @@ impl MazeConfig {
radius: u16, radius: u16,
orientation: HexOrientation, orientation: HexOrientation,
seed: Option<u64>, seed: Option<u64>,
global_conig: &GlobalMazeConfig, global_config: &GlobalMazeConfig,
start_pos: Option<Hex>, start_pos: Option<Hex>,
) -> Self { ) -> Self {
let seed = seed.unwrap_or_else(|| thread_rng().gen()); let seed = seed.unwrap_or_else(|| thread_rng().gen());
@ -65,15 +65,11 @@ impl MazeConfig {
break; break;
} }
} }
dbg!(seed, start_pos, end_pos);
info!(
"Start pos: (q={}, r={}). End pos: (q={}, r={})",
start_pos.x, start_pos.y, end_pos.x, end_pos.y
);
let layout = HexLayout { let layout = HexLayout {
orientation, orientation,
hex_size: Vec2::splat(global_conig.hex_size), hex_size: Vec2::splat(global_config.hex_size),
..default() ..default()
}; };