refactor(game-play-validation): use canBeSkipped variable for valid…

…ating thief play (#740) Closes #724
antoinezanardi · Dec 12, 2023 · 482cd53 · 482cd53
1 parent 5486fe5
commit 482cd53
Show file tree

Hide file tree

Showing 3 changed files with 26,151 additions and 26,222 deletions.
diff --git a/src/modules/game/providers/services/game-play/game-play-validator.service.ts b/src/modules/game/providers/services/game-play/game-play-validator.service.ts
@@ -15,7 +15,6 @@ import type { GameAdditionalCard } from "@/modules/game/schemas/game-additional-
 import type { Game } from "@/modules/game/schemas/game.schema";
 import type { GamePlaySourceName } from "@/modules/game/types/game-play.type";
 import type { GameWithCurrentPlay } from "@/modules/game/types/game-with-current-play";
-import { WEREWOLF_ROLES } from "@/modules/role/constants/role.constant";
 import { RoleNames } from "@/modules/role/enums/role.enum";
 
 import { BadGamePlayPayloadReasons } from "@/shared/exception/enums/bad-game-play-payload-error.enum";
@@ -54,13 +53,10 @@ export class GamePlayValidatorService {
   }
 
   private validateGamePlayThiefChosenCard(chosenCard: GameAdditionalCard | undefined, game: GameWithCurrentPlay): void {
-    const { mustChooseBetweenWerewolves } = game.options.roles.thief;
-    if (!game.additionalCards || !mustChooseBetweenWerewolves) {
+    if (!game.additionalCards) {
       return;
     }
-    const werewolfRoleNames = WEREWOLF_ROLES.map(({ name }) => name);
-    const areAllAdditionalCardsWerewolves = game.additionalCards.every(({ roleName }) => werewolfRoleNames.includes(roleName));
-    if (areAllAdditionalCardsWerewolves && !chosenCard) {
+    if (!chosenCard && game.currentPlay.canBeSkipped === false) {
       throw new BadGamePlayPayloadException(BadGamePlayPayloadReasons.THIEF_MUST_CHOOSE_CARD);
     }
     if (chosenCard && chosenCard.recipient !== RoleNames.THIEF) {