feat(game-options): cupid must win with lovers game option (#779)

Closes #749
antoinezanardi · Dec 25, 2023 · ddf59bc · ddf59bc
1 parent f2ffed4
commit ddf59bc
Show file tree

Hide file tree

Showing 53 changed files with 36,218 additions and 33,986 deletions.
diff --git a/.run/Accursed Wolf-Father Role.run.xml b/.run/Accursed Wolf-Father Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@accursed-wolf-father-role&quot;" />
+    <arguments value="--tags &quot;@accursed-wolf-father-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Actor Role.run.xml b/.run/Actor Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@actor-role&quot;" />
+    <arguments value="--tags &quot;@actor-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Angel Role.run.xml b/.run/Angel Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@angel-role&quot;" />
+    <arguments value="--tags &quot;@angel-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Bear Tamer Role.run.xml b/.run/Bear Tamer Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@bear-tamer-role&quot;" />
+    <arguments value="--tags &quot;@bear-tamer-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Big Bad Wolf Role.run.xml b/.run/Big Bad Wolf Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@big-bad-wolf-role&quot;" />
+    <arguments value="--tags &quot;@big-bad-wolf-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Cupid Role.run.xml b/.run/Cupid Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@cupid-role&quot;" />
+    <arguments value="--tags &quot;@cupid-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Defender Role.run.xml b/.run/Defender Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@defender-role&quot;" />
+    <arguments value="--tags &quot;@defender-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Devoted Servant Role.run.xml b/.run/Devoted Servant Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@devoted-servant-role&quot;" />
+    <arguments value="--tags &quot;@devoted-servant-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Elder Role.run.xml b/.run/Elder Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@elder-role&quot;" />
+    <arguments value="--tags &quot;@elder-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Fox Role.run.xml b/.run/Fox Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@fox-role&quot;" />
+    <arguments value="--tags &quot;@fox-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Game Creation.run.xml b/.run/Game Creation.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@game-creation&quot;" />
+    <arguments value="--tags &quot;@game-creation&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Game History.run.xml b/.run/Game History.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@game-history&quot;" />
+    <arguments value="--tags &quot;@game-history&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Game Victory.run.xml b/.run/Game Victory.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@game-victory&quot;" />
+    <arguments value="--tags &quot;@game-victory&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Idiot Role.run.xml b/.run/Idiot Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@idiot-role&quot;" />
+    <arguments value="--tags &quot;@idiot-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Little Girl Role.run.xml b/.run/Little Girl Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@little-girl-role&quot;" />
+    <arguments value="--tags &quot;@little-girl-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Pied Piper Role.run.xml b/.run/Pied Piper Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@pied-piper-role&quot;" />
+    <arguments value="--tags &quot;@pied-piper-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Prejudiced Manipulator Role.run.xml b/.run/Prejudiced Manipulator Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@prejudiced-manipulator-role&quot;" />
+    <arguments value="--tags &quot;@prejudiced-manipulator-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Role.run.xml b/.run/Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@role&quot;" />
+    <arguments value="--tags &quot;@role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Rusty Sword Knight Role.run.xml b/.run/Rusty Sword Knight Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@rusty-sword-knight-role&quot;" />
+    <arguments value="--tags &quot;@rusty-sword-knight-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Scandalmonger Role.run.xml b/.run/Scandalmonger Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@scandalmonger-role&quot;" />
+    <arguments value="--tags &quot;@scandalmonger-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Scapegoat Role.run.xml b/.run/Scapegoat Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@scapegoat-role&quot;" />
+    <arguments value="--tags &quot;@scapegoat-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Sheriff Player Attribute.run.xml b/.run/Sheriff Player Attribute.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@sheriff-player-attribute&quot;" />
+    <arguments value="--tags &quot;@sheriff-player-attribute&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Stuttering Judge Role.run.xml b/.run/Stuttering Judge Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@stuttering-judge-role&quot;" />
+    <arguments value="--tags &quot;@stuttering-judge-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Thief Role.run.xml b/.run/Thief Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@thief-role&quot;" />
+    <arguments value="--tags &quot;@thief-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Three Brothers Role.run.xml b/.run/Three Brothers Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@three-brothers-role&quot;" />
+    <arguments value="--tags &quot;@three-brothers-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Two Sisters Role.run.xml b/.run/Two Sisters Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@two-sisters-role&quot;" />
+    <arguments value="--tags &quot;@two-sisters-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Villager-Villager Role.run.xml b/.run/Villager-Villager Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@villager-villager-role&quot;" />
+    <arguments value="--tags &quot;@villager-villager-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Vote Game Play.run.xml b/.run/Vote Game Play.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@vote-game-play&quot;" />
+    <arguments value="--tags &quot;@vote-game-play&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Werewolf Role.run.xml b/.run/Werewolf Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@werewolf-role&quot;" />
+    <arguments value="--tags &quot;@werewolf-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/White Werewolf Role.run.xml b/.run/White Werewolf Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@white-werewolf-role&quot;" />
+    <arguments value="--tags &quot;@white-werewolf-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Wild Child Role.run.xml b/.run/Wild Child Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@wild-child-role&quot;" />
+    <arguments value="--tags &quot;@wild-child-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Witch Role.run.xml b/.run/Witch Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@witch-role&quot;" />
+    <arguments value="--tags &quot;@witch-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/.run/Wolf-Hound Role.run.xml b/.run/Wolf-Hound Role.run.xml
@@ -5,7 +5,7 @@
     <scripts>
       <script value="test:cucumber" />
     </scripts>
-    <arguments value="-- --tags &quot;@wolf-hound-role&quot;" />
+    <arguments value="--tags &quot;@wolf-hound-role&quot;" />
     <node-interpreter value="project" />
     <envs />
     <method v="2" />

diff --git a/src/modules/game/constants/game-options/game-options.constant.ts b/src/modules/game/constants/game-options/game-options.constant.ts
@@ -24,7 +24,10 @@ const DEFAULT_GAME_OPTIONS: ReadonlyDeep<GameOptions> = {
       isTalkative: true,
       canSeeRoles: true,
     },
-    cupid: { lovers: { doRevealRoleToEachOther: false } },
+    cupid: {
+      lovers: { doRevealRoleToEachOther: false },
+      mustWinWithLovers: false,
+    },
     littleGirl: { isProtectedByDefender: false },
     defender: { canProtectTwice: false },
     elder: {

diff --git a/...ions/create-roles-game-options/create-cupid-game-options/create-cupid-game-options.dto.ts b/...ions/create-roles-game-options/create-cupid-game-options/create-cupid-game-options.dto.ts
@@ -1,8 +1,9 @@
 import type { ApiPropertyOptions } from "@nestjs/swagger";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { IsOptional, ValidateNested } from "class-validator";
+import { IsBoolean, IsOptional, ValidateNested } from "class-validator";
 
+import { DEFAULT_GAME_OPTIONS } from "@/modules/game/constants/game-options/game-options.constant";
 import { CreateCupidLoversGameOptionsDto } from "@/modules/game/dto/create-game/create-game-options/create-roles-game-options/create-cupid-game-options/create-cupid-lovers-game-options.dto";
 import { CUPID_GAME_OPTIONS_API_PROPERTIES } from "@/modules/game/schemas/game-options/roles-game-options/cupid-game-options/cupid-game-options.schema.constant";
 
@@ -15,6 +16,14 @@ class CreateCupidGameOptionsDto {
   @Type(() => CreateCupidLoversGameOptionsDto)
   @ValidateNested()
   public lovers: CreateCupidLoversGameOptionsDto = new CreateCupidLoversGameOptionsDto();
+
+  @ApiProperty({
+    ...CUPID_GAME_OPTIONS_API_PROPERTIES.mustWinWithLovers,
+    required: false,
+  } as ApiPropertyOptions)
+  @IsOptional()
+  @IsBoolean()
+  public mustWinWithLovers: boolean = DEFAULT_GAME_OPTIONS.roles.cupid.mustWinWithLovers;
 }
 
 export { CreateCupidGameOptionsDto };
diff --git a/src/modules/game/helpers/game-victory/game-victory.factory.ts b/src/modules/game/helpers/game-victory/game-victory.factory.ts
@@ -1,7 +1,8 @@
 import { plainToInstance } from "class-transformer";
 
+import { doesPlayerHaveActiveAttributeWithName } from "@/modules/game/helpers/player/player-attribute/player-attribute.helper";
 import { PlayerAttributeNames } from "@/modules/game/enums/player.enum";
-import { getPlayersWithActiveAttributeName, getPlayersWithCurrentSide, getPlayerWithCurrentRole } from "@/modules/game/helpers/game.helper";
+import { getPlayersWithCurrentSide, getPlayerWithCurrentRole } from "@/modules/game/helpers/game.helper";
 import type { Game } from "@/modules/game/schemas/game.schema";
 import { RoleNames, RoleSides } from "@/modules/role/enums/role.enum";
 import { GameVictoryTypes } from "@/modules/game/enums/game-victory.enum";
@@ -27,10 +28,13 @@ function createAngelGameVictory(game: Game, gameVictory: Partial<GameVictory> =
 }
 
 function createLoversGameVictory(game: Game, gameVictory: Partial<GameVictory> = {}): GameVictory {
-  const inLovePlayers = getPlayersWithActiveAttributeName(game, PlayerAttributeNames.IN_LOVE);
+  const { mustWinWithLovers: mustCupidWinWithLovers } = game.options.roles.cupid;
+  const winners = game.players.filter(player =>
+    doesPlayerHaveActiveAttributeWithName(player, PlayerAttributeNames.IN_LOVE, game) ||
+    player.role.current === RoleNames.CUPID && mustCupidWinWithLovers);
   return createGameVictory({
     type: GameVictoryTypes.LOVERS,
-    winners: inLovePlayers,
+    winners,
     ...gameVictory,
   });
 }