Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Steffen 2021-05-25 19:41:34 +02:00
commit 6b38a352ad
No known key found for this signature in database
GPG Key ID: 764D74E98267DFC6
2 changed files with 35 additions and 22 deletions

BIN
src/assets/icons/farmer.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

View File

@ -61,7 +61,7 @@
"team": "townsfolk",
"firstNight": 30,
"firstNightReminder": "Show the finger signal (0, 1, 2) for the number of evil alive neighbours of the Empath.",
"otherNight": 46,
"otherNight": 47,
"otherNightReminder": "Show the finger signal (0, 1, 2) for the number of evil neighbours.",
"reminders": [],
"setup": false,
@ -74,7 +74,7 @@
"team": "townsfolk",
"firstNight": 31,
"firstNightReminder": "The Fortune Teller points to two players. Give the head signal (nod yes, shake no) for whether one of those players is the Demon. ",
"otherNight": 47,
"otherNight": 48,
"otherNightReminder": "The Fortune Teller points to two players. Show the head signal (nod 'yes', shake 'no') for whether one of those players is the Demon.",
"reminders": ["Red herring"],
"setup": false,
@ -87,7 +87,7 @@
"team": "townsfolk",
"firstNight": 0,
"firstNightReminder": "",
"otherNight": 49,
"otherNight": 50,
"otherNightReminder": "If a player was executed today: Show that player\u2019s character token.",
"reminders": ["Executed"],
"setup": false,
@ -178,7 +178,7 @@
"team": "outsider",
"firstNight": 32,
"firstNightReminder": "The Butler points to a player. Mark that player as 'Master'.",
"otherNight": 48,
"otherNight": 49,
"otherNightReminder": "The Butler points to a player. Mark that player as 'Master'.",
"reminders": ["Master"],
"setup": false,
@ -244,7 +244,7 @@
"team": "minion",
"firstNight": 40,
"firstNightReminder": "Show the Grimoire to the Spy for as long as they need.",
"otherNight": 60,
"otherNight": 61,
"otherNightReminder": "Show the Grimoire to the Spy for as long as they need.",
"reminders": [],
"setup": false,
@ -361,7 +361,7 @@
"team": "townsfolk",
"firstNight": 33,
"firstNightReminder": "Show the marked character token. Point to the marked player.",
"otherNight": 45,
"otherNight": 46,
"otherNightReminder": "If the Grandmother\u2019s grandchild was killed by the Demon tonight: The Grandmother dies.",
"reminders": ["Grandchild"],
"setup": false,
@ -387,7 +387,7 @@
"team": "townsfolk",
"firstNight": 43,
"firstNightReminder": "The Chambermaid points to two players. Show the number signal (0, 1, 2, \u2026) for how many of those players wake tonight for their ability.",
"otherNight": 63,
"otherNight": 64,
"otherNightReminder": "The Chambermaid points to two players. Show the number signal (0, 1, 2, \u2026) for how many of those players wake tonight for their ability.",
"reminders": [],
"setup": false,
@ -440,7 +440,7 @@
"team": "townsfolk",
"firstNight": 0,
"firstNightReminder": "",
"otherNight": 42,
"otherNight": 43,
"otherNightReminder": "If the Gossip\u2019s public statement was true: Choose a player not protected from dying tonight. That player dies.",
"reminders": ["Dead"],
"setup": false,
@ -535,7 +535,7 @@
"team": "outsider",
"firstNight": 0,
"firstNightReminder": "The Tinker might die.",
"otherNight": 43,
"otherNight": 44,
"otherNightReminder": "The Tinker might die.",
"reminders": ["Dead"],
"setup": false,
@ -548,7 +548,7 @@
"team": "outsider",
"firstNight": 0,
"firstNightReminder": "",
"otherNight": 44,
"otherNight": 45,
"otherNightReminder": "If the Moonchild used their ability to target a player today: If that player is good, they die.",
"reminders": ["Dead"],
"setup": false,
@ -778,7 +778,7 @@
"team": "townsfolk",
"firstNight": 35,
"firstNightReminder": "The Dreamer points to a player. Show 1 good and 1 evil character token; one of these is correct.",
"otherNight": 50,
"otherNight": 51,
"otherNightReminder": "The Dreamer points to a player. Show 1 good and 1 evil character token; one of these is correct.",
"reminders": [],
"setup": false,
@ -804,7 +804,7 @@
"team": "townsfolk",
"firstNight": 42,
"firstNightReminder": "Show the hand signal for the number (0, 1, 2, etc.) of players whose ability malfunctioned due to other abilities.",
"otherNight": 62,
"otherNight": 63,
"otherNightReminder": "Show the hand signal for the number (0, 1, 2, etc.) of players whose ability malfunctioned due to other abilities.",
"reminders": ["Abnormal"],
"setup": false,
@ -817,7 +817,7 @@
"team": "townsfolk",
"firstNight": 0,
"firstNightReminder": "Place the 'Demon not voted' marker.",
"otherNight": 51,
"otherNight": 52,
"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"],
@ -831,7 +831,7 @@
"team": "townsfolk",
"firstNight": 0,
"firstNightReminder": "Place the 'Minions not nominated' marker.",
"otherNight": 52,
"otherNight": 53,
"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"],
@ -845,7 +845,7 @@
"team": "townsfolk",
"firstNight": 0,
"firstNightReminder": "",
"otherNight": 53,
"otherNight": 54,
"otherNightReminder": "Show the hand signal for the number (0, 1, 2, etc.) of dead evil players.",
"reminders": [],
"setup": false,
@ -871,7 +871,7 @@
"team": "townsfolk",
"firstNight": 36,
"firstNightReminder": "The Seamstress either shows a 'no' head signal, or points to two other players. If the Seamstress chose players , nod 'yes' or shake 'no' for whether they are of same alignment.",
"otherNight": 54,
"otherNight": 55,
"otherNightReminder": "If the Seamstress has not yet used their ability: the Seamstress either shows a 'no' head signal, or points to two other players. If the Seamstress chose players , nod 'yes' or shake 'no' for whether they are of same alignment.",
"reminders": ["No ability"],
"setup": false,
@ -911,7 +911,7 @@
"team": "townsfolk",
"firstNight": 0,
"firstNightReminder": "",
"otherNight": 55,
"otherNight": 56,
"otherNightReminder": "If today was the Juggler\u2019s first day: Show the hand signal for the number (0, 1, 2, etc.) of 'Correct' markers. Remove markers.",
"reminders": ["Correct"],
"setup": false,
@ -1163,7 +1163,7 @@
"team": "townsfolk",
"firstNight": 38,
"firstNightReminder": "Point to 1 evil player. Wake the townsfolk who is evil and show them the 'You are' card and the thumbs down evil sign.",
"otherNight": 58,
"otherNight": 59,
"otherNightReminder": "If the known evil player has died, point to another evil player. ",
"reminders": ["Known"],
"setup": true,
@ -1190,7 +1190,7 @@
"team": "townsfolk",
"firstNight": 41,
"firstNightReminder": "Show the General thumbs up for good winning, thumbs down for evil winning or thumb to the side for neither.",
"otherNight": 61,
"otherNight": 62,
"otherNightReminder": "Show the General thumbs up for good winning, thumbs down for evil winning or thumb to the side for neither.",
"reminders": [],
"setup": false,
@ -1216,7 +1216,7 @@
"team": "townsfolk",
"firstNight": 8,
"firstNightReminder": "Wake the Demon, show them the 'This character selected you' card, show the King token and point to the King player.",
"otherNight": 57,
"otherNight": 58,
"otherNightReminder": "If there are more dead than living, show the King a character token of a living player.",
"reminders": [],
"setup": false,
@ -1229,7 +1229,7 @@
"team": "townsfolk",
"firstNight": 37,
"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": 56,
"otherNight": 57,
"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",
@ -1246,7 +1246,7 @@
"team": "townsfolk",
"firstNight": 39,
"firstNightReminder": "If the cult leader changed alignment, show them the thumbs up good signal of the thumbs down evil signal accordingly.",
"otherNight": 59,
"otherNight": 60,
"otherNightReminder": "If the cult leader changed alignment, show them the thumbs up good signal of the thumbs down evil signal accordingly.",
"reminders": [],
"setup": false,
@ -1291,6 +1291,19 @@
"setup": false,
"ability": "Once per game, during the day, visit the Storyteller for some advice to help you win."
},
{
"id": "farmer",
"name": "Farmer",
"edition": "",
"team": "townsfolk",
"firstNight": 0,
"firstNightReminder": "",
"otherNight": 42,
"otherNightReminder": "If a Farmer died tonight, choose another good player and make them the Farmer. Wake this player, show them the 'You are' card and the Farmer character token.",
"reminders": [],
"setup": false,
"ability": "If you die at night, an alive good player becomes a Farmer."
},
{
"id": "choirboy",
"name": "Choirboy",