atomising item use: placeholder Item triggers

src/effects/mod.rs

@@ -7,6 +7,7 @@ use std::sync::Mutex;
 mod damage;
 mod particles;
 mod targeting;
+mod triggers;
 
 lazy_static! {
     pub static ref EFFECT_QUEUE: Mutex<VecDeque<EffectSpawner>> = Mutex::new(VecDeque::new());
@@ -17,6 +18,7 @@ pub enum EffectType {
     Bloodstain,
     Particle { glyph: FontCharType, fg: RGB, bg: RGB, lifespan: f32, delay: f32 },
     EntityDeath,
+    ItemUse { item: Entity },
 }
 
 #[derive(Clone)]
@@ -53,6 +55,13 @@ pub fn run_effects_queue(ecs: &mut World) {
 
 /// Applies an effect to the correct target(s).
 fn target_applicator(ecs: &mut World, effect: &EffectSpawner) {
+    // Item use is handled differently - it creates other effects with itself
+    // as the source, passing all effects attached to the item into the queue.
+    if let EffectType::ItemUse { item } = effect.effect_type {
+        triggers::item_trigger(effect.source, item, &effect.target, ecs);
+        return;
+    }
+    // Otherwise, just match the effect and enact it directly.
     match &effect.target {
         Targets::Tile { target } => affect_tile(ecs, effect, *target),
         Targets::TileList { targets } => targets.iter().for_each(|target| affect_tile(ecs, effect, *target)),

src/effects/triggers.rs

@@ -0,0 +1,16 @@
+use super::{Entity, Targets, World};
+use crate::{gamelog, Consumable};
+use specs::prelude::*;
+
+pub fn item_trigger(source: Option<Entity>, item: Entity, target: &Targets, ecs: &mut World) {
+    // Use the item via the generic system
+    event_trigger(source, item, target, ecs);
+    // If it's a consumable, delete it
+    if ecs.read_storage::<Consumable>().get(item).is_some() {
+        ecs.entities().delete(item).expect("Failed to delete item");
+    }
+}
+
+fn event_trigger(source: Option<Entity>, entity: Entity, target: &Targets, ecs: &mut World) {
+    let logger = gamelog::Logger::new();
+}