Organise the screens a bit more

Author: Andy-Python-Programmer

resources/maps/01.map

@@ -1,7 +1,7 @@
 .comment Define all of our variables
 
 .end We **rustaceans** love all animals and we do not want to disappoint them like the gophers. \nWe also have animals in our language too like Cow<>. \nWe just love the correct animals ⌐■_■
-.using Turbofish Gun
+.using_weapon Turbofish Gun
 
 .comment The map
 [-4------]_[--8---8---*-]_[--------------8]

src/dead.rs

@@ -14,22 +14,35 @@ use ggez::{
 };
 use utils::AssetManager;
 
-mod dead;
-mod game;
-mod map;
-mod menu;
-mod physics;
 mod utils;
 
-mod components {
-    pub mod barrel;
-    pub mod bullet;
-    pub mod cloud;
-    pub mod enemy;
-    pub mod player;
-    pub mod tile;
+mod screens {
+    pub mod menu {
+        pub mod menu;
+    }
+
+    pub mod game {
+        pub mod components {
+            pub mod barrel;
+            pub mod bullet;
+            pub mod cloud;
+            pub mod enemy;
+            pub mod player;
+            pub mod tile;
+        }
+
+        pub mod game;
+        pub mod map;
+        pub mod physics;
+    }
+
+    pub mod dead {
+        pub mod dead;
+    }
 }
 
+pub use screens::*;
+
 const WIDTH: f32 = 1000.0;
 const HEIGHT: f32 = 600.0;
 
@@ -91,9 +104,9 @@ pub enum Screen {
 
 pub struct Game {
     screen: Screen,
-    menu_screen: menu::Menu,
-    game_screen: Mutex<game::Game>,
-    death_screen: dead::Death,
+    menu_screen: menu::menu::Menu,
+    game_screen: Mutex<game::game::Game>,
+    death_screen: dead::dead::Death,
 
     asset_manager: Rc<AssetManager>,
 }
@@ -107,9 +120,9 @@ impl Game {
         Self {
             screen: Screen::Menu,
 
-            menu_screen: menu::Menu::create(ctx, asset_manager.clone()),
-            game_screen: game::Game::create(ctx, asset_manager.clone()),
-            death_screen: dead::Death::spawn(ctx),
+            menu_screen: menu::menu::Menu::create(ctx, asset_manager.clone()),
+            game_screen: game::game::Game::create(ctx, asset_manager.clone()),
+            death_screen: dead::dead::Death::spawn(ctx, asset_manager.clone()),
 
             asset_manager,
         }
@@ -179,7 +192,8 @@ impl EventHandler for Game {
                 if let Some(s) = change {
                     match s {
                         Screen::Menu => {
-                            self.game_screen = game::Game::create(ctx, self.asset_manager.clone());
+                            self.game_screen =
+                                game::game::Game::create(ctx, self.asset_manager.clone());
                         }
 
                         _ => (),

src/main.rs

@@ -0,0 +1,105 @@
+use std::rc::Rc;
+
+use ggez::{
+    graphics::Color,
+    graphics::{self, Scale, Text, TextFragment},
+    nalgebra::Point2,
+    Context, GameResult,
+};
+use graphics::DrawParam;
+
+use crate::{utils::AssetManager, WIDTH};
+
+pub struct Death {
+    asset_manager: Rc<AssetManager>,
+}
+
+impl Death {
+    pub fn spawn(_ctx: &mut Context, asset_manager: Rc<AssetManager>) -> Self {
+        Self { asset_manager }
+    }
+
+    pub fn draw(&mut self, ctx: &mut Context) -> GameResult<()> {
+        graphics::clear(ctx, graphics::BLACK);
+
+        let consolas = self.asset_manager.get_font("Consolas.ttf");
+        let ferris_planet = self.asset_manager.get_image("ferris_planet.png");
+
+        let dead = Text::new(
+            TextFragment::new("YOU DEAD")
+                .scale(Scale::uniform(35.0))
+                .font(consolas)
+                .color(Color::from_rgb(255, 80, 76)),
+        );
+
+        let unsafe_dead = Text::new(
+            TextFragment::new("unsafe")
+                .scale(Scale::uniform(30.0))
+                .font(consolas)
+                .color(Color::from_rgb(74, 129, 191)),
+        );
+
+        let unsafe_dead_block_start = Text::new(
+            TextFragment::new("{")
+                .scale(Scale::uniform(30.0))
+                .font(consolas)
+                .color(Color::from_rgb(255, 255, 255)),
+        );
+
+        let unsafe_dead_block_func = Text::new(
+            TextFragment::new("dead()")
+                .scale(Scale::uniform(30.0))
+                .font(consolas)
+                .color(Color::from_rgb(214, 208, 132)),
+        );
+
+        let unsafe_dead_block_end = Text::new(
+            TextFragment::new("}")
+                .scale(Scale::uniform(30.0))
+                .font(consolas)
+                .color(Color::from_rgb(255, 255, 255)),
+        );
+
+        graphics::draw(
+            ctx,
+            &dead,
+            DrawParam::default().dest(Point2::new((WIDTH / 2.0) - 60.0, 40.0)),
+        )?;
+
+        graphics::draw(
+            ctx,
+            &unsafe_dead,
+            DrawParam::default().dest(Point2::new((WIDTH / 2.0) - 200.0, 200.0)),
+        )?;
+
+        graphics::draw(
+            ctx,
+            &unsafe_dead_block_start,
+            DrawParam::default().dest(Point2::new((WIDTH / 2.0) - 90.0, 200.0)),
+        )?;
+
+        graphics::draw(
+            ctx,
+            &unsafe_dead_block_func,
+            DrawParam::default().dest(Point2::new((WIDTH / 2.0) - 125.0, 260.0)),
+        )?;
+
+        graphics::draw(
+            ctx,
+            &unsafe_dead_block_end,
+            DrawParam::default().dest(Point2::new((WIDTH / 2.0) - 200.0, 300.0)),
+        )?;
+
+        graphics::draw(
+            ctx,
+            &ferris_planet,
+            DrawParam::default().dest(Point2::new((WIDTH / 2.0) - 10.0, 240.0)),
+        )?;
+
+        graphics::present(ctx)
+    }
+
+    pub fn update(&self, _ctx: &mut Context) -> GameResult {
+        Ok(())
+    }
+}

src/screens/dead/dead.rs

@@ -3,7 +3,7 @@ use ggez_goodies::{camera::Camera, nalgebra_glm::Vec2};
 use graphics::DrawParam;
 
 use crate::{
-    physics::{isometry_to_point, Physics},
+    game::physics::{isometry_to_point, Physics},
     utils::AssetManager,
     HEIGHT,
 };

src/components/barrel.rs renamed to src/screens/game/components/barrel.rs

@@ -6,10 +6,9 @@ use ggez::{
 use ggez_goodies::{camera::Camera, nalgebra_glm::Vec2};
 
 use nphysics2d::{algebra::Velocity2, math::Velocity, nalgebra as na, object::DefaultBodyHandle};
-use physics::ObjectData;
 
 use crate::{
-    physics::{self, isometry_to_point, Physics},
+    game::physics::{isometry_to_point, ObjectData, Physics},
     utils::AssetManager,
 };
 
@@ -18,6 +17,11 @@ pub enum PlayerWeapon {
     Grappling(Grappling),
 }
 
+pub enum WeaponType {
+    Turbofish,
+    Grappling,
+}
+
 pub struct Turbofish {
     body: DefaultBodyHandle,
 }
@@ -141,8 +145,6 @@ impl Grappling {
         camera: &Camera,
         physics: &mut Physics,
     ) -> GameResult<()> {
-        // FIXME
-
         let player = isometry_to_point(physics.get_rigid_body(self.player_body).position());
 
         let rect = graphics::Mesh::new_rectangle(