From c8ad4818ab11c168dcaa02526ca20bba5204887c Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Fri, 16 Feb 2024 22:40:13 +0100
Subject: [PATCH 01/38] save

---
 Cargo.lock                               | 103 ++++++++++++++++++++---
 crates/border-wars/Cargo.toml            |   1 +
 crates/border-wars/src/map/generation.rs |  65 ++++++++++++++
 crates/border-wars/src/map/hex.rs        |   3 +-
 crates/border-wars/src/map/mod.rs        |  16 ++++
 5 files changed, 175 insertions(+), 13 deletions(-)
 create mode 100644 crates/border-wars/src/map/generation.rs

diff --git a/Cargo.lock b/Cargo.lock
index bb750c8..33c901a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -93,7 +93,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.12",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -1126,7 +1126,7 @@ checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
- "getrandom",
+ "getrandom 0.2.12",
  "hashbrown 0.14.3",
  "instant",
  "nonmax",
@@ -1316,6 +1316,7 @@ version = "0.1.0"
 dependencies = [
  "bevy",
  "bevy_egui",
+ "noise",
  "num",
  "partial-min-max",
  "paste",
@@ -2108,6 +2109,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.12"
@@ -2117,7 +2129,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
@@ -2847,7 +2859,7 @@ checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
  "log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
@@ -2961,6 +2973,17 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
+[[package]]
+name = "noise"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ba869e17168793186c10ca82c7079a4ffdeac4f1a7d9e755b9491c028180e40"
+dependencies = [
+ "num-traits",
+ "rand 0.7.3",
+ "rand_xorshift",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -3475,6 +3498,19 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
 
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -3482,8 +3518,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -3493,7 +3539,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
 ]
 
 [[package]]
@@ -3502,7 +3557,25 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.12",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
+dependencies = [
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -3607,7 +3680,7 @@ dependencies = [
  "home",
  "log",
  "mio",
- "rand",
+ "rand 0.8.5",
  "tungstenite",
  "uuid",
 ]
@@ -3639,7 +3712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
- "getrandom",
+ "getrandom 0.2.12",
  "libc",
  "spin",
  "untrusted",
@@ -4342,7 +4415,7 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "rand",
+ "rand 0.8.5",
  "rustls",
  "rustls-native-certs",
  "rustls-pki-types",
@@ -4430,7 +4503,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.12",
  "serde",
 ]
 
@@ -4468,6 +4541,12 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/crates/border-wars/Cargo.toml b/crates/border-wars/Cargo.toml
index 70e1543..ccb73ba 100644
--- a/crates/border-wars/Cargo.toml
+++ b/crates/border-wars/Cargo.toml
@@ -13,6 +13,7 @@ workspace = true
 [dependencies]
 bevy = "0.12.1"
 bevy_egui = "0.24.0"
+noise = "0.8.2"
 num = "0.4.1"
 partial-min-max = "0.4.0"
 paste = "1.0.14"
diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
new file mode 100644
index 0000000..5863817
--- /dev/null
+++ b/crates/border-wars/src/map/generation.rs
@@ -0,0 +1,65 @@
+//! All fonctions related to the generation of the map.
+
+use bevy::prelude::*;
+use noise::{NoiseFn, Perlin};
+
+use super::hex::*;
+use super::Tile;
+
+/// A plugin to handle the map generation.
+pub struct MapGenerationPlugin;
+
+impl Plugin for MapGenerationPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_event::<MapGenerationEvent>().add_systems(
+            Update,
+            generate_map.run_if(in_state(crate::CurrentScene::Game)),
+        );
+    }
+}
+
+/// An event to trigger the generation of the map.
+#[derive(Event)]
+pub struct MapGenerationEvent {
+    /// The seed used to generate the map.
+    pub seed: u32,
+
+    /// The radius of the map.
+    pub radius: usize,
+}
+
+/// spawns the tiles.
+fn generate_map(
+    mut event: EventReader<MapGenerationEvent>,
+    mut commands: Commands,
+    mut noise: Local<Option<Perlin>>,
+    mut map_iterator: Local<Option<HexSpiral<isize>>>,
+) {
+    // Handle map generation events.
+    for event in event.read() {
+        *noise = Some(Perlin::new(event.seed));
+        *map_iterator = Some(HexPosition(0, 0).spiral(event.radius));
+    }
+
+    if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
+        if let Some(position) = spiral.next() {
+            let pixel_position = position.to_pixel_coordinates((0.1, 0.1));
+            let type_tile = get_type_tile(pixel_position, perlin);
+
+            commands.spawn((type_tile, position));
+        } else {
+            *noise = None;
+            *map_iterator = None;
+        }
+    }
+}
+
+/// Returns the type of the tile at the given position with the given noise.
+fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
+    let value = noise.get([position.0 as f64, position.1 as f64]);
+    match value {
+        v if v <= -0.4 => Tile::Hill,
+        v if v >= 0.4 => Tile::Forest,
+        _ => Tile::Grass,
+    }
+}
diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs
index 5410eff..5ee633c 100644
--- a/crates/border-wars/src/map/hex.rs
+++ b/crates/border-wars/src/map/hex.rs
@@ -4,6 +4,7 @@ use std::ops::{
     Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Rem, RemAssign, Sub, SubAssign,
 };
 
+use bevy::prelude::*;
 use paste::paste;
 
 /// Represents a number that can be used in calculations for hexagonal grids.
@@ -98,7 +99,7 @@ number_impl! {
 /// Represents a position in a hexagonal grid.
 /// We use the axial coordinate system explained in this
 /// [documentation](https://www.redblobgames.com/grids/hexagons/#coordinates).
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Component)]
 pub struct HexPosition<T: Number>(pub T, pub T);
 
 /// All possible directions in a hexagonal grid.
diff --git a/crates/border-wars/src/map/mod.rs b/crates/border-wars/src/map/mod.rs
index 515d0c2..00eeeff 100644
--- a/crates/border-wars/src/map/mod.rs
+++ b/crates/border-wars/src/map/mod.rs
@@ -1,3 +1,19 @@
 //! Contains all the logic related to the map.
 
+pub mod generation;
 pub mod hex;
+
+use bevy::prelude::*;
+
+/// The tile of the map.
+#[derive(Component)]
+pub enum Tile {
+    /// The hill tile.
+    Hill,
+
+    /// The grass tile.
+    Grass,
+
+    /// The forest tile.
+    Forest,
+}
-- 
2.43.4


From ef693b54d9ce00a734b8737772ca8ede2d33aa89 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Fri, 16 Feb 2024 22:54:16 +0100
Subject: [PATCH 02/38] change doc

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 5863817..0a2b110 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -28,7 +28,7 @@ pub struct MapGenerationEvent {
     pub radius: usize,
 }
 
-/// spawns the tiles.
+/// spawns the tiles if the event is received.
 fn generate_map(
     mut event: EventReader<MapGenerationEvent>,
     mut commands: Commands,
-- 
2.43.4


From 066561ff6c0f6d1e2bd4f8d38a9b618cbd0230b2 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Fri, 16 Feb 2024 22:55:11 +0100
Subject: [PATCH 03/38] chnage disposition

---
 crates/border-wars/src/map/generation.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 0a2b110..b3408e4 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -44,9 +44,8 @@ fn generate_map(
     if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
         if let Some(position) = spiral.next() {
             let pixel_position = position.to_pixel_coordinates((0.1, 0.1));
-            let type_tile = get_type_tile(pixel_position, perlin);
 
-            commands.spawn((type_tile, position));
+            commands.spawn((get_type_tile(pixel_position, perlin), position));
         } else {
             *noise = None;
             *map_iterator = None;
-- 
2.43.4


From 32f09423cb0fb309c9a9c0ed84caf6d3098d7c6e Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Fri, 16 Feb 2024 23:21:54 +0100
Subject: [PATCH 04/38] change doc

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index b3408e4..0860304 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -28,7 +28,7 @@ pub struct MapGenerationEvent {
     pub radius: usize,
 }
 
-/// spawns the tiles if the event is received.
+/// Spawns the tiles if the event is received.
 fn generate_map(
     mut event: EventReader<MapGenerationEvent>,
     mut commands: Commands,
-- 
2.43.4


From e3c2bc1ac90f586926bfc5d6e12a9866ab4ca579 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sat, 17 Feb 2024 21:10:40 +0100
Subject: [PATCH 05/38] ajout d'un event de fin de map

---
 crates/border-wars/src/map/generation.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 0860304..dcd92b8 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -28,9 +28,14 @@ pub struct MapGenerationEvent {
     pub radius: usize,
 }
 
+/// An event send when the map is generated.
+#[derive(Event)]
+pub struct EndMapGenerationEvent;
+
 /// Spawns the tiles if the event is received.
 fn generate_map(
     mut event: EventReader<MapGenerationEvent>,
+    mut end_map_event: EventWriter<EndMapGenerationEvent>,
     mut commands: Commands,
     mut noise: Local<Option<Perlin>>,
     mut map_iterator: Local<Option<HexSpiral<isize>>>,
@@ -47,6 +52,7 @@ fn generate_map(
 
             commands.spawn((get_type_tile(pixel_position, perlin), position));
         } else {
+            end_map_event.send(EndMapGenerationEvent);
             *noise = None;
             *map_iterator = None;
         }
-- 
2.43.4


From 1350b04e296e4cf06a09ffbfb50436c0b2bca54e Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sat, 17 Feb 2024 21:42:38 +0100
Subject: [PATCH 06/38] delete the map

---
 crates/border-wars/src/map/generation.rs | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index dcd92b8..fa6a8a6 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -11,10 +11,13 @@ pub struct MapGenerationPlugin;
 
 impl Plugin for MapGenerationPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<MapGenerationEvent>().add_systems(
-            Update,
-            generate_map.run_if(in_state(crate::CurrentScene::Game)),
-        );
+        app.add_event::<MapGenerationEvent>()
+            .add_event::<EndMapGenerationEvent>()
+            .add_systems(
+                Update,
+                (generate_map.after(delete_map), delete_map)
+                    .run_if(in_state(crate::CurrentScene::Game)),
+            );
     }
 }
 
@@ -68,3 +71,15 @@ fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
         _ => Tile::Grass,
     }
 }
+
+fn delete_map(
+    mut commands: Commands,
+    query: Query<Entity, With<Tile>>,
+    mut event: EventReader<EndMapGenerationEvent>,
+) {
+    for _ in event.read() {
+        for entity in query.iter() {
+            commands.entity(entity).despawn_recursive();
+        }
+    }
+}
-- 
2.43.4


From 0fdc351356db62980e9b7e20ec01460411109c19 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sat, 17 Feb 2024 21:43:21 +0100
Subject: [PATCH 07/38] add doc

---
 crates/border-wars/src/map/generation.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index fa6a8a6..90a9cd5 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -72,6 +72,7 @@ fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
     }
 }
 
+/// Despawns the tiles if the event : [EndMapGenerationEvent] is received.
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-- 
2.43.4


From 744d9b646e56780f04ba8c2a4c939592889f5231 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sun, 18 Feb 2024 11:17:40 +0100
Subject: [PATCH 08/38] update

---
 crates/border-wars/src/map/generation.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 90a9cd5..cd5334b 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -52,7 +52,6 @@ fn generate_map(
     if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
         if let Some(position) = spiral.next() {
             let pixel_position = position.to_pixel_coordinates((0.1, 0.1));
-
             commands.spawn((get_type_tile(pixel_position, perlin), position));
         } else {
             end_map_event.send(EndMapGenerationEvent);
@@ -76,7 +75,7 @@ fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-    mut event: EventReader<EndMapGenerationEvent>,
+    mut event: EventReader<MapGenerationEvent>,
 ) {
     for _ in event.read() {
         for entity in query.iter() {
-- 
2.43.4


From fcd0bdf9ed98fd184a207808f41e28795c82218d Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sun, 18 Feb 2024 20:59:52 +0100
Subject: [PATCH 09/38] update

---
 crates/border-wars/src/map/generation.rs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index cd5334b..0eca720 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -11,8 +11,8 @@ pub struct MapGenerationPlugin;
 
 impl Plugin for MapGenerationPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<MapGenerationEvent>()
-            .add_event::<EndMapGenerationEvent>()
+        app.add_event::<MapGeneration>()
+            .add_event::<EndMapGeneration>()
             .add_systems(
                 Update,
                 (generate_map.after(delete_map), delete_map)
@@ -23,7 +23,7 @@ impl Plugin for MapGenerationPlugin {
 
 /// An event to trigger the generation of the map.
 #[derive(Event)]
-pub struct MapGenerationEvent {
+pub struct MapGeneration {
     /// The seed used to generate the map.
     pub seed: u32,
 
@@ -33,12 +33,12 @@ pub struct MapGenerationEvent {
 
 /// An event send when the map is generated.
 #[derive(Event)]
-pub struct EndMapGenerationEvent;
+pub struct EndMapGeneration;
 
 /// Spawns the tiles if the event is received.
 fn generate_map(
-    mut event: EventReader<MapGenerationEvent>,
-    mut end_map_event: EventWriter<EndMapGenerationEvent>,
+    mut event: EventReader<MapGeneration>,
+    mut end_map_event: EventWriter<EndMapGeneration>,
     mut commands: Commands,
     mut noise: Local<Option<Perlin>>,
     mut map_iterator: Local<Option<HexSpiral<isize>>>,
@@ -51,10 +51,10 @@ fn generate_map(
 
     if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
         if let Some(position) = spiral.next() {
-            let pixel_position = position.to_pixel_coordinates((0.1, 0.1));
+            let pixel_position = position.to_pixel_coordinates((0.2, 0.2)); // Réduire la taille de la tuile
             commands.spawn((get_type_tile(pixel_position, perlin), position));
         } else {
-            end_map_event.send(EndMapGenerationEvent);
+            end_map_event.send(EndMapGeneration);
             *noise = None;
             *map_iterator = None;
         }
@@ -65,17 +65,18 @@ fn generate_map(
 fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
     let value = noise.get([position.0 as f64, position.1 as f64]);
     match value {
-        v if v <= -0.4 => Tile::Hill,
-        v if v >= 0.4 => Tile::Forest,
+        v if v <= -0.5 => Tile::Hill, // Réduire le seuil pour les collines
+        v if v >= 0.5 => Tile::Forest, // Réduire le seuil pour les forêts
         _ => Tile::Grass,
     }
 }
 
+
 /// Despawns the tiles if the event : [EndMapGenerationEvent] is received.
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-    mut event: EventReader<MapGenerationEvent>,
+    mut event: EventReader<MapGeneration>,
 ) {
     for _ in event.read() {
         for entity in query.iter() {
-- 
2.43.4


From d3c89956a1ea0080fae645e5a43644e853f6cab3 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sun, 18 Feb 2024 21:00:42 +0100
Subject: [PATCH 10/38] update

---
 crates/border-wars/src/map/generation.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 0eca720..9cf9fff 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -65,13 +65,12 @@ fn generate_map(
 fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
     let value = noise.get([position.0 as f64, position.1 as f64]);
     match value {
-        v if v <= -0.5 => Tile::Hill, // Réduire le seuil pour les collines
+        v if v <= -0.5 => Tile::Hill,  // Réduire le seuil pour les collines
         v if v >= 0.5 => Tile::Forest, // Réduire le seuil pour les forêts
         _ => Tile::Grass,
     }
 }
 
-
 /// Despawns the tiles if the event : [EndMapGenerationEvent] is received.
 fn delete_map(
     mut commands: Commands,
-- 
2.43.4


From 135f1b73472f0ee9a7bb0f75d33974b8626e920a Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sun, 18 Feb 2024 21:02:32 +0100
Subject: [PATCH 11/38] update doc

---
 crates/border-wars/src/map/generation.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 9cf9fff..34ccf49 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -51,7 +51,7 @@ fn generate_map(
 
     if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
         if let Some(position) = spiral.next() {
-            let pixel_position = position.to_pixel_coordinates((0.2, 0.2)); // Réduire la taille de la tuile
+            let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
             commands.spawn((get_type_tile(pixel_position, perlin), position));
         } else {
             end_map_event.send(EndMapGeneration);
@@ -65,8 +65,8 @@ fn generate_map(
 fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
     let value = noise.get([position.0 as f64, position.1 as f64]);
     match value {
-        v if v <= -0.5 => Tile::Hill,  // Réduire le seuil pour les collines
-        v if v >= 0.5 => Tile::Forest, // Réduire le seuil pour les forêts
+        v if v <= -0.5 => Tile::Hill,
+        v if v >= 0.5 => Tile::Forest,
         _ => Tile::Grass,
     }
 }
-- 
2.43.4


From f5ffcffb131109b462397dcdaefaf88ea901cbd8 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Sun, 18 Feb 2024 22:04:01 +0100
Subject: [PATCH 12/38] update

---
 crates/border-wars/src/map/generation.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 34ccf49..31aabba 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -65,8 +65,8 @@ fn generate_map(
 fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
     let value = noise.get([position.0 as f64, position.1 as f64]);
     match value {
-        v if v <= -0.5 => Tile::Hill,
-        v if v >= 0.5 => Tile::Forest,
+        v if v <= -0.4 => Tile::Hill,
+        v if v >= 0.4 => Tile::Forest,
         _ => Tile::Grass,
     }
 }
-- 
2.43.4


From 73c25c8bd5bc7192c02bf0948529fb64e51be6c8 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Tue, 20 Feb 2024 11:20:41 +0100
Subject: [PATCH 13/38] rename

---
 crates/border-wars/src/map/generation.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 31aabba..9efd643 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -11,7 +11,7 @@ pub struct MapGenerationPlugin;
 
 impl Plugin for MapGenerationPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<MapGeneration>()
+        app.add_event::<StartMapGeneration>()
             .add_event::<EndMapGeneration>()
             .add_systems(
                 Update,
@@ -23,7 +23,7 @@ impl Plugin for MapGenerationPlugin {
 
 /// An event to trigger the generation of the map.
 #[derive(Event)]
-pub struct MapGeneration {
+pub struct StartMapGeneration {
     /// The seed used to generate the map.
     pub seed: u32,
 
@@ -37,7 +37,7 @@ pub struct EndMapGeneration;
 
 /// Spawns the tiles if the event is received.
 fn generate_map(
-    mut event: EventReader<MapGeneration>,
+    mut event: EventReader<StartMapGeneration>,
     mut end_map_event: EventWriter<EndMapGeneration>,
     mut commands: Commands,
     mut noise: Local<Option<Perlin>>,
@@ -75,7 +75,7 @@ fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-    mut event: EventReader<MapGeneration>,
+    mut event: EventReader<StartMapGeneration>,
 ) {
     for _ in event.read() {
         for entity in query.iter() {
-- 
2.43.4


From 748bde27b4a08a4342a23e0434d5902d00172c35 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Tue, 20 Feb 2024 11:22:18 +0100
Subject: [PATCH 14/38] change base

---
 crates/border-wars/src/map/generation.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 9efd643..2d320ca 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -28,7 +28,7 @@ pub struct StartMapGeneration {
     pub seed: u32,
 
     /// The radius of the map.
-    pub radius: usize,
+    pub radius: u16,
 }
 
 /// An event send when the map is generated.
@@ -41,12 +41,12 @@ fn generate_map(
     mut end_map_event: EventWriter<EndMapGeneration>,
     mut commands: Commands,
     mut noise: Local<Option<Perlin>>,
-    mut map_iterator: Local<Option<HexSpiral<isize>>>,
+    mut map_iterator: Local<Option<HexSpiral<i32>>>,
 ) {
     // Handle map generation events.
     for event in event.read() {
         *noise = Some(Perlin::new(event.seed));
-        *map_iterator = Some(HexPosition(0, 0).spiral(event.radius));
+        *map_iterator = Some(HexPosition(0, 0).spiral(event.radius as usize));
     }
 
     if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
-- 
2.43.4


From 07ffb9e45c1c6c531369e4fc1e50aabbd701f2f3 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Tue, 20 Feb 2024 11:31:08 +0100
Subject: [PATCH 15/38] change doc

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 2d320ca..63013da 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -71,7 +71,7 @@ fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
     }
 }
 
-/// Despawns the tiles if the event : [EndMapGenerationEvent] is received.
+/// Despawns the tiles if the event : [MapGenerationEvent] is received.
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-- 
2.43.4


From acd2de265c100133443618b3cc7fc1782d73fec0 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Tue, 20 Feb 2024 12:16:05 +0100
Subject: [PATCH 16/38] rename

---
 crates/border-wars/src/map/generation.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 63013da..ab0b2b1 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -52,17 +52,17 @@ fn generate_map(
     if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
         if let Some(position) = spiral.next() {
             let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
-            commands.spawn((get_type_tile(pixel_position, perlin), position));
+            commands.spawn((get_type(pixel_position, perlin), position));
         } else {
             end_map_event.send(EndMapGeneration);
             *noise = None;
             *map_iterator = None;
         }
-    }
+    } 
 }
 
-/// Returns the type of the tile at the given position with the given noise.
-fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
+/// Returns the type of the position with the given noise.
+fn get_type(position: (f32, f32), noise: &Perlin) -> Tile {
     let value = noise.get([position.0 as f64, position.1 as f64]);
     match value {
         v if v <= -0.4 => Tile::Hill,
-- 
2.43.4


From 915d5ba5a45658afb90eadd1cdef040f4085fd24 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 11:15:54 +0100
Subject: [PATCH 17/38] update

---
 crates/border-wars/src/map/generation.rs | 26 +++++++++++++-----------
 crates/border-wars/src/map/hex.rs        |  5 +++++
 crates/border-wars/src/map/mod.rs        |  7 ++++++-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index ab0b2b1..bbb0092 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -5,6 +5,7 @@ use noise::{NoiseFn, Perlin};
 
 use super::hex::*;
 use super::Tile;
+use super::TilePosition;
 
 /// A plugin to handle the map generation.
 pub struct MapGenerationPlugin;
@@ -41,24 +42,25 @@ fn generate_map(
     mut end_map_event: EventWriter<EndMapGeneration>,
     mut commands: Commands,
     mut noise: Local<Option<Perlin>>,
-    mut map_iterator: Local<Option<HexSpiral<i32>>>,
+    mut spiral: Local<Option<HexSpiral<i32>>>,
 ) {
     // Handle map generation events.
     for event in event.read() {
         *noise = Some(Perlin::new(event.seed));
-        *map_iterator = Some(HexPosition(0, 0).spiral(event.radius as usize));
+        *spiral = Some(TilePosition::new(0,0).spiral(event.radius as usize));
     }
 
-    if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
-        if let Some(position) = spiral.next() {
-            let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
-            commands.spawn((get_type(pixel_position, perlin), position));
-        } else {
-            end_map_event.send(EndMapGeneration);
-            *noise = None;
-            *map_iterator = None;
-        }
-    } 
+    if let (None, None) = (noise.as_ref(), spiral.as_mut()) {
+        return;
+    }
+    if let Some(position) = spiral.as_mut().unwrap().next() {
+        let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
+        commands.spawn((get_type(pixel_position, &noise.unwrap()), position as TilePosition));
+    } else {
+        end_map_event.send(EndMapGeneration);
+        *noise = None;
+        *spiral = None;
+    }
 }
 
 /// Returns the type of the position with the given noise.
diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs
index 5ee633c..3edb991 100644
--- a/crates/border-wars/src/map/hex.rs
+++ b/crates/border-wars/src/map/hex.rs
@@ -234,6 +234,11 @@ impl<T: Number> Iterator for HexSpiral<T> {
 }
 
 impl<T: Number> HexPosition<T> {
+    /// Creates a new [HexPosition].
+    pub fn new(x: T, y: T) -> Self {
+        Self(x, y)
+    }
+
     /// Converts the current [HexPosition] into a pixel coordinate.
     /// Input: The size of the hexagon in pixels (witdh, height).
     ///
diff --git a/crates/border-wars/src/map/mod.rs b/crates/border-wars/src/map/mod.rs
index 00eeeff..5265d18 100644
--- a/crates/border-wars/src/map/mod.rs
+++ b/crates/border-wars/src/map/mod.rs
@@ -5,8 +5,13 @@ pub mod hex;
 
 use bevy::prelude::*;
 
+use self::hex::*;
+
+/// The position of a tile in a hexagonal map.
+pub type TilePosition = HexPosition<i32>;
+
 /// The tile of the map.
-#[derive(Component)]
+#[derive(Component, Debug)]
 pub enum Tile {
     /// The hill tile.
     Hill,
-- 
2.43.4


From 74d81721c768cc33879550b32545826932db45cf Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 11:35:11 +0100
Subject: [PATCH 18/38] add let else

---
 crates/border-wars/src/map/generation.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index bbb0092..d466c1b 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -41,25 +41,25 @@ fn generate_map(
     mut event: EventReader<StartMapGeneration>,
     mut end_map_event: EventWriter<EndMapGeneration>,
     mut commands: Commands,
-    mut noise: Local<Option<Perlin>>,
-    mut spiral: Local<Option<HexSpiral<i32>>>,
+    mut local_noise: Local<Option<Perlin>>,
+    mut local_spiral: Local<Option<HexSpiral<i32>>>,
 ) {
     // Handle map generation events.
     for event in event.read() {
-        *noise = Some(Perlin::new(event.seed));
-        *spiral = Some(TilePosition::new(0,0).spiral(event.radius as usize));
+        *local_noise = Some(Perlin::new(event.seed));
+        *local_spiral = Some(TilePosition::new(0,0).spiral(event.radius as usize));
     }
 
-    if let (None, None) = (noise.as_ref(), spiral.as_mut()) {
+    let (Some(noise), Some(spiral)) = (local_noise.as_ref(), local_spiral.as_mut()) else {
         return;
-    }
-    if let Some(position) = spiral.as_mut().unwrap().next() {
+    };
+    if let Some(position) = spiral.next() {
         let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
-        commands.spawn((get_type(pixel_position, &noise.unwrap()), position as TilePosition));
+        commands.spawn((get_type(pixel_position, &noise), position as TilePosition));
     } else {
         end_map_event.send(EndMapGeneration);
-        *noise = None;
-        *spiral = None;
+        *local_noise = None;
+        *local_spiral = None;
     }
 }
 
-- 
2.43.4


From 3ebe60d6cd80967b1be17dc7ad349d1ac2bb96f4 Mon Sep 17 00:00:00 2001
From: Corentin <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 10:38:51 +0000
Subject: [PATCH 19/38] Update crates/border-wars/src/map/generation.rs

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index d466c1b..ed56c4e 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -73,7 +73,7 @@ fn get_type(position: (f32, f32), noise: &Perlin) -> Tile {
     }
 }
 
-/// Despawns the tiles if the event : [MapGenerationEvent] is received.
+/// Despawns the tiles if the event : [StartMapGeneration] is received.
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-- 
2.43.4


From 6f061deb343189bcf7dc3ab70856f20c3b8936ee Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 11:42:22 +0100
Subject: [PATCH 20/38] fmt

---
 crates/border-wars/src/map/generation.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index d466c1b..160a1c4 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -4,8 +4,7 @@ use bevy::prelude::*;
 use noise::{NoiseFn, Perlin};
 
 use super::hex::*;
-use super::Tile;
-use super::TilePosition;
+use super::{Tile, TilePosition};
 
 /// A plugin to handle the map generation.
 pub struct MapGenerationPlugin;
@@ -47,7 +46,7 @@ fn generate_map(
     // Handle map generation events.
     for event in event.read() {
         *local_noise = Some(Perlin::new(event.seed));
-        *local_spiral = Some(TilePosition::new(0,0).spiral(event.radius as usize));
+        *local_spiral = Some(TilePosition::new(0, 0).spiral(event.radius as usize));
     }
 
     let (Some(noise), Some(spiral)) = (local_noise.as_ref(), local_spiral.as_mut()) else {
-- 
2.43.4


From 2f0875d60e650c9b7f92f8ce5532ee696fa9ae72 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 11:50:47 +0100
Subject: [PATCH 21/38] fix clippy

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index af611c0..6e03333 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -54,7 +54,7 @@ fn generate_map(
     };
     if let Some(position) = spiral.next() {
         let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
-        commands.spawn((get_type(pixel_position, &noise), position as TilePosition));
+        commands.spawn((get_type(pixel_position, noise), position as TilePosition));
     } else {
         end_map_event.send(EndMapGeneration);
         *local_noise = None;
-- 
2.43.4


From 83c36c704dbb34509fd2ea00adf0221c6008a4c5 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 11:54:45 +0100
Subject: [PATCH 22/38] fix clippy

---
 crates/border-wars/src/map/hex.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs
index 3edb991..1dc4301 100644
--- a/crates/border-wars/src/map/hex.rs
+++ b/crates/border-wars/src/map/hex.rs
@@ -235,7 +235,7 @@ impl<T: Number> Iterator for HexSpiral<T> {
 
 impl<T: Number> HexPosition<T> {
     /// Creates a new [HexPosition].
-    pub fn new(x: T, y: T) -> Self {
+    pub const fn new(x: T, y: T) -> Self {
         Self(x, y)
     }
 
@@ -262,7 +262,7 @@ impl<T: Number> HexPosition<T> {
             size.0
                 * 3f32
                     .sqrt()
-                    .mul_add(T::to_f32(self.0), 3f32.sqrt() / 2.0 * T::to_f32(self.0)),
+                    .mul_add(T::to_f32(self.0), 3f32.sqrt() / 2.0 * T::to_f32(self.1)),
             size.1 * (3.0 / 2.0 * T::to_f32(self.1)),
         )
     }
-- 
2.43.4


From 0d9b7c0ce2d5c96f781d0234bbd812106fac5ffe Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 12:01:21 +0100
Subject: [PATCH 23/38] update

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 6e03333..4a948a4 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -1,4 +1,4 @@
-//! All fonctions related to the generation of the map.
+//! All functions related to the generation of the map.
 
 use bevy::prelude::*;
 use noise::{NoiseFn, Perlin};
-- 
2.43.4


From 3cf5d76d00d8eaf2470ed2f04ac3dc25d5bda72b Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 17:42:20 +0100
Subject: [PATCH 24/38] update

---
 crates/border-wars/src/map/generation.rs | 27 ++++++++++++++++--------
 crates/border-wars/src/map/hex.rs        | 18 ++++++----------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 4a948a4..4239923 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -35,36 +35,45 @@ pub struct StartMapGeneration {
 #[derive(Event)]
 pub struct EndMapGeneration;
 
-/// Spawns the tiles if the event is received.
+/// Generate each tiles of the map if the [StartMapGeneration] is received.
+///
+/// The map is generated using the [Perlin] noise function and the [HexSpiral].
+///
+/// It's generated one tile at a time, until the spiral is finished.
 fn generate_map(
-    mut event: EventReader<StartMapGeneration>,
-    mut end_map_event: EventWriter<EndMapGeneration>,
+    mut start_generation_events: EventReader<StartMapGeneration>,
+    mut end_generation_writer: EventWriter<EndMapGeneration>,
     mut commands: Commands,
     mut local_noise: Local<Option<Perlin>>,
     mut local_spiral: Local<Option<HexSpiral<i32>>>,
 ) {
-    // Handle map generation events.
-    for event in event.read() {
+    // Handle map generation events and create the spiral and the noise.
+    for event in start_generation_events.read() {
         *local_noise = Some(Perlin::new(event.seed));
         *local_spiral = Some(TilePosition::new(0, 0).spiral(event.radius as usize));
     }
 
+    // Check if the map is being generated.
     let (Some(noise), Some(spiral)) = (local_noise.as_ref(), local_spiral.as_mut()) else {
         return;
     };
+
+    // Spawn a tile until the spiral is finished
+    // If the map is generated, we send [EndMapGeneration] and set the local
+    // variables to None.
     if let Some(position) = spiral.next() {
-        let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
+        let pixel_position = position.to_pixel_coordinates() * 0.2;
         commands.spawn((get_type(pixel_position, noise), position as TilePosition));
     } else {
-        end_map_event.send(EndMapGeneration);
+        end_generation_writer.send(EndMapGeneration);
         *local_noise = None;
         *local_spiral = None;
     }
 }
 
 /// Returns the type of the position with the given noise.
-fn get_type(position: (f32, f32), noise: &Perlin) -> Tile {
-    let value = noise.get([position.0 as f64, position.1 as f64]);
+fn get_type(position: Vec2, noise: &Perlin) -> Tile {
+    let value = noise.get([position.x as f64, position.y as f64]);
     match value {
         v if v <= -0.4 => Tile::Hill,
         v if v >= 0.4 => Tile::Forest,
diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs
index 1dc4301..11d2eca 100644
--- a/crates/border-wars/src/map/hex.rs
+++ b/crates/border-wars/src/map/hex.rs
@@ -240,7 +240,6 @@ impl<T: Number> HexPosition<T> {
     }
 
     /// Converts the current [HexPosition] into a pixel coordinate.
-    /// Input: The size of the hexagon in pixels (witdh, height).
     ///
     /// If you want to learn more about pixel coordinates conversion,
     /// you can check the
@@ -252,18 +251,13 @@ impl<T: Number> HexPosition<T> {
     /// use border_wars::map::hex::HexPosition;
     ///
     /// let position = HexPosition(1, 0);
-    /// assert_eq!(
-    ///     position.to_pixel_coordinates((1.0, 1.0)),
-    ///     (3f32.sqrt(), 0.0)
-    /// );
+    /// assert_eq!(position.to_pixel_coordinates(), (3f32.sqrt(), 0.0));
     /// ```
-    pub fn to_pixel_coordinates(&self, size: (f32, f32)) -> (f32, f32) {
-        (
-            size.0
-                * 3f32
-                    .sqrt()
-                    .mul_add(T::to_f32(self.0), 3f32.sqrt() / 2.0 * T::to_f32(self.1)),
-            size.1 * (3.0 / 2.0 * T::to_f32(self.1)),
+    pub fn to_pixel_coordinates(&self) -> Vec2 {
+        Vec2::new(
+            3f32.sqrt()
+                .mul_add(T::to_f32(self.0), 3f32.sqrt() / 2.0 * T::to_f32(self.1)),
+            3.0 / 2.0 * T::to_f32(self.1),
         )
     }
 
-- 
2.43.4


From d64d0bb25815862d0a418b12f1ee76ea8882b500 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 17:45:08 +0100
Subject: [PATCH 25/38] update

---
 crates/border-wars/src/map/hex.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs
index 11d2eca..b31f29c 100644
--- a/crates/border-wars/src/map/hex.rs
+++ b/crates/border-wars/src/map/hex.rs
@@ -249,9 +249,10 @@ impl<T: Number> HexPosition<T> {
     ///
     /// ```no_run
     /// use border_wars::map::hex::HexPosition;
+    /// use bevy::math::Vec2;
     ///
     /// let position = HexPosition(1, 0);
-    /// assert_eq!(position.to_pixel_coordinates(), (3f32.sqrt(), 0.0));
+    /// assert_eq!(position.to_pixel_coordinates(), Vec2::new(3f32.sqrt(), 0.0));
     /// ```
     pub fn to_pixel_coordinates(&self) -> Vec2 {
         Vec2::new(
-- 
2.43.4


From 4633db96092d5f191a044ee89f2947256ab06f8d Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 17:48:00 +0100
Subject: [PATCH 26/38] update

---
 crates/border-wars/src/map/hex.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs
index b31f29c..7ffb02c 100644
--- a/crates/border-wars/src/map/hex.rs
+++ b/crates/border-wars/src/map/hex.rs
@@ -252,7 +252,7 @@ impl<T: Number> HexPosition<T> {
     /// use bevy::math::Vec2;
     ///
     /// let position = HexPosition(1, 0);
-    /// assert_eq!(position.to_pixel_coordinates(), Vec2::new(3f32.sqrt(), 0.0));
+    /// assert_eq!(position.to_pixel_coordinates(), (3f32.sqrt(), 0.0).into());
     /// ```
     pub fn to_pixel_coordinates(&self) -> Vec2 {
         Vec2::new(
-- 
2.43.4


From 4b1f7008fd6bbde61d069793b35ea6c94d719dad Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 17:49:20 +0100
Subject: [PATCH 27/38] fix fmt

---
 crates/border-wars/src/map/hex.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs
index 7ffb02c..415bdfc 100644
--- a/crates/border-wars/src/map/hex.rs
+++ b/crates/border-wars/src/map/hex.rs
@@ -248,8 +248,8 @@ impl<T: Number> HexPosition<T> {
     /// # Example
     ///
     /// ```no_run
-    /// use border_wars::map::hex::HexPosition;
     /// use bevy::math::Vec2;
+    /// use border_wars::map::hex::HexPosition;
     ///
     /// let position = HexPosition(1, 0);
     /// assert_eq!(position.to_pixel_coordinates(), (3f32.sqrt(), 0.0).into());
-- 
2.43.4


From 9e9eec3914e525f2f48af6cbc6fb0b1c88664782 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 17:57:43 +0100
Subject: [PATCH 28/38] save

---
 crates/border-wars/src/map/generation.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 4239923..dd263b3 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -85,9 +85,9 @@ fn get_type(position: Vec2, noise: &Perlin) -> Tile {
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-    mut event: EventReader<StartMapGeneration>,
+    mut start_generation_events: EventReader<StartMapGeneration>,
 ) {
-    for _ in event.read() {
+    for _ in start_generation_events.read() {
         for entity in query.iter() {
             commands.entity(entity).despawn_recursive();
         }
-- 
2.43.4


From c11a797d38f8655cdf3432c48f576dcef511af50 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:37:47 +0100
Subject: [PATCH 29/38] save

---
 crates/border-wars/src/map/generation.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index dd263b3..9587d74 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -9,13 +9,15 @@ use super::{Tile, TilePosition};
 /// A plugin to handle the map generation.
 pub struct MapGenerationPlugin;
 
+const MAP_GENERATION_ZOOM: f32 = 0.2;
+
 impl Plugin for MapGenerationPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<StartMapGeneration>()
             .add_event::<EndMapGeneration>()
             .add_systems(
                 Update,
-                (generate_map.after(delete_map), delete_map)
+                (delete_map, generate_map.after(delete_map))
                     .run_if(in_state(crate::CurrentScene::Game)),
             );
     }
@@ -62,8 +64,7 @@ fn generate_map(
     // If the map is generated, we send [EndMapGeneration] and set the local
     // variables to None.
     if let Some(position) = spiral.next() {
-        let pixel_position = position.to_pixel_coordinates() * 0.2;
-        commands.spawn((get_type(pixel_position, noise), position as TilePosition));
+        commands.spawn((get_type_tile(position, noise), position as TilePosition));
     } else {
         end_generation_writer.send(EndMapGeneration);
         *local_noise = None;
@@ -72,8 +73,9 @@ fn generate_map(
 }
 
 /// Returns the type of the position with the given noise.
-fn get_type(position: Vec2, noise: &Perlin) -> Tile {
-    let value = noise.get([position.x as f64, position.y as f64]);
+fn get_type_tile(position: HexPosition<i32>, noise: &Perlin) -> Tile {
+    let pixel_position = position.to_pixel_coordinates() * MAP_GENERATION_ZOOM;
+    let value = noise.get([pixel_position.x as f64, pixel_position.y as f64]);
     match value {
         v if v <= -0.4 => Tile::Hill,
         v if v >= 0.4 => Tile::Forest,
@@ -81,7 +83,7 @@ fn get_type(position: Vec2, noise: &Perlin) -> Tile {
     }
 }
 
-/// Despawns the tiles if the event : [StartMapGeneration] is received.
+/// Despawns the tiles if the event [StartMapGeneration] is received.
 fn delete_map(
     mut commands: Commands,
     query: Query<Entity, With<Tile>>,
-- 
2.43.4


From 62eacf2c84fea64fa853f484b88f6ecb6fb6b63b Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:38:36 +0100
Subject: [PATCH 30/38] add doc

---
 crates/border-wars/src/map/generation.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 9587d74..2de36e5 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -9,6 +9,7 @@ use super::{Tile, TilePosition};
 /// A plugin to handle the map generation.
 pub struct MapGenerationPlugin;
 
+/// The zoom of the map during the generation.
 const MAP_GENERATION_ZOOM: f32 = 0.2;
 
 impl Plugin for MapGenerationPlugin {
-- 
2.43.4


From f184c938042da5cdad3feef009c749b09da1e8d8 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:40:20 +0100
Subject: [PATCH 31/38] change doc

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 2de36e5..610a895 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -73,7 +73,7 @@ fn generate_map(
     }
 }
 
-/// Returns the type of the position with the given noise.
+/// Returns the type of the [HexPosition] with the given noise.
 fn get_type_tile(position: HexPosition<i32>, noise: &Perlin) -> Tile {
     let pixel_position = position.to_pixel_coordinates() * MAP_GENERATION_ZOOM;
     let value = noise.get([pixel_position.x as f64, pixel_position.y as f64]);
-- 
2.43.4


From 7f255d081c97a72eca187212634310977ca343d2 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:41:47 +0100
Subject: [PATCH 32/38] update

---
 crates/border-wars/src/map/generation.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 610a895..2dd0824 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -10,7 +10,7 @@ use super::{Tile, TilePosition};
 pub struct MapGenerationPlugin;
 
 /// The zoom of the map during the generation.
-const MAP_GENERATION_ZOOM: f32 = 0.2;
+const MAP_GENERATION_ZOOM: f32 = 5.;
 
 impl Plugin for MapGenerationPlugin {
     fn build(&self, app: &mut App) {
@@ -75,7 +75,7 @@ fn generate_map(
 
 /// Returns the type of the [HexPosition] with the given noise.
 fn get_type_tile(position: HexPosition<i32>, noise: &Perlin) -> Tile {
-    let pixel_position = position.to_pixel_coordinates() * MAP_GENERATION_ZOOM;
+    let pixel_position = position.to_pixel_coordinates() / MAP_GENERATION_ZOOM;
     let value = noise.get([pixel_position.x as f64, pixel_position.y as f64]);
     match value {
         v if v <= -0.4 => Tile::Hill,
-- 
2.43.4


From 65e81d493b7468a0daaf0fe4dd49327fbeea8ef5 Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:47:28 +0100
Subject: [PATCH 33/38] change doc

---
 crates/border-wars/src/map/renderer.rs | 56 ++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 crates/border-wars/src/map/renderer.rs

diff --git a/crates/border-wars/src/map/renderer.rs b/crates/border-wars/src/map/renderer.rs
new file mode 100644
index 0000000..ad38cce
--- /dev/null
+++ b/crates/border-wars/src/map/renderer.rs
@@ -0,0 +1,56 @@
+//! All functions related to the rendering of the map.
+
+use bevy::prelude::*;
+
+use super::Tile;
+use crate::map::TilePosition;
+
+/// A plugin to render the map.
+pub struct RendererPlugin;
+
+impl Plugin for RendererPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Startup, setup_camera).add_systems(
+            Update,
+            render_map.run_if(in_state(crate::CurrentScene::Game)),
+        );
+    }
+}
+
+/// Sets up the camera.
+fn setup_camera(mut commands: Commands) {
+    commands.spawn(Camera2dBundle::default());
+}
+
+impl Tile {
+    /// Returns the texture handle of the tile.
+    pub fn get_texture(&self, asset_server: &AssetServer) -> Handle<Image> {
+        match self {
+            Tile::Grass => asset_server.load("tiles/grass.png"),
+            Tile::Forest => asset_server.load("tiles/forest.png"),
+            Tile::Hill => asset_server.load("tiles/hill.png"),
+        }
+    }
+}
+
+/// Renders the map.
+fn render_map(
+    query: Query<(Entity, &TilePosition, &Tile), Changed<Tile>>,
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+) {
+    for (entity, position, tile) in query.iter() {
+        let pixel_position_ratio = position.to_pixel_coordinates();
+        let pixel_position = (50. * pixel_position_ratio.x, pixel_position_ratio.y * 30.);
+
+        commands.entity(entity).insert(SpriteBundle {
+            transform: Transform::from_translation(Vec3 {
+                x: pixel_position.0,
+                y: pixel_position.1,
+                z: 0.,
+            }),
+            texture: tile.get_texture(&*asset_server),
+            ..default()
+        });
+    }
+}
-- 
2.43.4


From 0caf97d9b8b32ea44df2c306ecf8e1b89eec5aaf Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:49:45 +0100
Subject: [PATCH 34/38] change doc

---
 crates/border-wars/src/map/generation.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 2dd0824..0869672 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -40,7 +40,7 @@ pub struct EndMapGeneration;
 
 /// Generate each tiles of the map if the [StartMapGeneration] is received.
 ///
-/// The map is generated using the [Perlin] noise function and the [HexSpiral].
+/// The map is generated using a [Perlin] noise and a [HexSpiral].
 ///
 /// It's generated one tile at a time, until the spiral is finished.
 fn generate_map(
@@ -74,7 +74,7 @@ fn generate_map(
 }
 
 /// Returns the type of the [HexPosition] with the given noise.
-fn get_type_tile(position: HexPosition<i32>, noise: &Perlin) -> Tile {
+fn get_tile_type(position: HexPosition<i32>, noise: &Perlin) -> Tile {
     let pixel_position = position.to_pixel_coordinates() / MAP_GENERATION_ZOOM;
     let value = noise.get([pixel_position.x as f64, pixel_position.y as f64]);
     match value {
-- 
2.43.4


From b77061fed2c6c8fe8376ee38c722c79f2a39f38e Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:50:58 +0100
Subject: [PATCH 35/38] save

---
 crates/border-wars/src/map/generation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 0869672..0d40357 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -65,7 +65,7 @@ fn generate_map(
     // If the map is generated, we send [EndMapGeneration] and set the local
     // variables to None.
     if let Some(position) = spiral.next() {
-        commands.spawn((get_type_tile(position, noise), position as TilePosition));
+        commands.spawn((get_tile_type(position, noise), position as TilePosition));
     } else {
         end_generation_writer.send(EndMapGeneration);
         *local_noise = None;
-- 
2.43.4


From c34fc16753992e0264c496063585680e0759a4b4 Mon Sep 17 00:00:00 2001
From: Corentin <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 17:53:04 +0000
Subject: [PATCH 36/38] Delete crates/border-wars/src/map/renderer.rs

---
 crates/border-wars/src/map/renderer.rs | 56 --------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 crates/border-wars/src/map/renderer.rs

diff --git a/crates/border-wars/src/map/renderer.rs b/crates/border-wars/src/map/renderer.rs
deleted file mode 100644
index ad38cce..0000000
--- a/crates/border-wars/src/map/renderer.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-//! All functions related to the rendering of the map.
-
-use bevy::prelude::*;
-
-use super::Tile;
-use crate::map::TilePosition;
-
-/// A plugin to render the map.
-pub struct RendererPlugin;
-
-impl Plugin for RendererPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(Startup, setup_camera).add_systems(
-            Update,
-            render_map.run_if(in_state(crate::CurrentScene::Game)),
-        );
-    }
-}
-
-/// Sets up the camera.
-fn setup_camera(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
-}
-
-impl Tile {
-    /// Returns the texture handle of the tile.
-    pub fn get_texture(&self, asset_server: &AssetServer) -> Handle<Image> {
-        match self {
-            Tile::Grass => asset_server.load("tiles/grass.png"),
-            Tile::Forest => asset_server.load("tiles/forest.png"),
-            Tile::Hill => asset_server.load("tiles/hill.png"),
-        }
-    }
-}
-
-/// Renders the map.
-fn render_map(
-    query: Query<(Entity, &TilePosition, &Tile), Changed<Tile>>,
-    mut commands: Commands,
-    asset_server: Res<AssetServer>,
-) {
-    for (entity, position, tile) in query.iter() {
-        let pixel_position_ratio = position.to_pixel_coordinates();
-        let pixel_position = (50. * pixel_position_ratio.x, pixel_position_ratio.y * 30.);
-
-        commands.entity(entity).insert(SpriteBundle {
-            transform: Transform::from_translation(Vec3 {
-                x: pixel_position.0,
-                y: pixel_position.1,
-                z: 0.,
-            }),
-            texture: tile.get_texture(&*asset_server),
-            ..default()
-        });
-    }
-}
-- 
2.43.4


From 34557956e4b5e99a2ee50ef902142c768b63acfd Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 18:59:38 +0100
Subject: [PATCH 37/38] change name variable

---
 crates/border-wars/src/map/generation.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/border-wars/src/map/generation.rs b/crates/border-wars/src/map/generation.rs
index 0d40357..f1ce9ee 100644
--- a/crates/border-wars/src/map/generation.rs
+++ b/crates/border-wars/src/map/generation.rs
@@ -10,7 +10,7 @@ use super::{Tile, TilePosition};
 pub struct MapGenerationPlugin;
 
 /// The zoom of the map during the generation.
-const MAP_GENERATION_ZOOM: f32 = 5.;
+const MAP_GENERATION_SCALE: f32 = 5.;
 
 impl Plugin for MapGenerationPlugin {
     fn build(&self, app: &mut App) {
@@ -75,7 +75,7 @@ fn generate_map(
 
 /// Returns the type of the [HexPosition] with the given noise.
 fn get_tile_type(position: HexPosition<i32>, noise: &Perlin) -> Tile {
-    let pixel_position = position.to_pixel_coordinates() / MAP_GENERATION_ZOOM;
+    let pixel_position = position.to_pixel_coordinates() / MAP_GENERATION_SCALE;
     let value = noise.get([pixel_position.x as f64, pixel_position.y as f64]);
     match value {
         v if v <= -0.4 => Tile::Hill,
-- 
2.43.4


From 9d392e3b08e06cb42c4c6860807bb724f9fa036c Mon Sep 17 00:00:00 2001
From: CoCoSol007 <solois.corentin@gmail.com>
Date: Wed, 21 Feb 2024 19:02:22 +0100
Subject: [PATCH 38/38] save

---
 .vscode/settings.json                       |   7 +++
 crates/border-wars/assets/tiles/forest.png  | Bin 0 -> 11194 bytes
 crates/border-wars/assets/tiles/grass.png   | Bin 0 -> 2752 bytes
 crates/border-wars/assets/tiles/hill.png    | Bin 0 -> 11970 bytes
 crates/border-wars/src/.main.rs.swp         | Bin 0 -> 12288 bytes
 crates/border-wars/src/main.rs              |  13 +++++
 crates/border-wars/src/map/.renderer.rs.swp | Bin 0 -> 57344 bytes
 crates/border-wars/src/map/mod.rs           |   1 +
 crates/border-wars/src/map/renderer.rs      |  56 ++++++++++++++++++++
 9 files changed, 77 insertions(+)
 create mode 100644 .vscode/settings.json
 create mode 100644 crates/border-wars/assets/tiles/forest.png
 create mode 100644 crates/border-wars/assets/tiles/grass.png
 create mode 100644 crates/border-wars/assets/tiles/hill.png
 create mode 100644 crates/border-wars/src/.main.rs.swp
 create mode 100644 crates/border-wars/src/map/.renderer.rs.swp
 create mode 100644 crates/border-wars/src/map/renderer.rs

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..8f7aa14
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "cSpell.words": [
+        "despawn",
+        "Despawns",
+        "Perlin"
+    ]
+}
\ No newline at end of file
diff --git a/crates/border-wars/assets/tiles/forest.png b/crates/border-wars/assets/tiles/forest.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6c89ecc56219a5ea39e4c813bb9bc2eacfdfe19
GIT binary patch
literal 11194
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
Ye{S6taNuNF_W%F@07*qoM6N<$g0sq}E&u=k

literal 0
HcmV?d00001

diff --git a/crates/border-wars/assets/tiles/grass.png b/crates/border-wars/assets/tiles/grass.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ecf787bab29c2f7467702139bfa8f5616a74b76
GIT binary patch
literal 2752
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
GLSTaS>35p|

literal 0
HcmV?d00001

diff --git a/crates/border-wars/assets/tiles/hill.png b/crates/border-wars/assets/tiles/hill.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cb6354855a53622a7d465914f32a7ede14fc309
GIT binary patch
literal 11970
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

literal 0
HcmV?d00001

diff --git a/crates/border-wars/src/.main.rs.swp b/crates/border-wars/src/.main.rs.swp
new file mode 100644
index 0000000000000000000000000000000000000000..b1680bc6f16043bb6402614ba9e7fb29b39e9c9a
GIT binary patch
literal 12288
zcmeI2&1w`u5XUPTJsA~+5Il8Ma7H$>$x7IzR|MIFAQIGQ)LWR$)UG2tJwx|QmUUe{
z_zrsZ4SWYZcoRISZ{Q1vM{7RvF@7w1j8wy)p6;&hs`}Mw+1g&be`8&=oCeT14e-hP
zh_iF=;o&6!FY+Q2^|O<SqZ4(ac%nsd_^f=ez7lz9h$=DlSVxc1qmS)K`=}QNt~PZ~
zy9rjejP~lG8z@Jczi`AROn?bg38YDPp*6F4rLnY_9b7m+FV3FXtlIF32`~XBzyz28
z6JP>NfC(^x|C&G&Pr-A_@JN~ExpJQRX)c#MF##sP1egF5U;<2l2`~XBzyz286JP>|
zkbvt0d^-W~WQKyL|NnP?|9?3J@R{_MG$P$3T_hbNO_RQ#1o%pNM|w>fkTytnNVBBl
zq-oMo(g%9`4e1r>CFup}DJl1P2$^xnOn?b60Vco%m;e)C0!)AjFoAy}Fdl=TF}Cw5
z`_!%<q(+M68tm;EL|=+#v)O7aH<ntp`~Y{TciJ(id~4l}*H9rfOb3w?Bj_s8L$wvU
zu@$C?$StK<%`QC9L4x{f<;FFe?m!Vq7J{QwW!ddL_m1oPTV`ky42^Y5ttxuK>ZDrJ
zdv`r@EajRTqFvkdYVU`h-;MieFHpwXpkPs>zMZf4bFLUwLYrur`!*9zR<P@){iLul
zg~#i0ETzJMWoMwWesU`ZkQx+41Nv6hfG*|16x;C2vB^>=vx8y$#*C^UC85eQm$J&>
zPxe&4vYb+mDnx3cvMe$im+#=tP|8?iKlQ07m)ijK`n<UJ2=g=r)k_aW90e*7QCB3i
J-=o4g@B<(i3~T@Z

literal 0
HcmV?d00001

diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs
index ef67c5e..0f01daa 100644
--- a/crates/border-wars/src/main.rs
+++ b/crates/border-wars/src/main.rs
@@ -1,11 +1,24 @@
 //! The main entry point of the game.
 
 use bevy::prelude::*;
+use border_wars::map::generation::{MapGenerationPlugin, StartMapGeneration};
+use border_wars::map::renderer::RendererPlugin;
 use border_wars::scenes::ScenesPlugin;
+use border_wars::CurrentScene;
 
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
         .add_plugins(ScenesPlugin)
+        .add_plugins(MapGenerationPlugin)
+        .add_plugins(RendererPlugin)
+        .add_systems(OnEnter(CurrentScene::Game), gen_map)
         .run();
 }
+
+fn gen_map(mut event: EventWriter<StartMapGeneration>) {
+    event.send(StartMapGeneration {
+        seed: 5667,
+        radius: 5,
+    })
+}
diff --git a/crates/border-wars/src/map/.renderer.rs.swp b/crates/border-wars/src/map/.renderer.rs.swp
new file mode 100644
index 0000000000000000000000000000000000000000..da1dbbec0226080defbc4c580f8ccfe6fc8e79a9
GIT binary patch
literal 57344
zcmeI&PiP%Q00!`}dht)KRtg>`5yEbH-Iu04lua5*qqaR1s!0Qa^4RRods(}0cRMrN
zBrT~Y5f7fkgEzs02T`nNMK3}tf}j@<f+8Nos~!X|ezUtx@?P5@cq#PT@@3zfo&7Vv
z-ObFVyE?sc_MAKs%m_?R2=U?Idv)&M4e`ezA>tw~Op&=IdrphRVo~l{qgi;Z-C*~*
zBCduix29X_;x!fH!)l=urH`yf+H_+bSv6W@ble?AWml^l)szmj`42l}6$((G5vXkc
z$cg<Ij?EmMb_LH&PROSYUZ4&IC_n)UP=Epypa2CZa32ZSa-Vn|?cLY5`EWabU~K+i
z`~C5D-f8ELwsX!XKmiI+fC3bt00k&O0SZun0u;D+1)@ZVuOAWOE%zXg|Np=B{D1R+
z5I2y|kn70%$TegOc@;T@EFcp32Y(d!68Q)jAg>@R$TG5o%py-BzwQ^}7vyK;2jl}}
z1zA7@^2KA=2V#*N$&ic43UV3|$Zt5#uaM6Xcg%l1B*Zt!P2?TqW#l+=0Qnn#wD=vl
zj=YDwjl7AxfqeJyy?ai0WcQiCmXMg5pY<nywk~m>-4q0g>PJ;(JzvxX?GLLqY^7Bw
zZJMcIplq)#@um((#^AeA`m)k~XJoalvF~ncS3)@*j8=2So1rYz4VCrE!lX7W^5E$0
zl{RjxG(B3$>L@q;LJvc^y!|ok>tfie7iE##w6~(-WAdtS`*l-X42Mykm;i4IrFPS6
zW`2<7XqEMrN}XDDs>+j0VJ%UwgC8i)ZI(}XlUKuMw<bGd4cJASDLb}Mo|M}SwMDOK
zdR*Y$q%?Q$BzfM^88FG?)BHyP3Q&Lo6!^aaf!}sY=ptp?&7s?Bd)!XlyZbWD<)upL
z%>ccg_Iz}CF0R+x-PMQkC1vIoT<5=3_x<xtS3Iojc840u#kOm0merdL<%@3XbKdiH
zZ`+YmXVk{|_88_;lU`BtC|t%!!|%w&wJ0B`WX^q^$1eK0Y+lXn;VoTHbh}*~hkI4m
zNV}#a3IjYl)JMB(m{WguEpU_DR2ZH~vrL|xA8AvN6;a|%x<QWVuAxFu=7Y(xK}@sy
z3x!t3?zsUVqsrYkaazN3&n*mGjqwc(BO9+tqq2T`R?2Esf@Ne><`#EG+7`;GT_?+z
zN9N@j40<v(cXk*J)O@?K1{8z6ya8>;c@n3=4S$M$&Fq8%kq*nO*2KE4`SwuCl+k+b
zEk;A7qnV@`JcZ%*=n~f<4jI=@Rrcb#l6U6|$6b2vn3j|^vMTGnH!IxXJntHExf8u}
zp#-|hduiWG^PaI7UwQSL-(k2|X;iXHvC45toW_CpV`uw9nV|m8C^IU{AWD*+*)&!S
zjkjbYjYf1v+TxE?5$;&f+SMw}5^t(KHD!r2;@Z4WmadUC=J~7|;P!L3XLD66-4;RE
zoo8cp72C0ev$fEIESt4$(YAco9Z?x2+cx7C3BxtDfm>kbzMB=UhN()W!_Zyfv!X6p
zRhKuzu+%E65(pheako1m7jW<Ni#&FtX@k9CT&)s`9lLw5VNdhHt*fQJDc$q`A^him
z>Rtf&R0uq#*VB)9M*al(7+FV7B2OcKqTWx)x5&H57IF!>h}7F?*XN7^BLcVm@*n%H
zz-L@O<MOGR0u-PC1t>rP3Q&Lo6rcbFC_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun
z0u-PC1t>rP3Q&Lo6rcbFC_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP
z3Q&Lo6rcbFC_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6rcbF
zC_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6rcbFC_n)UP=Epy
rpa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&LocNYkJe^&ep(b0>H

literal 0
HcmV?d00001

diff --git a/crates/border-wars/src/map/mod.rs b/crates/border-wars/src/map/mod.rs
index 5265d18..73d0c06 100644
--- a/crates/border-wars/src/map/mod.rs
+++ b/crates/border-wars/src/map/mod.rs
@@ -2,6 +2,7 @@
 
 pub mod generation;
 pub mod hex;
+pub mod renderer;
 
 use bevy::prelude::*;
 
diff --git a/crates/border-wars/src/map/renderer.rs b/crates/border-wars/src/map/renderer.rs
new file mode 100644
index 0000000..ad38cce
--- /dev/null
+++ b/crates/border-wars/src/map/renderer.rs
@@ -0,0 +1,56 @@
+//! All functions related to the rendering of the map.
+
+use bevy::prelude::*;
+
+use super::Tile;
+use crate::map::TilePosition;
+
+/// A plugin to render the map.
+pub struct RendererPlugin;
+
+impl Plugin for RendererPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Startup, setup_camera).add_systems(
+            Update,
+            render_map.run_if(in_state(crate::CurrentScene::Game)),
+        );
+    }
+}
+
+/// Sets up the camera.
+fn setup_camera(mut commands: Commands) {
+    commands.spawn(Camera2dBundle::default());
+}
+
+impl Tile {
+    /// Returns the texture handle of the tile.
+    pub fn get_texture(&self, asset_server: &AssetServer) -> Handle<Image> {
+        match self {
+            Tile::Grass => asset_server.load("tiles/grass.png"),
+            Tile::Forest => asset_server.load("tiles/forest.png"),
+            Tile::Hill => asset_server.load("tiles/hill.png"),
+        }
+    }
+}
+
+/// Renders the map.
+fn render_map(
+    query: Query<(Entity, &TilePosition, &Tile), Changed<Tile>>,
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+) {
+    for (entity, position, tile) in query.iter() {
+        let pixel_position_ratio = position.to_pixel_coordinates();
+        let pixel_position = (50. * pixel_position_ratio.x, pixel_position_ratio.y * 30.);
+
+        commands.entity(entity).insert(SpriteBundle {
+            transform: Transform::from_translation(Vec3 {
+                x: pixel_position.0,
+                y: pixel_position.1,
+                z: 0.,
+            }),
+            texture: tile.get_texture(&*asset_server),
+            ..default()
+        });
+    }
+}
-- 
2.43.4