Add hunger: Reformat
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
use specs::prelude::*;
|
||||
|
||||
use crate::{DefenseBonus, Equipped, HungerClock, HungerState, MeleePowerBonus, Position};
|
||||
use crate::components::{CombatStats, Name, SufferDamage, WantsToMelee};
|
||||
use crate::gamelog::GameLog;
|
||||
use crate::particle_system::ParticleBuilder;
|
||||
use crate::{DefenseBonus, Equipped, HungerClock, HungerState, MeleePowerBonus, Position};
|
||||
|
||||
pub struct MeleeCombatSystem {}
|
||||
|
||||
@@ -21,7 +21,7 @@ impl<'a> System<'a> for MeleeCombatSystem {
|
||||
ReadStorage<'a, Equipped>,
|
||||
WriteExpect<'a, ParticleBuilder>,
|
||||
ReadStorage<'a, Position>,
|
||||
ReadStorage<'a, HungerClock>
|
||||
ReadStorage<'a, HungerClock>,
|
||||
);
|
||||
|
||||
fn run(&mut self, data: Self::SystemData) {
|
||||
@@ -37,11 +37,11 @@ impl<'a> System<'a> for MeleeCombatSystem {
|
||||
equipped,
|
||||
mut particle_builder,
|
||||
positions,
|
||||
hunger_clock
|
||||
hunger_clock,
|
||||
) = data;
|
||||
|
||||
for (entity, wants_melee, name, stats) in
|
||||
(&entities, &wants_melee, &names, &combat_stats).join()
|
||||
(&entities, &wants_melee, &names, &combat_stats).join()
|
||||
{
|
||||
if stats.hp <= 0 {
|
||||
continue;
|
||||
@@ -49,7 +49,7 @@ impl<'a> System<'a> for MeleeCombatSystem {
|
||||
|
||||
let mut offensive_bonus = 0;
|
||||
for (_item_entity, power_bonus, equipped_by) in
|
||||
(&entities, &melee_bonus, &equipped).join()
|
||||
(&entities, &melee_bonus, &equipped).join()
|
||||
{
|
||||
if equipped_by.owner == entity {
|
||||
offensive_bonus += power_bonus.power;
|
||||
@@ -68,7 +68,7 @@ impl<'a> System<'a> for MeleeCombatSystem {
|
||||
|
||||
let mut defensive_bonus = 0;
|
||||
for (_item_entity, defense_bonus, equipped_by) in
|
||||
(&entities, &defense_bonus, &equipped).join()
|
||||
(&entities, &defense_bonus, &equipped).join()
|
||||
{
|
||||
if equipped_by.owner == wants_melee.target {
|
||||
defensive_bonus += defense_bonus.defense;
|
||||
|
Reference in New Issue
Block a user