From f422238d7aaae0ff1b2d560a71a99b0a881ad338 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sun, 23 Feb 2020 22:12:21 +0100
Subject: players can get damage from traps

---
 src/room.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/room.rs')

diff --git a/src/room.rs b/src/room.rs
index a4046b2..916d76d 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -33,7 +33,8 @@ use crate::{
 		Take,
 		Migrate,
 		Use,
-		Attacking
+		Attacking,
+		Trapping
 	},
 	components::{
 		Position,
@@ -81,8 +82,9 @@ impl <'a, 'b>Room<'a, 'b> {
 			.with(Take, "take", &["controlinput"])
 			.with(Use, "use", &["controlinput"])
 			.with(Move, "move", &["registernew", "controlinput"])
-			.with(Attacking, "attacking", &["use"])
-			.with(View::default(), "view", &["move"])
+			.with(Trapping, "trapping", &["move"])
+			.with(Attacking, "attacking", &["use", "trapping"])
+			.with(View::default(), "view", &["move", "attacking"])
 			.with(Migrate, "migrate", &["view"])
 			.with(Create, "create", &["view", "controlinput"])
 			.with(Remove, "remove", &["view", "move"])
-- 
cgit