stephenseo/LD53
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Tweaks

Browse source
This commit is contained in:
Stephen Seo 2023-04-29 16:32:56 +09:00
parent f2df3f9a5a
commit f02b72c57e
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/world.rs
View file

@ -1,11 +1,11 @@
use crate::helpers::round_f32_to_i32;
use crate::sprites::*; use crate::sprites::*;
use tinyrand::{Rand, StdRand}; use tinyrand::{Rand, StdRand};
use crate::helpers::round_f32_to_i32;
const CAR_ANIM_FRAMES: u8 = 10; const CAR_ANIM_FRAMES: u8 = 10;
const MOVE_RATE: f32 = 1f32; const MOVE_RATE: f32 = 1f32;
const MULTIPLIER_INC_RATE: f32 = 0.07f32; const MULTIPLIER_INC_RATE: f32 = 0.13f32;
const HOUSE_FRAMES: u32 = 150; const HOUSE_FRAMES: u32 = 100;
const HOUSE_RANGE: f32 = 90f32; const HOUSE_RANGE: f32 = 90f32;
pub struct World { pub struct World {
@ -20,6 +20,7 @@ pub struct World {
// - 1 fixed // - 1 fixed
house: Option<(f32, u8)>, house: Option<(f32, u8)>,
house_frames: u32, house_frames: u32,
house_frames_max: u32,
is_in_range: bool, is_in_range: bool,
score: u64, score: u64,
rate_multiplier: f32, rate_multiplier: f32,
@ -37,6 +38,7 @@ impl World {
shrubs: [None, None, None, None, None, None, None, None], shrubs: [None, None, None, None, None, None, None, None],
house: None, house: None,
house_frames: 0, house_frames: 0,
house_frames_max: HOUSE_FRAMES,
is_in_range: false, is_in_range: false,
score: 0, score: 0,
rate_multiplier: 1f32, rate_multiplier: 1f32,
@ -89,22 +91,33 @@ impl World {
if self.house.is_none() { if self.house.is_none() {
self.house_frames += 1; self.house_frames += 1;
if self.house_frames > HOUSE_FRAMES { if self.house_frames > self.house_frames_max {
self.house_frames = 0; self.house_frames = 0;
self.house = Some((170f32, 0)); self.house = Some((170f32, 0));
self.house_frames_max = HOUSE_FRAMES + (self.rand.next_u16() % 100) as u32;
} }
} else { } else {
self.house.as_mut().unwrap().0 -= self.get_move_rate(); self.house.as_mut().unwrap().0 -= self.get_move_rate();
let pos_ref: &f32 = &self.house.as_ref().unwrap().0; let pos_ref: &f32 = &self.house.as_ref().unwrap().0;
let state_ref: &u8 = &self.house.as_ref().unwrap().1; let state_ref: &u8 = &self.house.as_ref().unwrap().1;
if *state_ref == 0 && *pos_ref < HOUSE_RANGE && *pos_ref >= 0f32 { if *state_ref == 0 && *pos_ref < HOUSE_RANGE && *pos_ref >= -20f32 {
self.is_in_range = true; self.is_in_range = true;
} else if *pos_ref < -(HOUSE0_WIDTH as f32) { } else if *pos_ref < -(HOUSE0_WIDTH as f32) {
if self.is_in_range {
self.rate_multiplier /= 2f32;
if self.rate_multiplier < 1f32 {
self.rate_multiplier = 1f32;
}
self.status_text = Some(("Slow down!", 80));
}
self.house.take(); self.house.take();
self.is_in_range = false; self.is_in_range = false;
} else { } else {
if self.is_in_range { if self.is_in_range {
self.rate_multiplier = 1f32; self.rate_multiplier /= 2f32;
if self.rate_multiplier < 1f32 {
self.rate_multiplier = 1f32;
}
self.status_text = Some(("Slow down!", 80)); self.status_text = Some(("Slow down!", 80));
} }
self.is_in_range = false; self.is_in_range = false;