kristoferssolo/maze-ascension
1
0
Fork 0
mirror of https://github.com/kristoferssolo/maze-ascension.git synced 2025-12-30 21:31:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: hexlab changes

Browse Source
This commit is contained in:
Kristofers Solo 2024-12-29 17:11:31 +02:00
parent 3b5c92e998
commit 9e3538f571
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -2675,9 +2675,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
[[package]] [[package]]
name = "hexlab" name = "hexlab"
version = "0.5.0" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f19ccfce524b2ad659c08508de50522933909ed9787e4c4001cf80d4d380e789" checksum = "7bd7c21f4e2c11d40473d1ae673905f4deae3b12104fa6d70eeef9ef385aceb6"
dependencies = [ dependencies = [
"bevy_reflect", "bevy_reflect",
"bevy_utils", "bevy_utils",

2
src/maze/components.rs
View File

@ -2,7 +2,7 @@ use crate::floor::components::Floor;
use super::GlobalMazeConfig; use super::GlobalMazeConfig;
use bevy::prelude::*; use bevy::prelude::*;
use hexlab::HexMaze; use hexlab::Maze as HexMaze;
use hexx::{Hex, HexLayout, HexOrientation}; use hexx::{Hex, HexLayout, HexOrientation};
use rand::{rngs::StdRng, thread_rng, Rng, SeedableRng}; use rand::{rngs::StdRng, thread_rng, Rng, SeedableRng};

2
src/maze/triggers/common.rs
View File

@ -2,7 +2,7 @@ use crate::maze::{
components::MazeConfig, components::MazeConfig,
errors::{MazeError, MazeResult}, errors::{MazeError, MazeResult},
}; };
use hexlab::{GeneratorType, HexMaze, MazeBuilder}; use hexlab::prelude::{Maze as HexMaze, *};
pub fn generate_maze(config: &MazeConfig) -> MazeResult<HexMaze> { pub fn generate_maze(config: &MazeConfig) -> MazeResult<HexMaze> {
MazeBuilder::new() MazeBuilder::new()

2
src/maze/triggers/spawn.rs
View File

@ -10,7 +10,7 @@ use crate::{
theme::palette::rose_pine::RosePine, theme::palette::rose_pine::RosePine,
}; };
use bevy::prelude::*; use bevy::prelude::*;
use hexlab::prelude::*; use hexlab::prelude::{Maze as HexMaze, Tile as HexTile, *};
use hexx::HexOrientation; use hexx::HexOrientation;
use std::f32::consts::{FRAC_PI_2, FRAC_PI_3, FRAC_PI_6}; use std::f32::consts::{FRAC_PI_2, FRAC_PI_3, FRAC_PI_6};

3
src/player/systems/input.rs
View File

@ -4,6 +4,7 @@ use crate::{
player::components::{CurrentPosition, MovementTarget, Player}, player::components::{CurrentPosition, MovementTarget, Player},
}; };
use bevy::prelude::*; use bevy::prelude::*;
use hexlab::WallStorage;
use hexx::{EdgeDirection, HexOrientation}; use hexx::{EdgeDirection, HexOrientation};
pub(super) fn player_input( pub(super) fn player_input(
@ -24,7 +25,7 @@ pub(super) fn player_input(
continue; continue;
}; };
let Some(tile) = maze.0.get_tile(current_pos) else { let Some(tile) = maze.0.get(current_pos) else {
continue; continue;
}; };