replaced Dead component with trigger messages

1 files changed, 18 insertions, 10 deletions

diff --git a/src/systems/die.rs b/src/systems/die.rs
index e9fb127..c6fd646 100644
--- a/src/systems/die.rs
+++ b/src/systems/die.rs
@@ -9,7 +9,7 @@ use specs::{
 };
 
 use crate::{
-	components::{Dead, Removed, Player},
+	components::{Trigger, TriggerBox, Removed, Player},
 	resources::Emigration,
 	purgatory,
 	playerstate::RoomPos
@@ -20,19 +20,27 @@ pub struct Die;
 impl <'a> System<'a> for Die {
 	type SystemData = (
 		Entities<'a>,
-		ReadStorage<'a, Dead>,
+		ReadStorage<'a, TriggerBox>,
 		WriteStorage<'a, Removed>,
 		Write<'a, Emigration>,
 		ReadStorage<'a, Player>
 	);
-	fn run(&mut self, (entities, deads, mut removeds, mut emigration, players): Self::SystemData) {
-		// npcs etc get removed when dead
-		for (entity, _, _) in (&entities, &deads, !&players).join() {
-			removeds.insert(entity, Removed).unwrap();
-		}
-		// players move to purgatory when dead
-		for (player, _) in (&players, &deads).join() {
-			emigration.emigrants.push((player.id.clone(), purgatory::purgatory_id(), RoomPos::Unknown));
+	fn run(&mut self, (entities, triggerboxes, mut removeds, mut emigration, players): Self::SystemData) {
+		for (entity, triggerbox) in (&entities, &triggerboxes).join() {
+			for trigger in triggerbox.messages.iter() {
+				match trigger {
+					Trigger::Die | Trigger::Remove => {
+						if let Some(player) = players.get(entity) {
+							// players move to purgatory when dead
+							emigration.emigrants.push((player.id.clone(), purgatory::purgatory_id(), RoomPos::Unknown));
+						} else {
+							// npcs etc get removed when dead
+							removeds.insert(entity, Removed).unwrap();
+						}
+					}
+					_ => {}
+				}
+			}
 		}
 	}
 }