octopus movement

assets/worlds/mainworld.json

@@ -17,5 +17,17 @@
                 "y": 100
             }
         }
+    ],
+    "octopus": [
+        {
+            "position_a" : {
+                "x": 300,
+                "y": 150
+            },
+            "position_b" : {
+                "x": 500,
+                "y": 100
+            }
+        }
     ]
 }

src/entities/enemy/mod.rs

@@ -1,2 +1,3 @@
 pub mod base;
-pub mod jellyfish;
+pub mod jellyfish;
+pub mod octopus;

src/entities/enemy/octopus.rs

@@ -0,0 +1,50 @@
+use super::base::EnemyBase;
+use raylib::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize, Default, Clone)]
+pub struct Octopus {
+    pub position_a: Vector2,
+    pub position_b: Vector2,
+
+    #[serde(skip)]
+    pub current_position: Vector2,
+
+    #[serde(skip)]
+    pub stunned_timer: f64,
+    #[serde(skip)]
+    pub max_stunned_time: f64,
+}
+
+impl Octopus {}
+
+impl EnemyBase for Octopus {
+    fn render(
+        &mut self,
+        context_2d: &mut raylib::prelude::RaylibMode2D<raylib::prelude::RaylibDrawHandle>,
+        resources: &mut crate::resources::GlobalResources,
+        dt: f64,
+    ) {
+        let is_octopus_stunned = self.stunned_timer > 0.0;
+
+        // Simple sine position
+        let h_trans = if is_octopus_stunned {
+            0.0
+        } else {
+            (context_2d.get_time() / 8.0).sin().abs() as f32
+        };
+
+        // Modify the current pose
+        let dist_a_to_b = self.position_b - self.position_a;
+        self.current_position =(dist_a_to_b * h_trans) + self.position_a;
+
+        // TODO: TMP
+        context_2d.draw_circle_v(self.current_position, 10.0, Color::RED);
+    }
+
+    fn handle_logic(&mut self, player: &mut crate::player::Player, dt: f64) {}
+
+    fn handle_getting_attacked(&mut self, stun_duration: f64) {
+        todo!()
+    }
+}

src/logic/ingame/mod.rs

@@ -130,6 +130,10 @@ impl Screen for InGameScreen {
                 jellyfish.handle_logic(&mut game_core.player, dt);
                 jellyfish.render(&mut context_2d, &mut game_core.resources, dt);
             }
+            for octopus in game_core.world.octopus.iter_mut() {
+                octopus.handle_logic(&mut game_core.player, dt);
+                octopus.render(&mut context_2d, &mut game_core.resources, dt);
+            }
 
             // Render Player
             game_core

src/world.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use std::io::Read;
 use failure::Error;
 
-use crate::entities::{enemy::jellyfish::JellyFish, fish::FishEntity};
+use crate::entities::{enemy::{jellyfish::JellyFish, octopus::Octopus}, fish::FishEntity};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct World {
@@ -21,7 +21,9 @@ pub struct World {
     #[serde(skip)]
     pub colliders: Vec<Rectangle>,
 
-    pub jellyfish: Vec<JellyFish>
+    pub jellyfish: Vec<JellyFish>,
+    pub octopus: Vec<Octopus>,
+    
 }
 
 impl World {