From cf91ab2c9818d4887ba202b6be16c282769c3428 Mon Sep 17 00:00:00 2001
From: skizzerz <skizzerz@skizzerz.net>
Date: Fri, 30 Oct 2015 15:05:10 -0700
Subject: [PATCH] More informative messages for nightmares, fix dullahan target
 issue

---
 src/gamemodes.py | 8 ++++++++
 src/wolfgame.py  | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/gamemodes.py b/src/gamemodes.py
index 469c20e..8ad876f 100644
--- a/src/gamemodes.py
+++ b/src/gamemodes.py
@@ -811,6 +811,7 @@ class SleepyMode(GameMode):
                                         "you see a large black horse with dark red eyes and flames where its mane and tail would be. " +
                                         "After a brief period of time, it starts chasing after you! You think if you can cross the bridge " +
                                         "over the nearby river you'll be safe, but your surroundings are almost unrecognizable in this darkness."))
+        pm(cli, self.having_nightmare, 'You can pm me "north", "east", "south", and "west", or their abbreviations "n", "e", "s", and "w" to navigate.')
         self.correct = [None, None, None]
         self.fake1 = [None, None, None]
         self.fake2 = [None, None, None]
@@ -891,7 +892,9 @@ class SleepyMode(GameMode):
             self.prev_direction = "n"
         else:
             self.step = 0
+            self.on_path = set()
             self.prev_direction = self.start_direction
+            pm(cli, self.having_nightmare, "You find yourself back where you started...")
         self.nightmare_step(cli)
 
     def east(self, cli, nick, chan, rest):
@@ -912,7 +915,9 @@ class SleepyMode(GameMode):
             self.prev_direction = "e"
         else:
             self.step = 0
+            self.on_path = set()
             self.prev_direction = self.start_direction
+            pm(cli, self.having_nightmare, "You find yourself back where you started...")
         self.nightmare_step(cli)
 
     def south(self, cli, nick, chan, rest):
@@ -933,7 +938,9 @@ class SleepyMode(GameMode):
             self.prev_direction = "s"
         else:
             self.step = 0
+            self.on_path = set()
             self.prev_direction = self.start_direction
+            pm(cli, self.having_nightmare, "You find yourself back where you started...")
         self.nightmare_step(cli)
 
     def west(self, cli, nick, chan, rest):
@@ -956,6 +963,7 @@ class SleepyMode(GameMode):
             self.step = 0
             self.on_path = set()
             self.prev_direction = self.start_direction
+            pm(cli, self.having_nightmare, "You find yourself back where you started...")
         self.nightmare_step(cli)
 
     def prolong_night(self, evt, cli, var):
diff --git a/src/wolfgame.py b/src/wolfgame.py
index 63278c9..312d0c4 100644
--- a/src/wolfgame.py
+++ b/src/wolfgame.py
@@ -7843,6 +7843,7 @@ def start(cli, nick, chan, forced = False, restart = ""):
                 target = random.choice(ps)
                 ps.remove(target)
                 ts.add(target)
+            random.shuffle(ts)
 
     if not restart:
         gamemode = var.CURRENT_GAMEMODE.name