merge

JamesCraster · Feb 4, 2019 · 38af195 · 38af195
2 parents b4641bf + 6b29d23
commit 38af195
Show file tree

Hide file tree

Showing 19 changed files with 2,950 additions and 374 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -44,6 +44,8 @@ This guide includes instructions on how to easily build OpenWerewolf from source
 
 - [Install Node.js](https://nodejs.org/en/)
 
+- [Install Redis](https://redis.io/download)
+
 - Unzip release.zip, and run:
 
 ```

diff --git a/Core/core.ts b/Core/core.ts
@@ -17,3 +17,4 @@ export { Server } from "./server";
 export { Game, MessageRoom } from "./game";
 export { User } from "./user";
 export { Utils, Colors, Stopwatch } from "./utils";
+export { Player } from "./player";
diff --git a/Core/game.ts b/Core/game.ts
@@ -75,6 +75,7 @@ export abstract class Game {
     this.author = author;
     this.license = license;
     setInterval(this.pregameLobbyUpdate.bind(this), 500);
+    setInterval(this.update.bind(this), 500);
   }
   public get name() {
     return this._name;
@@ -88,6 +89,7 @@ export abstract class Game {
   public get users() {
     return this._users;
   }
+  protected update() {}
   get usernameColorPairs(): Array<NameColorPair> {
     let usernameColorPairs = [];
     for (let i = 0; i < this._users.length; i++) {

diff --git a/Games/Classic/Classic.ts b/Games/Classic/Classic.ts
@@ -444,7 +444,15 @@ export class Classic extends Game {
         ]);
         break;
       case Alignment.neutral:
-        player.user.send(`You are a ${role}`, undefined, player.role.color);
+        if (player.role.backgroundColor) {
+          player.user.send(
+            `You are a ${role}`,
+            undefined,
+            player.role.backgroundColor,
+          );
+        } else {
+          player.user.send(`You are a ${role}`, undefined, player.role.color);
+        }
         player.user.headerSend([
           { text: "You are a ", color: Colors.white },
           { text: role, color: player.role.color },

diff --git a/Games/Classic/Roles.ts b/Games/Classic/Roles.ts
@@ -52,6 +52,7 @@ export type Role = {
   abilities: Array<{ ability: Ability; uses?: number }>;
   passives: Array<Passives>;
   color?: Colors;
+  backgroundColor?: Colors;
 };
 
 export namespace GameEndConditions {
@@ -225,7 +226,8 @@ export namespace Roles {
     roleName: "survivor",
     alignment: Alignment.neutral,
     winCondition: WinConditions.survive,
-    color: Colors.yellow,
+    color: Colors.brightYellow,
+    backgroundColor: Colors.yellow,
     abilities: [],
     passives: [],
   };

diff --git a/Games/Local/List.json b/Games/Local/List.json
@@ -0,0 +1,143 @@
+{
+    "defaultLists": [
+        [
+            "mafioso",
+            "jester",
+            "sherrif",
+            "vigilante"
+        ],
+        [
+            "mafioso",
+            "doctor",
+            "escort",
+            "sherrif",
+            "survivor"
+        ],
+        [
+            "mafioso",
+            "doctor",
+            "escort",
+            "sherrif",
+            "survivor",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie"
+        ],
+        [
+            "mafioso",
+            "mafioso",
+            "doctor",
+            "vigilante",
+            "sherrif",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie",
+            "townie"
+        ]
+
+    ]
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     - [Install Node.js](https://nodejs.org/en/)
+    - [Install Redis](https://redis.io/download)
     - Unzip release.zip, and run:
     ```
@@ Expand Down @@