added deep copying for abilities

Author: JamesCraster

.gitignore

@@ -7,7 +7,8 @@ bundle.js
 
 node_modules
 
+coverage
+test/*.js
 #Ignore notes
 TODO.txt
 .DS_Store
-

games/classic/classic.ts

@@ -481,25 +481,16 @@ export class Classic extends Game {
     this.tallyInterval = setInterval(this.tallyVotes.bind(this), 1000);
   }
   private tallyVotes() {
-    let count = 0;
     let defendant = 0;
     let aliveCount = this.players.filter(player => player.alive).length;
-    let beginTrial: boolean = false;
-    for (let i = 0; i < this.players.length; i++) {
-      count = 0;
-      if (beginTrial) {
+    let beginTrial = false;
+    for (let possibleDefendant of this.players) {
+      let count = this.players.map(elem => (elem.vote == possibleDefendant.user.id ? 1 : 0)).reduce<number>((acc, val) => acc + val, 0);
+      if (count >= Math.floor(aliveCount / 2) + 1) {
+        beginTrial = true;
+        defendant = this.players.indexOf(possibleDefendant);
         break;
       }
-      for (let j = 0; j < this.players.length; j++) {
-        if (this.players[j].vote == this.players[i].user.id) {
-          count++;
-        }
-        if (count >= Math.floor(aliveCount / 2) + 1) {
-          beginTrial = true;
-          defendant = i;
-          break;
-        }
-      }
     }
     if (beginTrial) {
       this.trialClock.stop();

games/classic/classicPlayer.ts

@@ -33,20 +33,35 @@ export class ClassicPlayer extends Player {
   //the username of the player that this player is nominating during the trial
   private _vote: string = "";
   private _finalVote: string = FinalVote.abstain;
+  //! Important: Roles are immutable, so to keep track of uses of abilities etc, a deep copy of abilities is made.
+  //! This deep copy is accessible by .abilities. Whenever role is updated, _abilities must be updated too.
+  //! The setter for roles will do this automatically.
+  //! TLDR: don't use this._role, use this.role instead.
   private _role: Role;
+  private _abilities: Array<{ ability: Ability; uses?: number }> = [];
   private _winLynchTarget: ClassicPlayer | undefined = undefined;
+  //the abilities of this player
   constructor(user: User, role: Role) {
     super(user);
     this._role = role;
+    this._abilities = Array.from(role.abilities) as Array<{ ability: Ability; uses?: number }>;
   }
   public get alive() {
     return this._alive;
   }
   public get role() {
     return this._role;
   }
+  public set role(role: Role) {
+    this._role = role;
+    //give the player their abilities
+    this._abilities = Array.from(role.abilities) as Array<{ ability: Ability; uses?: number }>;
+  }
+  public get abilities() {
+    return this._abilities;
+  }
   public upgradeToGodfather() {
-    this._role = Roles.godfather;
+    this.role = Roles.godfather;
     this.user.send("You have been promoted to godfather - now you get final say on who to kill.");
   }
   get winLynchTarget() {
@@ -62,13 +77,13 @@ export class ClassicPlayer extends Player {
     this._hanged = true;
   }
   public get alignment(): Alignment {
-    return this._role.alignment;
+    return this.role.alignment;
   }
   public get roleName(): string {
-    return this._role.roleName;
+    return this.role.roleName;
   }
   public isRole(role: Role): boolean {
-    return this._role.roleName == role.roleName;
+    return this.role.roleName == role.roleName;
   }
   public set target(target: string) {
     this._target = target;
@@ -80,13 +95,13 @@ export class ClassicPlayer extends Player {
     this._target = "";
   }
   public get winCondition() {
-    return this._role.winCondition;
+    return this.role.winCondition;
   }
   public resetAfterNight() {
     this.clearTarget();
     this._healed = false;
     this._mafiaVotes = 0;
-    this._roleBlocked = false;
+    this.roleBlocked = false;
   }
   public resetAfterTrial() {
     this._vote = "";
@@ -99,7 +114,7 @@ export class ClassicPlayer extends Player {
     return this._healed;
   }
   public roleBlock() {
-    this._roleBlocked = true;
+    this.roleBlocked = true;
   }
   get roleBlocked() {
     return this._roleBlocked;
@@ -146,10 +161,4 @@ export class ClassicPlayer extends Player {
   public get finalVote() {
     return this._finalVote;
   }
-  public get abilities(): Array<{
-    ability: Ability;
-    uses?: number | undefined;
-  }> {
-    return this._role.abilities;
-  }
 }

games/classic/roles.ts

@@ -34,26 +34,26 @@ type WinCondition = (player: ClassicPlayer, game: Classic) => boolean;
 type GameEndCondition = (game: Classic) => boolean;
 
 export type Ability = {
-  condition: (
+  readonly condition: (
     targetPlayer: ClassicPlayer,
     game: Classic,
     player?: Player,
   ) => boolean | undefined;
-  action: (
+  readonly action: (
     targetPlayer: ClassicPlayer,
     game: Classic,
     player?: ClassicPlayer,
   ) => void;
 };
 
 export interface Role {
-  roleName: string;
-  alignment: Alignment;
-  winCondition: WinCondition;
-  abilities: Array<{ ability: Ability; uses?: number }>;
-  passives: Array<Passives>;
-  color?: Colors;
-  backgroundColor?: Colors;
+  readonly roleName: string;
+  readonly alignment: Alignment;
+  readonly winCondition: WinCondition;
+  abilities: Readonly<Array<Readonly<{ ability: Ability; uses?: number }>>>;
+  readonly passives: Array<Passives>;
+  readonly color?: Colors;
+  readonly backgroundColor?: Colors;
 };
 
 export namespace GameEndConditions {