hotfix: vice president & versatile (#1331)

Co-authored-by: DrSharky <[email protected]>
UltiMafia · Dec 17, 2023 · 611e33e · 611e33e
1 parent 3d35ece
commit 611e33e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/Games/types/Mafia/roles/cards/ElectOnPresidentDeath.js b/Games/types/Mafia/roles/cards/ElectOnPresidentDeath.js
@@ -6,8 +6,12 @@ module.exports = class ElectOnPresidentDeath extends Card {
 
     this.listeners = {
       death: function (player) {
-        if (this.player.alive && player.role.name === "President") {
-          this.player.setRole("President");
+        if (
+          player !== this.player &&
+          player.role.name === "President" &&
+          this.player.alive
+        ) {
+          this.player.setRole(`${player.role.name}:${player.role.modifier}`, player.role.data);
         }
       },
     };

diff --git a/Games/types/Mafia/roles/cards/InheritFirstDeadAligned.js b/Games/types/Mafia/roles/cards/InheritFirstDeadAligned.js
@@ -11,14 +11,7 @@ module.exports = class InheritFirstDeadAligned extends Card {
           !isVanillaRole(player) &&
           this.player.alive
         ) {
-          this.actor.setRole(
-              `${this.target.role.name}:${this.target.role.modifier}`,
-              this.target.role.data,
-              false,
-              false,
-              true
-          );
-          this.game.events.emit("roleAssigned", this.actor);
+          this.player.setRole(`${player.role.name}:${player.role.modifier}`, player.role.data);
         }
       },
     };

diff --git a/Games/types/Mafia/roles/cards/KillAlignedOnDeath.js b/Games/types/Mafia/roles/cards/KillAlignedOnDeath.js
@@ -14,13 +14,8 @@ module.exports = class KillAlignedOnDeath extends Card {
           return;
         }
 
-        this.player.role.data.position = this.player.role.modifier;
-        if (this.player.role.name === "President") {
-          this.player.role.data.position = this.player.role.name;
-        }
-
         this.game.queueAlert(
-          `${this.player.name} has been elected as the ${this.player.role.data.position}! Protect them at all costs!`,
+          `${this.player.name} is the ${this.player.role.modifier}! Protect them at all costs!`,
           0,
           this.game.players.filter(
             (p) => p.role.alignment === this.player.role.alignment
@@ -32,15 +27,6 @@ module.exports = class KillAlignedOnDeath extends Card {
           return;
         }
 
-        if (this.name == "President") {
-          const vicePresidents = this.game.players.filter(
-            (p) => p.role.name == "Vice President"
-          );
-          if (vicePresidents.length > 0) {
-            return;
-          }
-        }
-
         for (let p of this.game.alivePlayers()) {
           if (p.role.alignment === this.player.role.alignment) {
             p.kill("basic", this.player, instant);

diff --git a/Games/types/Mafia/roles/cards/WinWithMafia.js b/Games/types/Mafia/roles/cards/WinWithMafia.js
@@ -117,6 +117,10 @@ module.exports = class WinWithMafia extends Card {
       },
       death: function (player) {
         if (player.role.name == "President") {
+          const vicePresidents = this.game.players.filter((p) => p.role.name == "Vice President");
+          if (vicePresidents.length > 0) {
+            return;
+          }
           this.killedPresident = true;
         }
       },