improve representation

Author: DarthB

assets/elf_char.png

@@ -4,17 +4,20 @@ use super::GameState;
 
 pub fn process(gs: &mut GameState) {
     clear_background(BLACK);
+
+    super::draw_elf_message(gs);
+
     draw_text(
         "GAME OVER",
         screen_width() / 2.0 - 80.0,
-        screen_height() / 2.0,
+        screen_height() / 2.0 + 160.,
         40.0,
         RED,
     );
     draw_text(
         "Press Return to Restart",
-        screen_width() / 2.0 - 120.0,
-        screen_height() / 2.0 + 50.0,
+        screen_width() / 2.0 - 100.0,
+        screen_height() / 2.0 + 250.0,
         20.0,
         DARKGRAY,
     );

src/gamestate/gameover.rs

@@ -502,10 +502,11 @@ I told you did I?
                         }
                         GameStateEnum::GameOver => {
                             let tmp = r##"
-Ohh no! We lost, you wanna cheat to win?.-.
-Just change the `main<dot>roto` - you can.
-change the wave composition or even.
-reduce the number of waves.
+Ohh no! We lost, want an easier experience?.-.
+Just change the `scripts/main,roto`!.-.
+YOU can change the wave composition or even.
+reduce the number of waves.-.
+Just save the file and Press Return here!
 "##;
                             tmp
                         }
@@ -514,8 +515,9 @@ reduce the number of waves.
 We did it! Why that sad face?.-.
 The evil forces won't affect xmas!.-.
 Okay too easy!? My suggestions:.
-1- Change Number of waves in main<dot>roto
-2- Don't use the weapon you think is best.
+1: Change Number of waves in scripts/main,roto.
+2: Don't use the weapon you think is best.-.-
+Just save the file and Press Return here!
 "##;
                             tmp
                         }
@@ -584,3 +586,33 @@ Okay too easy!? My suggestions:.
         }
     }
 }
+
+pub fn draw_elf_message(gs: &GameState) -> bool {
+    if let Some(msg) = &gs.message_from_elf {
+        let texture = &gs.visual_config.char_tex.as_ref().unwrap();
+
+        let mut params = DrawTextureParams::default();
+        let (w, h, s) = (texture.width(), texture.height(), 0.33);
+        let x = 0.;
+        let y = 0.;
+        params.dest_size = Some(Vec2::new(w * s, h * s));
+
+        draw_texture_ex(texture, x, y, WHITE, params);
+
+        let x = 300.;
+        let y = 60.;
+        draw_text("The Guardian:", x, y, 32., YELLOW);
+
+        let y = 100.;
+        msg.split('.')
+            .filter(|sentence| !sentence.is_empty())
+            .enumerate()
+            .for_each(|(i, sentence)| {
+                let line = sentence.trim();
+                draw_text(line, x, y + i as f32 * 22., 20., WHITE);
+            });
+        true
+    } else {
+        false
+    }
+}

src/gamestate/mod.rs

@@ -45,30 +45,9 @@ pub fn draw(gs: &GameState) {
     // Draw the playing state underneath (frozen)
     clear_background(BLACK);
 
-    if let Some(msg) = &gs.message_from_elf {
-        let texture = &gs.visual_config.char_tex.as_ref().unwrap();
-
-        let mut params = DrawTextureParams::default();
-        let (w, h, s) = (texture.width(), texture.height(), 0.33);
-        let x = 0.;
-        let y = 0.;
-        params.dest_size = Some(Vec2::new(w * s, h * s));
-
-        draw_texture_ex(texture, x, y, WHITE, params);
-
-        let x = 300.;
-        let y = 60.;
-        draw_text("The Guardian:", x, y, 32., YELLOW);
-
-        let y = 100.;
-        msg.split('.')
-            .filter(|sentence| !sentence.is_empty())
-            .enumerate()
-            .for_each(|(i, sentence)| {
-                let line = sentence.trim();
-                draw_text(line, x, y + i as f32 * 22., 20., WHITE);
-            });
-    } else {
+    let has_been_drawn = super::draw_elf_message(gs);
+
+    if !has_been_drawn {
         crate::gamestate::playing::draw(gs);
         // Draw semi-transparent overlay
         draw_rectangle(

src/gamestate/weapon_selection.rs

@@ -5,11 +5,13 @@ use super::GameState;
 pub fn process(gs: &mut GameState) {
     clear_background(BLACK);
 
+    super::draw_elf_message(gs);
+
     // Draw victory message
     draw_text(
         "VICTORY!",
         screen_width() / 2.0 - 100.0,
-        screen_height() / 2.0 - 80.0,
+        screen_height() / 2.0 + 80.0,
         60.0,
         GOLD,
     );
@@ -20,7 +22,7 @@ pub fn process(gs: &mut GameState) {
     draw_text(
         &congrats_text,
         screen_width() / 2.0 - congrats_width / 2.0,
-        screen_height() / 2.0 - 20.0,
+        screen_height() / 2.0 + 140.0,
         24.0,
         YELLOW,
     );
@@ -30,7 +32,7 @@ pub fn process(gs: &mut GameState) {
     draw_text(
         &level_text,
         screen_width() / 2.0 - 80.0,
-        screen_height() / 2.0 + 30.0,
+        screen_height() / 2.0 + 170.0,
         20.0,
         LIGHTGRAY,
     );
@@ -39,7 +41,7 @@ pub fn process(gs: &mut GameState) {
     draw_text(
         &xp_text,
         screen_width() / 2.0 - 70.0,
-        screen_height() / 2.0 + 60.0,
+        screen_height() / 2.0 + 200.0,
         20.0,
         LIGHTGRAY,
     );
@@ -50,7 +52,7 @@ pub fn process(gs: &mut GameState) {
         draw_text(
             "Weapons:",
             screen_width() / 2.0 - 50.0,
-            screen_height() / 2.0 + 100.0,
+            screen_height() / 2.0 + 240.0,
             18.0,
             LIGHTGRAY,
         );
@@ -60,7 +62,7 @@ pub fn process(gs: &mut GameState) {
             draw_text(
                 &weapon_text,
                 screen_width() / 2.0 - 60.0,
-                screen_height() / 2.0 + 125.0 + (i as f32 * 22.0),
+                screen_height() / 2.0 + 265.0 + (i as f32 * 22.0),
                 16.0,
                 GRAY,
             );
@@ -71,7 +73,7 @@ pub fn process(gs: &mut GameState) {
     draw_text(
         "Press Return to Play Again",
         screen_width() / 2.0 - 140.0,
-        screen_height() / 2.0 + 200.0,
+        screen_height() / 2.0 + 340.0,
         22.0,
         WHITE,
     );