diff options
| author | troido <troido@protonmail.com> | 2020-02-23 23:44:50 +0100 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-02-23 23:44:50 +0100 |
| commit | 86cdc6c567d0ca429d69bebbb2fb02f1d3754c8d (patch) | |
| tree | d70eb9d9f014c9cdbf301772c339f22ee5e3ab82 /src/room.rs | |
| parent | f422238d7aaae0ff1b2d560a71a99b0a881ad338 (diff) | |
players can now attack other objects
Diffstat (limited to 'src/room.rs')
| -rw-r--r-- | src/room.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/room.rs b/src/room.rs index 916d76d..e19d689 100644 --- a/src/room.rs +++ b/src/room.rs @@ -34,7 +34,8 @@ use crate::{ Migrate, Use, Attacking, - Trapping + Trapping, + Fight }, components::{ Position, @@ -83,7 +84,8 @@ impl <'a, 'b>Room<'a, 'b> { .with(Use, "use", &["controlinput"]) .with(Move, "move", &["registernew", "controlinput"]) .with(Trapping, "trapping", &["move"]) - .with(Attacking, "attacking", &["use", "trapping"]) + .with(Fight, "fight", &["move", "controlinput"]) + .with(Attacking, "attacking", &["use", "trapping", "fight"]) .with(View::default(), "view", &["move", "attacking"]) .with(Migrate, "migrate", &["view"]) .with(Create, "create", &["view", "controlinput"]) |