Part 2 of Shadowmoon Valley https://github.com/CoronaCore/Issues/issues/93

Signed-off-by: Salja <salja8840@gmail.com>