Gambler fix (#1780)

Gambler Works
UltiMafia · Dec 11, 2024 · 16559f3 · 16559f3
1 parent c8efd7c
commit 16559f3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/Games/types/Mafia/roles/Independent/Astrologer.js b/Games/types/Mafia/roles/Independent/Astrologer.js
@@ -7,16 +7,5 @@ module.exports = class Astrologer extends Role {
     this.alignment = "Independent";
     this.winCount = "Village";
     this.cards = ["VillageCore", "MakeTargetsInLove", "WinIfPairedLoversAlive"];
-
-    this.listeners = {
-      roleAssigned: function (player) {
-        if (player !== this.player) {
-          return;
-        }
-        this.player.queueAlert(
-          "As above, so below. Observe the motions of the planets and find a pair of lovers that will rebuild this wretched town after it falls."
-        );
-      },
-    };
   }
 };
diff --git a/Games/types/Mafia/roles/Independent/Gambler.js b/Games/types/Mafia/roles/Independent/Gambler.js
@@ -6,17 +6,5 @@ module.exports = class Gambler extends Role {
 
     this.alignment = "Independent";
     this.cards = ["VillageCore", "ChallengeTarget", "WinWithTwoGambleWins"];
-
-    this.listeners = {
-      roleAssigned: function (player) {
-        if (player !== this.player) {
-          return;
-        }
-
-        this.player.queueAlert(
-          ":dice6: Everything this Village does is based on chance. Show them the odds and prove that the house doesn't always win."
-        );
-      },
-    };
   }
 };
diff --git a/Games/types/Mafia/roles/cards/ChallengeTarget.js b/Games/types/Mafia/roles/cards/ChallengeTarget.js
@@ -9,6 +9,9 @@ module.exports = class ChallengeTarget extends Card {
         if (player !== this.player) {
           return;
         }
+        this.player.queueAlert(
+          ":dice6: Everything this Village does is based on chance. Show them the odds and prove that the house doesn't always win."
+        );
         this.data.meetingName = "Gamble with " + this.player.name;
       },
     };

diff --git a/Games/types/Mafia/roles/cards/WinIfPairedLoversAlive.js b/Games/types/Mafia/roles/cards/WinIfPairedLoversAlive.js
@@ -5,6 +5,17 @@ module.exports = class WinIfPairedLoversAlive extends Card {
   constructor(role) {
     super(role);
 
+    this.listeners = {
+      roleAssigned: function (player) {
+        if (player !== this.player) {
+          return;
+        }
+        this.player.queueAlert(
+          "As above, so below. Observe the motions of the planets and find a pair of lovers that will rebuild this wretched town after it falls."
+        );
+      },
+    };
+
     this.winCheck = {
       priority: PRIORITY_WIN_CHECK_DEFAULT,
       againOnFinished: true,