cargofmt; uncommitted balancing
Some checks failed
Rust / rustfmt (push) Successful in 21s
Rust / clippy (push) Failing after 1m29s
Rust / build (push) Successful in 2m36s

This commit is contained in:
Dominic 2024-07-08 12:56:27 +02:00
parent 173410ef4e
commit 7317f7514c
Signed by: msrd0
GPG key ID: AAF7C8430CA3345D
3 changed files with 6 additions and 5 deletions

View file

@ -1,7 +1,8 @@
use super::{furniture::Furniture, grid::Grid};
use crate::game::{self, ZLayer};
use comfy::{
draw_rect, draw_rect_outline, draw_sprite, error, random_i32, texture_id, vec2, EngineContext, HashSet, RandomRange as _, Vec2, BLUE, GREEN, PURPLE, RED, WHITE
draw_rect, draw_rect_outline, draw_sprite, error, random_i32, texture_id, vec2,
EngineContext, HashSet, RandomRange as _, Vec2, BLUE, GREEN, PURPLE, RED, WHITE
};
use indexmap::IndexSet;

View file

@ -173,10 +173,10 @@ fn update_move_player(state: &mut State, ctx: &mut EngineContext<'_>) {
},
// we are walking on a path
(MovementCost::Path, MovementCost::Path) => 10.0,
(MovementCost::Path, MovementCost::Path) => 7.0,
// we are walking across an obstacle
(MovementCost::Obstacle, _) | (_, MovementCost::Obstacle) => 1.0,
(MovementCost::Obstacle, _) | (_, MovementCost::Obstacle) => 2.0,
// we are walking on grass
_ => 5.0

View file

@ -126,9 +126,9 @@ pub fn setup(state: &mut State, ctx: &mut EngineContext<'_>) {
}
/// The amount of energy a ghost consumes idle.
pub const GHOST_DISCHARGE_RATE: f32 = 60.0;
pub const GHOST_DISCHARGE_RATE: f32 = 40.0;
/// The amount of energy additionally consumed by a moving ghost.
pub const GHOST_DISCHARGE_RATE_MOVEMENT: f32 = 60.0;
pub const GHOST_DISCHARGE_RATE_MOVEMENT: f32 = 40.0;
/// The amount of energy a house consumes idle.
pub const HOUSE_DISCHARGE_RATE: f32 = 30.0;
/// The amount of energy a ghost can charge when inside a house.