Merge branch 'master' of github.com:Ewpratten/ludum-dare-48

README.md

@@ -1,6 +1,6 @@
 <img src="./assets/img/logos/readme.png" width="100%">
 
-# \[Game Name\]
+# Deep Breath
 
 
 [![Build](https://github.com/Ewpratten/ludum-dare-48/actions/workflows/build.yml/badge.svg)](https://github.com/Ewpratten/ludum-dare-48/actions/workflows/build.yml)
@@ -9,7 +9,11 @@
 [![Rust 1.51](https://img.shields.io/badge/Rust-1.51-orange)](https://www.rust-lang.org/)
 [![Made with Raylib](https://img.shields.io/badge/Made%20With-raylib-blue)](https://www.raylib.com/)
 
-*\[Game Name\]* is a ...
+**Deep Breath** is an exploration game where you explore an underwater cave in hopes of finding your lost transponder. Items and upgrades can be acquired along the way to assist your search.
+
+This game was written in [Rust](https://www.rust-lang.org/), on top of [Rust bindings](https://github.com/deltaphc/raylib-rs) to the [`raylib`](https://github.com/raysan5/raylib) graphics library. For most of the team, this has been our first big Rust project.
+
+This has been our second game produced for Ludum Dare. Check out the first [here](https://ldjam.com/events/ludum-dare/46/micromanaged-mike).
 
 ## Development Resources
 

assets/img/enemies/pufferFishAttack.json

@@ -0,0 +1,50 @@
+{ "frames": {
+   "pufferFish 0.aseprite": {
+    "frame": { "x": 0, "y": 0, "w": 39, "h": 25 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+    "sourceSize": { "w": 39, "h": 25 },
+    "duration": 100
+   },
+   "pufferFish 1.aseprite": {
+    "frame": { "x": 39, "y": 0, "w": 39, "h": 25 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+    "sourceSize": { "w": 39, "h": 25 },
+    "duration": 100
+   },
+   "pufferFish 2.aseprite": {
+    "frame": { "x": 78, "y": 0, "w": 39, "h": 25 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+    "sourceSize": { "w": 39, "h": 25 },
+    "duration": 100
+   },
+   "pufferFish 3.aseprite": {
+    "frame": { "x": 117, "y": 0, "w": 39, "h": 25 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+    "sourceSize": { "w": 39, "h": 25 },
+    "duration": 100
+   }
+ },
+ "meta": {
+  "app": "http://www.aseprite.org/",
+  "version": "1.2.27-x64",
+  "image": "pufferFishAttack.png",
+  "format": "RGBA8888",
+  "size": { "w": 156, "h": 25 },
+  "scale": "1",
+  "frameTags": [
+  ],
+  "layers": [
+   { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+  ],
+  "slices": [
+  ]
+ }
+}

assets/img/enemies/pufferFishBigIdle.json

@@ -0,0 +1,42 @@
+{ "frames": {
+   "pufferFish 0.aseprite": {
+    "frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 1.aseprite": {
+    "frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 2.aseprite": {
+    "frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   }
+ },
+ "meta": {
+  "app": "http://www.aseprite.org/",
+  "version": "1.2.27-x64",
+  "image": "pufferFishBigIdle.png",
+  "format": "RGBA8888",
+  "size": { "w": 57, "h": 19 },
+  "scale": "1",
+  "frameTags": [
+  ],
+  "layers": [
+   { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+  ],
+  "slices": [
+  ]
+ }
+}

assets/img/enemies/pufferFishExpand.json

@@ -0,0 +1,50 @@
+{ "frames": {
+   "pufferFish 0.aseprite": {
+    "frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 1.aseprite": {
+    "frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 2.aseprite": {
+    "frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 3.aseprite": {
+    "frame": { "x": 57, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   }
+ },
+ "meta": {
+  "app": "http://www.aseprite.org/",
+  "version": "1.2.27-x64",
+  "image": "pufferFishExpand.png",
+  "format": "RGBA8888",
+  "size": { "w": 76, "h": 19 },
+  "scale": "1",
+  "frameTags": [
+  ],
+  "layers": [
+   { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+  ],
+  "slices": [
+  ]
+ }
+}

assets/img/enemies/pufferFishIdle.json

@@ -0,0 +1,66 @@
+{ "frames": {
+   "pufferFish 0.aseprite": {
+    "frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 1.aseprite": {
+    "frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 2.aseprite": {
+    "frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 3.aseprite": {
+    "frame": { "x": 57, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 4.aseprite": {
+    "frame": { "x": 76, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   },
+   "pufferFish 5.aseprite": {
+    "frame": { "x": 95, "y": 0, "w": 19, "h": 19 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+    "sourceSize": { "w": 19, "h": 19 },
+    "duration": 100
+   }
+ },
+ "meta": {
+  "app": "http://www.aseprite.org/",
+  "version": "1.2.27-x64",
+  "image": "pufferFish.png",
+  "format": "RGBA8888",
+  "size": { "w": 114, "h": 19 },
+  "scale": "1",
+  "frameTags": [
+  ],
+  "layers": [
+   { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+  ],
+  "slices": [
+  ]
+ }
+}

src/entities/enemy/jellyfish.rs

@@ -6,7 +6,7 @@ use crate::{
 use raylib::prelude::*;
 use serde::{Deserialize, Serialize};
 
-const JELLYFISH_STUN_DURATION: f64 = 0.75;
+const JELLYFISH_STUN_DURATION: f64 = 1.5;
 const JELLYFISH_STUN_REACH: f32 = 20.0;
 
 #[derive(Debug, Serialize, Deserialize, Default, Clone)]

src/entities/enemy/mod.rs

@@ -1,4 +1,5 @@
 pub mod base;
 pub mod jellyfish;
 pub mod octopus;
-pub mod whirlpool;
+pub mod whirlpool;
+pub mod pufferfish;

src/entities/enemy/octopus.rs

@@ -10,7 +10,7 @@ use raylib::prelude::*;
 use serde::{Deserialize, Serialize};
 
 const OCTOPUS_SUCK_AIR_DELAY: f64 = 3.5;
-const OCTOPUS_SUCK_AIR_RANGE: f32 = 70.0;
+const OCTOPUS_SUCK_AIR_RANGE: f32 = 40.0;
 const OCTOPUS_SUCK_AIR_DURATION: f64 = 1.0;
 const OCTOPUS_SUCK_AIR_AMOUNT: f32 = 0.1;
 

src/entities/enemy/pufferfish.rs

@@ -0,0 +1,154 @@
+use raylib::prelude::*;
+
+use serde::{Deserialize, Serialize};
+
+use crate::{lib::utils::calculate_linear_slide, pallette::TRANSLUCENT_RED_64};
+
+use super::base::EnemyBase;
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub enum PufferState {
+    SmallIdle,
+    Growing,
+    LargeIdle,
+    Blowing,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Pufferfish {
+    pub position: Vector2,
+    pub is_knocking_back: bool,
+    pub time_knocking_back: f64,
+
+    pub inflate_timer: f64,
+    pub is_large: bool,
+    pub stun_timer: f64,
+    pub puffer_state: PufferState,
+}
+
+impl EnemyBase for Pufferfish {
+    fn render(
+        &mut self,
+        context_2d: &mut RaylibMode2D<RaylibDrawHandle>,
+        player: &mut crate::player::Player,
+        resources: &mut crate::resources::GlobalResources,
+        dt: f64,
+    ) {
+
+		let is_stunned = self.stun_timer > 0.0;
+
+		// Render the stun ring
+        if is_stunned {
+			println!("Stunned");
+            let stun_ring_alpha =
+                calculate_linear_slide(self.stun_timer / 1.0);
+            context_2d.draw_circle_v(
+                self.position,
+                12.0,
+                TRANSLUCENT_RED_64.fade(0.55 * stun_ring_alpha as f32),
+            );
+
+            self.stun_timer -= dt;
+        }
+
+
+		let angle = player.position.angle_to(self.position).to_degrees();
+
+		
+        match self.puffer_state {
+            PufferState::SmallIdle => {
+                resources.pufferfish_small.draw(
+                    context_2d,
+                    Vector2 {
+                        x: self.position.x,
+                        y: self.position.y,
+                    },
+                    angle,
+                );
+
+				if self.position.distance_to(player.position).abs() <= 100.0 && self.inflate_timer > 1.0{
+					self.puffer_state = PufferState::Growing;
+				}
+				self.is_large = false;
+            },
+            PufferState::Growing => {
+				self.inflate_timer = 0.0;
+                resources.pufferfish_expand.draw(
+                    context_2d,
+                    Vector2 {
+                        x: self.position.x,
+                        y: self.position.y,
+                    },
+                    angle,
+                );
+
+                if resources.pufferfish_expand.get_current_frame_id(context_2d) == 3 {
+                   self.puffer_state = PufferState::LargeIdle;
+                }
+				self.is_large = true;
+                
+            },
+            PufferState::LargeIdle => {
+				self.inflate_timer = 0.0;
+                resources.pufferfish_big.draw(
+                    context_2d,
+                    Vector2 {
+                        x: self.position.x,
+                        y: self.position.y,
+                    },
+                    angle,
+                );
+
+				if self.position.distance_to(player.position).abs() <= 65.0{
+					self.puffer_state = PufferState::Blowing;
+					self.is_knocking_back = true;
+					self.time_knocking_back = 0.0;
+				}
+
+				self.is_large = true;
+            },
+            PufferState::Blowing => {
+				
+				resources.pufferfish_attack.draw(
+                    context_2d,
+                    Vector2 {
+                        x: self.position.x,
+                        y: self.position.y,
+                    },
+                    angle,
+                );
+
+
+				if resources.pufferfish_expand.get_current_frame_id(context_2d) == 3 && self.inflate_timer > 1.0{
+                    self.puffer_state = PufferState::SmallIdle;
+					self.inflate_timer = 0.0;
+                }
+				self.is_large = false;
+			},
+        }
+    }
+
+    fn handle_logic(&mut self, player: &mut crate::player::Player, dt: f64) {
+
+
+
+		self.inflate_timer += dt;
+        self.time_knocking_back += dt;
+
+		if self.time_knocking_back >= 0.5{
+			self.is_knocking_back = false;
+		}
+
+		if self.position.distance_to(player.position).abs() > 120.0 && self.is_large {
+			self.puffer_state = PufferState::Blowing;
+			self.inflate_timer = 0.0;
+		}
+
+    }
+
+    fn handle_getting_attacked(&mut self, stun_duration: f64, current_time: f64) {
+
+		self.stun_timer = stun_duration;
+
+	}
+}

src/items.rs

@@ -32,25 +32,25 @@ impl StunGun {
     pub fn lvl1() -> Self {
         Self {
             range: 30.0,
-            duration: 0.75,
+            duration: 2.0,
             level: 1,
-            cost: 30,
+            cost: 15,
         }
     }
     pub fn lvl2() -> Self {
         Self {
             range: 60.0,
-            duration: 1.25,
+            duration: 2.5,
             level: 2,
-            cost: 40,
+            cost: 25,
         }
     }
     pub fn lvl3() -> Self {
         Self {
             range: 80.0,
-            duration: 1.0,
+            duration: 3.0,
             level: 3,
-            cost: 50,
+            cost: 40,
         }
     }
 }
@@ -111,14 +111,14 @@ impl AirBag {
         Self {
             extra_oxygen: 0.15,
             level: 1,
-            cost: 30,
+            cost: 25,
         }
     }
     pub fn lvl2() -> Self {
         Self {
             extra_oxygen: 0.30,
             level: 2,
-            cost: 40,
+            cost: 35,
         }
     }
     pub fn lvl3() -> Self {
@@ -186,21 +186,21 @@ impl Flashlight {
         Self {
             radius: 0.25,
             level: 1,
-            cost: 40,
+            cost: 20,
         }
     }
     pub fn lvl2() -> Self {
         Self {
             radius: 0.5,
             level: 2,
-            cost: 50,
+            cost: 30,
         }
     }
     pub fn lvl3() -> Self {
         Self {
             radius: 1.0,
             level: 3,
-            cost: 60,
+            cost: 50,
         }
     }
 }
@@ -259,21 +259,21 @@ pub struct Flippers {
 impl Flippers {
     pub fn lvl1() -> Self {
         Self {
-            speed_increase: 1.2,
+            speed_increase: 1.1,
             level: 1,
             cost: 30,
         }
     }
     pub fn lvl2() -> Self {
         Self {
-            speed_increase: 1.5,
+            speed_increase: 1.2,
             level: 2,
             cost: 40,
         }
     }
     pub fn lvl3() -> Self {
         Self {
-            speed_increase: 1.8,
+            speed_increase: 1.3,
             level: 3,
             cost: 50,
         }

src/lib/wrappers/audio/player.rs

@@ -39,3 +39,10 @@ impl std::ops::Deref for AudioPlayer {
         &self.backend
     }
 }
+
+
+impl std::ops::DerefMut for AudioPlayer {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.backend
+    }
+}

src/logic/ingame/mod.rs

@@ -253,6 +253,17 @@ impl Screen for InGameScreen {
 					
 				}
 
+				// Iterates over pufferfish
+				for pufferfish in game_core.world.pufferfish.iter_mut(){
+
+					pufferfish.handle_logic(&mut game_core.player, dt);
+					pufferfish.render(&mut context_2d, &mut game_core.player, &mut game_core.resources, dt);
+
+
+
+				}
+
+
 				// Removes whirlpools set for removal
 				game_core.world.whirlpool.retain(|x| !x.should_remove());
 				

src/logic/ingame/playerlogic.rs

@@ -1,6 +1,7 @@
+use raylib::core::audio::RaylibAudio;
 use raylib::prelude::*;
 
-use crate::gamecore::GameCore;
+use crate::{gamecore::GameCore, lib::wrappers::audio::player::AudioPlayer};
 
 const NORMAL_PLAYER_SPEED: i32 = 1;
 const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
@@ -11,14 +12,19 @@ const BOOST_DECREASE_PER_SECOND: f32 = 0.65;
 const BOOST_REGEN_PER_SECOND: f32 = 0.25;
 const BREATH_DECREASE_PER_SECOND: f32 = 0.02;
 
+
+
 pub fn update_player_movement(
     draw_handle: &mut RaylibDrawHandle,
     game_core: &mut GameCore,
     window_center: Vector2,
 ) {
+    
+    // let mut p: AudioPlayer = AudioPlayer::new(RaylibAudio::init_audio_device());
+    // p.play_sound(&game_core.resources.breath);
     // Calculate DT
     let dt = draw_handle.get_time() - game_core.last_frame_time;
-
+    
     // Handle player movement
     let mouse_pose = draw_handle.get_mouse_position();
     let mouse_world_pose = draw_handle.get_screen_to_world2D(mouse_pose, game_core.master_camera);
@@ -80,6 +86,7 @@ pub fn update_player_movement(
         game_core
             .player
             .begin_attack(&mut game_core.world, draw_handle.get_time());
+            //println!("{{\"x\":{}, \"y\":{}}},",f32::round(game_core.player.position.x),f32::round(game_core.player.position.y));
     }
 
     // Move the player in their direction
@@ -202,6 +209,44 @@ pub fn update_player_movement(
 
 	}
 
+	for pufferfish in game_core.world.pufferfish.iter_mut(){
+
+		if pufferfish.is_knocking_back{
+			// Calculates info for formulas
+
+			// Deltas between positions
+			let net_pose = game_core.player.position - pufferfish.position;
+
+			// Angle between: UNITS: RADIANS
+			let angle = net_pose.y.atan2(net_pose.x);
+
+			// Calculates force
+			let force = 1.0;
+
+			// Calculates componets of force
+			let mut force_x = (force as f32  * angle.cos()).clamp(-1.0, 1.0);
+			let mut force_y = (force as f32 * angle.sin()).clamp(-1.0, 1.0);
+
+			// Prevents Nan erros
+			if force_x.is_nan(){
+				force_x = 1.0 * net_pose.x;
+			}
+
+			if force_y.is_nan(){
+				force_y = 1.0 * net_pose.y;
+			}
+
+			game_core.player.additional_vel.x += force_x;
+			game_core.player.additional_vel.y += force_y;
+
+            should_apply_friction = false;
+
+		}
+
+
+
+	}
+
     if should_apply_friction {
         game_core.player.additional_vel.x /= PLAYER_FRICTION;
         game_core.player.additional_vel.y /= PLAYER_FRICTION;

src/logic/mainmenu.rs

@@ -34,8 +34,8 @@ impl Screen for MainMenuScreen {
 
         // Render title
         draw_handle.draw_text(
-            "ONE BREATH",
-            (win_height / 2) - 80,
+            "DEEP BREATH",
+            (win_height / 2) - 100,
             win_width / 8,
             80,
             Color::BLACK,

src/logic/pausemenu.rs

@@ -123,9 +123,9 @@ impl Screen for PauseMenuScreen {
 
         // Render credits
         draw_handle.draw_text(
-            "Credits:\n\t- @ewpratten\n\t- @rsninja722\n\t- @wm-c\n\t- @catarinaburghi",
+            "Credits:\n\t- @ewpratten\n\t- @rsninja722\n\t- @wm-c\n\t- @catarinaburghi\n\t- @kondroel",
             (win_width / 2) - (SCREEN_PANEL_SIZE.x as i32 / 2) + 10,
-            (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2) + 170,
+            (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2) + 150,
             20,
             Color::BLACK,
         );

src/main.rs

@@ -23,7 +23,7 @@ const DEFAULT_WINDOW_DIMENSIONS: Vector2 = Vector2 {
     x: 1080.0,
     y: 720.0,
 };
-const WINDOW_TITLE: &str = r"One Breath";
+const WINDOW_TITLE: &str = r"Deep Breath";
 const MAX_FPS: u32 = 60;
 
 fn main() {

src/player.rs

@@ -103,6 +103,11 @@ impl Player {
                 if whirlpool.position.distance_to(self.position).abs() <= stun_reach {
                     whirlpool.handle_getting_attacked(self.attacking_timer, current_time);
                 }
+            }
+			for pufferfish in world.pufferfish.iter_mut() {
+                if pufferfish.position.distance_to(self.position).abs() <= stun_reach {
+                    pufferfish.handle_getting_attacked(self.attacking_timer, current_time);
+                }
             }
         }
     }

src/resources.rs

@@ -1,9 +1,4 @@
-use raylib::{
-    math::Vector2,
-    shaders::Shader,
-    texture::{Image, RenderTexture2D, Texture2D},
-    RaylibHandle, RaylibThread,
-};
+use raylib::{RaylibHandle, RaylibThread, audio::Sound, math::Vector2, shaders::Shader, texture::{Image, RenderTexture2D, Texture2D}};
 
 use crate::lib::wrappers::animation::FrameAnimationWrapper;
 
@@ -33,6 +28,10 @@ pub struct GlobalResources {
     pub octopus_animation_regular: FrameAnimationWrapper,
     pub octopus_animation_attack: FrameAnimationWrapper,
 	pub whirlpool: FrameAnimationWrapper,
+	pub pufferfish_big: FrameAnimationWrapper,
+	pub pufferfish_small: FrameAnimationWrapper,
+	pub pufferfish_attack: FrameAnimationWrapper,
+	pub pufferfish_expand: FrameAnimationWrapper,
 
     // Darkness layer
     pub darkness_overlay: Texture2D,
@@ -62,6 +61,9 @@ pub struct GlobalResources {
 
     // Treasure
     pub transponder: FrameAnimationWrapper,
+
+    // Audio
+    pub breath: Sound,
 }
 
 impl GlobalResources {
@@ -155,7 +157,7 @@ impl GlobalResources {
                 )?,
                 Vector2 { x: 20.0, y: 20.0 },
                 15,
-                4,
+                6,
             ),
             octopus_animation_regular: FrameAnimationWrapper::new(
                 raylib.load_texture_from_image(
@@ -257,6 +259,43 @@ impl GlobalResources {
                 4,
                 4,
 			),
+            pufferfish_big: FrameAnimationWrapper::new(
+                raylib.load_texture_from_image(
+                    &thread,
+                    &Image::load_image("./assets/img/enemies/pufferFishBigIdle.png")?,
+                )?,
+                Vector2 { x: 19.0, y: 19.0 },
+                3,
+                2,
+			),
+            pufferfish_small: FrameAnimationWrapper::new(
+                raylib.load_texture_from_image(
+                    &thread,
+                    &Image::load_image("./assets/img/enemies/pufferFishIdle.png")?,
+                )?,
+                Vector2 { x: 19.0, y: 19.0 },
+                6,
+                2,
+			),
+            pufferfish_attack: FrameAnimationWrapper::new(
+                raylib.load_texture_from_image(
+                    &thread,
+                    &Image::load_image("./assets/img/enemies/pufferFishAttack.png")?,
+                )?,
+                Vector2 { x: 39.0, y: 25.0 },
+                4,
+                2,
+			),
+            pufferfish_expand: FrameAnimationWrapper::new(
+                raylib.load_texture_from_image(
+                    &thread,
+                    &Image::load_image("./assets/img/enemies/pufferFishExpand.png")?,
+                )?,
+                Vector2 { x: 19.0, y: 19.0 },
+                4,
+                2,
+			),
+            breath: Sound::load_sound("./assets/audio/breath.mp3")?
         })
     }
 }

src/world.rs

@@ -4,14 +4,7 @@ use failure::Error;
 use raylib::math::{Rectangle, Vector2};
 use serde::{Deserialize, Serialize};
 
-use crate::{
-    entities::{
-        enemy::{jellyfish::JellyFish, octopus::Octopus, whirlpool::Whirlpool,},
-        fish::FishEntity,
-		
-    },
-    player::Player,
-};
+use crate::{entities::{enemy::{jellyfish::JellyFish, octopus::Octopus, pufferfish::Pufferfish, whirlpool::Whirlpool}, fish::FishEntity}, player::Player};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct World {
@@ -31,6 +24,7 @@ pub struct World {
     pub jellyfish: Vec<JellyFish>,
     pub octopus: Vec<Octopus>,
 	pub whirlpool: Vec<Whirlpool>,
+	pub pufferfish: Vec<Pufferfish>
     
 }