done

Author: rsninja722

README.md

@@ -32,6 +32,10 @@ Core libraries:
  - [`serde`](https://serde.rs/)
  - [`serialstudio-rs`](https://github.com/Ewpratten/serialstudio-rs)
 
+Sound Samples:
+ - [JavierZumer](https://freesound.org/people/JavierZumer/sounds/257236/)
+ - [Noted451](https://freesound.org/people/Noted451/sounds/531015/)
+
 ### VSCode Setup
 
 If using VSCode, disable the `Rust` extension, and install everything in the **Workspace Recommendations** (You will see this list by searching `@recommended` in the extensions panel)

assets/audio/succ.mp3

@@ -276,6 +276,19 @@
 			"stun_timer": 0.0,
 			"puffer_state": "SmallIdle"
 
+		},
+		{
+			"position" : {
+                "x":260, 
+                "y":1472
+            },
+			"is_knocking_back": false,
+			"time_knocking_back": 0.0,
+			"inflate_timer": 0.0,
+			"is_large": false,
+			"stun_timer": 0.0,
+			"puffer_state": "SmallIdle"
+
 		}
 
 	]

assets/audio/swimSong.mp3

@@ -10,6 +10,6 @@ pub trait EnemyBase {
         resources: &mut GlobalResources,
         dt: f64,
     );
-    fn handle_logic(&mut self, player: &mut Player, dt: f64);
+    fn handle_logic(&mut self, player: &mut Player, dt: f64) -> u8;
     fn handle_getting_attacked(&mut self, stun_duration: f64, current_time: f64);
 }

assets/audio/zap.mp3

@@ -77,13 +77,14 @@ impl EnemyBase for JellyFish {
             && !is_jelly_stunned;
     }
 
-    fn handle_logic(&mut self, player: &mut Player, _dt: f64) {
+    fn handle_logic(&mut self, player: &mut Player, _dt: f64) -> u8 {
         // Handle stunning the player
         if self.do_stun_player {
             if self.position.distance_to(player.position).abs() <= JELLYFISH_STUN_REACH {
                 player.set_stun_seconds(JELLYFISH_STUN_DURATION);
             }
         }
+        return 0;
     }
 
     fn handle_getting_attacked(&mut self, stun_duration: f64, _current_time: f64) {

assets/img/map/tutorial2.png renamed to assets/img/map/tut1.png

@@ -123,16 +123,19 @@ impl EnemyBase for Octopus {
         }
     }
 
-    fn handle_logic(&mut self, player: &mut crate::player::Player, _dt: f64) {
+    fn handle_logic(&mut self, player: &mut crate::player::Player, _dt: f64) -> u8 {
         if self.suck_air_time_remaining > 0.0 && !self.has_taken_air_from_player {
             if player.position.distance_to(self.current_position).abs() <= OCTOPUS_SUCK_AIR_RANGE {
                 // Take air from the player
                 player.breath_percent -= OCTOPUS_SUCK_AIR_AMOUNT;
-
+                
                 // Set the flag
                 self.has_taken_air_from_player = true;
+
+                return 1;
             }
         }
+        return 0;
     }
 
     fn handle_getting_attacked(&mut self, stun_duration: f64, _current_time: f64) {