Knight calm spell is now a room effect
Merging conflicts