summaryrefslogtreecommitdiff
path: root/src/room.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-02-23 22:12:21 +0100
committertroido <troido@protonmail.com>2020-02-23 22:12:21 +0100
commitf422238d7aaae0ff1b2d560a71a99b0a881ad338 (patch)
treec335cb8eee47d34953f7d4cd96c195958d223202 /src/room.rs
parent613952f918b8d72a3e397dc46be309b2320c6ad0 (diff)
players can get damage from traps
Diffstat (limited to 'src/room.rs')
-rw-r--r--src/room.rs8
1 files changed, 5 insertions, 3 deletions
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"])