diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index bc951c4..764c27e 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -330,7 +330,7 @@ export default {
toggleNight() {
this.$store.commit("toggleNight");
if (this.grimoire.isNight) {
- this.$store.commit("players/setOnBlock", -1);
+ this.$store.commit("players/setMarked", -1);
}
},
...mapMutations([
diff --git a/src/components/Player.vue b/src/components/Player.vue
index a90f0a2..8c28e06 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -101,7 +101,7 @@
@@ -267,8 +267,8 @@ export default {
if (this.grimoire.isPublic) {
if (!this.player.isDead) {
this.updatePlayer("isDead", true);
- if (this.player.isOnBlock) {
- this.updatePlayer("isOnBlock", false);
+ if (this.player.isMarked) {
+ this.updatePlayer("isMarked", false);
}
} else if (this.player.isVoteless) {
this.updatePlayer("isVoteless", false);
@@ -278,8 +278,8 @@ export default {
}
} else {
this.updatePlayer("isDead", !this.player.isDead);
- if (this.player.isOnBlock) {
- this.updatePlayer("isOnBlock", false);
+ if (this.player.isMarked) {
+ this.updatePlayer("isMarked", false);
}
if (this.player.isVoteless) {
this.updatePlayer("isVoteless", false);
diff --git a/src/components/TownSquare.vue b/src/components/TownSquare.vue
index 86cb846..1bd17b3 100644
--- a/src/components/TownSquare.vue
+++ b/src/components/TownSquare.vue
@@ -203,10 +203,10 @@ export default {
this.nominate = -1;
},
toggleOnBlock(playerIndex) {
- if (this.players[playerIndex].isOnBlock) {
- this.$store.commit("players/setOnBlock", -1);
+ if (this.players[playerIndex].isMarked) {
+ this.$store.commit("players/setMarked", -1);
} else {
- this.$store.commit("players/setOnBlock", playerIndex);
+ this.$store.commit("players/setMarked", playerIndex);
}
}
}
diff --git a/src/components/Vote.vue b/src/components/Vote.vue
index 0152f29..3bc807d 100644
--- a/src/components/Vote.vue
+++ b/src/components/Vote.vue
@@ -67,11 +67,11 @@
class="button-group"
v-if="session.lockedVote && !session.isVoteInProgress"
>
-
- Put on block
+
+ Mark nominee
-
@@ -249,12 +249,12 @@ export default {
this.$store.commit("session/setVotingSpeed", speed);
}
},
- setOnBlock() {
- this.$store.commit("players/setOnBlock", this.session.nomination[1]);
+ setMarked() {
+ this.$store.commit("players/setMarked", this.session.nomination[1]);
this.finish();
},
- emptyBlock() {
- this.$store.commit("players/setOnBlock", -1);
+ removeMarked() {
+ this.$store.commit("players/setMarked", -1);
this.finish();
}
}
diff --git a/src/store/modules/players.js b/src/store/modules/players.js
index 8d8d08c..38a740c 100644
--- a/src/store/modules/players.js
+++ b/src/store/modules/players.js
@@ -5,7 +5,7 @@ const NEWPLAYER = {
reminders: [],
isVoteless: false,
isDead: false,
- isOnBlock: false,
+ isMarked: false,
pronouns: ""
};
@@ -137,12 +137,12 @@ const mutations = {
move(state, [from, to]) {
state.players.splice(to, 0, state.players.splice(from, 1)[0]);
},
- setOnBlock(state, playerIndex) {
+ setMarked(state, playerIndex) {
state.players.forEach(player => {
- player.isOnBlock = false;
+ player.isMarked = false;
});
if (playerIndex >= 0) {
- state.players[playerIndex].isOnBlock = true;
+ state.players[playerIndex].isMarked = true;
}
},
setBluff(state, { index, role } = {}) {
diff --git a/src/store/socket.js b/src/store/socket.js
index 3dc4239..305a439 100644
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -170,7 +170,7 @@ class LiveSession {
break;
case "onBlock":
if (!this._isSpectator) return;
- this._store.commit("players/setOnBlock", params);
+ this._store.commit("players/setMarked", params);
break;
case "isNight":
if (!this._isSpectator) return;
@@ -255,7 +255,7 @@ class LiveSession {
id: player.id,
isDead: player.isDead,
isVoteless: player.isVoteless,
- isOnBlock: player.isOnBlock,
+ isMarked: player.isMarked,
pronouns: player.pronouns,
...(player.role && player.role.team === "traveler"
? { roleId: player.role.id }
@@ -317,7 +317,7 @@ class LiveSession {
const player = players[x];
const { roleId } = state;
// update relevant properties
- ["name", "id", "isDead", "isVoteless", "isOnBlock", "pronouns"].forEach(
+ ["name", "id", "isDead", "isVoteless", "isMarked", "pronouns"].forEach(
property => {
const value = state[property];
if (player[property] !== value) {
@@ -708,7 +708,7 @@ class LiveSession {
* Set which player is on the block. ST only
* @param id, player id or -1 for empty
*/
- setOnBlock(playerIndex) {
+ setMarked(playerIndex) {
if (this._isSpectator) return;
this._send("onBlock", playerIndex);
}
@@ -865,8 +865,8 @@ export default store => {
case "players/setFabled":
session.sendFabled();
break;
- case "players/setOnBlock":
- session.setOnBlock(payload);
+ case "players/setMarked":
+ session.setMarked(payload);
break;
case "players/swap":
session.swapPlayer(payload);