Updates for the menu screen

Author: Andy-Python-Programmer

README.md

@@ -1,6 +1,4 @@
-<img src="misc/thumbnail.png">
-
-# Call of Ferris ( Ownership War )
+<p align="center"><img src="resources/images/logo.png"></p>
 
 ## Screenshots
 

resources/images/logo.png

@@ -1,8 +1,5 @@
-use ggez::{
-    event::KeyCode,
-    graphics::{self, Scale, Text, TextFragment},
-    Context, GameResult,
-};
+use ggez::{Context, GameResult, event::KeyCode, graphics::{self, Scale, Text, TextFragment}, nalgebra::{Point2, Vector2}};
+use graphics::DrawParam;
 use std::process::exit;
 
 use crate::HEIGHT;
@@ -11,68 +8,47 @@ use crate::WIDTH;
 pub struct Menu {
     pub consolas: graphics::Font,
     pub ferris_ninja: graphics::Image,
+    pub logo: graphics::Image,
+    pub bg: graphics::Image
 }
 
 impl Menu {
     pub fn create(ctx: &mut Context) -> Self {
         Self {
             consolas: graphics::Font::new(ctx, "/fonts/Consolas.ttf").unwrap(),
             ferris_ninja: graphics::Image::new(ctx, "/images/ferris_ninja.png").unwrap(),
+            logo: graphics::Image::new(ctx, "/images/logo.png").unwrap(),
+            bg: graphics::Image::new(ctx, "/images/menu_bg.png").unwrap(),
         }
     }
 
     pub fn draw(&self, ctx: &mut Context) -> GameResult<()> {
         // Clear the screen
         graphics::clear(ctx, graphics::BLACK);
 
-        let title_call = TextFragment {
-            text: "CALL".to_owned(),
-            font: Some(self.consolas),
-            scale: Some(Scale::uniform(30.0)),
-
-            ..Default::default()
-        };
-
-        let title_of = TextFragment {
-            text: "OF".to_owned(),
-            font: Some(self.consolas),
-            scale: Some(Scale::uniform(15.0)),
-
-            ..Default::default()
-        };
-
-        let title_ferris = TextFragment {
-            text: "FERRIS".to_owned(),
-            font: Some(self.consolas),
-            scale: Some(Scale::uniform(30.0)),
-
-            ..Default::default()
-        };
-
-        graphics::draw(
-            ctx,
-            &Text::new(title_call),
-            (ggez::nalgebra::Point2::new(WIDTH - 220.0, 10.0),),
-        )?;
-
         graphics::draw(
             ctx,
-            &Text::new(title_of),
-            (ggez::nalgebra::Point2::new(WIDTH - 150.0, 20.0),),
+            &self.bg,
+            DrawParam::default()
+                .dest(Point2::new(0.0, 0.0))
+                .scale(Vector2::new(0.6, 0.5))
         )?;
 
         graphics::draw(
             ctx,
-            &Text::new(title_ferris),
-            (ggez::nalgebra::Point2::new(WIDTH - 130.0, 10.0),),
+            &self.logo,
+            (ggez::nalgebra::Point2::new(
+                WIDTH - (self.logo.width() as f32 + 20.0),
+                10.0
+            ),),
         )?;
 
         graphics::draw(
             ctx,
             &self.ferris_ninja,
             (ggez::nalgebra::Point2::new(
-                WIDTH - (WIDTH - 100.0),
-                HEIGHT - (&self.ferris_ninja.height() + 30) as f32,
+                WIDTH - (WIDTH - 400.0),
+                HEIGHT - (&self.ferris_ninja.height() + 140) as f32,
             ),),
         )?;
 
@@ -97,32 +73,32 @@ impl Menu {
             &Text::new(press_and_to),
             (ggez::nalgebra::Point2::new(
                 WIDTH - 200.0,
-                HEIGHT - (&self.ferris_ninja.height() + 60) as f32,
+                HEIGHT - (&self.ferris_ninja.height() + 30) as f32,
             ),),
         )?;
 
         let play_rect = graphics::Mesh::new_rectangle(
             ctx,
             graphics::DrawMode::fill(),
             graphics::Rect::new(
-                WIDTH - 260.0,
-                HEIGHT - (&self.ferris_ninja.height() + 40) as f32,
+                WIDTH - 200.0,
+                HEIGHT - (&self.ferris_ninja.height() + 10) as f32,
                 220.0,
                 40.0,
             ),
-            [36.0 / 255.0, 36.0 / 255.0, 36.0 / 255.0, 1.0].into(),
+            [36.0 / 255.0, 36.0 / 255.0, 36.0 / 255.0, 0.5].into(),
         )?;
 
         let quit_rect = graphics::Mesh::new_rectangle(
             ctx,
             graphics::DrawMode::fill(),
             graphics::Rect::new(
-                WIDTH - 260.0,
+                WIDTH - 200.0,
                 HEIGHT - (&self.ferris_ninja.height() - 70) as f32,
                 220.0,
                 40.0,
             ),
-            [36.0 / 255.0, 36.0 / 255.0, 36.0 / 255.0, 1.0].into(),
+            [36.0 / 255.0, 36.0 / 255.0, 36.0 / 255.0, 0.5].into(),
         )?;
 
         let play_text = TextFragment {
@@ -149,7 +125,7 @@ impl Menu {
             &Text::new(play_text),
             (ggez::nalgebra::Point2::new(
                 WIDTH - 170.0,
-                HEIGHT - (&self.ferris_ninja.height() + 28) as f32,
+                HEIGHT - self.ferris_ninja.height() as f32,
             ),),
         )?;