Merge pull request #31 from spj2401Dev/minus-point-on-picture-remove

#28

client/pages/setWords/index.html

@@ -36,6 +36,11 @@ <h1 class="header-text">Set Prompts</h1>
         <input type="number" placeholder="3" max="1000" min="1" step="1" id="votes" class="number-input">
     </div>
 
+    <div class="block">
+        <input type="checkbox" id="penalty">
+        <label for="isTeam">One Point penalty for invalid Photo</label>
+    </div>
+
     <div class="block">
         <button class="button" id="word-suggestion">✨ Suggest Words</button>
     </div>

client/pages/setWords/script.js

@@ -72,6 +72,7 @@ function submitPrompts() {
   const promptInputs = promptContainer.getElementsByTagName("input");
   const time = document.getElementById("duration").value;
   const votes = document.getElementById("votes").value;
+  const penalty = document.getElementById("penalty").checked;
   const prompts = [];
 
   if (time < 1) {
@@ -108,6 +109,7 @@ function submitPrompts() {
     wordsPerPlayer: wordsPerPlayer,
     time: time,
     votesPerPlayer: votes,
+    penalty: penalty,
   };
 
   fetch("/words", {

src/controller/photoController.mjs

@@ -3,10 +3,12 @@ import {
   AddImageToPlayer,
   GetFullPlayers,
   DeclinePhoto,
+  AddVoteToWord
 } from "../services/playerService.mjs";
 import path from "path";
 import webSocketService from "../services/webSocketService.mjs";
 import fs from 'fs';
+import { game } from "../models/game.mjs";
 
 const uploadDir = "data/photos/";
 
@@ -109,6 +111,10 @@ export const DeclinePhotoController = async (req, res) => {
   const word = req.body.word;
   DeclinePhoto(playername, word);
 
+  if (game.removePoints) {
+    AddVoteToWord(word, playername, -1);
+  }
+
   webSocketService.broadcast("Decline");
 
   res.status(200).send("Photo declined.");

src/controller/wordController.mjs

@@ -13,6 +13,7 @@ export const setWords = async (req, res) => {
   wordsPerPlayer = req.body.wordsPerPlayer;
   var time = req.body.time; // Time in Minutes
   var votes = req.body.votesPerPlayer;
+  var penalty = req.body.penalty;
 
   if (words.length + wordlist.length < wordsPerPlayer) {
     return res.status(400).json({
@@ -28,6 +29,7 @@ export const setWords = async (req, res) => {
   userWordList = words;
   game.time = time;
   game.votesPerPlayer = votes;
+  game.removePoints = penalty;
 
   await changeGameStatus(GameStatus.STARTING)
   webSocketService.broadcast('Words');

src/models/game.mjs

@@ -7,4 +7,5 @@ export const game = {
     endTime: new Date(),
     words: [],
     votesPerPlayer: 0,
+    removePoints: false, // If true, one point is removed from the player if one of their pictures gets deleted by an Admin
 };

src/services/playerService.mjs

@@ -109,7 +109,7 @@ export function GetWinner() {
   players.forEach((p) => {
     if (!rankList.some((player) => player.player === p.name)) {
       let completedPhotos = p.words.filter((w) => w.completed === true);
-      let votesScore = completedPhotos.reduce((acc, word) => acc + word.votes, 0);
+      let votesScore = p.words.reduce((acc, word) => acc + word.votes, 0);
       let totalScore = completedPhotos.length + votesScore;
 
       rankList.push({
@@ -157,7 +157,7 @@ export function VoteForPlayer(playername) {
   }
 }
 
-export function AddVoteToWord(word, playername) {
+export function AddVoteToWord(word, playername, amount = 1) {
   let player = players.find((p) => p.name === playername);
   if (!player) {
     return;
@@ -166,7 +166,7 @@ export function AddVoteToWord(word, playername) {
   if (!targetWord) {
     return;
   }
-  targetWord.votes += 1;
+  targetWord.votes += amount;
 }
 
 export function getVoteAmount(playername) {