From bd1da23cf18960b36f8683c09899044d64b4bd83 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Thu, 21 May 2020 12:25:36 +0200
Subject: made Talk its own component/system instead of part of interact

---
 src/systems/mod.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/systems/mod.rs')

diff --git a/src/systems/mod.rs b/src/systems/mod.rs
index 7323dee..56606e7 100644
--- a/src/systems/mod.rs
+++ b/src/systems/mod.rs
@@ -24,6 +24,7 @@ mod building;
 mod deduplicate;
 mod spawntrigger;
 mod replace;
+mod talk;
 
 pub use self::{
 	controlinput::ControlInput,
@@ -50,5 +51,6 @@ pub use self::{
 	building::Building,
 	deduplicate::Deduplicate,
 	spawntrigger::SpawnTrigger,
-	replace::Replace
+	replace::Replace,
+	talk::Talk
 };
-- 
cgit 


From 1899b27b791734a6b72e28cfb1420536c6035ee4 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Thu, 21 May 2020 15:26:12 +0200
Subject: added exchanger as seperate component/system; refactored other
 interactions; parameter parsing returns result instead of option

---
 src/systems/mod.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/systems/mod.rs')

diff --git a/src/systems/mod.rs b/src/systems/mod.rs
index 56606e7..76e39ce 100644
--- a/src/systems/mod.rs
+++ b/src/systems/mod.rs
@@ -25,6 +25,7 @@ mod deduplicate;
 mod spawntrigger;
 mod replace;
 mod talk;
+mod exchange;
 
 pub use self::{
 	controlinput::ControlInput,
@@ -52,5 +53,6 @@ pub use self::{
 	deduplicate::Deduplicate,
 	spawntrigger::SpawnTrigger,
 	replace::Replace,
-	talk::Talk
+	talk::Talk,
+	exchange::Exchange
 };
-- 
cgit 


From 92e437e50498f7705e33a556535ba39a2b918f9d Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Mon, 21 Sep 2020 00:59:38 +0200
Subject: made talk and reply a form of interact again

---
 src/systems/mod.rs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/systems/mod.rs')

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
 };
-- 
cgit 


From e2281d8c6293b311ccc187e3503093a1120e6215 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Mon, 21 Sep 2020 02:32:22 +0200
Subject: exchange is now an interaction again

---
 src/systems/mod.rs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/systems/mod.rs')

diff --git a/src/systems/mod.rs b/src/systems/mod.rs
index 963cfa6..7f93bb9 100644
--- a/src/systems/mod.rs
+++ b/src/systems/mod.rs
@@ -24,7 +24,6 @@ mod building;
 mod deduplicate;
 mod spawntrigger;
 mod replace;
-mod exchange;
 
 pub use self::{
 	controlinput::ControlInput,
@@ -52,5 +51,4 @@ pub use self::{
 	deduplicate::Deduplicate,
 	spawntrigger::SpawnTrigger,
 	replace::Replace,
-	exchange::Exchange
 };
-- 
cgit