interacting now works

3 files changed, 67 insertions, 2 deletions

diff --git a/src/systems/fight.rs b/src/systems/fight.rs
index 47b5811..cd6399f 100644
--- a/src/systems/fight.rs
+++ b/src/systems/fight.rs
@@ -31,7 +31,7 @@ impl <'a> System<'a> for Fight {
 	type SystemData = (
 		Entities<'a>,
 		ReadStorage<'a, Controller>,
-		WriteStorage<'a, Position>,
+		ReadStorage<'a, Position>,
 		Read<'a, Ground>,
 		WriteStorage<'a, AttackInbox>,
 		ReadStorage<'a, Fighter>,
diff --git a/src/systems/interact.rs b/src/systems/interact.rs
new file mode 100644
index 0000000..4c0245d
--- /dev/null
+++ b/src/systems/interact.rs
@@ -0,0 +1,63 @@
+
+use std::collections::HashSet;
+use specs::{
+	Entities,
+	ReadStorage,
+	WriteStorage,
+	System,
+	Join,
+	Read
+};
+
+use crate::components::{
+	Controller,
+	Position,
+	ControlCooldown,
+	Interactable,
+	Dead
+};
+
+use crate::controls::{Control};
+use crate::resources::{Ground};
+
+
+
+pub struct Interact;
+impl <'a> System<'a> for Interact {
+	type SystemData = (
+		Entities<'a>,
+		ReadStorage<'a, Controller>,
+		ReadStorage<'a, Position>,
+		Read<'a, Ground>,
+		WriteStorage<'a, ControlCooldown>,
+		ReadStorage<'a, Interactable>,
+		WriteStorage<'a, Dead>
+	);
+	
+	fn run(&mut self, (entities, controllers, positions, ground, mut cooldowns, interactables, mut deads): Self::SystemData) {
+		for (entity, controller, position) in (&entities, &controllers, &positions).join(){
+			let mut target = None;
+			match &controller.control {
+				Control::Interact(directions) => {
+					'targets: for direction in directions {
+						for ent in ground.cells.get(&(position.pos + direction.to_position())).unwrap_or(&HashSet::new()) {
+							if let Some(interactable) = interactables.get(*ent) {
+								target = Some((*ent, interactable));
+								break 'targets;
+							}
+						}
+					}
+				}
+				_ => {}
+			}
+			if let Some((ent, interactable)) = target {
+				match interactable {
+					Interactable::Harvest => {
+						deads.insert(ent, Dead).unwrap();
+					}
+				}
+				cooldowns.insert(entity, ControlCooldown{amount: 2}).unwrap();
+			}
+		}
+	}
+}
diff --git a/src/systems/mod.rs b/src/systems/mod.rs
index 37afcd0..887a1f9 100644
--- a/src/systems/mod.rs
+++ b/src/systems/mod.rs
@@ -17,6 +17,7 @@ mod updatecooldowns;
 mod controlai;
 mod die;
 mod spawn;
+mod interact;
 
 pub use self::{
 	controlinput::ControlInput,
@@ -36,5 +37,6 @@ pub use self::{
 	updatecooldowns::UpdateCooldowns,
 	controlai::ControlAI,
 	die::Die,
-	spawn::Spawn
+	spawn::Spawn,
+	interact::Interact
 };