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

WIP: 2.10

Browse Source
This commit is contained in:
Kasper Juul Hermansen
2022-01-27 18:28:40 +01:00
parent 3caf253441
commit ecbecc1a58
13 changed files with 485 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/inventory_system.rs
View File

@@ -1,10 +1,11 @@
use rltk::Rltk;
use specs::prelude::*;
use crate::{AreaOfEffect, CombatStats, Confusion, Consumable, InBackpack, InflictsDamage, Map, Name, Position, Potion, ProvidesHealing, Ranged, State, SufferDamage, WantsToDropItem, WantsToPickupItem, WantsToUseItem};
use crate::gamelog::GameLog;
use crate::gui::ItemMenuResult;
use crate::spawner::{confusion_scroll, player};
use crate::{
AreaOfEffect, CombatStats, Confusion, Consumable, InBackpack, InflictsDamage, Map, Name,
Position, ProvidesHealing, Ranged, SufferDamage, WantsToDropItem, WantsToPickupItem,
WantsToUseItem,
};
pub struct ItemCollectionSystem {}
@@ -80,7 +81,7 @@ impl<'a> System<'a> for ItemUseSystem {
map,
mut suffer_damage,
aoe,
mut confused
mut confused,
) = data;
for (entity, use_item) in (&entities, &wants_use).join() {
@@ -88,7 +89,7 @@ impl<'a> System<'a> for ItemUseSystem {
let mut targets: Vec<Entity> = Vec::new();
match use_item.target {
None => { targets.push(*player_entity) }
None => targets.push(*player_entity),
Some(target) => {
let area_effect = aoe.get(use_item.item);
match area_effect {
@@ -99,8 +100,11 @@ impl<'a> System<'a> for ItemUseSystem {
}
}
Some(area_effect) => {
let mut black_tiles = rltk::field_of_view(target, area_effect.radius, &*map);
black_tiles.retain(|p| p.x > 0 && p.x < map.width - 1 && p.y > 0 && p.y < map.height - 1);
let mut black_tiles =
rltk::field_of_view(target, area_effect.radius, &*map);
black_tiles.retain(|p| {
p.x > 0 && p.x < map.width - 1 && p.y > 0 && p.y < map.height - 1
});
for tile_idx in black_tiles.iter() {
let idx = map.xy_idx(tile_idx.x, tile_idx.y);
for mob in map.tile_content[idx].iter() {
@@ -119,7 +123,10 @@ impl<'a> System<'a> for ItemUseSystem {
if entity == *player_entity {
let mob_name = names.get(*mob).unwrap();
let item_name = names.get(use_item.item).unwrap();
game_log.entries.push(format!("You use {} on {}, inflicting {} hp.", item_name.name, mob_name.name, item_damages.damage));
game_log.entries.push(format!(
"You use {} on {}, inflicting {} hp.",
item_name.name, mob_name.name, item_damages.damage
));
}
used_item = true;
@@ -153,16 +160,20 @@ impl<'a> System<'a> for ItemUseSystem {
if entity == *player_entity {
let mob_name = names.get(*mob).unwrap();
let item_name = names.get(use_item.item).unwrap();
game_log.entries.push(format!("You use {} on {}, confusing them.", item_name.name, mob_name.name));
game_log.entries.push(format!(
"You use {} on {}, confusing them.",
item_name.name, mob_name.name
));
}
}
}
}
for mob in add_confusion.iter() {
confused.insert(mob.0, Confusion { turns: mob.1 }).expect("Unable to insert status");
confused
.insert(mob.0, Confusion { turns: mob.1 })
.expect("Unable to insert status");
}
if used_item {
let consumable = consumables.get(use_item.item);
match consumable {