Add hunger: Reformat
This commit is contained in:
@@ -3,9 +3,13 @@ use std::cmp::{max, min};
|
||||
use rltk::{Point, Rltk, VirtualKeyCode};
|
||||
use specs::prelude::*;
|
||||
|
||||
use crate::{components::{CombatStats, Player, Position, Viewshed, WantsToMelee}, HungerClock, HungerState, Item, map::Map, Monster, RunState, State, TileType, WantsToPickupItem};
|
||||
use crate::gamelog::GameLog;
|
||||
use crate::spawner::player;
|
||||
use crate::{
|
||||
components::{CombatStats, Player, Position, Viewshed, WantsToMelee},
|
||||
map::Map,
|
||||
HungerClock, HungerState, Item, Monster, RunState, State, TileType, WantsToPickupItem,
|
||||
};
|
||||
|
||||
pub fn try_move_player(delta_x: i32, delta_y: i32, ecs: &mut World) {
|
||||
let mut positions = ecs.write_storage::<Position>();
|
||||
@@ -17,7 +21,7 @@ pub fn try_move_player(delta_x: i32, delta_y: i32, ecs: &mut World) {
|
||||
let map = ecs.fetch::<Map>();
|
||||
|
||||
for (entity, _player, pos, viewshed) in
|
||||
(&entities, &mut players, &mut positions, &mut viewsheds).join()
|
||||
(&entities, &mut players, &mut positions, &mut viewsheds).join()
|
||||
{
|
||||
if pos.x + delta_x < 1
|
||||
|| pos.x + delta_x > map.width - 1
|
||||
@@ -139,8 +143,12 @@ fn skip_turn(ecs: &mut World) -> RunState {
|
||||
let mut heal_bonus = 0;
|
||||
if let Some(hc) = hunger_clock.get(*player_entity) {
|
||||
match hc.state {
|
||||
HungerState::Hungry | HungerState::Starving => {can_heal = false;}
|
||||
HungerState::WellFed => {heal_bonus = 1;}
|
||||
HungerState::Hungry | HungerState::Starving => {
|
||||
can_heal = false;
|
||||
}
|
||||
HungerState::WellFed => {
|
||||
heal_bonus = 1;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user