Shepherd

rewin123 · Dec 11, 2023 · d9edc02 · d9edc02
1 parent db25563
commit d9edc02
Show file tree

Hide file tree

Showing 39 changed files with 47 additions and 5 deletions.
diff --git a/assets/shepherd/tile000.png b/assets/shepherd/tile000.png
diff --git a/assets/shepherd/tile001.png b/assets/shepherd/tile001.png
diff --git a/assets/shepherd/tile002.png b/assets/shepherd/tile002.png
diff --git a/assets/shepherd/tile003.png b/assets/shepherd/tile003.png
diff --git a/assets/shepherd/tile004.png b/assets/shepherd/tile004.png
diff --git a/assets/shepherd/tile005.png b/assets/shepherd/tile005.png
diff --git a/assets/shepherd/tile006.png b/assets/shepherd/tile006.png
diff --git a/assets/shepherd/tile007.png b/assets/shepherd/tile007.png
diff --git a/assets/shepherd/tile008.png b/assets/shepherd/tile008.png
diff --git a/assets/shepherd/tile009.png b/assets/shepherd/tile009.png
diff --git a/assets/shepherd/tile010.png b/assets/shepherd/tile010.png
diff --git a/assets/shepherd/tile011.png b/assets/shepherd/tile011.png
diff --git a/assets/shepherd/tile012.png b/assets/shepherd/tile012.png
diff --git a/assets/shepherd/tile013.png b/assets/shepherd/tile013.png
diff --git a/assets/shepherd/tile014.png b/assets/shepherd/tile014.png
diff --git a/assets/shepherd/tile015.png b/assets/shepherd/tile015.png
diff --git a/assets/shepherd/tile016.png b/assets/shepherd/tile016.png
diff --git a/assets/shepherd/tile017.png b/assets/shepherd/tile017.png
diff --git a/assets/shepherd/tile018.png b/assets/shepherd/tile018.png
diff --git a/assets/shepherd/tile019.png b/assets/shepherd/tile019.png
diff --git a/assets/shepherd/tile020.png b/assets/shepherd/tile020.png
diff --git a/assets/shepherd/tile021.png b/assets/shepherd/tile021.png
diff --git a/assets/shepherd/tile022.png b/assets/shepherd/tile022.png
diff --git a/assets/shepherd/tile023.png b/assets/shepherd/tile023.png
diff --git a/assets/shepherd/tile024.png b/assets/shepherd/tile024.png
diff --git a/assets/shepherd/tile025.png b/assets/shepherd/tile025.png
diff --git a/assets/shepherd/tile026.png b/assets/shepherd/tile026.png
diff --git a/assets/shepherd/tile027.png b/assets/shepherd/tile027.png
diff --git a/assets/shepherd/tile028.png b/assets/shepherd/tile028.png
diff --git a/assets/shepherd/tile029.png b/assets/shepherd/tile029.png
diff --git a/assets/shepherd/tile030.png b/assets/shepherd/tile030.png
diff --git a/assets/shepherd/tile031.png b/assets/shepherd/tile031.png
diff --git a/assets/shepherd/tile032.png b/assets/shepherd/tile032.png
diff --git a/assets/shepherd/tile033.png b/assets/shepherd/tile033.png
diff --git a/assets/shepherd/tile034.png b/assets/shepherd/tile034.png
diff --git a/assets/shepherd/tile035.png b/assets/shepherd/tile035.png
diff --git a/assets/shepherd/tile036.png b/assets/shepherd/tile036.png
diff --git a/src/sheep.rs b/src/sheep.rs
@@ -464,7 +464,7 @@ pub fn setup(
 
     let mut exact_sheep_count = 0;
 
-    for _ in 0..sheep_count {
+    while exact_sheep_count < sheep_count {
         let x = rng.gen_range(-r..r);
         let y = 0.0;
         let z = rng.gen_range(-r..r);

diff --git a/src/shepherd.rs b/src/shepherd.rs
@@ -8,7 +8,7 @@ use crate::{
     player::{Bark, DOG_ACCELERATION, DOG_SPEED},
     sunday::DayState,
     torch::{IgniteTorch, TorchBase},
-    GameSet, GameStuff,
+    GameSet, GameStuff, auto_anim::{AutoAnimPlugin, AutoAnim, AnimSet, AnimRange},
 };
 
 const SHEPHERD_PATH: &str = "test/Knight.png";
@@ -25,9 +25,34 @@ impl Plugin for ShepherdPlugin {
         app.add_event::<SpawnShepherd>()
             .add_systems(
                 Update,
-                (spawn_shepherd_system, ignite_all_torhes, bark_system).in_set(GameSet::Playing),
+                (spawn_shepherd_system, ignite_all_torhes, bark_system, set_anim).in_set(GameSet::Playing),
             )
-            .add_systems(OnEnter(DayState::Evening), start_ignite_torches);
+            .add_systems(OnEnter(DayState::Evening), start_ignite_torches)
+            .add_plugins(AutoAnimPlugin::<ShepherdAnim>::default());
+    }
+}
+
+#[derive(Default)]
+pub enum ShepherdAnim {
+    #[default]
+    Sleep,
+    Walk
+}
+
+impl AnimSet for ShepherdAnim {
+    fn get_folder_path() -> String {
+        "shepherd".to_string()
+    }
+
+    fn get_index_range(&self) -> crate::auto_anim::AnimRange {
+        match self {
+            ShepherdAnim::Sleep => AnimRange::new(0, 19),
+            ShepherdAnim::Walk => AnimRange::new(20,27),
+        }
+    }
+
+    fn get_tile_count() -> usize {
+        37
     }
 }
 
@@ -100,7 +125,7 @@ fn spawn_shepherd_system(
             PbrBundle {
                 transform: Transform::from_translation(event.pos)
                     .with_rotation(get_sprite_rotation())
-                    .with_scale(Vec3::new(1.0, 1.0, 2.0)),
+                    .with_scale(Vec3::new(3.0, 3.0, 3.0)),
                 material: materials.add(StandardMaterial {
                     base_color_texture: Some(asset_server.load(SHEPHERD_PATH)),
                     ..default()
@@ -115,6 +140,11 @@ fn spawn_shepherd_system(
                 target_velocity: Vec3::ZERO,
             },
             GameStuff,
+            AutoAnim {
+                set : ShepherdAnim::Sleep,
+                current_frame: 0,
+                timer: Timer::from_seconds(0.1, TimerMode::Repeating)
+            }
         ));
     }
     events.clear();
@@ -135,3 +165,15 @@ fn bark_system(
         }
     }
 }
+
+fn set_anim(
+    mut query : Query<(&mut AutoAnim<ShepherdAnim>, Option<&IgniteAllTorhes>)>
+) {
+    for (mut anim, ignite) in query.iter_mut() {
+        if ignite.is_some() {
+            anim.set = ShepherdAnim::Walk;
+        } else {
+            anim.set = ShepherdAnim::Sleep;
+        }
+    }
+}