refactor(Witch): Change potion structure for plays and game history. …

…Closes #130
antoinezanardi · Feb 27, 2021 · 34f8e4c · 34f8e4c
1 parent 580db5a
commit 34f8e4c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@
 ### ♻️ Refactoring
 
 * [#129](https://github.com/antoinezanardi/werewolves-assistant-web/issues/129) - Change sheriff enabled option property name.
+* [#130](https://github.com/antoinezanardi/werewolves-assistant-web/issues/130) - Change `potion` structure for plays and game history.
 
 ### 📦 Packages
 

diff --git a/src/components/Game/GameContent/GameContent.vue b/src/components/Game/GameContent/GameContent.vue
@@ -136,8 +136,8 @@ export default {
                 } else if (lastGameHistoryEntry.play.action === "eat" && lastGameHistoryEntrySourceName === "werewolves" &&
                     !!vileFatherOfWolvesPlayer && vileFatherOfWolvesPlayer.isAlive) {
                     this.events.push(new GameEvent({ type: `vile-father-of-wolves-infects`, targets: lastGameHistoryEntry.play.targets }));
-                } else if (this.game.history.length && lastGameHistoryEntry.wasVotePlayWithoutDeath) {
-                    this.events.push(new GameEvent({ type: `no-death-after-votes`, targets: this.game.history[1].play.targets }));
+                } else if (this.game.history.length && lastGameHistoryEntry.wasVotePlayWithoutDeath && !lastGameHistoryEntry.revealedPlayers) {
+                    this.events.push(new GameEvent({ type: `no-death-after-votes`, targets: this.game.history[0].play.targets }));
                 } else if (lastGameHistoryEntry.play.action === "choose-card") {
                     this.events.push(new GameEvent({ type: `thief-chooses-card`, targets: [{ player: this.game.originalThiefPlayer }] }));
                 }

diff --git a/src/components/shared/Game/GameSummary/GameSummaryModal/GameSummaryHistoryDeadPlayerLine.vue b/src/components/shared/Game/GameSummary/GameSummaryModal/GameSummaryHistoryDeadPlayerLine.vue
@@ -42,7 +42,10 @@ export default {
         return {
             SVGs: { dead },
             murderIcons: {
-                "all": { vote },
+                "all": {
+                    vote,
+                    reconsider: vote,
+                },
                 "werewolves": { eat: eaten },
                 "big-bad-wolf": { eat: bigBadWolf },
                 "white-werewolf": { eat: whiteWerewolf },

diff --git a/src/plugins/vue-i18n/fr.json b/src/plugins/vue-i18n/fr.json
@@ -912,7 +912,8 @@
     "GameSummaryHistoryDeadPlayerLine": {
         "murder": {
             "all": {
-                "vote": "a été pendu sur la place publique après le vote du village."
+                "vote": "a été pendu sur la place publique après le vote du village.",
+                "reconsider": "a finalement été pendu, le Village revenant sur sa décision d'épargner l'Idiot maintenant que l'Ancien est mort."
             },
             "werewolves": {
                 "eat": "a été dévoré par les Loups-Garous."