diff --git a/Games/types/Mafia/Winners.js b/Games/types/Mafia/Winners.js index 4a0e6632b..3a40f9543 100644 --- a/Games/types/Mafia/Winners.js +++ b/Games/types/Mafia/Winners.js @@ -83,7 +83,7 @@ module.exports = class MafiaWinners extends Winners { return "Here's a little lesson in trickery, this is going down in history. If you wanna be a villain number one, then look no further than the Supervillain."; case "Survivor": return "Through the carnage, the Survivor drifted on."; - case "Tofurkey": + case "Squab": return ":turkey: The grain shipments arrived in town a day too late. The streets were filled with wild Turkeys..."; case "Turkey": return ":turkey: The grain shipments arrived in town a day too late. The streets were filled with wild Turkeys..."; diff --git a/Games/types/Mafia/roles/Hostile/Tofurkey.js b/Games/types/Mafia/roles/Hostile/Squab.js similarity index 77% rename from Games/types/Mafia/roles/Hostile/Tofurkey.js rename to Games/types/Mafia/roles/Hostile/Squab.js index 279073dbc..24ec780d6 100644 --- a/Games/types/Mafia/roles/Hostile/Tofurkey.js +++ b/Games/types/Mafia/roles/Hostile/Squab.js @@ -1,8 +1,8 @@ const Role = require("../../Role"); -module.exports = class Tofurkey extends Role { +module.exports = class Squab extends Role { constructor(player, data) { - super("Tofurkey", player, data); + super("Squab", player, data); this.alignment = "Hostile"; this.cards = [ diff --git a/Games/types/Mafia/roles/cards/SubtractTurkeyOnDeath.js b/Games/types/Mafia/roles/cards/SubtractTurkeyOnDeath.js index 26c7f9815..a2f38e4cb 100644 --- a/Games/types/Mafia/roles/cards/SubtractTurkeyOnDeath.js +++ b/Games/types/Mafia/roles/cards/SubtractTurkeyOnDeath.js @@ -17,9 +17,9 @@ module.exports = class SubtractTurkeyOnDeath extends Card { (person.hasItem("Food") && person.alive && person.role.name !== "Turkey") || - person.role.name !== "Tofurkey" + person.role.name !== "Squab" ) { - person.item.drop("Food"); + person.dropItem("Food"); } } } diff --git a/Games/types/Mafia/roles/cards/WinIfOnlyTurkeyAlive.js b/Games/types/Mafia/roles/cards/WinIfOnlyTurkeyAlive.js index 59dc64ef9..1e33071b5 100644 --- a/Games/types/Mafia/roles/cards/WinIfOnlyTurkeyAlive.js +++ b/Games/types/Mafia/roles/cards/WinIfOnlyTurkeyAlive.js @@ -14,7 +14,7 @@ module.exports = class WinIfOnlyTurkeyAlive extends Card { this.game .alivePlayers() .filter( - (p) => p.role.name === "Turkey" || p.role.name === "Tofurkey" + (p) => p.role.name === "Turkey" || p.role.name === "Squab" ).length === aliveCount ) { winners.addPlayer(this.player, this.name); @@ -26,7 +26,7 @@ module.exports = class WinIfOnlyTurkeyAlive extends Card { for (let player of this.game.players) { if ( player.role.name === "Turkey" || - (player.role.name === "Tofurkey" && player !== this.player) + (player.role.name === "Squab" && player !== this.player) ) { this.revealToPlayer(player); } diff --git a/data/contributors.js b/data/contributors.js index 98fe7cbf9..a605addd4 100644 --- a/data/contributors.js +++ b/data/contributors.js @@ -172,7 +172,7 @@ const artContributors = { "Nyarlathotep", "Leprechaun", "Benandante", - "Tofurkey", + "Squab", "Seeker", "Hider", ], diff --git a/data/roles.js b/data/roles.js index 6f3eee641..74daa000a 100644 --- a/data/roles.js +++ b/data/roles.js @@ -1804,13 +1804,13 @@ const roleData = { "Wins if all players left alive have went on a successful date.", ], }, - Tofurkey: { + Squab: { alignment: "Hostile", - disabled: true, + newlyAdded: true, description: [ "The game begins with a famine, with each player starting with four bread.", - "Tofurkeys are immune to the famine.", - "If a Tofurkey dies, each remaining player loses one meal.", + "Squabs are immune to the famine.", + "If a Squab dies, each remaining player loses one meal.", "Wins if they survive to the end of the game and everyone else dies of famine.", ], }, diff --git a/react_main/public/images/roles/squab-vivid.png b/react_main/public/images/roles/squab-vivid.png new file mode 100644 index 000000000..f178ac6d1 Binary files /dev/null and b/react_main/public/images/roles/squab-vivid.png differ diff --git a/react_main/public/images/roles/succubus-vivid.png b/react_main/public/images/roles/succubus-vivid.png new file mode 100644 index 000000000..9b50e15e0 Binary files /dev/null and b/react_main/public/images/roles/succubus-vivid.png differ diff --git a/react_main/public/images/roles/tofurkey-vivid.png b/react_main/public/images/roles/tofurkey-vivid.png deleted file mode 100644 index c31676677..000000000 Binary files a/react_main/public/images/roles/tofurkey-vivid.png and /dev/null differ diff --git a/react_main/src/css/roles.css b/react_main/src/css/roles.css index ef59f1c36..d2ca8649a 100644 --- a/react_main/src/css/roles.css +++ b/react_main/src/css/roles.css @@ -2455,8 +2455,8 @@ background-image: url("/images/roles/mistletoe-retro.png"); } -.role-icon-scheme-vivid .role-Mafia-Tofurkey { - background-image: url("/images/roles/tofurkey-vivid.png"); +.role-icon-scheme-vivid .role-Mafia-Squab { + background-image: url("/images/roles/squab-vivid.png"); } .role-icon-scheme-vivid .role-Mafia-Turkey {