From cfd462a26b3ed4c5f23760a77ae87ce61dc9bbe2 Mon Sep 17 00:00:00 2001 From: troido Date: Sun, 12 Apr 2020 23:10:10 +0200 Subject: replaced Dead component with trigger messages --- src/components/messages.rs | 19 +++++++++++++++++++ src/components/mod.rs | 8 +++----- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'src/components') diff --git a/src/components/messages.rs b/src/components/messages.rs index 8fe38e3..fa4d747 100644 --- a/src/components/messages.rs +++ b/src/components/messages.rs @@ -65,3 +65,22 @@ pub struct AttackMessage { impl Message for AttackMessage {} pub type AttackInbox = Inbox; + + + + + + + + +#[derive(Debug, Clone)] +pub enum Trigger { + Loot, + Die, + Remove +} +impl Message for Trigger {} + +pub type TriggerBox = Inbox; + + diff --git a/src/components/mod.rs b/src/components/mod.rs index 412dc2e..530cda3 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -11,7 +11,9 @@ pub mod ear; pub use messages::{ AttackMessage, AttackInbox, - AttackType + AttackType, + Trigger, + TriggerBox }; pub use faction::Faction; pub use interactable::Interactable; @@ -125,10 +127,6 @@ pub struct RoomExit { #[storage(NullStorage)] pub struct Entered; -#[derive(Default, Component, Debug, Clone)] -#[storage(NullStorage)] -pub struct Dead; - #[derive(Component, Debug, Clone)] #[storage(HashMapStorage)] pub struct Trap { -- cgit