miller refactor

Games/types/Mafia/items/Suit.js

@@ -4,6 +4,7 @@ module.exports = class Suit extends Item {
   constructor(options) {
     super("Suit");
     this.type = options?.type;
+    this.identity = options?.identity;
     this.concealed = options?.concealed;
     if (this.concealed) {
       this.cannotBeSnooped = true;
@@ -16,6 +17,7 @@ module.exports = class Suit extends Item {
     player.role.appearance.reveal = this.type;
     player.role.appearance.investigate = this.type;
     player.role.appearance.condemn = this.type;
+    player.role.appearance.self = this.identity;
     player.role.hideModifier = {
       death: true,
       reveal: true,

Games/types/Mafia/roles/Village/Miller.js

@@ -5,6 +5,6 @@ module.exports = class Miller extends Role {
     super("Miller", player, data);
 
     this.alignment = "Village";
-    this.cards = ["VillageCore", "WinWithVillage", "AppearAsMafioso"];
+    this.cards = ["VillageCore", "WinWithVillage", "AppearAsRandomEvil"];
   }
 };

Games/types/Mafia/roles/cards/AppearAsRandomEvil.js

@@ -0,0 +1,33 @@
+const Card = require("../../Card");
+const Random = require("../../../../../lib/Random");
+
+module.exports = class AppearAsRandomEvil extends Card {
+  constructor(role) {
+    super(role);
+
+    this.listeners = {
+      roleAssigned: function (player) {
+        if (player !== this.player) {
+          return;
+        }
+
+        let roles = [];
+
+        for (let player of this.game.players) {
+          let roleName = player.role.name;
+          let roleAignment = player.role.alignment;
+          if (
+            roleAignment === "Mafia" ||
+            roleAignment === "Cult"
+          ) {
+            roles.push(roleName);
+          }
+        }
+
+        const roleAppearance = Random.randArrayVal(roles);
+        const selfAppearance = role.name == "Miller" ? "Villager" : "real";
+        this.player.holdItem("Suit", { type: roleAppearance, identity: selfAppearance, concealed: true });
+      },
+    };
+  }
+};

Games/types/Mafia/roles/cards/AppearAsRandomRole.js

@@ -26,7 +26,6 @@ module.exports = class AppearAsRandomRole extends Card {
 
         const roleAppearance = Random.randArrayVal(roles);
         this.player.holdItem("Suit", { type: roleAppearance, concealed: true });
-        this.player.queueAlert(roleAppearance);
       },
     };
   }

data/modifiers.js

@@ -195,27 +195,27 @@ const modifierData = {
         "If this player is shot or targeted for a kill, will bleed and then die in one day.",
     },
     Shady: {
-      internal: ["AppearAsMafioso"],
+      internal: ["AppearAsRandomEvil"],
       description:
-        "Appears as Mafioso when investigated or condemned. Appears as their real role on death.",
-      incompatible: ["Blasphemous", "Faceless", "Unassuming"],
+        "Appears as a random role in the game that is Mafia/Cult-aligned.",
+      incompatible: ["Camouflaged", "Faceless", "Unassuming"],
     },
-    Blasphemous: {
-      internal: ["AppearAsCultist"],
+    Camouflaged: {
+      internal: ["AppearAsRandomRole"],
       description:
-        "Appears as Cultist when investigated or condemned. Appears as their real role on death.",
+        "Appears as a random role in the game that is not Villager, Impersonator or Impostor.",
       incompatible: ["Shady", "Faceless", "Unassuming"],
-    },
+  },
     Faceless: {
       internal: ["AppearAsFliplessOnDeath"],
       description:
         "Player's role will be hidden from the town when condemned or on death.",
-      incompatible: ["Shady", "Blasphemous", "Unassuming"],
+      incompatible: ["Shady", "Camouflaged", "Unassuming"],
     },
     Unassuming: {
       internal: ["AppearAsVillagerOnDeath"],
       description: "Appears as Villager when condemned or on death.",
-      incompatible: ["Shady", "Blasphemous", "Faceless"],
+      incompatible: ["Shady", "Camouflaged", "Faceless"],
     },
     Noisy: {
       internal: ["RevealNameToTarget"],
@@ -338,11 +338,6 @@ const modifierData = {
       internal: ["DisguiseAsTarget"],
       description: "Gains a suit of each target's role.",
     },
-    Camouflaged: {
-      internal: ["AppearAsRandomRole"],
-      description:
-        "Appears as a random role in the game that is not Villager, Impersonator or Impostor.",
-    },
     Omniscient: {
       internal: ["Omniscient"],
       description: "Each night see all visits and learn all players roles.",

data/renamedModifiers.js

@@ -7,5 +7,6 @@ module.exports = {
     Loudmouthed: "Loud",
     Gossipy: "Loud",
     Oblivious: "Lone",
+    Blasphemous: "Shady",
   },
 };

data/renamedRoles.js

@@ -61,6 +61,7 @@ module.exports = {
     Poltergeist: "Hooker",
     Quartermaster: "Gunsmith",
     Benandante: "Grouch",
+    Occultist: "Miller",
   },
   Ghost: {
     Town: "Villager",

data/roles.js

@@ -63,19 +63,7 @@ const roleData = {
       category: "Basic",
       description: [
         "Appears as Villager to self.",
-        "Appears as Mafioso to investigative roles.",
-        "Appears as Mafioso upon being condemned.",
-        "Appears as Miller upon being killed.",
-      ],
-    },
-    Occultist: {
-      alignment: "Village",
-      category: "Basic",
-      description: [
-        "Appears as Villager to self.",
-        "Appears as Cultist to investigative roles.",
-        "Appears as Cultist upon being condemned.",
-        "Appears as Occultist upon being killed.",
+        "Appears as a random role in the game that is Mafia/Cult-aligned to investigative roles and upon being killed.",
       ],
     },
     "Party Host": {