From 7a7b478a9f6c89a9f20cd904568fa10efddaa848 Mon Sep 17 00:00:00 2001
From: Simon Balling <ballingsimon@googlemail.com>
Date: Sun, 26 Jun 2022 01:05:50 +0200
Subject: [PATCH] Removed travelers from majority calculation

---
 src/components/Vote.vue      | 2 +-
 src/store/modules/players.js | 6 ++++++
 src/store/modules/session.js | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/Vote.vue b/src/components/Vote.vue
index c37df21..17f258a 100644
--- a/src/components/Vote.vue
+++ b/src/components/Vote.vue
@@ -121,7 +121,7 @@ export default {
   computed: {
     ...mapState("players", ["players"]),
     ...mapState(["session", "grimoire"]),
-    ...mapGetters({ alive: "players/alive" }),
+    ...mapGetters({ alive: "players/aliveNonTravelers" }),
     nominator: function() {
       return this.players[this.session.nomination[0]];
     },
diff --git a/src/store/modules/players.js b/src/store/modules/players.js
index 9a7ab0f..536e290 100644
--- a/src/store/modules/players.js
+++ b/src/store/modules/players.js
@@ -24,6 +24,12 @@ const getters = {
     );
     return Math.min(nonTravelers.length, 15);
   },
+  aliveNonTravelers({ players }) {
+    const nonTravelers = players.filter(
+      player => !player.isDead && player.role.team !== "traveler"
+    );
+    return Math.min(nonTravelers.length, 15);
+  },
   // calculate a Map of player => night order
   nightOrder({ players, fabled }) {
     const firstNight = [0];
diff --git a/src/store/modules/session.js b/src/store/modules/session.js
index 884117a..31ac984 100644
--- a/src/store/modules/session.js
+++ b/src/store/modules/session.js
@@ -84,7 +84,7 @@ const mutations = {
       nominee: players[state.nomination[1]].name,
       type: isExile ? "Exile" : "Execution",
       majority: Math.ceil(
-        players.filter(player => !player.isDead || isExile).length / 2
+        players.filter(player => (!player.isDead && player.role.team !== "traveler") || isExile).length / 2
       ),
       votes: players
         .filter((player, index) => state.votes[index])