From 877a5ba4484f70faabe5468a4ab52bec52d99ccf Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sat, 24 Apr 2021 11:37:17 -0400
Subject: [PATCH] fish pickup

---
 assets/worlds/mainworld.json |  4 ++--
 src/entities/fish.rs         | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/assets/worlds/mainworld.json b/assets/worlds/mainworld.json
index 9d52a17..45a78a5 100644
--- a/assets/worlds/mainworld.json
+++ b/assets/worlds/mainworld.json
@@ -6,11 +6,11 @@
     "fish": [
         {
             "x": 500.0,
-            "y": 500.0
+            "y": 300.0
         },
         {
             "x": 800.0,
-            "y": 500.0
+            "y": 200.0
         }
     ]
 }
\ No newline at end of file
diff --git a/src/entities/fish.rs b/src/entities/fish.rs
index f2a784c..869fb61 100644
--- a/src/entities/fish.rs
+++ b/src/entities/fish.rs
@@ -22,7 +22,7 @@ impl FishEntity {
         Self {
             position: position,
             direction: Vector2::zero(),
-            following_player: true,
+            following_player: false,
             size: Vector2 { x: 5.0, y: 8.0 },
             rng: rand::thread_rng()
         }
@@ -67,9 +67,20 @@ impl FishEntity {
     }
 
     pub fn handle_free_movement(&mut self, player: &Player, dt: f64) {
-        if player.position.distance_to(self.position).abs() <= player.size.y * 2.0 {
+        // Distance and direction to player
+        let dist_to_player = player.position - self.position;
+        let dist_to_player_lin = self.position.distance_to(player.position);
+        let mut direction_to_player = dist_to_player;
+        direction_to_player.normalize();
+
+        // Handle player picking up fish
+        if player.position.distance_to(self.position).abs() <= player.size.y * 1.2 {
             self.following_player = true;
         }
+
+        // Look at the player;
+        self.position = self.position;
+        self.direction = direction_to_player;
     }
 
     pub fn update_position(&mut self, player: &Player, dt: f64) {