flipper logic

src/items.rs

@@ -1,19 +1,24 @@
 use serde::{Deserialize, Serialize};
 
-// #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-// #[serde(tag = "t", content = "c")]
-// pub enum ShopItems {
-//     StunGun,
-//     AirBag,
-//     Flashlight { power: u8 },
-//     Flippers { speed_increase: u8 },
-// }
-
-
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct StunGun {
     pub range: f32,
-    pub duration: f64
+    pub duration: f64,
+}
+
+impl StunGun {
+    pub fn lvl1() -> Self {
+        Self {
+            range: 30.0,
+            duration: 0.5,
+        }
+    }
+    pub fn lvl2() -> Self {
+        Self {
+            range: 60.0,
+            duration: 0.75,
+        }
+    }
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
@@ -24,5 +29,18 @@ pub struct Flashlight;
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct Flippers {
-    pub speed_increase: f32
+    pub speed_increase: f32,
-}
+}
+
+impl Flippers {
+    pub fn lvl1() -> Self {
+        Self {
+            speed_increase: 1.2
+        }
+    }
+    pub fn lvl2() -> Self {
+        Self {
+            speed_increase: 1.5
+        }
+    }
+}

src/logic/ingame/playerlogic.rs

@@ -126,6 +126,11 @@ pub fn update_player_movement(
         }
     }
 
+    // Handle flippers doing a speed increase
+    if game_core.player.inventory.flippers.is_some() {
+        let speed_multiplier = speed_multiplier * game_core.player.inventory.flippers.as_ref().unwrap().speed_increase;
+    }
+
     // Update the player's breath
     game_core.player.breath_percent =
         (game_core.player.breath_percent - BREATH_DECREASE_PER_SECOND * dt as f32).clamp(0.0, 1.0);

src/player.rs

@@ -7,10 +7,10 @@ const STUN_ATTACK_TIME: f64 = 0.75;
 
 #[derive(Debug, Serialize, Deserialize, Default, Clone)]
 pub struct PlayerInventory {
-    stun_gun: Option<StunGun>,
+    pub stun_gun: Option<StunGun>,
-    air_bag: Option<AirBag>,
+    pub air_bag: Option<AirBag>,
-    flashlight: Option<Flashlight>,
+    pub flashlight: Option<Flashlight>,
-    flippers: Option<Flippers>
+    pub flippers: Option<Flippers>
 }
 
 #[derive(Debug, Default)]
@@ -78,7 +78,7 @@ impl Player {
 
     /// Try to attack with the stun gun
     pub fn begin_attack(&mut self) {
-        if true || self.inventory.stun_gun.is_some() && self.stun_timer == 0.0 {
+        if self.inventory.stun_gun.is_some() && self.stun_timer == 0.0 {
             self.attacking_timer = self.inventory.stun_gun.as_ref().unwrap().duration;
         }
     }
@@ -134,15 +134,15 @@ impl Player {
         );
 
         // Calculate AOE ring
-        if self.attacking_timer != 0.0 {
+        if self.attacking_timer != 0.0 && self.inventory.stun_gun.is_some() {
-            let aoe_ring = calculate_linear_slide( self.attacking_timer / STUN_ATTACK_TIME) as f32;
+            let aoe_ring = calculate_linear_slide( self.attacking_timer / self.inventory.stun_gun.as_ref().unwrap().duration) as f32;
             self.attacking_timer = (self.attacking_timer - dt).max(0.0);
 
             // Render attack AOE
             context_2d.draw_circle_lines(
                 self.position.x as i32,
                 self.position.y as i32,
-                AOE_RING_MAX_RADIUS * aoe_ring,
+                self.inventory.stun_gun.as_ref().unwrap().range * aoe_ring,
                 TRANSLUCENT_WHITE_64,
             );
         }