kjuulh/roguelike
1
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity

Add hunger

Browse Source
This commit is contained in:
Kasper Juul Hermansen
2022-01-29 00:31:00 +01:00
parent cb17a9c356
commit 74c05f97af
10 changed files with 280 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/melee_combat_system.rs
View File

@@ -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, MeleePowerBonus, Position};
pub struct MeleeCombatSystem {}
@@ -21,6 +21,7 @@ impl<'a> System<'a> for MeleeCombatSystem {
ReadStorage<'a, Equipped>,
WriteExpect<'a, ParticleBuilder>,
ReadStorage<'a, Position>,
ReadStorage<'a, HungerClock>
);
fn run(&mut self, data: Self::SystemData) {
@@ -36,62 +37,71 @@ impl<'a> System<'a> for MeleeCombatSystem {
equipped,
mut particle_builder,
positions,
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 {
let mut offensive_bonus = 0;
for (_item_entity, power_bonus, equipped_by) in
(&entities, &melee_bonus, &equipped).join()
if stats.hp <= 0 {
continue;
}
let mut offensive_bonus = 0;
for (_item_entity, power_bonus, equipped_by) in
(&entities, &melee_bonus, &equipped).join()
{
if equipped_by.owner == entity {
offensive_bonus += power_bonus.power;
}
}
if let Some(hc) = hunger_clock.get(entity) {
if hc.state == HungerState::WellFed {
offensive_bonus += 1;
}
}
let target_stats = combat_stats.get(wants_melee.target).unwrap();
if target_stats.hp > 0 {
let target_name = names.get(wants_melee.target).unwrap();
let mut defensive_bonus = 0;
for (_item_entity, defense_bonus, equipped_by) in
(&entities, &defense_bonus, &equipped).join()
{
if equipped_by.owner == entity {
offensive_bonus += power_bonus.power;
if equipped_by.owner == wants_melee.target {
defensive_bonus += defense_bonus.defense;
}
}
let target_stats = combat_stats.get(wants_melee.target).unwrap();
if target_stats.hp > 0 {
let target_name = names.get(wants_melee.target).unwrap();
let mut defensive_bonus = 0;
for (_item_entity, defense_bonus, equipped_by) in
(&entities, &defense_bonus, &equipped).join()
{
if equipped_by.owner == wants_melee.target {
defensive_bonus += defense_bonus.defense;
}
}
if let Some(pos) = positions.get(wants_melee.target) {
particle_builder.request(
pos.x,
pos.y,
rltk::RGB::named(rltk::ORANGE),
rltk::RGB::named(rltk::BLACK),
rltk::to_cp437('‼'),
200.0,
);
}
let damage = i32::max(
0,
(stats.power + offensive_bonus) - (target_stats.defense + defensive_bonus),
if let Some(pos) = positions.get(wants_melee.target) {
particle_builder.request(
pos.x,
pos.y,
rltk::RGB::named(rltk::ORANGE),
rltk::RGB::named(rltk::BLACK),
rltk::to_cp437('‼'),
200.0,
);
}
if damage == 0 {
log.entries.push(format!(
"{} is unable to hurt {}",
&name.name, &target_name.name
));
} else {
log.entries.push(format!(
"{} hits {}, for {} hp.",
&name.name, &target_name.name, damage
));
SufferDamage::new_damage(&mut inflict_damage, wants_melee.target, damage)
}
let damage = i32::max(
0,
(stats.power + offensive_bonus) - (target_stats.defense + defensive_bonus),
);
if damage == 0 {
log.entries.push(format!(
"{} is unable to hurt {}",
&name.name, &target_name.name
));
} else {
log.entries.push(format!(
"{} hits {}, for {} hp.",
&name.name, &target_name.name, damage
));
SufferDamage::new_damage(&mut inflict_damage, wants_melee.target, damage)
}
}
}