made talk and reply a form of interact again

2 files changed, 6 insertions, 2 deletions

diff --git a/src/systems/interact.rs b/src/systems/interact.rs
index bce2afc..35c30b6 100644
--- a/src/systems/interact.rs
+++ b/src/systems/interact.rs
@@ -73,6 +73,12 @@ impl <'a> System<'a> for Interact {
 				let mut cooldown = 2;
 				let name = visibles.get(ent).map(|v| v.name.as_str());
 				match interactable {
+					Interactable::Say(text) => {
+						say(ear, text.clone(), name);
+					}
+					Interactable::Reply(text) => {
+						say(ear, text.replace("{}", &arg.unwrap()), name);
+					}
 					Interactable::Trigger(trigger) => {
 						TriggerBox::add_message(&mut triggerbox, ent, *trigger);
 					}
diff --git a/src/systems/mod.rs b/src/systems/mod.rs
index 76e39ce..963cfa6 100644
--- a/src/systems/mod.rs
+++ b/src/systems/mod.rs
@@ -24,7 +24,6 @@ mod building;
 mod deduplicate;
 mod spawntrigger;
 mod replace;
-mod talk;
 mod exchange;
 
 pub use self::{
@@ -53,6 +52,5 @@ pub use self::{
 	deduplicate::Deduplicate,
 	spawntrigger::SpawnTrigger,
 	replace::Replace,
-	talk::Talk,
 	exchange::Exchange
 };