From 8f58cb3c9f0d60cb8d48eb0fccdd0f05027cd7c9 Mon Sep 17 00:00:00 2001
From: Elijah Perrault <elijah@starcoder.info>
Date: Thu, 7 Apr 2011 15:45:02 -0600
Subject: [PATCH] Werewolf: Fixed a leave before game begin bug.

---
 doc/CHANGELOG       |  1 +
 modules/Werewolf.pm | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 2e0b70d..f9dfef4 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ===============================================================================
+    * Werewolf: Fixed a leave before game begin bug.
     * Aliases now work in PM's to the bot too.
     * Added an epic, Werewolf module.
     * Made slog() saner.
diff --git a/modules/Werewolf.pm b/modules/Werewolf.pm
index 281ca73..92f44e1 100644
--- a/modules/Werewolf.pm
+++ b/modules/Werewolf.pm
@@ -1245,7 +1245,7 @@ sub _getrole {
         elsif ($PLAYERS{$plyr} =~ m/h/xsm) { $role = 'harlot' }
         elsif ($PLAYERS{$plyr} =~ m/g/xsm) { $role = 'guardian angel' }
         elsif ($PLAYERS{$plyr} =~ m/d/xsm) { $role = 'detective' }
-        else { $role = 'villager' }
+        elsif ($PLAYERS{$plyr} =~ m/v/xsm) { $role = 'villager' }
     }
     elsif ($lev == 2) {
         if ($PLAYERS{$plyr} =~ m/w/xsm) { $role = 'wolf' }
@@ -1254,7 +1254,7 @@ sub _getrole {
         elsif ($PLAYERS{$plyr} =~ m/g/xsm) { $role = 'guardian angel' }
         elsif ($PLAYERS{$plyr} =~ m/d/xsm) { $role = 'detective' }
         elsif ($PLAYERS{$plyr} =~ m/t/xsm) { $role = 'traitor' }
-        else { $role = 'villager' }
+        elsif ($PLAYERS{$plyr} =~ m/v/xsm) { $role = 'villager' }
     }
     if (!$role) { $role = 'person' }
     
@@ -1286,12 +1286,14 @@ sub _player_del {
     if ($SEEN) { if ($SEEN eq $player) { $SEEN = 0 } }
 
     # Check for winning conditions.
-    my $wolves;
-    while ((undef, $_) = each %PLAYERS) { if ($_ =~ m/(w|t)/xsm) { $wolves++ } }
-    if (!$wolves) { _gameover('v'); return }
-    my $villagers;
-    while ((undef, $_) = each %PLAYERS) { if ($_ =~ m/(v|s|g|h|d)/xsm) { $villagers++ } }
-    if ($villagers <= $wolves) { _gameover('w'); return }
+    if (!$PGAME) {
+        my $wolves;
+        while ((undef, $_) = each %PLAYERS) { if ($_ =~ m/(w|t)/xsm) { $wolves++ } }
+        if (!$wolves) { _gameover('v'); return }
+        my $villagers;
+        while ((undef, $_) = each %PLAYERS) { if ($_ =~ m/(v|s|g|h|d)/xsm) { $villagers++ } }
+        if ($villagers <= $wolves) { _gameover('w'); return }
+    }
 
     return 1;
 }