From c5f86d783bc7c1ab21163aa6a4b6597fcce316a3 Mon Sep 17 00:00:00 2001 From: Golbolco Date: Fri, 10 Nov 2023 11:37:42 -0500 Subject: [PATCH] succubus icon by hima --- Games/types/Mafia/Winners.js | 2 +- .../Mafia/roles/Hostile/{Tofurkey.js => Squab.js} | 4 ++-- .../Mafia/roles/cards/SubtractTurkeyOnDeath.js | 4 ++-- .../Mafia/roles/cards/WinIfOnlyTurkeyAlive.js | 4 ++-- data/contributors.js | 2 +- data/roles.js | 8 ++++---- react_main/public/images/roles/squab-vivid.png | Bin 0 -> 603 bytes react_main/public/images/roles/succubus-vivid.png | Bin 0 -> 607 bytes react_main/public/images/roles/tofurkey-vivid.png | Bin 514 -> 0 bytes react_main/src/css/roles.css | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) rename Games/types/Mafia/roles/Hostile/{Tofurkey.js => Squab.js} (77%) create mode 100644 react_main/public/images/roles/squab-vivid.png create mode 100644 react_main/public/images/roles/succubus-vivid.png delete mode 100644 react_main/public/images/roles/tofurkey-vivid.png 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 0000000000000000000000000000000000000000..f178ac6d12d48fe312f12f657d3d0ad9dc9fde1d GIT binary patch literal 603 zcmV-h0;K(kP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0q{vgK~zXft(4tO z#4r$qoqI%g5-mVEG(aoR0TodWw19LcUV|s`oX2~+wol@VEGJ%jXMd6`smGcxk0oE$ zhP6A0H^cFFxwky!VQpB`fChn7qs@ShpUVus$_%`94TymR>;}z_4&e;4>+& z>L7B~TPL(@`AqynwPx#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&01jnXNoGw=04e|g z00;m8000000Mb*F0005nNklA6aHeeS7u@ONV8_Psyyf4np&Cc$r=nszlb93{}H+y&Czi1R=ZC09L zUQ8Ff&hqos61K!*q>4xiPcM2bw%;G|I)|HKkH_}$D4M@nj7gBpgJNWy*P+^uUphxT zg4XqAG5Z4Ic*bhG>lhWsLm4y*nxb$*CRKtnh-oxfn;7fyjih-yshR~lD3zJh` z6-c*)cIbiF)HB&XkjZW*oUiZkrNKVM*; zBMoIaCZuaAW_80W2ClP(iB!ucj}M`He_O0 zijuH*wsalNmigLQ+bHgo8BXu`KH@E);X0NHPR3U}0xeFW{q{D`5$hFDI%DZrK7d4L z-GfpAa!qqUdvZ<47n9C8`;3u@M$9eI7}~ihY`K+aK`X|CI$LSAuFOkH!m0ZjwA>Z8 tlFDTC)4)rXiUmpGy6uah#Xp5Z_yD^Z0ZXsv-CY0x002ovPDHLkV1nY=2s!`& literal 0 HcmV?d00001 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 c31676677416b41e8e0e6c7f3285e59d56b84058..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0hdWcK~zXft&+=4 z#6S=Q_lSfLgu#^qK@h@5KqRC=5(GdvoDmXNqaM2KH|?H}yxUR_H04)<2(w%b#<9w z`T0%7h6WREKQlQql^U+v>f`lhF)|^jm|#$GoHfNJ{QkTzAj#gmCpM7s3(#+hk*YX@ zuuMuHsfwBH+~>0^|4RoW2%16fT(vJ<8j(qqxaW#?X?PEnD6O69|C*H^j>u%%2foGNs(slo zhV_Udh(g6xbur8&5q1yDV)YKQnc?HhYZN+~kLz^$13FtXs6KuvumAu607*qoM6N<$ Ef~W1?W&i*H 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 {