diff options
| author | troido <troido@protonmail.com> | 2020-05-12 21:51:37 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-05-12 21:51:37 +0200 |
| commit | 1b380b31f50035f10f651e220effe8a2970c0fd5 (patch) | |
| tree | 5a25b839a4ee70ba96f7f096161ea59c08842492 /src/room.rs | |
| parent | 6c5b15758fbceef7987b40ee50a71ddc9624372d (diff) | |
removed 'substitute' part of encyclopedia
Diffstat (limited to 'src/room.rs')
| -rw-r--r-- | src/room.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/room.rs b/src/room.rs index 9583a93..d0f22df 100644 --- a/src/room.rs +++ b/src/room.rs @@ -67,13 +67,16 @@ use crate::{ Timeout, Clear, Building, - Deduplicate + Deduplicate, + SpawnTrigger, + Replace } }; pub fn default_dispatcher<'a, 'b>() -> Dispatcher<'a, 'b> { DispatcherBuilder::new() .with(Deduplicate, "deduplicate", &[]) + .with(Replace, "replace", &[]) .with(Timeout, "timeout", &[]) .with(UpdateCooldowns, "cool_down", &[]) .with(Spawn, "spawn", &[]) @@ -82,11 +85,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(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"]) + .with(Attacking, "attacking", &["use", "trapping", "fight", "heal", "interact", "spawntrigger"]) .with(Die, "die", &["attacking"]) .with(DropLoot, "droploot", &["attacking"]) .with(Building, "building", &["attacking"]) @@ -120,7 +124,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), + (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) ); |
