From 81b5d0985cc48ab7a6654f40f767d313084a813b Mon Sep 17 00:00:00 2001
From: MRegnard <62838312+MRegnard@users.noreply.github.com>
Date: Wed, 4 Dec 2024 21:41:51 +0100
Subject: [PATCH] Updating the Organ Grinder Vote Mode (#205)

* Update CHANGELOG.md

* Hidding the skulls for player, if the option "Organ Grinder Vote" is ON.

* Adding a message for the ST, if the option "Organ Grinder Vote" is ON.

* Correcting spaces typos

* Adding the french version of the message for ST

* Adding the english version of the message for the ST

* Deleting an OG reminder (EN)

This reminder was previously used to ignore the issue of the skulls visible by players. Now that this issue is corrected, this token is useless.

* Deleting an OG reminder (FR)

This reminder was previously used to ignore the issue of the skulls visible by players. Now that this issue is corrected, this token is useless.

* Some corrections for the linter

* Some corrections for the linter

* Corrections for the linter

---------

Co-authored-by: Pingumask <68610022+Pingumask@users.noreply.github.com>
---
 CHANGELOG.md                   |  1 +
 src/components/Player.vue      |  5 ++++-
 src/components/Vote.vue        | 14 ++++++++++++++
 src/store/locale/en/roles.json |  1 -
 src/store/locale/en/ui.json    |  1 +
 src/store/locale/fr/roles.json |  1 -
 src/store/locale/fr/ui.json    |  1 +
 7 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09c2a1e..1678564 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Upcoming version
 
+- Clearer and more efficient print for the votes hidden by Organ Grinder
 - Using official generic icons as default custom icons
 - Adding the reminder tokens "Townsfolk", "Outsider", "Minion" and "Demon"
 - Unique night order bubble for each player with the same role
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 6e6615c..62fd24c 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -142,7 +142,10 @@
 
       <!-- On block icon -->
       <div class="marked">
-        <font-awesome-icon icon="skull" />
+        <font-awesome-icon
+          icon="skull"
+          v-if="!(this.session.isSpectator && grimoire.isOrganVoteMode)"
+        />
       </div>
       <div
         class="name"
diff --git a/src/components/Vote.vue b/src/components/Vote.vue
index dd159a3..d89f890 100644
--- a/src/components/Vote.vue
+++ b/src/components/Vote.vue
@@ -49,6 +49,17 @@
       </em>
 
       <template v-if="!session.isSpectator">
+        <br />
+        <em
+          class="orange"
+          v-if="
+            grimoire.isOrganVoteMode &&
+            ((nominee && nominee.role.team !== 'traveler') ||
+              typeof session.nomination[1] == 'string')
+          "
+        >
+          {{ locale.vote.secretBallot }}
+        </em>
         <div v-if="!session.isVoteInProgress && session.lockedVote < 1">
           {{ locale.vote.timePerPlayer }}
           <font-awesome-icon
@@ -371,6 +382,9 @@ export default {
     &.blue {
       color: $townsfolk;
     }
+    &.orange {
+      color: $minion;
+    }
   }
 
   svg {
diff --git a/src/store/locale/en/roles.json b/src/store/locale/en/roles.json
index c8cb29c..e2d60d0 100644
--- a/src/store/locale/en/roles.json
+++ b/src/store/locale/en/roles.json
@@ -1920,7 +1920,6 @@
     "otherNight": 0,
     "otherNightReminder": "",
     "reminders": [
-      "About to die",
       "Used vote"
     ],
     "setup": false,
diff --git a/src/store/locale/en/ui.json b/src/store/locale/en/ui.json
index ef040db..0b0dde9 100644
--- a/src/store/locale/en/ui.json
+++ b/src/store/locale/en/ui.json
@@ -76,6 +76,7 @@
     "votes": "votes",
     "inFavor": "in favor",
     "majorityIs": "majority is",
+    "secretBallot": "Voting is by secret ballot.",
     "timePerPlayer": "Time per player:",
     "countdown": "Countdown",
     "restart": "Restart",
diff --git a/src/store/locale/fr/roles.json b/src/store/locale/fr/roles.json
index 20ac4bd..d0b215b 100644
--- a/src/store/locale/fr/roles.json
+++ b/src/store/locale/fr/roles.json
@@ -1924,7 +1924,6 @@
     "otherNight": 0,
     "otherNightReminder": "",
     "reminders": [
-      "Condamné",
       "Vote utilisé"
     ],
     "setup": false,
diff --git a/src/store/locale/fr/ui.json b/src/store/locale/fr/ui.json
index 511dbde..6c43789 100644
--- a/src/store/locale/fr/ui.json
+++ b/src/store/locale/fr/ui.json
@@ -76,6 +76,7 @@
     "votes": "votes",
     "inFavor": "pour",
     "majorityIs": "majorité à",
+    "secretBallot": "Les votes ont lieu à bulletin secret.",
     "timePerPlayer": "Temps par Joueur :",
     "countdown": "Compte à rebours",
     "restart": "Relancer",