From 18d587fdead38a4432da718b3ed58393aa5cf34b Mon Sep 17 00:00:00 2001
From: StephenAdamson <stephen.h.adamson@gmail.com>
Date: Wed, 18 Dec 2024 00:09:13 +0000
Subject: [PATCH] cleanup

---
 src/cursor.rs |  2 +-
 src/main.rs   | 17 ++++++++++++-----
 src/tile.rs   |  7 ++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/cursor.rs b/src/cursor.rs
index 40466ee..37ca642 100644
--- a/src/cursor.rs
+++ b/src/cursor.rs
@@ -5,7 +5,7 @@ use bevy::prelude::*;
 #[require(Transform)]
 pub struct Cursor {}
 
-pub fn setup_curor(mut commands: Commands, asset_server: Res<AssetServer>) {
+pub fn setup_cursor(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands.spawn((
         Transform::from_xyz(0., 0., 10.).with_scale(Vec3::splat(PIXEL_RATIO)),
         Sprite {
diff --git a/src/main.rs b/src/main.rs
index bb0fe56..2b3bd1a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,15 +24,22 @@ fn main() {
                 .set(ImagePlugin::default_nearest()),
         )
         .insert_resource(ClearColor(Color::srgb(0.0, 0.0, 0.0)))
-        .add_systems(Startup, (game::setup_level, camera::spawn_panning_camera))
+        .add_systems(
+            Startup,
+            (
+                game::setup_level,
+                camera::spawn_panning_camera,
+                cursor::setup_cursor,
+            ),
+        )
         .add_systems(PostStartup, tile::tile_sprite_occlusion)
-        .add_systems(Startup, cursor::setup_curor)
         .add_systems(
             FixedUpdate,
             (
                 camera::camera_movement,
                 citizen::citizen_movement,
-                tile::tile_item_sprite_update,
+                tile::tile_water_update,
+                cursor::move_cursor,
             ),
         )
         .init_resource::<tile::CameraMoved>()
@@ -40,9 +47,9 @@ fn main() {
             FixedUpdate,
             (
                 tile::camera_z_movement,
-                tile::tile_sprite_occlusion.run_if(|camera_moved: Res<tile::CameraMoved>| camera_moved.0),
+                tile::tile_sprite_occlusion
+                    .run_if(|camera_moved: Res<tile::CameraMoved>| camera_moved.0),
             ),
         )
-        .add_systems(FixedUpdate, cursor::move_cursor)
         .run();
 }
diff --git a/src/tile.rs b/src/tile.rs
index 6d2eb44..1bdd98a 100644
--- a/src/tile.rs
+++ b/src/tile.rs
@@ -42,10 +42,11 @@ pub struct WallTile {
 }
 
 #[derive(Component)]
-pub struct WaterTile {
-    pub tile: Tile,
-    pub swimmable: bool,
+#[require(Tile)]
+pub struct HasWater {
+    pub height : u8,
     pub astarmultiplier: f32,
+    pub swimmable: bool,
 }
 
 #[derive(Component)]