From 9afec3f372fa417b620488ba47cafa23eb29cc2f Mon Sep 17 00:00:00 2001
From: Oliver-Akins <Tyler.Akins1999@gmail.com>
Date: Sun, 10 Jan 2021 16:31:25 -0700
Subject: [PATCH] Move guesser limit to config file.

---
 server/src/events/UpdatePlayer.ts | 18 +++++++++---------
 server/src/types/config.d.ts      |  1 +
 server/template.toml              |  2 ++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/server/src/events/UpdatePlayer.ts b/server/src/events/UpdatePlayer.ts
index f2dff42..9cc3799 100644
--- a/server/src/events/UpdatePlayer.ts
+++ b/server/src/events/UpdatePlayer.ts
@@ -85,11 +85,11 @@ const modifyPlayer = (io: Server, socket: Socket, data: UpdatePlayer): void => {
 
 		switch (data.to.role) {
 			case "guesser":
-				if (team.guessers.length >= 7) {
-					game.log.debug(`Game cannot have more than 7 guessers`);
+				if (team.guessers.length >= conf.game.guesser_limit) {
+					game.log.debug(`Game cannot have more than ${conf.game.guesser_limit} guessers`);
 					socket.emit(`PlayerUpdate`, {
 						status: 403,
-						message: `A team can't have 8 or more ${conf.game.guesser_name}`,
+						message: `That team already has the maximum number of ${conf.game.guesser_name}s`,
 						source: `UpdatePlayer.Modify`
 					});
 					return;
@@ -128,11 +128,11 @@ const modifyPlayer = (io: Server, socket: Socket, data: UpdatePlayer): void => {
 		let team = game.teams[data.to.team - 1];
 		switch (data.to.role) {
 			case "guesser":
-				if (team.guessers.length >= 7) {
-					game.log.debug(`Game cannot have more than 7 guessers`);
+				if (team.guessers.length >= conf.game.guesser_limit) {
+					game.log.debug(`Game cannot have more than ${conf.game.guesser_limit} guessers`);
 					socket.emit(`PlayerUpdate`, {
 						status: 403,
-						message: `A team can't have 8 or more ${conf.game.guesser_name}`,
+						message: `That team already has the maximum number of ${conf.game.guesser_name}s`,
 						source: `UpdatePlayer.Modify`
 					});
 					return;
@@ -181,11 +181,11 @@ const modifyPlayer = (io: Server, socket: Socket, data: UpdatePlayer): void => {
 		switch (data.to.role) {
 			case "guesser":
 				// Ensure we don't get 8 guessers
-				if (newTeam.guessers.length >= 7) {
-					game.log.debug(`Game cannot have 8 or more guessers on a team.`);
+				if (newTeam.guessers.length >= conf.game.guesser_limit) {
+					game.log.debug(`That team already`);
 					socket.emit(`PlayerUpdate`, {
 						status: 403,
-						message: `Cannot have 8 players as ${conf.game.guesser_name}s on a single team.`,
+						message: `That team already has the maximum number of ${conf.game.guesser_name}s`,
 						source: `UpdatePlayer.Modify`
 					});
 					return;
diff --git a/server/src/types/config.d.ts b/server/src/types/config.d.ts
index dfda422..4e59563 100644
--- a/server/src/types/config.d.ts
+++ b/server/src/types/config.d.ts
@@ -17,6 +17,7 @@ interface config {
 		code_length: number;
 		writer_name: string;
 		guesser_name: string;
+		guesser_limit: number;
 		cards: {
 			type: `csv` | `sheets`;
 			key?: string;
diff --git a/server/template.toml b/server/template.toml
index 2d85d90..ca45d4b 100644
--- a/server/template.toml
+++ b/server/template.toml
@@ -11,6 +11,8 @@ code_length = 6
 writer_name = "Spirit"
 guesser_name = "Medium"
 
+# The limit of players that are allowed to be guessers on each team.
+guesser_limit = 7
 
 [game.cards]