fix merge; rename ghost
All checks were successful
Rust / rustfmt (pull_request) Successful in 25s
Rust / clippy (pull_request) Successful in 1m26s
Rust / build (pull_request) Successful in 3m2s

This commit is contained in:
luckyturtledev 2024-07-06 22:34:31 +02:00
parent b3b0bfb725
commit f1af8c80a3
3 changed files with 7 additions and 8 deletions

View file

@ -6,14 +6,14 @@ use comfy::EngineContext;
use std::ops::Sub;
#[derive(Debug)]
pub struct Gost {
pub struct Ghost {
/// current electric charge of the Ghost
pub charge: f32,
/// max electric charge of the Ghost
pub max_charge: f32
}
impl Default for Gost {
impl Default for Ghost {
fn default() -> Self {
Self {
charge: 1000.0,

View file

@ -12,8 +12,8 @@ mod ui;
use self::{
activities::{house::HouseState, overworld::worldgen::Overworld, Activity},
assets::Assets
use game::Gost;
assets::Assets,
game::Ghost
};
use comfy::{
init_game_config, pollster, run_comfy_main_async, EngineContext, EngineState,
@ -26,8 +26,7 @@ const GAME_NAME: &str = "Powercreep";
struct State {
setup_called: bool,
activity: Activity,
activity: Activity,
gohst: Gost
ghost: Ghost,
overworld: Overworld,
house: HouseState
}

View file

@ -4,7 +4,7 @@ use comfy::{
EngineContext, Vec2, BLUE, RED
};
pub fn draw(state: &State, engine: &EngineContext) {
pub fn draw(state: &State, _engine: &EngineContext<'_>) {
// seperate fill state into smaller section for better readability
let section_count = 5;
let mut start_positon = screen_to_world(Vec2::new(screen_width(), screen_height()));
@ -14,7 +14,7 @@ pub fn draw(state: &State, engine: &EngineContext) {
start_positon.y += 0.5 * section_size.y + 0.5 * section_size.y;
// draw fill level
{
let gohst = &state.gohst;
let gohst = &state.ghost;
let percent = gohst.charge / gohst.max_charge;
let mut size = section_size;
size.y = section_size.y * section_count as f32 * percent;