summaryrefslogtreecommitdiff
path: root/src/room.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-10-03 15:20:52 +0200
committertroido <troido@protonmail.com>2020-10-03 15:20:52 +0200
commitfa5ddaa570473ece02e0a3bfb35702211d21ce12 (patch)
tree501498c9db9d7d2c985f86272b3405c98301556f /src/room.rs
parent5af83beb6f10023cef7eba192a0b190518fe967b (diff)
added dense grass; home is now part of monsterAI component
Diffstat (limited to 'src/room.rs')
-rw-r--r--src/room.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/room.rs b/src/room.rs
index 400dfa2..4f0aa47 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -71,6 +71,7 @@ use crate::{
Building,
SpawnTrigger,
Replace,
+ SpawnCheck,
}
};
@@ -80,12 +81,13 @@ pub fn default_dispatcher<'a, 'b>() -> Dispatcher<'a, 'b> {
.with(Timeout, "timeout", &[])
.with(UpdateCooldowns, "cool_down", &[])
.with(Spawn, "spawn", &[])
+ .with(SpawnCheck, "spawncheck", &["spawn"])
.with(ControlInput, "controlinput", &["cool_down"])
.with(ControlAI, "controlai", &["cool_down"])
.with(Take, "take", &["controlinput", "controlai"])
.with(Use, "use", &["controlinput", "controlai"])
.with(Interact, "interact", &["controlinput", "controlai"])
- .with(SpawnTrigger, "spawntrigger", &["spawn", "replace"])
+ .with(SpawnTrigger, "spawntrigger", &["spawncheck", "replace"])
.with(Move, "move", &["controlinput", "controlai"])
.with(Trapping, "trapping", &["move"])
.with(Fight, "fight", &["move"])
@@ -124,7 +126,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, Minable, LootHolder, OnSpawn, Substitute),
+ (Position, Visible, Controller, Movable, New, Removed, Moved, Player, Inventory, Health, Serialise, RoomExit, Entered, TriggerBox, Trap, Fighter, Healing, ControlCooldown, Autofight, MonsterAI, AttackInbox, Item, Spawner, Clan, Faction, Interactable, Loot, Timer, TimeOffset, Flags, Ear, Build, Whitelist, Minable, LootHolder, OnSpawn, Substitute, Stats, Requirements),
(Ground, Input, Output, Size, Spawn, Players, Emigration, Time, RoomFlags)
);