added Tanner

chrisgillis · Dec 23, 2015 · 76ba33b · 76ba33b
1 parent 7213309
commit 76ba33b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/src/Game/Game.php b/src/Game/Game.php
@@ -74,6 +74,22 @@ public function getPlayersOfRole($roleType)
         return $werewolves;
     }
 
+    /**
+     * @return \Slack\User[]
+     */
+    public function getOriginalPlayersOfRole($roleType)
+    {
+        $werewolves = [];
+
+        foreach ($this->originalPlayers as $player) {
+            if ($player->role == $roleType) {
+                $werewolves[] = $player;
+            }
+        }
+
+        return $werewolves;
+    }
+
     public function hasPlayer($playerId) {
         return isset($this->players[$playerId]);
     }
@@ -99,6 +115,14 @@ public function getNumRole($roleType)
         return count($this->getPlayersOfRole($roleType));
     }
 
+    /**
+     * @return int
+     */
+    public function getOriginalNumRole($roleType)
+    {
+        return count($this->getOriginalPlayersOfRole($roleType));
+    }
+
     public function getState()
     {
         return $this->state;
@@ -151,12 +175,17 @@ public function clearVotes()
 
     public function isOver()
     {
-        $numSeers = $this->getNumRole(Role::SEER);
-        $numVillagers = $this->getNumRole(Role::VILLAGER);
-        $numBodyguard = $this->getNumRole(Role::BODYGUARD);
         $numWerewolves = $this->getNumRole(Role::WEREWOLF);
+        $numTanner = $this->getNumRole(Role::TANNER);
+
+        $numGood = count($this->getPlayers()) - $numWerewolves;
 
-        $numGood = $numVillagers + $numSeers + $numBodyguard;
+        if ($numTanner == 0) {
+            if ($this->getOriginalNumRole(Role::TANNER) > 0) {
+                $this->winningTeam = Role::TANNER;
+                return true;
+            }
+        }
 
         if ($numWerewolves == 0) {
             $this->winningTeam = Role::VILLAGER;

diff --git a/src/Game/GameManager.php b/src/Game/GameManager.php
@@ -185,15 +185,18 @@ public function endGame($id, $enderUserId = null)
         if($winningTeam !== null) {
             $winMsg = ":clipboard: Role Summary\r\n--------------------------------------------------------------\r\n{$playerList}\r\n\r\n:tada: The game is over. The ";
             if ($winningTeam == Role::VILLAGER) {
-                $winMsg .= "Townsfolk ";
+                $winMsg .= "Townsfolk are victorious!";
             }
             elseif ($winningTeam == Role::WEREWOLF) {
-                $winMsg .= "Werewolves ";
+                $winMsg .= "Werewolves are victorious!";
+            }
+            elseif ($winningTeam == Role::TANNER) {
+                $winMsg .= "Tanner is victorious!";
             }
             else {
-                $winMsg .= "UnknownTeam ";
+                $winMsg .= "UnknownTeam is victorious!";
             }
-            $winMsg .= "are victorious!";
+
             $client->getChannelGroupOrDMByID($id)
                 ->then(function (ChannelInterface $channel) use ($client, $playerList, $winMsg) {
                     $client->send($winMsg, $channel);

diff --git a/src/Game/Role.php b/src/Game/Role.php
@@ -6,4 +6,5 @@ class Role
     const SEER = "Seer";
     const WEREWOLF = "Werewolf";
     const BODYGUARD = "Bodyguard";
+    const TANNER = "Tanner";
 }
diff --git a/src/Game/RoleStrategy/Classic.php b/src/Game/RoleStrategy/Classic.php
@@ -19,6 +19,10 @@ public function assign(array $players)
             $roles[Role::BODYGUARD] = 1;
         }
 
+        if ($num_players >= 6) {
+            $roles[Role::TANNER] = 1;
+        }
+
         $roles += [
             Role::VILLAGER => max($num_good - count($roles), 0),
             Role::WEREWOLF => $num_evil