notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More informative messages for nightmares, fix dullahan target issue

Browse Source
This commit is contained in:
skizzerz 2015-10-30 15:05:10 -07:00
parent 12384d191d
commit cf91ab2c98
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gamemodes.py
View File

@ -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. " + "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 " + "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.")) "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.correct = [None, None, None]
self.fake1 = [None, None, None] self.fake1 = [None, None, None]
self.fake2 = [None, None, None] self.fake2 = [None, None, None]
@ -891,7 +892,9 @@ class SleepyMode(GameMode):
self.prev_direction = "n" self.prev_direction = "n"
else: else:
self.step = 0 self.step = 0
self.on_path = set()
self.prev_direction = self.start_direction self.prev_direction = self.start_direction
pm(cli, self.having_nightmare, "You find yourself back where you started...")
self.nightmare_step(cli) self.nightmare_step(cli)
def east(self, cli, nick, chan, rest): def east(self, cli, nick, chan, rest):
@ -912,7 +915,9 @@ class SleepyMode(GameMode):
self.prev_direction = "e" self.prev_direction = "e"
else: else:
self.step = 0 self.step = 0
self.on_path = set()
self.prev_direction = self.start_direction self.prev_direction = self.start_direction
pm(cli, self.having_nightmare, "You find yourself back where you started...")
self.nightmare_step(cli) self.nightmare_step(cli)
def south(self, cli, nick, chan, rest): def south(self, cli, nick, chan, rest):
@ -933,7 +938,9 @@ class SleepyMode(GameMode):
self.prev_direction = "s" self.prev_direction = "s"
else: else:
self.step = 0 self.step = 0
self.on_path = set()
self.prev_direction = self.start_direction self.prev_direction = self.start_direction
pm(cli, self.having_nightmare, "You find yourself back where you started...")
self.nightmare_step(cli) self.nightmare_step(cli)
def west(self, cli, nick, chan, rest): def west(self, cli, nick, chan, rest):
@ -956,6 +963,7 @@ class SleepyMode(GameMode):
self.step = 0 self.step = 0
self.on_path = set() self.on_path = set()
self.prev_direction = self.start_direction self.prev_direction = self.start_direction
pm(cli, self.having_nightmare, "You find yourself back where you started...")
self.nightmare_step(cli) self.nightmare_step(cli)
def prolong_night(self, evt, cli, var): def prolong_night(self, evt, cli, var):

1
src/wolfgame.py
View File

@ -7843,6 +7843,7 @@ def start(cli, nick, chan, forced = False, restart = ""):
target = random.choice(ps) target = random.choice(ps)
ps.remove(target) ps.remove(target)
ts.add(target) ts.add(target)
random.shuffle(ts)
if not restart: if not restart:
gamemode = var.CURRENT_GAMEMODE.name gamemode = var.CURRENT_GAMEMODE.name