spielemarmelade/turtlegame
4
0
Fork 0
Code Issues Pull requests Releases 1 Activity Actions

fmt
Some checks failed
Rust / rustfmt (pull_request) Successful in 20s
Details
Rust / clippy (pull_request) Failing after 1m38s
Details
Rust / build (pull_request) Successful in 2m59s
Details

Browse source
This commit is contained in:
luckyturtledev 2024-07-07 18:45:40 +02:00
parent fb5149945e
commit 612d9e4913
2 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/activities/house/room.rs
View file

@ -1,11 +1,10 @@
use super::{furniture::Furniture, grid::Grid}; use super::{furniture::Furniture, grid::Grid};
use crate::game::{self, ZLayer}; use crate::game::{self, ZLayer};
use comfy::{ use comfy::{
draw_rect, draw_rect_outline, draw_sprite, error, random_i32, vec2, EngineContext, draw_rect, draw_rect_outline, draw_sprite, error, random_i32, texture_id, vec2,
HashSet, RandomRange as _, Vec2, GREEN, PURPLE, RED, WHITE, EngineContext, HashSet, RandomRange as _, Vec2, GREEN, PURPLE, RED, WHITE
}; };
use indexmap::IndexSet; use indexmap::IndexSet;
use comfy::texture_id;
pub const SCALE: f32 = 4.0; pub const SCALE: f32 = 4.0;

7
src/game.rs
View file

@ -76,7 +76,7 @@ pub enum ZLayer {
Human = 0, Human = 0,
Ghost = 1, Ghost = 1,
UI = 100, UI = 100,
GameOver = 1000, GameOver = 1000
} }
impl From<ZLayer> for i32 { impl From<ZLayer> for i32 {
@ -135,7 +135,6 @@ pub const HOUSE_DISCHARGE_RATE: f32 = 30.0;
pub const GHOST_CHARGE_RATE: f32 = 200.0; pub const GHOST_CHARGE_RATE: f32 = 200.0;
pub fn update(state: &mut State, ctx: &mut EngineContext<'_>) { pub fn update(state: &mut State, ctx: &mut EngineContext<'_>) {
if state.ghost.charge > 0.0 { if state.ghost.charge > 0.0 {
// Update the score. It's based on time. // Update the score. It's based on time.
state.score += ctx.delta * 10.0; state.score += ctx.delta * 10.0;
@ -171,8 +170,8 @@ pub fn update(state: &mut State, ctx: &mut EngineContext<'_>) {
}, },
_ => {} _ => {}
} }
}} }
else { } else {
crate::game_over::update(state, ctx); crate::game_over::update(state, ctx);
} }