From 7317f7514cdd4f5da6a038ece89c5d0fb191be99 Mon Sep 17 00:00:00 2001
From: Dominic <git@msrd0.de>
Date: Mon, 8 Jul 2024 12:56:27 +0200
Subject: [PATCH] cargofmt; uncommitted balancing

---
 src/activities/house/room.rs    | 3 ++-
 src/activities/overworld/mod.rs | 4 ++--
 src/game.rs                     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/activities/house/room.rs b/src/activities/house/room.rs
index 5661bc6..419ae07 100644
--- a/src/activities/house/room.rs
+++ b/src/activities/house/room.rs
@@ -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;
 
diff --git a/src/activities/overworld/mod.rs b/src/activities/overworld/mod.rs
index a702a08..6ebdec3 100644
--- a/src/activities/overworld/mod.rs
+++ b/src/activities/overworld/mod.rs
@@ -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
diff --git a/src/game.rs b/src/game.rs
index 45a6ad4..d340953 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -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.