Impl basic "game" (kind of WIP)

diff --git a/src/sprites.rs b/src/sprites.rs
index f29dfb21f4ca56747772e364eba38fbec7c56189..efcf485804115268eeb971b31913b3d59dd579a2 100644 (file)
--- a/src/sprites.rs
+++ b/src/sprites.rs
@@ -122,25 +122,6 @@ pub const HOUSE1: [u8; 252] = [
     0xa8, 0xa0, 0xa0, 0x0a, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 ];
-// box
-pub const BOX_WIDTH: u32 = 28;
-pub const BOX_HEIGHT: u32 = 28;
-pub const BOX_FLAGS: u32 = 1; // BLIT_2BPP
-pub const BOX: [u8; 196] = [
-    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xa0, 0x00,
-    0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68,
-    0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00,
-    0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0,
-    0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00,
-    0x68, 0x00, 0x00, 0x1a, 0xa5, 0x55, 0x55, 0x69, 0x55, 0x55, 0x5a, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a,
-    0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00,
-    0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68,
-    0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00,
-    0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa0, 0x00, 0x00, 0x68, 0x00, 0x00, 0x1a, 0xa5,
-    0x55, 0x55, 0x69, 0x55, 0x55, 0x5a, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-    0xaa, 0xaa, 0xaa, 0xaa,
-];
 // plant
 pub const PLANT_WIDTH: u32 = 12;
 pub const PLANT_HEIGHT: u32 = 10;

diff --git a/src/world.rs b/src/world.rs
index 5b9ffada2713551cba6cc5bc8703b3161307ee48..0de3a984ca203e06066851861c79a04eac88878e 100644 (file)
--- a/src/world.rs
+++ b/src/world.rs
@@ -2,17 +2,14 @@ use crate::sprites::*;
 use tinyrand::{Rand, StdRand};
 
 const CAR_ANIM_FRAMES: u8 = 10;
-const BOX_INTERP_RATE: f32 = 0.01f32;
 const MOVE_RATE: f32 = 1f32;
+const MULTIPLIER_INC_RATE: f32 = 0.04f32;
+const HOUSE_FRAMES: u32 = 180;
+const HOUSE_RANGE: f32 = 90f32;
 
 pub struct World {
     car_state: bool,
     car_frames: u8,
-    // sx, sy, ex, ey, interp, interp-type
-    // interp-type:
-    //  - 0 linear
-    //  - 1 squared
-    box_pos: Option<(f32, f32, f32, f32, f32, u8)>,
     rand: StdRand,
     street_offset: f32,
     shrubs: [Option<(f32, f32)>; 8],
@@ -21,6 +18,11 @@ pub struct World {
     //   - 0 broken
     //   - 1 fixed
     house: Option<(f32, u8)>,
+    house_frames: u32,
+    is_in_range: bool,
+    score: u64,
+    rate_multiplier: f32,
+    status_text: Option<(&'static str, u32)>,
 }
 
 impl World {
@@ -28,16 +30,25 @@ impl World {
         World {
             car_state: false,
             car_frames: 0,
-            box_pos: None,
             rand: StdRand::default(),
             street_offset: 0.0f32,
             shrubs: [None, None, None, None, None, None, None, None],
             house: None,
+            house_frames: 0,
+            is_in_range: false,
+            score: 0,
+            rate_multiplier: 1f32,
+            status_text: None,
         }
     }
 
+    pub fn get_move_rate(&self) -> f32 {
+        MOVE_RATE * self.rate_multiplier
+    }
+
     pub fn update(&mut self) {
         let gamepad = unsafe { *crate::GAMEPAD1 };
+        let mouse = unsafe { *crate::MOUSE_BUTTONS };
 
         self.car_frames += 1;
         if self.car_frames > CAR_ANIM_FRAMES {
@@ -49,18 +60,19 @@ impl World {
             }
         }
 
-        self.street_offset -= MOVE_RATE;
+        self.street_offset -= self.get_move_rate();
         if self.street_offset <= -45f32 {
             self.street_offset += 45f32;
         }
 
         let mut empty_shrub_exists: Option<usize> = None;
+        let move_rate = self.get_move_rate();
         for (idx, shrub) in self.shrubs.iter_mut().enumerate() {
             if let Some((x, _y)) = shrub {
                 if *x < -(PLANT_WIDTH as f32) {
                     shrub.take();
                 } else {
-                    *x -= MOVE_RATE;
+                    *x -= move_rate;
                 }
             } else {
                 empty_shrub_exists = Some(idx);
@@ -71,6 +83,47 @@ impl World {
             self.shrubs[empty_shrub_exists.unwrap()] =
                 Some((180f32, (self.rand.next_u16() % 80 + 60) as f32));
         }
+
+        if self.house.is_none() {
+            self.house_frames += 1;
+            if self.house_frames > HOUSE_FRAMES {
+                self.house_frames = 0;
+                self.house = Some((170f32, 0));
+            }
+        } else {
+            self.house.as_mut().unwrap().0 -= self.get_move_rate();
+            let pos_ref: &f32 = &self.house.as_ref().unwrap().0;
+            let state_ref: &u8 = &self.house.as_ref().unwrap().1;
+            if *state_ref == 0 && *pos_ref < HOUSE_RANGE && *pos_ref >= 0f32 {
+                self.is_in_range = true;
+            } else if *pos_ref < -(HOUSE0_WIDTH as f32) {
+                self.house.take();
+                self.is_in_range = false;
+            } else {
+                if self.is_in_range {
+                    self.rate_multiplier = 1f32;
+                    self.status_text = Some(("Slow down!", 80));
+                }
+                self.is_in_range = false;
+            }
+        }
+
+        if self.is_in_range
+            && ((gamepad & crate::BUTTON_1) != 0 || (mouse & crate::MOUSE_LEFT) != 0)
+        {
+            self.is_in_range = false;
+            self.house.as_mut().unwrap().1 = 1;
+            self.score += 1;
+            self.rate_multiplier += MULTIPLIER_INC_RATE;
+            self.status_text = Some(("Speed up!", 80));
+        }
+
+        if let Some((_, t)) = &mut self.status_text {
+            *t -= 1;
+            if *t == 0 {
+                self.status_text.take();
+            }
+        }
     }
 
     pub fn draw(&mut self) {
@@ -103,10 +156,60 @@ impl World {
             }
         }
 
+        if let Some((x, state)) = self.house {
+            match state {
+                0 => crate::blit(
+                    &HOUSE1,
+                    x.round() as i32,
+                    30 + HOUSE0_HEIGHT as i32 - HOUSE1_HEIGHT as i32,
+                    HOUSE1_WIDTH,
+                    HOUSE1_HEIGHT,
+                    HOUSE1_FLAGS,
+                ),
+                1 => crate::blit(
+                    &HOUSE0,
+                    x.round() as i32,
+                    30,
+                    HOUSE0_WIDTH,
+                    HOUSE0_HEIGHT,
+                    HOUSE0_FLAGS,
+                ),
+                _ => (),
+            }
+        }
+
         if self.car_state {
             crate::blit(&CAR0, 10, 103, CAR0_WIDTH, CAR0_HEIGHT, CAR0_FLAGS);
         } else {
             crate::blit(&CAR1, 10, 103, CAR1_WIDTH, CAR1_HEIGHT, CAR1_FLAGS);
         }
+
+        if self.is_in_range {
+            unsafe {
+                *crate::DRAW_COLORS = 0x1;
+            }
+            crate::text("Tap or Press X!", 5, 5);
+        }
+
+        unsafe {
+            *crate::DRAW_COLORS = 0x1;
+        }
+
+        if let Some((s, t)) = self.status_text {
+            if (t / 10) % 2 == 0 {
+                crate::text(s, 20, 30);
+            }
+        }
+
+        let mut width = 0;
+        let mut temp = self.score;
+        while temp > 0 {
+            temp /= 10;
+            width += 1;
+        }
+        if width == 0 {
+            width = 1;
+        }
+        crate::text(format!("{}", self.score), 160 - width * 7, 0);
     }
 }