Merge branch 'init-map' into 'main'
Init map Closes #16 See merge request CoCo_Sol/border-wars!6
This commit is contained in:
commit
ab0782e712
37
Cargo.lock
generated
37
Cargo.lock
generated
|
@ -1024,6 +1024,7 @@ name = "border-wars"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bevy",
|
"bevy",
|
||||||
|
"rand",
|
||||||
"slotmap",
|
"slotmap",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -2428,6 +2429,12 @@ dependencies = [
|
||||||
"unicode-xid",
|
"unicode-xid",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ppv-lite86"
|
||||||
|
version = "0.2.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-crate"
|
name = "proc-macro-crate"
|
||||||
version = "1.3.1"
|
version = "1.3.1"
|
||||||
|
@ -2468,6 +2475,36 @@ version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
|
checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.8.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"rand_chacha",
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_chacha"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||||
|
dependencies = [
|
||||||
|
"ppv-lite86",
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.6.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "range-alloc"
|
name = "range-alloc"
|
||||||
version = "0.1.3"
|
version = "0.1.3"
|
||||||
|
|
|
@ -5,4 +5,5 @@ edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bevy = "0.10.1"
|
bevy = "0.10.1"
|
||||||
|
rand = "0.8.5"
|
||||||
slotmap = "1.0.6"
|
slotmap = "1.0.6"
|
||||||
|
|
|
@ -8,10 +8,12 @@
|
||||||
#![deny(clippy::all)]
|
#![deny(clippy::all)]
|
||||||
#![deny(warnings)]
|
#![deny(warnings)]
|
||||||
|
|
||||||
|
use bevy::prelude::Component;
|
||||||
|
|
||||||
pub mod map;
|
pub mod map;
|
||||||
|
|
||||||
/// Position d'un object sur la carte du jeu.
|
/// Position d'un object sur la carte du jeu.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Component)]
|
||||||
pub struct Position {
|
pub struct Position {
|
||||||
/// La position en x.
|
/// La position en x.
|
||||||
pub x: u8,
|
pub x: u8,
|
||||||
|
@ -22,5 +24,6 @@ pub struct Position {
|
||||||
|
|
||||||
slotmap::new_key_type! {
|
slotmap::new_key_type! {
|
||||||
/// Peut être utiliser pour identifier n'importe quel objet appartenant a un joueur (le joueur compris).
|
/// Peut être utiliser pour identifier n'importe quel objet appartenant a un joueur (le joueur compris).
|
||||||
|
#[derive(Component)]
|
||||||
pub struct PlayerId;
|
pub struct PlayerId;
|
||||||
}
|
}
|
||||||
|
|
27
src/map.rs
27
src/map.rs
|
@ -1,6 +1,10 @@
|
||||||
//! Contiens tous ce qui est relatif à la carte du jeu.
|
//! Contiens tous ce qui est relatif à la carte du jeu.
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
use crate::Position;
|
||||||
|
use bevy::prelude::{Commands, Component};
|
||||||
|
use rand::Rng;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Component)]
|
||||||
/// Une case sur la carte du jeu.
|
/// Une case sur la carte du jeu.
|
||||||
pub enum Tile {
|
pub enum Tile {
|
||||||
/// Un chateau.
|
/// Un chateau.
|
||||||
|
@ -70,3 +74,24 @@ pub enum Tile {
|
||||||
/// Permet de bloquer le passage des troupes.
|
/// Permet de bloquer le passage des troupes.
|
||||||
Wall,
|
Wall,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Initialisation d'une map aleatoire.
|
||||||
|
pub fn init_map(width: u8, height: u8, mut commands: Commands) {
|
||||||
|
for x in 0..width {
|
||||||
|
for y in 0..height {
|
||||||
|
if !(x % 2 == 0 && y == width - 1) {
|
||||||
|
commands.spawn((get_random_tile(), Position { x, y }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Cette fonction return un ellement aleatoire entre de la Grass Hill et Forest
|
||||||
|
fn get_random_tile() -> Tile {
|
||||||
|
let mut rng = rand::thread_rng();
|
||||||
|
match rng.gen_range(1..=4) {
|
||||||
|
1 => Tile::Forest,
|
||||||
|
2 => Tile::Hill,
|
||||||
|
_ => Tile::Grass,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue