Add countdown

Author: piotrek-szczygiel

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "klocki"
-version = "0.1.2"
+version = "0.1.4"
 authors = ["Piotr Szczygieł <[email protected]>"]
 edition = "2018"
 

resources/sfx/countdown.wav

@@ -162,7 +162,9 @@ impl EventHandler for Game {
 
         match &mut self.replay {
             Some(replay) => {
-                replay.update(ctx);
+                if !replay.gameplay.paused() && !self.g.imgui_state.paused {
+                    replay.update(ctx);
+                }
                 gameplay = &mut replay.gameplay;
             }
             None => {

resources/sfx/go.wav

@@ -6,6 +6,7 @@ use ggez::{
     timer, Context, GameResult,
 };
 
+use crate::popups::Popup;
 use crate::{
     action::Action,
     bag::Bag,
@@ -42,6 +43,8 @@ pub struct Gameplay {
     blocks: Blocks,
 
     explosion: bool,
+    countdown: Option<i32>,
+    countdown_switch: Duration,
 }
 
 impl Gameplay {
@@ -83,6 +86,8 @@ impl Gameplay {
             font,
             blocks,
             explosion: false,
+            countdown: Some(4),
+            countdown_switch: Duration::new(0, 0),
         })
     }
 
@@ -130,6 +135,10 @@ impl Gameplay {
         self.game_over
     }
 
+    pub fn paused(&self) -> bool {
+        self.game_over || self.countdown.is_some() || self.matrix.blocked()
+    }
+
     fn process_action(&mut self, g: &mut Global, action: Action, sfx: bool) -> bool {
         match action {
             Action::HoldPiece => {
@@ -162,8 +171,13 @@ impl Gameplay {
                             self.explode();
                             let t_spin = self.piece.t_spin(&self.matrix);
                             self.score.lock(rows, t_spin);
-                            self.popups
-                                .lock(rows, t_spin, self.score.btb(), self.score.combo());
+                            self.popups.lock(
+                                rows,
+                                t_spin,
+                                self.score.btb(),
+                                self.score.combo(),
+                                g.settings.gameplay.clear_delay.into(),
+                            );
                         } else {
                             self.score.reset_combo();
                         }
@@ -201,6 +215,10 @@ impl Gameplay {
                 self.matrix.game_over();
                 self.explode();
 
+                let mut popup = Popup::new(Duration::from_secs(10));
+                popup.add("Game Over", Color::new(0.9, 0.1, 0.2, 1.0), 4.0);
+                self.popups.add(popup);
+
                 if sfx {
                     g.sfx.play("gameover");
                 }
@@ -314,6 +332,37 @@ impl Gameplay {
             self.blocks = Blocks::new(g.settings.tileset(ctx, &g.settings_state)?);
         }
 
+        if let Some(countdown) = self.countdown.as_mut() {
+            if *countdown == 4 {
+                self.countdown_switch = Duration::from_secs(1);
+            }
+
+            self.countdown_switch += timer::delta(ctx);
+            if self.countdown_switch >= Duration::from_secs(1) {
+                self.countdown_switch = Duration::new(0, 0);
+                *countdown -= 1;
+
+                let mut text = countdown.to_string();
+
+                if sfx {
+                    if *countdown == 0 {
+                        g.sfx.play("go");
+                    } else {
+                        g.sfx.play("countdown");
+                    }
+                }
+
+                if *countdown == 0 {
+                    self.countdown = None;
+                    text = String::from("Go!");
+                }
+
+                let mut popup = Popup::new(Duration::from_secs(2));
+                popup.add(&text, Color::new(0.8, 0.9, 1.0, 1.0), 4.0);
+                self.popups.add(popup);
+            }
+        }
+
         self.popups.update(
             ctx,
             (g.settings.gameplay.block_size * self.matrix.width) as f32,
@@ -323,7 +372,7 @@ impl Gameplay {
 
         self.matrix.update(ctx, g, sfx)?;
 
-        if self.game_over || self.matrix.blocked() || g.imgui_state.paused {
+        if self.paused() || g.imgui_state.paused {
             return Ok(());
         }
 

src/game.rs

@@ -229,6 +229,8 @@ impl ImGuiWrapper {
                 Window::new(im_str!("Game over"))
                     .opened(&mut opened)
                     .resizable(false)
+                    .size([120.0, 180.0], Condition::Appearing)
+                    .position([w / 2.0 - 60.0, h / 3.0 * 2.0], Condition::Appearing)
                     .collapsible(false)
                     .build(&ui, || {
                         ui.text(im_str!("Score: {}", g.imgui_state.replay_score));

src/gameplay.rs

@@ -59,7 +59,7 @@ impl Randomizer {
             uniform_vx: Uniform::new(-7.5, 7.5),
             normal_vy: Normal::new(-10.0, 5.0).unwrap(),
             uniform_vr: Uniform::new(-8.0 * std::f32::consts::PI, 8.0 * std::f32::consts::PI),
-            uniform_lifetime: Uniform::new(250, 500),
+            uniform_lifetime: Uniform::new(250, 750),
         }
     }
 }
@@ -380,6 +380,7 @@ impl Matrix {
     }
 
     fn collapse_rows(&mut self, rows: &[i32]) {
+        self.update_grid = true;
         let mut rng = rand::thread_rng();
 
         for &row in rows {

src/imgui_wrapper.rs

@@ -10,7 +10,7 @@ use ggez::{
 use crate::utils;
 
 #[derive(Default)]
-struct Popup {
+pub struct Popup {
     canvas: Option<Canvas>,
     fragments: Vec<PopupFragment>,
     visible: Duration,
@@ -144,23 +144,42 @@ impl Popup {
     }
 }
 
-#[derive(Default)]
 pub struct Popups {
     active_popup: Option<Popup>,
     fading_popups: Vec<Popup>,
     font: Font,
+    just_created: bool,
 }
 
 impl Popups {
     pub fn new(ctx: &mut Context) -> GameResult<Popups> {
         Ok(Popups {
+            active_popup: None,
+            fading_popups: vec![],
             font: Font::new(ctx, utils::path(ctx, "fonts/bold.ttf"))?,
-            ..Default::default()
+            just_created: true,
         })
     }
 
-    pub fn lock(&mut self, rows: i32, t_spin: bool, btb: bool, combo: Option<i32>) {
-        let mut popup = Popup::new(Duration::from_millis(1500));
+    pub fn add(&mut self, popup: Popup) {
+        let mut popup = Some(popup);
+        std::mem::swap(&mut popup, &mut self.active_popup);
+
+        if let Some(mut popup) = popup {
+            if popup.hide < 0.5 {
+                popup.visible = popup.lifetime / 2;
+            }
+            self.fading_popups.push(popup);
+        }
+    }
+
+    pub fn lock(&mut self, rows: i32, t_spin: bool, btb: bool, combo: Option<i32>, delay: u64) {
+        let mut lifetime = delay;
+        if lifetime < 250 {
+            lifetime = 250;
+        }
+
+        let mut popup = Popup::new(Duration::from_millis(lifetime * 2));
 
         if t_spin {
             popup.add("T-Spin\n", Color::new(1.0, 0.5, 0.9, 1.0), 4.0);
@@ -196,20 +215,17 @@ impl Popups {
             }
         }
 
-        let mut popup = Some(popup);
-        std::mem::swap(&mut popup, &mut self.active_popup);
-
-        if let Some(mut popup) = popup {
-            if popup.hide < 0.5 {
-                popup.visible = popup.lifetime / 2;
-            }
-            self.fading_popups.push(popup);
-        }
+        self.add(popup);
     }
 
     pub fn update(&mut self, ctx: &mut Context, width: f32, height: f32, scale: f32) -> GameResult {
         let dt = timer::delta(ctx);
 
+        if self.just_created {
+            self.just_created = false;
+            return Ok(());
+        }
+
         let mut fading = false;
         if let Some(p) = self.active_popup.as_mut() {
             if p.canvas.is_none() {

src/matrix.rs

@@ -81,7 +81,7 @@ impl Settings {
                 gameplay: Gameplay {
                     block_size: 32,
                     ghost_piece: 10,
-                    clear_delay: 0,
+                    clear_delay: 250,
                     skin: String::from("default.png"),
                 },
                 audio: Audio {

src/popups.rs

@@ -16,9 +16,25 @@ pub struct Sfx {
 impl Sfx {
     pub fn load(ctx: &mut Context, volume: u32) -> GameResult<Sfx> {
         let sounds = [
-            "move", "rotate", "softdrop", "harddrop", "hold", "holdfail", "lock", "linefall",
-            "gameover", "erase1", "erase2", "erase3", "erase4", "tspin0", "tspin1", "tspin2",
+            "move",
+            "rotate",
+            "softdrop",
+            "harddrop",
+            "hold",
+            "holdfail",
+            "lock",
+            "linefall",
+            "gameover",
+            "erase1",
+            "erase2",
+            "erase3",
+            "erase4",
+            "tspin0",
+            "tspin1",
+            "tspin2",
             "tspin3",
+            "countdown",
+            "go",
         ]
         .iter()
         .map(|&s| (s, Sfx::source(ctx, s, volume)))