martyn/townsquare
1
0
Fork 0
mirror of https://github.com/bra1n/townsquare.git synced 2025-04-04 14:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

adding organ grinder and secret vote

Browse source
This commit is contained in:
Dave 2023-05-23 16:49:03 +01:00
parent 1d76c39c69
commit ff91f4dc74
8 changed files with 226 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/assets/icons/organgrinder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 236 KiB

32
src/components/Player.vue
View file

@ -6,13 +6,17 @@
:class="[
{
dead: player.isDead,
marked: session.markedPlayer === index,
marked:
(!session.isSpectator || session.isVoteWatchingAllowed) &&
session.markedPlayer === index,
'no-vote': player.isVoteless,
you: session.sessionId && player.id && player.id === session.playerId,
'vote-yes': session.votes[index],
'vote-lock': voteLocked
'vote-yes':
(!session.isSpectator || session.isVoteWatchingAllowed) &&
session.votes[index],
'vote-lock': voteLocked,
},
player.role.team
player.role.team,
]"
>
<div class="shroud" @click="toggleStatus()"></div>
@ -191,7 +195,7 @@
: require('../assets/icons/' +
(reminder.imageAlt || reminder.role) +
'.png')
})`
})`,
}"
></span>
<span class="text">{{ reminder.name }}</span>
@ -210,13 +214,13 @@ import { mapGetters, mapState } from "vuex";
export default {
components: {
Token
Token,
},
props: {
player: {
type: Object,
required: true
}
required: true,
},
},
computed: {
...mapState("players", ["players"]),
@ -244,12 +248,12 @@ export default {
} else {
return { width: 12 + this.grimoire.zoom + unit };
}
}
},
},
data() {
return {
isMenuOpen: false,
isSwap: false
isSwap: false,
};
},
methods: {
@ -305,7 +309,7 @@ export default {
this.$store.commit("players/update", {
player: this.player,
property,
value
value,
});
if (closeMenu) {
this.isMenuOpen = false;
@ -342,10 +346,10 @@ export default {
if (!this.voteLocked) return;
this.$store.commit("session/voteSync", [
this.index,
!this.session.votes[this.index]
!this.session.votes[this.index],
]);
}
}
},
},
};
</script>

57
src/components/Vote.vue
View file

@ -20,7 +20,13 @@
<em v-else>(majority is {{ Math.ceil(players.length / 2) }})</em>
<template v-if="!session.isSpectator">
<div v-if="!session.isVoteInProgress && session.lockedVote < 1">
<div
v-if="
session.isVoteWatchingAllowed &&
!session.isVoteInProgress &&
session.lockedVote < 1
"
>
Time per player:
<font-awesome-icon
@mousedown.prevent="setVotingSpeed(-500)"
@ -59,7 +65,7 @@
<div
class="button"
:class="{
disabled: session.nomination[1] === session.markedPlayer
disabled: session.nomination[1] === session.markedPlayer,
}"
@click="setMarked"
>
@ -71,7 +77,7 @@
</div>
</template>
<template v-else-if="canVote">
<div v-if="!session.isVoteInProgress">
<div v-if="session.isVoteWatchingAllowed && !session.isVoteInProgress">
{{ session.votingSpeed / 1000 }} seconds between votes
</div>
<div class="button-group">
@ -130,7 +136,7 @@ export default {
const nomination = this.session.nomination[0];
return {
transform: `rotate(${Math.round((nomination / players) * 360)}deg)`,
transitionDuration: this.session.votingSpeed - 100 + "ms"
transitionDuration: this.session.votingSpeed - 100 + "ms",
};
},
nominee: function() {
@ -143,14 +149,16 @@ export default {
const rotation = (360 * (nomination + Math.min(lock, players))) / players;
return {
transform: `rotate(${Math.round(rotation)}deg)`,
transitionDuration: this.session.votingSpeed - 100 + "ms"
transitionDuration: this.session.votingSpeed - 100 + "ms",
};
},
player: function() {
return this.players.find(p => p.id === this.session.playerId);
return this.players.find((p) => p.id === this.session.playerId);
},
currentVote: function() {
const index = this.players.findIndex(p => p.id === this.session.playerId);
const index = this.players.findIndex(
(p) => p.id === this.session.playerId
);
return index >= 0 ? !!this.session.votes[index] : undefined;
},
canVote: function() {
@ -173,17 +181,17 @@ export default {
);
const reorder = [
...voters.slice(nomination + 1),
...voters.slice(0, nomination + 1)
...voters.slice(0, nomination + 1),
];
return (this.session.lockedVote
? reorder.slice(0, this.session.lockedVote - 1)
: reorder
).filter(n => !!n);
}
).filter((n) => !!n);
},
},
data() {
return {
voteTimer: null
voteTimer: null,
};
},
methods: {
@ -198,13 +206,18 @@ export default {
this.$store.commit("session/lockVote", 1);
this.$store.commit("session/setVoteInProgress", true);
clearInterval(this.voteTimer);
this.voteTimer = setInterval(() => {
this.$store.commit("session/lockVote");
if (this.session.lockedVote > this.players.length) {
clearInterval(this.voteTimer);
this.$store.commit("session/setVoteInProgress", false);
}
}, this.session.votingSpeed);
if (this.session.isVoteWatchingAllowed) {
this.voteTimer = setInterval(() => {
this.$store.commit("session/lockVote");
if (this.session.lockedVote > this.players.length) {
clearInterval(this.voteTimer);
this.$store.commit("session/setVoteInProgress", false);
}
}, this.session.votingSpeed);
} else {
this.$store.commit("session/lockVote", this.players, length + 1);
}
},
pause() {
if (this.voteTimer) {
@ -233,7 +246,9 @@ export default {
},
vote(vote) {
if (!this.canVote) return false;
const index = this.players.findIndex(p => p.id === this.session.playerId);
const index = this.players.findIndex(
(p) => p.id === this.session.playerId
);
if (index >= 0 && !!this.session.votes[index] !== vote) {
this.$store.commit("session/voteSync", [index, vote]);
}
@ -249,8 +264,8 @@ export default {
},
removeMarked() {
this.$store.commit("session/setMarkedPlayer", -1);
}
}
},
},
};
</script>

35
src/components/modals/VoteHistoryModal.vue
View file

@ -20,11 +20,20 @@
<font-awesome-icon
:icon="[
'fas',
session.isVoteHistoryAllowed ? 'check-square' : 'square'
session.isVoteHistoryAllowed ? 'check-square' : 'square',
]"
/>
Accessible to players
</div>
<div class="option" @click="setVoteWatching">
<font-awesome-icon
:icon="[
'fas',
session.isVoteWatchingAllowed ? 'check-square' : 'square',
]"
/>
Vote Watching
</div>
<div class="option" @click="clearVoteHistory">
<font-awesome-icon icon="trash-alt" />
Clear for everyone
@ -73,7 +82,7 @@
<font-awesome-icon
:icon="[
'fas',
vote.votes.length >= vote.majority ? 'check-square' : 'square'
vote.votes.length >= vote.majority ? 'check-square' : 'square',
]"
/>
</td>
@ -92,10 +101,10 @@ import { mapMutations, mapState } from "vuex";
export default {
components: {
Modal
Modal,
},
computed: {
...mapState(["session", "modals"])
...mapState(["session", "modals"]),
},
methods: {
clearVoteHistory() {
@ -106,9 +115,23 @@ export default {
"session/setVoteHistoryAllowed",
!this.session.isVoteHistoryAllowed
);
if (this.session.isVoteHistoryAllowed) {
this.$store.commit("session/setVoteWatchingAllowed", true);
}
},
...mapMutations(["toggleModal"])
}
setVoteWatching() {
this.$store.commit(
"session/setVoteWatchingAllowed",
!this.session.isVoteWatchingAllowed
);
if (!this.session.isVoteWatchingAllowed) {
this.$store.commit("session/setVoteHistoryAllowed", false);
}
},
...mapMutations(["toggleModal"]),
},
};
</script>

25
src/hatred.json
View file

@ -372,5 +372,30 @@
"reason": "If the Lleech has poisoned the Heretic then the Lleech dies, the Heretic remains poisoned."
}
]
},
{
"id": "Organ Grinder",
"hatred": [
{
"id": "Butler",
"reason": "If the Organ Grinder is causing eyes closed voting, the Butler may raise their hand to vote but their vote is only counted if their master voted too."
},
{
"id": "Flowergirl",
"reason": "If players' eyes were closed during the nominations, the Flowergirl learns how many times the Demon voted."
},
{
"id": "Lil' Monsta",
"reason": "Votes for the Organ Grinder count if the Organ Grinder is babysitting Lil' Monsta."
},
{
"id": "Minstrel",
"reason": "Only 1 jinxed character can be in play. Evil players start knowing which character it is."
},
{
"id": "Preacher",
"reason": "Only 1 jinxed character can be in play. Evil players start knowing which character it is."
}
]
}
]

138
src/roles.json
View file

@ -8,8 +8,7 @@
"firstNightReminder": "Show the character token of a Townsfolk in play. Point to two players, one of which is that character.",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["Townsfolk",
"Wrong"],
"reminders": ["Townsfolk", "Wrong"],
"setup": false,
"ability": "You start knowing that 1 of 2 players is a particular Townsfolk."
},
@ -22,8 +21,7 @@
"firstNightReminder": "Show the character token of an Outsider in play. Point to two players, one of which is that character.",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["Outsider",
"Wrong"],
"reminders": ["Outsider", "Wrong"],
"setup": false,
"ability": "You start knowing that 1 of 2 players is a particular Outsider. (Or that zero are in play.)"
},
@ -36,8 +34,7 @@
"firstNightReminder": "Show the character token of a Minion in play. Point to two players, one of which is that character.",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["Minion",
"Wrong"],
"reminders": ["Minion", "Wrong"],
"setup": false,
"ability": "You start knowing that 1 of 2 players is a particular Minion."
},
@ -415,8 +412,7 @@
"firstNightReminder": "",
"otherNight": 9,
"otherNightReminder": "The previously protected and drunk players lose those markers. The Innkeeper points to two players. Those players are protected. One is drunk.",
"reminders": ["Protected",
"Drunk"],
"reminders": ["Protected", "Drunk"],
"setup": false,
"ability": "Each night*, choose 2 players: they can't die tonight, but 1 is drunk until dusk."
},
@ -455,10 +451,7 @@
"firstNightReminder": "The Courtier either shows a 'no' head signal, or points to a character on the sheet. If the Courtier used their ability: If that character is in play, that player is drunk.",
"otherNight": 8,
"otherNightReminder": "Reduce the remaining number of days the marked player is poisoned. If the Courtier has not yet used their ability: The Courtier either shows a 'no' head signal, or points to a character on the sheet. If the Courtier used their ability: If that character is in play, that player is drunk.",
"reminders": ["Drunk 3",
"Drunk 2",
"Drunk 1",
"No ability"],
"reminders": ["Drunk 3", "Drunk 2", "Drunk 1", "No ability"],
"setup": false,
"ability": "Once per game, at night, choose a character: they are drunk for 3 nights & 3 days."
},
@ -471,8 +464,7 @@
"firstNightReminder": "",
"otherNight": 43,
"otherNightReminder": "If the Professor has not used their ability: The Professor either shakes their head no, or points to a player. If that player is a Townsfolk, they are now alive.",
"reminders": ["Alive",
"No ability"],
"reminders": ["Alive", "No ability"],
"setup": false,
"ability": "Once per game, at night*, choose a dead player: if they are a Townsfolk, they are resurrected."
},
@ -576,9 +568,7 @@
"firstNightReminder": "If 7 or more players: Show the Lunatic a number of arbitrary 'Minions', players equal to the number of Minions in play. Show 3 character tokens of arbitrary good characters. If the token received by the Lunatic is a Demon that would wake tonight: Allow the Lunatic to do the Demon actions. Place their 'attack' markers. Wake the Demon. Show the Demon\u2019s real character token. Show them the Lunatic player. If the Lunatic attacked players: Show the real demon each marked player. Remove any Lunatic 'attack' markers.",
"otherNight": 20,
"otherNightReminder": "Allow the Lunatic to do the actions of the Demon. Place their 'attack' markers. If the Lunatic selected players: Wake the Demon. Show the 'attack' marker, then point to each marked player. Remove any Lunatic 'attack' markers.",
"reminders": ["Attack 1",
"Attack 2",
"Attack 3"],
"reminders": ["Attack 1", "Attack 2", "Attack 3"],
"setup": false,
"ability": "You think you are a Demon, but you are not. The Demon knows who you are & who you choose at night."
},
@ -591,8 +581,7 @@
"firstNightReminder": "Show each of the Outsider tokens in play.",
"otherNight": 37,
"otherNightReminder": "If an Outsider died today: The Godfather points to a player. That player dies.",
"reminders": ["Died today",
"Dead"],
"reminders": ["Died today", "Dead"],
"setup": true,
"ability": "You start knowing which Outsiders are in play. If 1 died today, choose a player tonight: they die. [\u22121 or +1 Outsider]"
},
@ -618,8 +607,7 @@
"firstNightReminder": "",
"otherNight": 36,
"otherNightReminder": "If the Assassin has not yet used their ability: The Assassin either shows the 'no' head signal, or points to a player. That player dies.",
"reminders": ["Dead",
"No ability"],
"reminders": ["Dead", "No ability"],
"setup": false,
"ability": "Once per game, at night*, choose a player: they die, even if for some reason they could not."
},
@ -645,8 +633,7 @@
"firstNightReminder": "",
"otherNight": 25,
"otherNightReminder": "If no-one died during the day: The Zombuul points to a player. That player dies.",
"reminders": ["Died today",
"Dead"],
"reminders": ["Died today", "Dead"],
"setup": false,
"ability": "Each night*, if no-one died today, choose a player: they die. The 1st time you die, you live but register as dead."
},
@ -659,8 +646,7 @@
"firstNightReminder": "The Pukka points to a player. That player is poisoned.",
"otherNight": 26,
"otherNightReminder": "The Pukka points to a player. That player is poisoned. The previously poisoned player dies. ",
"reminders": ["Poisoned",
"Dead"],
"reminders": ["Poisoned", "Dead"],
"setup": false,
"ability": "Each night, choose a player: they are poisoned. The previously poisoned player dies then becomes healthy."
},
@ -673,8 +659,7 @@
"firstNightReminder": "",
"otherNight": 27,
"otherNightReminder": "One player that the Shabaloth chose the previous night might be resurrected. The Shabaloth points to two players. Those players die.",
"reminders": ["Dead",
"Alive"],
"reminders": ["Dead", "Alive"],
"setup": false,
"ability": "Each night*, choose 2 players: they die. A dead player you chose last night might be regurgitated."
},
@ -687,8 +672,7 @@
"firstNightReminder": "",
"otherNight": 28,
"otherNightReminder": "If the Po chose no-one the previous night: The Po points to three players. Otherwise: The Po either shows the 'no' head signal , or points to a player. Chosen players die",
"reminders": ["Dead",
"3 attacks"],
"reminders": ["Dead", "3 attacks"],
"setup": false,
"ability": "Each night*, you may choose a player: they die. If your last choice was no-one, choose 3 players tonight."
},
@ -740,8 +724,7 @@
"firstNightReminder": "",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["Nominate good",
"Nominate evil"],
"reminders": ["Nominate good", "Nominate evil"],
"setup": false,
"ability": "Only the Storyteller can nominate. At least 1 opposite player must be nominated each day."
},
@ -819,8 +802,7 @@
"firstNightReminder": "",
"otherNight": 57,
"otherNightReminder": "Nod 'yes' or shake head 'no' for whether the Demon voted today. Place the 'Demon not voted' marker (remove 'Demon voted', if any).",
"reminders": ["Demon voted",
"Demon not voted"],
"reminders": ["Demon voted", "Demon not voted"],
"setup": false,
"ability": "Each night*, you learn if a Demon voted today."
},
@ -833,8 +815,7 @@
"firstNightReminder": "",
"otherNight": 58,
"otherNightReminder": "Nod 'yes' or shake head 'no' for whether a Minion nominated today. Place the 'Minion not nominated' marker (remove 'Minion nominated', if any).",
"reminders": ["Minions not nominated",
"Minion nominated"],
"reminders": ["Minions not nominated", "Minion nominated"],
"setup": false,
"ability": "Each night*, you learn if a Minion nominated today."
},
@ -886,8 +867,7 @@
"firstNightReminder": "The Philosopher either shows a 'no' head signal, or points to a good character on their sheet. If they chose a character: Swap the out-of-play character token with the Philosopher token and add the 'Is the Philosopher' reminder. If the character is in play, place the drunk marker by that player.",
"otherNight": 2,
"otherNightReminder": "If the Philosopher has not used their ability: the Philosopher either shows a 'no' head signal, or points to a good character on their sheet. If they chose a character: Swap the out-of-play character token with the Philosopher token and add the 'Is the Philosopher' reminder. If the character is in play, place the drunk marker by that player.",
"reminders": ["Drunk",
"Is the Philosopher"],
"reminders": ["Drunk", "Is the Philosopher"],
"setup": false,
"ability": "Once per game, at night, choose a good character: gain that ability. If this character is in play, they are drunk."
},
@ -1043,8 +1023,7 @@
"firstNightReminder": "",
"otherNight": 29,
"otherNightReminder": "The Fang Gu points to a player. That player dies. Or, if that player was an Outsider and there are no other Fang Gu in play: The Fang Gu dies instead of the chosen player. The chosen player is now an evil Fang Gu. Wake the new Fang Gu. Show the 'You are' card, then the Fang Gu token. Show the 'You are' card, then the thumb-down 'evil' hand sign.",
"reminders": ["Dead",
"Once"],
"reminders": ["Dead", "Once"],
"setup": true,
"ability": "Each night*, choose a player: they die. The 1st Outsider this kills becomes an evil Fang Gu & you die instead. [+1 Outsider]"
},
@ -1057,9 +1036,7 @@
"firstNightReminder": "",
"otherNight": 32,
"otherNightReminder": "The Vigormortis points to a player. That player dies. If a Minion, they keep their ability and one of their Townsfolk neighbours is poisoned.",
"reminders": ["Dead",
"Has ability",
"Poisoned"],
"reminders": ["Dead", "Has ability", "Poisoned"],
"setup": true,
"ability": "Each night*, choose a player: they die. Minions you kill keep their ability & poison 1 Townsfolk neighbour. [\u22121 Outsider]"
},
@ -1072,8 +1049,7 @@
"firstNightReminder": "",
"otherNight": 30,
"otherNightReminder": "The No Dashii points to a player. That player dies.",
"reminders": ["Dead",
"Poisoned"],
"reminders": ["Dead", "Poisoned"],
"setup": false,
"ability": "Each night*, choose a player: they die. Your 2 Townsfolk neighbours are poisoned."
},
@ -1099,8 +1075,7 @@
"firstNightReminder": "Choose a player, wake them and tell them which Barista power is affecting them. Treat them accordingly (sober/healthy/true info or activate their ability twice).",
"otherNight": 1,
"otherNightReminder": "Choose a player, wake them and tell them which Barista power is affecting them. Treat them accordingly (sober/healthy/true info or activate their ability twice).",
"reminders": ["Sober & Healthy",
"Ability twice"],
"reminders": ["Sober & Healthy", "Ability twice"],
"setup": false,
"ability": "Each night, until dusk, 1) a player becomes sober, healthy and gets true info, or 2) their ability works twice. They learn which."
},
@ -1139,8 +1114,7 @@
"firstNightReminder": "",
"otherNight": 1,
"otherNightReminder": "The Bone Collector either shakes their head no or points at any dead player. If they pointed at any dead player, put the Bone Collector's 'Has Ability' reminder by the chosen player's character token. (They may need to be woken tonight to use it.)",
"reminders": ["No ability",
"Has ability"],
"reminders": ["No ability", "Has ability"],
"setup": false,
"ability": "Once per game, at night, choose a dead player: they regain their ability until dusk."
},
@ -1192,8 +1166,7 @@
"firstNightReminder": "Show the Pixie 1 in-play Townsfolk character token.",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["Mad",
"Has ability"],
"reminders": ["Mad", "Has ability"],
"setup": false,
"ability": "You start knowing 1 in-play Townsfolk. If you were mad that you were this character, you gain their ability when they die."
},
@ -1245,11 +1218,13 @@
"firstNightReminder": "Choose a character type. Point to a player whose character is of that type. Place the Balloonist's Seen reminder next to that character.",
"otherNight": 62,
"otherNightReminder": "Choose a character type that does not yet have a Seen reminder next to a character of that type. Point to a player whose character is of that type, if there are any. Place the Balloonist's Seen reminder next to that character.",
"reminders": ["Seen Townsfolk",
"Seen Outsider",
"Seen Minion",
"Seen Demon",
"Seen Traveller"],
"reminders": [
"Seen Townsfolk",
"Seen Outsider",
"Seen Minion",
"Seen Demon",
"Seen Traveller"
],
"setup": true,
"ability": "Each night, you learn 1 player of each character type, until there are no more types to learn. [+1 Outsider]"
},
@ -1432,8 +1407,7 @@
"firstNightReminder": "",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["Poisoned",
"Died today"],
"reminders": ["Poisoned", "Died today"],
"setup": false,
"ability": "You have the ability of the recently killed executee. If they are evil, you are poisoned until a good player dies by execution."
},
@ -1472,8 +1446,7 @@
"firstNightReminder": "",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["Drunk",
"Guess used"],
"reminders": ["Drunk", "Guess used"],
"setup": false,
"ability": "1 player is drunk, even if you die. If you guess (once) who it is, learn the Demon player, but guess wrong & get false info."
},
@ -1591,8 +1564,7 @@
"firstNightReminder": "Show the Mephit their secret word.",
"otherNight": 18,
"otherNightReminder": "Wake the 1st good player that said the Mephit's secret word and show them the 'You are' card and the thumbs down evil signal.",
"reminders": ["Turns evil",
"No ability"],
"reminders": ["Turns evil", "No ability"],
"setup": false,
"ability": "You start knowing a secret word. The 1st good player to say this word becomes evil that night."
},
@ -1605,8 +1577,7 @@
"firstNightReminder": "Show the Mezepheles their secret word.",
"otherNight": 18,
"otherNightReminder": "Wake the 1st good player that said the Mezepheles' secret word and show them the 'You are' card and the thumbs down evil signal.",
"reminders": ["Turns evil",
"No ability"],
"reminders": ["Turns evil", "No ability"],
"setup": false,
"ability": "You start knowing a secret word. The 1st good player to say this word becomes evil that night."
},
@ -1637,6 +1608,19 @@
"setup": false,
"ability": "If you are executed, all but 3 players die. 1 minute later, the player with the most players pointing at them dies."
},
{
"id": "organgrinder",
"name": "Organ Grinder",
"edition": "",
"team": "minion",
"firstNight": 0,
"firstNightReminder": "",
"otherNight": 0,
"otherNightReminder": "",
"reminders": ["About to die"],
"setup": false,
"ability": "All players keep their eyes closed when voting & the vote tally is secret. Votes for you only count if you vote."
},
{
"id": "lilmonsta",
"name": "Lil' Monsta",
@ -1647,8 +1631,7 @@
"otherNight": 35,
"otherNightReminder": "Wake all Minions together, allow them to vote by pointing at who they want to babysit Lil' Monsta. Choose a player, that player dies.",
"reminders": [],
"remindersGlobal": ["Is the Demon",
"Dead"],
"remindersGlobal": ["Is the Demon", "Dead"],
"setup": true,
"ability": "Each night, Minions choose who babysits Lil' Monsta's token & \"is the Demon\". A player dies each night*. [+1 Minion]"
},
@ -1661,8 +1644,7 @@
"firstNightReminder": "The Lleech points to a player. Place the Poisoned reminder token.",
"otherNight": 34,
"otherNightReminder": "The Lleech points to a player. That player dies.",
"reminders": ["Dead",
"Poisoned"],
"reminders": ["Dead", "Poisoned"],
"setup": false,
"ability": "Each night*, choose a player: they die. You start by choosing an alive player: they are poisoned - you die if & only if they die."
},
@ -1675,9 +1657,7 @@
"firstNightReminder": "",
"otherNight": 33,
"otherNightReminder": "The Al-Hadikhia chooses 3 players. Announce the first player, wake them to nod yes to live or shake head no to die, kill or resurrect accordingly, then put to sleep and announce the next player. If all 3 are alive after this, all 3 die.",
"reminders": ["1", "2", "3",
"Chose death",
"Chose life"],
"reminders": ["1", "2", "3", "Chose death", "Chose life"],
"setup": false,
"ability": "Each night*, choose 3 players (all players learn who): each silently chooses to live or die, but if all live, all die."
},
@ -1690,8 +1670,7 @@
"firstNightReminder": "",
"otherNight": 23,
"otherNightReminder": "Choose a player, that player dies.",
"reminders": ["Dead",
"About to die"],
"reminders": ["Dead", "About to die"],
"setup": true,
"ability": "Each night*, a player might die. Executions fail if only evil voted. You register as a Minion too. [Most players are Legion]"
},
@ -1704,12 +1683,14 @@
"firstNightReminder": "Place the Leviathan 'Day 1' marker. Announce 'The Leviathan is in play; this is Day 1.'",
"otherNight": 73,
"otherNightReminder": "Change the Leviathan Day reminder for the next day.",
"reminders": ["Day 1",
"Day 2",
"Day 3",
"Day 4",
"Day 5",
"Good player executed"],
"reminders": [
"Day 1",
"Day 2",
"Day 3",
"Day 4",
"Day 5",
"Good player executed"
],
"setup": false,
"ability": "If more than 1 good player is executed, you win. All players know you are in play. After day 5, evil wins."
},
@ -1740,4 +1721,3 @@
"ability": "Once per day, you may choose to kill an alive neighbour, if your other alive neighbour agrees."
}
]

16
src/store/modules/session.js
View file

@ -26,8 +26,9 @@ const state = () => ({
isVoteInProgress: false,
voteHistory: [],
markedPlayer: -1,
isVoteHistoryAllowed: true,
isRolesDistributed: false
isVoteHistoryAllowed: false,
isVoteWatchingAllowed: true,
isRolesDistributed: false,
});
const getters = {};
@ -35,7 +36,7 @@ const getters = {};
const actions = {};
// mutations helper functions
const set = key => (state, val) => {
const set = (key) => (state, val) => {
state[key] = val;
};
@ -50,6 +51,7 @@ const mutations = {
setMarkedPlayer: set("markedPlayer"),
setNomination: set("nomination"),
setVoteHistoryAllowed: set("isVoteHistoryAllowed"),
setVoteWatchingAllowed: set("isVoteWatchingAllowed"),
claimSeat: set("claimedSeat"),
distributeRoles: set("isRolesDistributed"),
setSessionId(state, sessionId) {
@ -84,11 +86,11 @@ 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 || isExile).length / 2
),
votes: players
.filter((player, index) => state.votes[index])
.map(({ name }) => name)
.map(({ name }) => name),
});
},
clearVoteHistory(state) {
@ -104,7 +106,7 @@ const mutations = {
voteSync: handleVote,
lockVote(state, lock) {
state.lockedVote = lock !== undefined ? lock : state.lockedVote + 1;
}
},
};
export default {
@ -112,5 +114,5 @@ export default {
state,
getters,
actions,
mutations
mutations,
};

76
src/store/socket.js
View file

@ -32,7 +32,7 @@ class LiveSession {
);
this._socket.addEventListener("message", this._handleMessage.bind(this));
this._socket.onopen = this._onOpen.bind(this);
this._socket.onclose = err => {
this._socket.onclose = (err) => {
this._socket = null;
clearInterval(this._pingTimer);
this._pingTimer = null;
@ -105,7 +105,7 @@ class LiveSession {
this._isSpectator
? this._store.state.session.playerId
: Object.keys(this._players).length,
"latency"
"latency",
]);
clearTimeout(this._pingTimer);
this._pingTimer = setTimeout(this._ping.bind(this), this._pingInterval);
@ -181,6 +181,10 @@ class LiveSession {
this._store.commit("session/setVoteHistoryAllowed", params);
this._store.commit("session/clearVoteHistory");
break;
case "isVoteWatchingAllowed":
if (!this._isSpectator) return;
this._store.commit("session/setVoteWatchingAllowed", params);
break;
case "votingSpeed":
if (!this._isSpectator) return;
this._store.commit("session/setVotingSpeed", params);
@ -255,7 +259,7 @@ class LiveSession {
*/
sendGamestate(playerId = "", isLightweight = false) {
if (this._isSpectator) return;
this._gamestate = this._store.state.players.players.map(player => ({
this._gamestate = this._store.state.players.players.map((player) => ({
name: player.name,
id: player.id,
isDead: player.isDead,
@ -263,12 +267,12 @@ class LiveSession {
pronouns: player.pronouns,
...(player.role && player.role.team === "traveler"
? { roleId: player.role.id }
: {})
: {}),
}));
if (isLightweight) {
this._sendDirect(playerId, "gs", {
gamestate: this._gamestate,
isLightweight
isLightweight,
});
} else {
const { session, grimoire } = this._store.state;
@ -278,13 +282,14 @@ class LiveSession {
gamestate: this._gamestate,
isNight: grimoire.isNight,
isVoteHistoryAllowed: session.isVoteHistoryAllowed,
isVoteWatchingAllowed: session.isVoteWatchingAllowed,
nomination: session.nomination,
votingSpeed: session.votingSpeed,
lockedVote: session.lockedVote,
isVoteInProgress: session.isVoteInProgress,
markedPlayer: session.markedPlayer,
fabled: fabled.map(f => (f.isCustom ? f : { id: f.id })),
...(session.nomination ? { votes: session.votes } : {})
fabled: fabled.map((f) => (f.isCustom ? f : { id: f.id })),
...(session.nomination ? { votes: session.votes } : {}),
});
}
}
@ -301,13 +306,14 @@ class LiveSession {
isLightweight,
isNight,
isVoteHistoryAllowed,
isVoteWatchingAllowed,
nomination,
votingSpeed,
votes,
lockedVote,
isVoteInProgress,
markedPlayer,
fabled
fabled,
} = data;
const players = this._store.state.players.players;
// adjust number of players
@ -325,7 +331,7 @@ class LiveSession {
const player = players[x];
const { roleId } = state;
// update relevant properties
["name", "id", "isDead", "isVoteless", "pronouns"].forEach(property => {
["name", "id", "isDead", "isVoteless", "pronouns"].forEach((property) => {
const value = state[property];
if (player[property] !== value) {
this._store.commit("players/update", { player, property, value });
@ -340,30 +346,34 @@ class LiveSession {
this._store.commit("players/update", {
player,
property: "role",
value: role
value: role,
});
}
} else if (!roleId && player.role.team === "traveler") {
this._store.commit("players/update", {
player,
property: "role",
value: {}
value: {},
});
}
});
if (!isLightweight) {
this._store.commit("toggleNight", !!isNight);
this._store.commit("session/setVoteHistoryAllowed", isVoteHistoryAllowed);
this._store.commit(
"session/setVoteWatchingAllowed",
isVoteWatchingAllowed
);
this._store.commit("session/nomination", {
nomination,
votes,
votingSpeed,
lockedVote,
isVoteInProgress
isVoteInProgress,
});
this._store.commit("session/setMarkedPlayer", markedPlayer);
this._store.commit("players/setFabled", {
fabled: fabled.map(f => this._store.state.fabled.get(f.id) || f)
fabled: fabled.map((f) => this._store.state.fabled.get(f.id) || f),
});
}
}
@ -381,7 +391,7 @@ class LiveSession {
}
this._sendDirect(playerId, "edition", {
edition: edition.isOfficial ? { id: edition.id } : edition,
...(roles ? { roles } : {})
...(roles ? { roles } : {}),
});
}
@ -422,7 +432,7 @@ class LiveSession {
const { fabled } = this._store.state.players;
this._send(
"fabled",
fabled.map(f => (f.isCustom ? f : { id: f.id }))
fabled.map((f) => (f.isCustom ? f : { id: f.id }))
);
}
@ -434,7 +444,7 @@ class LiveSession {
_updateFabled(fabled) {
if (!this._isSpectator) return;
this._store.commit("players/setFabled", {
fabled: fabled.map(f => this._store.state.fabled.get(f.id) || f)
fabled: fabled.map((f) => this._store.state.fabled.get(f.id) || f),
});
}
@ -454,7 +464,7 @@ class LiveSession {
this._send("player", {
index,
property,
value: value.id
value: value.id,
});
} else if (this._gamestate[index].roleId) {
// player was previously a traveler
@ -484,7 +494,7 @@ class LiveSession {
this._store.commit("players/update", {
player,
property: "role",
value: {}
value: {},
});
} else {
// load role, first from session, the global, then fail gracefully
@ -495,7 +505,7 @@ class LiveSession {
this._store.commit("players/update", {
player,
property: "role",
value: role
value: role,
});
}
} else {
@ -535,7 +545,7 @@ class LiveSession {
player,
property: "pronouns",
value,
isFromSockets: true
isFromSockets: true,
});
}
@ -556,12 +566,12 @@ class LiveSession {
}
}
// remove claimed seats from players that are no longer connected
this._store.state.players.players.forEach(player => {
this._store.state.players.players.forEach((player) => {
if (player.id && !this._players[player.id]) {
this._store.commit("players/update", {
player,
property: "id",
value: ""
value: "",
});
}
});
@ -635,7 +645,7 @@ class LiveSession {
this._store.commit("players/update", {
player: players[oldIndex],
property,
value: ""
value: "",
});
}
// add playerId to new seat
@ -659,7 +669,7 @@ class LiveSession {
if (player.id && player.role) {
message[player.id] = [
"player",
{ index, property: "role", value: player.role.id }
{ index, property: "role", value: player.role.id },
];
}
});
@ -714,6 +724,17 @@ class LiveSession {
);
}
/**
* Send the isVoteWatchingAllowed state. ST only
*/
setVoteWatchingAllowed() {
if (this._isSpectator) return;
this._send(
"isVoteWatchingAllowed",
this._store.state.session.isVoteWatchingAllowed
);
}
/**
* Send the voting speed. ST only
* @param votingSpeed voting speed in seconds, minimum 1
@ -757,7 +778,7 @@ class LiveSession {
this._send("vote", [
index,
this._store.state.session.votes[index],
!this._isSpectator
!this._isSpectator,
]);
}
}
@ -836,7 +857,7 @@ class LiveSession {
}
}
export default store => {
export default (store) => {
// setup
const session = new LiveSession(store);
@ -881,6 +902,9 @@ export default store => {
case "session/setVoteHistoryAllowed":
session.setVoteHistoryAllowed();
break;
case "session/setVoteWatchingAllowed":
session.setVoteWatchingAllowed();
break;
case "toggleNight":
session.setIsNight();
break;