diff options
| author | troido <troido@protonmail.com> | 2020-09-21 02:32:22 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-09-21 02:32:22 +0200 |
| commit | e2281d8c6293b311ccc187e3503093a1120e6215 (patch) | |
| tree | d74043230ec580584e46ead5a123d2922deabfc0 /src/room.rs | |
| parent | 92e437e50498f7705e33a556535ba39a2b918f9d (diff) | |
exchange is now an interaction again
Diffstat (limited to 'src/room.rs')
| -rw-r--r-- | src/room.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/room.rs b/src/room.rs index 04e3044..56fe2e6 100644 --- a/src/room.rs +++ b/src/room.rs @@ -71,7 +71,6 @@ use crate::{ Deduplicate, SpawnTrigger, Replace, - Exchange } }; @@ -87,13 +86,12 @@ pub fn default_dispatcher<'a, 'b>() -> Dispatcher<'a, 'b> { .with(Take, "take", &["controlinput", "controlai"]) .with(Use, "use", &["controlinput", "controlai"]) .with(Interact, "interact", &["controlinput", "controlai"]) - .with(Exchange, "exchange", &["controlinput", "controlai"]) .with(SpawnTrigger, "spawntrigger", &["spawn", "deduplicate", "replace"]) .with(Move, "move", &["controlinput", "controlai"]) .with(Trapping, "trapping", &["move"]) .with(Fight, "fight", &["move"]) .with(Heal, "heal", &[]) - .with(Attacking, "attacking", &["use", "trapping", "fight", "heal", "interact", "exchange", "spawntrigger"]) + .with(Attacking, "attacking", &["use", "trapping", "fight", "heal", "interact", "spawntrigger"]) .with(Die, "die", &["attacking"]) .with(DropLoot, "droploot", &["attacking"]) .with(Building, "building", &["attacking"]) @@ -127,7 +125,7 @@ impl <'a, 'b>Room<'a, 'b> { world.insert(NewEntities::new(encyclopedia)); register_insert!( world, - (Position, Visible, Controller, Movable, New, Removed, Moved, Player, Inventory, Health, Serialise, RoomExit, Entered, TriggerBox, Trap, Fighter, Healing, ControlCooldown, Autofight, MonsterAI, Home, AttackInbox, Item, Spawner, Clan, Faction, Interactable, Loot, Timer, Equipment, TimeOffset, Flags, Ear, Build, Whitelist, Dedup, Minable, LootHolder, OnSpawn, Substitute, Exchanger), + (Position, Visible, Controller, Movable, New, Removed, Moved, Player, Inventory, Health, Serialise, RoomExit, Entered, TriggerBox, Trap, Fighter, Healing, ControlCooldown, Autofight, MonsterAI, Home, AttackInbox, Item, Spawner, Clan, Faction, Interactable, Loot, Timer, Equipment, TimeOffset, Flags, Ear, Build, Whitelist, Dedup, Minable, LootHolder, OnSpawn, Substitute), (Ground, Input, Output, Size, Spawn, Players, Emigration, Time, RoomPermissions) ); |