From 94afacebec2d155fc8c96ab4173498e305c90d69 Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Thu, 7 Dec 2023 22:54:35 +0300
Subject: [PATCH] Polising and wolf sprite

---
 assets/test/wolf.png | Bin 0 -> 547 bytes
 src/sheep.rs         |  17 ++++++++++-------
 src/storyteller.rs   |  31 +++++++++++++++++++++----------
 src/test_level.rs    |   2 +-
 4 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 assets/test/wolf.png

diff --git a/assets/test/wolf.png b/assets/test/wolf.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bce3260edcc5612f6cb98ddd8379235e8230b27
GIT binary patch
literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq000*N000sQ1^@s6u;)b+00001b5ch_0Itp)
z=>Px$-AP12R5*>Tl)sANP!xy1yZ8#$Vr7*=0%CBQU^8zpV3lUeu-gijfwa5W3@ihw
z!uSR@P8ze3u)!i#DzWw<vW0W*-ic9mhB?i>xqrU<J16HH6>WCB*SzVtwjCEg2-R{i
zuZt`p+U!*G+?RKgU#;8kAz<5aThDwLJ{V2t_IupVJOGx9dHred?J8z4ngC}n#FG!h
zmy3DrO~<tWx2qU9dm)~f4|M()DnJ{TB1>4u5%)8X!Dyl%xqFzgjw5}q(*`NBM6cP7
zOSj+CApo#BuK`qf%AemaD5da&kZ(VJA>JuT#pPmN%LQ?@X;q#AXmz&Za`!OP`$NkD
zU|*K}{QmU}UoPgg91?&$Q01u}O*<WqdTx4F<tghpBHHX!M>dC+#q-l+tI}KGB1<6q
zw`LZUvK_bfgOGh$vR%bmMU|(V4o4kZxomz*0r^3AQJwIbiu<yp%F{PLaxj`uWC^Fk
zQG=R$x4>Xzi|MKv3KJ^eYkL>U<$#Q4NSf9R5ww@RhMOv-0hwX29rvQ+nTl_z@5se<
z9KFeN-~xI&9CgaIwb)kWqHr*pFtjZEAZ%@;MV2tMETYYh=cmW3;n2!u;s>FUvTXxL
lo1OBe<Jy~!ulDbz{RQUw0hKZI8!i9<002ovPDHLkV1iGJ0%ZUI

literal 0
HcmV?d00001

diff --git a/src/sheep.rs b/src/sheep.rs
index f84b39e..97a9d78 100644
--- a/src/sheep.rs
+++ b/src/sheep.rs
@@ -26,11 +26,11 @@ const SHEEP_ACCELERATION: f32 = SHEEP_SPEED * 3.0;
 
 const RANDOM_WALK_RANGE: f32 = 5.0;
 const RANDOM_WALK_ACCEPT_RADIUS: f32 = 0.5;
-pub const RANDOM_WALK_SPEED_MULTIPLIER: f32 = 0.2;
+pub const RANDOM_WALK_SPEED_MULTIPLIER: f32 = 0.3;
 
 //IDLE FEEDING must be large enough so that player can see sheep and react for escapes
-const IDLE_FEEDING_TIME: f32 = 5.0;
-const IDLE_FEEDING_TIME_RANGE: f32 = 1.5;
+const IDLE_FEEDING_TIME: f32 = 2.5;
+const IDLE_FEEDING_TIME_RANGE: f32 = 1.0;
 
 const MOVE_IN_DIST: f32 = 11.0;
 const MOVE_OUT_DIST: f32 = 10.0;
@@ -360,9 +360,12 @@ pub fn update_scared_sheeps(
 
     for (e, t, mut walk, mut dec, mut scare) in sheeps.iter_mut() {
         if scare.time > 2. {
-            *dec = Decision::Idle;
+            *dec = Decision::Feed;
             walk.0 = Vec3::ZERO;
-            commands.entity(e).remove::<IsScared>();
+            commands.entity(e).remove::<IsScared>().insert(IdleFeeding {
+                //sheep in stress for 3 seconds after dog bark
+                time: 3.0,
+            });
         } else {
             scare.time += time.delta_seconds();
 
@@ -413,9 +416,9 @@ pub fn setup(
     });
 
     //spawn sheeps
-    let r = level_size.0 / 1.5;
+    let r = level_size.0 / 1.5 / 2.0;
     let mut rng = rand::thread_rng();
-    let sheep_count = 100;
+    let sheep_count = 1000;
 
     for _ in 0..sheep_count {
         let x = rng.gen_range(-r..r);
diff --git a/src/storyteller.rs b/src/storyteller.rs
index 2602b79..0e90d45 100644
--- a/src/storyteller.rs
+++ b/src/storyteller.rs
@@ -10,8 +10,10 @@ use bevy::prelude::*;
 use rand::Rng;
 
 use crate::{
-    player::DOG_SPEED,
-    sheep::{GoTo, Sheep, RANDOM_WALK_SPEED_MULTIPLIER, SHEEP_SPEED},
+    player::{Dog, DOG_SPEED},
+    sheep::{
+        Decision, GoTo, IdleFeeding, IsScared, Sheep, RANDOM_WALK_SPEED_MULTIPLIER, SHEEP_SPEED,
+    },
     test_level::LevelSize,
 };
 
@@ -49,20 +51,24 @@ fn setup_start_time(mut teller: ResMut<Storyteller>, time: Res<Time>) {
 
 fn storyteller_system(
     mut commands: Commands,
-    sheep: Query<(Entity, &Transform), With<Sheep>>,
+    sheep: Query<(Entity, &Transform), (With<Sheep>, Without<IsScared>, Without<GoTo>)>,
     mut teller: ResMut<Storyteller>,
     time: Res<Time>,
     level_size: Res<LevelSize>,
+    dog: Query<&Transform, With<Dog>>,
 ) {
+    let Ok(dog_transform) = dog.get_single() else {
+        return;
+    };
     if teller.next_wave.is_none() {
         let level_time = time.elapsed_seconds() - teller.level_start_time;
         let unfiorm_time = level_time / teller.level_duration;
 
         let sheep_count = sheep.iter().count() as f32;
 
-        let c = sheep_count * unfiorm_time * 0.2 + 1.0;
-        let dt = 15.0 - 10.0 * unfiorm_time;
-        let n = 1.0 + 2.0 * unfiorm_time;
+        let c = sheep_count * unfiorm_time * 0.2 + 1.0 + 0.05 * sheep_count;
+        let dt = 10.0 - 3.0 * unfiorm_time;
+        let n = 2.0 + 2.0 * unfiorm_time;
 
         teller.next_wave = Some(SheepWave {
             count: c as usize,
@@ -90,7 +96,8 @@ fn storyteller_system(
                     .map(|(e, t)| {
                         let dir = t.translation;
                         let proj_dir = dir.dot(random_dir);
-                        (e, dir, proj_dir)
+                        let dist_to_dog = (t.translation - dog_transform.translation).length();
+                        (e, dir, proj_dir + dist_to_dog)
                     })
                     .collect::<Vec<_>>();
                 sorted_sheep.sort_by(|a, b| b.2.partial_cmp(&a.2).unwrap());
@@ -99,9 +106,13 @@ fn storyteller_system(
                 for i in 0..split_c {
                     if let Some((e, pos, dist)) = sorted_sheep.get(i) {
                         info!("Sending {:?} with {:?}", e, dist);
-                        commands.entity(*e).insert(GoTo {
-                            target: *pos + level_size.0 * random_dir,
-                        });
+                        commands
+                            .entity(*e)
+                            .insert(GoTo {
+                                target: *pos + level_size.0 * 2.0 * random_dir,
+                            })
+                            .insert(Decision::Escape)
+                            .remove::<IdleFeeding>();
                     }
                 }
             }
diff --git a/src/test_level.rs b/src/test_level.rs
index f207a89..29d10fe 100644
--- a/src/test_level.rs
+++ b/src/test_level.rs
@@ -16,7 +16,7 @@ pub struct LevelSize(pub f32);
 
 impl Default for LevelSize {
     fn default() -> Self {
-        Self(20.)
+        Self(30.)
     }
 }