+
+ Mark for execution
-
@@ -250,12 +245,10 @@ export default {
}
},
setMarked() {
- this.$store.commit("session/setMarkedPlayerId", this.session.nomination[1]);
- this.finish();
+ this.$store.commit("session/setMarkedPlayer", this.session.nomination[1]);
},
removeMarked() {
- this.$store.commit("session/setMarkedPlayerId", -1);
- this.finish();
+ this.$store.commit("session/setMarkedPlayer", -1);
}
}
};
@@ -278,6 +271,11 @@ export default {
text-shadow: 0 1px 2px #000000, 0 -1px 2px #000000, 1px 0 2px #000000,
-1px 0 2px #000000;
+ .mark .button {
+ font-size: 75%;
+ margin: 0;
+ }
+
&:after {
content: " ";
padding-bottom: 100%;
diff --git a/src/store/modules/session.js b/src/store/modules/session.js
index 5e31a18..2af436a 100644
--- a/src/store/modules/session.js
+++ b/src/store/modules/session.js
@@ -22,10 +22,10 @@ const state = () => ({
nomination: false,
votes: [],
lockedVote: 0,
- votingSpeed: 3000,
+ votingSpeed: 500,
isVoteInProgress: false,
voteHistory: [],
- markedPlayerId: -1,
+ markedPlayer: -1,
isVoteHistoryAllowed: true,
isRolesDistributed: false
});
@@ -47,7 +47,7 @@ const mutations = {
setPing: set("ping"),
setVotingSpeed: set("votingSpeed"),
setVoteInProgress: set("isVoteInProgress"),
- setMarkedPlayerId: set("markedPlayerId"),
+ setMarkedPlayer: set("markedPlayer"),
setNomination: set("nomination"),
setVoteHistoryAllowed: set("isVoteHistoryAllowed"),
claimSeat: set("claimedSeat"),
diff --git a/src/store/socket.js b/src/store/socket.js
index f6d05ee..eea5821 100644
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -170,7 +170,7 @@ class LiveSession {
break;
case "marked":
if (!this._isSpectator) return;
- this._store.commit("session/setMarkedPlayerId", params);
+ this._store.commit("session/setMarkedPlayer", params);
break;
case "isNight":
if (!this._isSpectator) return;
@@ -282,7 +282,7 @@ class LiveSession {
votingSpeed: session.votingSpeed,
lockedVote: session.lockedVote,
isVoteInProgress: session.isVoteInProgress,
- markedPlayerId: session.markedPlayerId,
+ markedPlayer: session.markedPlayer,
fabled: fabled.map(f => (f.isCustom ? f : { id: f.id })),
...(session.nomination ? { votes: session.votes } : {})
});
@@ -306,7 +306,7 @@ class LiveSession {
votes,
lockedVote,
isVoteInProgress,
- markedPlayerId,
+ markedPlayer,
fabled
} = data;
const players = this._store.state.players.players;
@@ -325,14 +325,12 @@ class LiveSession {
const player = players[x];
const { roleId } = state;
// update relevant properties
- ["name", "id", "isDead", "isVoteless", "pronouns"].forEach(
- property => {
- const value = state[property];
- if (player[property] !== value) {
- this._store.commit("players/update", { player, property, value });
- }
+ ["name", "id", "isDead", "isVoteless", "pronouns"].forEach(property => {
+ const value = state[property];
+ if (player[property] !== value) {
+ this._store.commit("players/update", { player, property, value });
}
- );
+ });
// roles are special, because of travelers
if (roleId && player.role.id !== roleId) {
const role =
@@ -361,9 +359,9 @@ class LiveSession {
votes,
votingSpeed,
lockedVote,
- isVoteInProgress,
+ isVoteInProgress
});
- this._store.commit("session/setMarkedPlayerId", markedPlayerId);
+ this._store.commit("session/setMarkedPlayer", markedPlayer);
this._store.commit("players/setFabled", {
fabled: fabled.map(f => this._store.state.fabled.get(f.id) || f)
});
@@ -729,7 +727,7 @@ class LiveSession {
/**
* Set which player is on the block. ST only
- * @param id, player id or -1 for empty
+ * @param playerIndex, player id or -1 for empty
*/
setMarked(playerIndex) {
if (this._isSpectator) return;
@@ -892,7 +890,7 @@ export default store => {
case "players/setFabled":
session.sendFabled();
break;
- case "session/setMarkedPlayerId":
+ case "session/setMarkedPlayer":
session.setMarked(payload);
break;
case "players/swap":