Melron and Moregano by Besjbo7 · Pull Request #761 · vck3000/ProAvalon

Besjbo7 · 2026-01-07T02:39:23Z

Adding two new roles:

Melron is a Resistance member who thinks that they are Merlin. They see an appropriate number of players as Spies, but their information is random.

Moregano is a Resistance member who thinks that they are Morgana. They see an appropriate number of players as Spymates, but their information is random. They can try to Fail, but it will be logged as a Success.

added Melron/Moregano enum Role

yarn.lock

vck3000 · 2026-02-02T03:22:36Z

src/gameplay/gameEngine/roles/avalon/melron.ts

+    this.room = thisRoom;
+  }
+
+private cachedSpyUsernames?: string[];


Suggested change

private cachedSpyUsernames?: string[];

private cachedSpyUsernames: string[] = [];

Something like this? Can just default it to empty list :).

Also let's call the list spiesThatMelronSees or something similar :).

Changed the name of the list - but if the default state is an empty list, it never initializes making a list, since right now it's triggered by there being no list. I can rework if that's a sloppy way to do it but for now this is necessary.

vck3000 · 2026-02-02T03:23:21Z

src/gameplay/gameEngine/roles/avalon/melron.ts

+    this.room = thisRoom;
+  }
+
+private cachedSpyUsernames?: string[];


Also tabbing is a bit off here haha. Can you use prettier to format this? It's a tool that helps you format files. I have a .prettierrc file in the repo that your tool should pick up automatically.

Used prettier!

vck3000 · 2026-02-02T03:24:13Z

src/gameplay/gameEngine/roles/avalon/melron.ts

+      if (p.alliance === Alliance.Spy) {
+        realSpyCount++;
+        if (p.role === Role.Mordred || p.role === Role.MordredAssassin) {
+          hasMordred = true;


Can we just do realSpyCount-- here instead of tracking hasMordred?
Let's us remove L47 below as well.

Good catch, changed.

vck3000 · 2026-02-02T03:26:49Z

src/gameplay/gameEngine/roles/avalon/melron.ts

+    const self = this.getSelfUsername();
+    const pool = this.room.playersInGame
+      .map((p: any) => p.username)
+      .filter((u: string) => u !== self);


Can you instead filter based on role? So something like

const pool = this.room.playersInGame .map((p: any) => p.role) .filter((role: Role) => role !== Melron);

This means we can also remove this.getSelfUsername()

Now filtering on role and got rid of getselfusername

vck3000 · 2026-02-02T03:28:45Z

src/gameplay/gameEngine/roles/avalon/melron.ts

+    // Shuffle once and cache picks
+    for (let i = pool.length - 1; i > 0; i--) {
+      const j = Math.floor(Math.random() * (i + 1));
+      [pool[i], pool[j]] = [pool[j], pool[i]];
+    }


Could we pull this logic out to a helper or utils file? I think this logic also existed in game.ts from memory.
Would be great to unify these!

Used shuffleArray, thanks!

vck3000 · 2026-02-02T03:32:43Z

src/gameplay/gameEngine/roles/avalon/moregano.ts

+    this.room = thisRoom;
+  }
+
+private cachedSpyUsernames?: string[]; // includes self username as first element


Let's rename this as well similar to my comment in melron.ts :)

As above, in current architecture having the default state by empty breaks things

vck3000 · 2026-02-02T03:33:42Z

src/gameplay/gameEngine/roles/avalon/moregano.ts

+    for (const p of this.room.playersInGame) {
+      if (p.alliance === Alliance.Spy) {
+        realSpyCount++;
+        if (p.role === Role.Oberon) hasOberon = true;


similar to hasMord, let's just realSpyCount--

vck3000 · 2026-02-02T03:36:46Z

src/gameplay/gameEngine/roles/avalon/moregano.ts

+
+    const pool = this.room.playersInGame
+      .map((p: any) => p.username)
+      .filter((u: string) => u !== self);


Let's do a similar thing here too :). Filter by role so we can remove getSelfUsername.

As above, done!

vck3000 · 2026-02-02T03:37:11Z

src/gameplay/gameEngine/roles/avalon/moregano.ts

+  if (!this.room.gameStarted) return { spies: [], roleTags: {} };
+
+  const self = this.getSelfUsername();
+  if (!self) return { spies: [], roleTags: {} };


I don't think we'll need this check. If a Moregano object/role exists in the game, I think it's safe to assume there'll be a username that exists :).

Deleted the check

vck3000 · 2026-02-02T03:38:45Z

src/gameplay/gameEngine/roles/avalon/moregano.ts

+        return this.room.playersInGame[i].username;
+      }
+    }
+    return '';


If we were to keep this function, we'd probably first move it to game.ts and then it'd be a good idea to return a string | null, so that it's clear to the caller that the return value may not be valid.

The function is gone anyway :)

vck3000 · 2026-02-02T03:39:12Z

src/gameplay/gameEngine/roles/roles.ts

  [MordredAssassin.role]: MordredAssassin,
  [Hitberon.role]: Hitberon,
+
+    [Melron.role]: Melron,


Indenting a bit funny :(

vck3000 · 2026-02-02T03:39:26Z

src/gameplay/gameEngine/roles/types.ts

  MordredAssassin = 'MordredAssassin',
  Hitberon = 'Hitberon',
+
+    // ADD THESE TWO


Let's remove the comment :).

vck3000 · 2026-02-02T03:40:24Z

src/gameplay/gameEngine/game.ts

+for (let i = 0; i < this.playersInGame.length; i++) {
+  const p = this.playersInGame[i];
+  if (p.role === Role.Melron) {
+    p.displayRole = Role.Merlin;   // Melron thinks they are Merlin
+  } else if (p.role === Role.Moregano) {
+    p.displayRole = Role.Morgana;  // Moregano thinks they are Morgana
+    (p as any).displayAlliance = Alliance.Spy;
+  }
+}


Is it possible to use a for (const player of this.playersInGame) loop?

Good idea, implemented.

vck3000 · 2026-02-02T03:45:00Z

src/gameplay/gameEngine/game.ts

+    p.displayRole = Role.Merlin;   // Melron thinks they are Merlin
+  } else if (p.role === Role.Moregano) {
+    p.displayRole = Role.Morgana;  // Moregano thinks they are Morgana
+    (p as any).displayAlliance = Alliance.Spy;


Can you remove the as any's here?

vck3000 · 2026-02-02T03:46:23Z

src/gameplay/gameEngine/game.ts

+const effectiveAlliance =
+  (playerRoles[i] as any).displayAlliance !== undefined
+    ? (playerRoles[i] as any).displayAlliance
+    : playerRoles[i].alliance;


Can we simplify this to
const effectiveAlliance = playerRoles[i].displayAlliance ? playerRoles[i].displayAlliance : playerRoles[i].alliance?

Simplified!

vck3000 · 2026-02-02T03:48:03Z

src/gameplay/gameEngine/phases/common/votingMission.ts

+const effectiveAlliance =
+  (player as any).displayAlliance !== undefined
+    ? (player as any).displayAlliance
+    : player.alliance;


Let's also simplify this - see prior comment pls

I wasn't actually able to figure out how to simplify this one - it doesn't compile if I use analogous language to game.ts. If this is a problem I'll try to figure it out...

vck3000 · 2026-02-02T03:57:20Z

src/gameplay/gameEngine/roles/avalon/melron.ts

+    this.room = thisRoom;
+  }
+
+private cachedSpyUsernames?: string[];


Do you think it'd be nice for the game to announce who was melron and moregano and what team they saw?

Can you also confirm whether the moment the game ends, melron and moregano see the true spy team in the end screen?

Nice all good, just confirmed the end screen looks good :).

Let's get an announcement in chat to specify who melron and moregano saw.

Got that postgame announcement feature working!

vck3000 · 2026-02-02T04:01:02Z

src/gameplay/gameEngine/roles/avalon/moregano.ts

Can you ask AI to add a unit test to ensure that moregano fail attempts are changed to a success pls?

Unit test added and succeeds.

Besjbo7 and others added 8 commits January 6, 2026 21:34

Update types.ts

5b37f1f

added Melron/Moregano enum Role

Create melron.ts

d237ca0

Create moregano.ts

bdf3508

Update roles.ts

22f264e

Update roles.ts

a54742f

Update game.ts

0811d3d

Update votingMission.ts

5c4eca6

Fix Moregano UI and stabilize Melron/Moregano vision

db2849e

vck3000 reviewed Feb 2, 2026

View reviewed changes

yarn.lock Show resolved Hide resolved

vck3000 reviewed Feb 2, 2026

View reviewed changes

	private cachedSpyUsernames?: string[];
	private cachedSpyUsernames: string[] = [];

Comments

Conversation

Besjbo7 commented Jan 7, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vck3000 Feb 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

vck3000 Feb 2, 2026 •

edited

Loading