feat: configをどじょうすくいロボコンへ対応させた

packages/config/src/config.ts

@@ -3,7 +3,7 @@ import { createConfig } from "./utility/createConfig";
 
 export const config = createConfig(
   {
-    contestName: "第2回 Matz葉がにロボコン",
+    contestName: "第1回 どじょうすくいロボコン",
     robots: [
       {
         type: "leg",
@@ -18,11 +18,6 @@ export const config = createConfig(
       {
         type: "elementary",
         name: "小学生部門",
-        robotTypes: ["wheel", "leg"],
-      },
-      {
-        type: "open",
-        name: "オープン部門",
         robotTypes: ["leg"],
       },
     ],
@@ -32,59 +27,57 @@ export const config = createConfig(
         name: "予選",
         limitSeconds: 180,
         course: {
-          elementary: 2,
-          open: 1,
+          elementary: 1,
         },
       },
       {
         type: "main",
         name: "本戦",
         limitSeconds: 180,
         course: {
-          elementary: 2,
-          open: 1,
+          elementary: 0,
         },
       },
     ],
     rules: [
-      {
-        name: "multiWalk",
-        label: "歩行型",
-        type: "single",
-        initial: true, // conditionsの`scorable`で制御する
-        point: (done: boolean) => (done ? 2 : 0),
-      },
+      // {
+      //   name: "multiWalk",
+      //   label: "歩行型",
+      //   type: "single",
+      //   initial: true, // conditionsの"scorable"で制御する
+      //   point: (done: boolean) => (done ? 2 : 0),
+      // },
       {
         name: "leaveBase",
-        label: "松江エリアを出た",
+        label: "水草エリアを出た",
         type: "single",
         initial: false,
         point: (done: boolean) => (done ? 1 : 0),
       },
       {
         name: "overMiddle",
-        label: "中間点を超えた",
+        label: "中間地点を超えた",
         type: "single",
         initial: false,
         point: (done: boolean) => (done ? 1 : 0),
       },
       {
         name: "enterDestination",
-        label: "金星エリアに入った",
+        label: "温暖化エリアに入った",
         type: "single",
         initial: false,
         point: (done: boolean) => (done ? 1 : 0),
       },
       {
         name: "placeBall",
-        label: "ボールを金星エリアに置いた",
+        label: "温暖化エリアに氷を置いた",
         type: "single",
         initial: false,
         point: (done: boolean) => (done ? 1 : 0),
       },
       {
         name: "returnBase",
-        label: "松江エリアに戻った",
+        label: "水草エリアに戻った",
         type: "single",
         initial: false,
         point: (done: boolean) => (done ? 2 : 0),
@@ -94,11 +87,19 @@ export const config = createConfig(
         label: "ゴール",
         type: "single",
         initial: false,
-        point: (done: boolean) => (done ? 1 : 0),
+        point: () => 0,
       },
       {
         name: "bringBall",
-        label: "雲粒子の数",
+        label: "どじょうの数",
+        type: "countable",
+        initial: 0,
+        point: (count: number) => count,
+        validate: (value: number) => 0 <= value && value <= 3,
+      },
+      {
+        name: "bringRareBall",
+        label: "激レアどじょうの数",
         type: "countable",
         initial: 0,
         point: (count: number) => count,
@@ -115,15 +116,15 @@ export const config = createConfig(
     sponsors: [],
   },
   {
-    multiWalk: {
-      visible: (state) => !state.matchInfo, // エキシビションモードでのみ表示
-      changeable: (state) =>
-        !state.matchInfo && // エキシビションモードでのみマニュアル変更可能
-        !state.matchState[state.side].getPointState().finish,
-      scorable: (state) =>
-        !state.matchInfo || // エキシビションモードでは通常通り加算可能
-        state.matchInfo.teams[state.side].robotType == "leg", // 通常の試合では歩行型のときのみ加算可能
-    },
+    // multiWalk: {
+    //   visible: (state) => !state.matchInfo, // エキシビションモードでのみ表示
+    //   changeable: (state) =>
+    //     !state.matchInfo && // エキシビションモードでのみマニュアル変更可能
+    //     !state.matchState[state.side].getPointState().finish,
+    //   scorable: (state) =>
+    //     !state.matchInfo || // エキシビションモードでは通常通り加算可能
+    //     state.matchInfo.teams[state.side].robotType == "leg", // 通常の試合では歩行型のときのみ加算可能
+    // },
     leaveBase: {
       changeable: (state) =>
         !state.matchState[state.side].getPointState().finish,
@@ -163,6 +164,14 @@ export const config = createConfig(
       changeable: (state) =>
         !state.matchState[state.side].getPointState().finish,
     },
+    bringRareBall: {
+      visible: (state) =>
+        !state.matchInfo || state.matchInfo.matchType === "main", // 本戦以外では激レアどじょうを表示しない
+      changeable: (state) =>
+        !state.matchState[state.side].getPointState().finish,
+      scorable: (state) =>
+        !state.matchInfo || state.matchInfo.matchType === "main", // 本戦以外では激レアどじょうに得点を与えない
+    },
     finish: {
       changeable: (state) => !state.matchState[state.side].getPointState().goal,
     },

packages/kcms/src/match/service/generatePre.test.ts

@@ -20,19 +20,17 @@ describe('GeneratePreMatchService', () => {
 
   const expectedTeamPair = [
     [
-      ['A1', 'B3'],
-      ['A3', 'C2'],
-      ['B1', 'N2'],
+      ['A1', 'B2'],
+      ['A2', 'B3'],
+      ['A3', 'C1'],
+      ['A4', 'C2'],
+      ['B1', 'N1'],
+      ['B2', 'N2'],
       ['B3', 'A1'],
-      ['C2', 'A3'],
-      ['N2', 'B1'],
-    ],
-    [
-      ['A2', 'B2'],
-      ['A4', 'C1'],
-      ['B2', 'N1'],
       ['C1', 'A2'],
+      ['C2', 'A3'],
       ['N1', 'A4'],
+      ['N2', 'B1'],
     ],
   ];
 

packages/kcms/src/team/models/team.test.ts

@@ -1,3 +1,4 @@
+import { config } from 'config';
 import { describe, expect, it } from 'vitest';
 import { Team, TeamID } from './team.js';
 
@@ -7,7 +8,7 @@ describe('正しくインスタンスを生成できる', () => {
       id: '123' as TeamID,
       teamName: 'チーム1',
       members: ['山田太郎', 'テスト大介'],
-      departmentType: 'open',
+      departmentType: config.departments[0].type,
       robotType: 'leg',
       isEntered: true,
     });
@@ -16,15 +17,15 @@ describe('正しくインスタンスを生成できる', () => {
     expect(actual.getTeamName()).toBe('チーム1');
     expect(actual.getMembers()).toEqual(['山田太郎', 'テスト大介']);
     expect(actual.getRobotType()).toBe('leg');
-    expect(actual.getDepartmentType()).toBe('open');
+    expect(actual.getDepartmentType()).toBe(config.departments[0].type);
   });
 
   it('正しくインスタンスを生成できる - クラブを含む場合', () => {
     const actual = Team.reconstruct({
       id: '123' as TeamID,
       teamName: 'チーム1',
       members: ['山田太郎', 'テスト大介'],
-      departmentType: 'open',
+      departmentType: config.departments[0].type,
       robotType: 'leg',
       isEntered: true,
       clubName: 'テストクラブ',
@@ -34,7 +35,7 @@ describe('正しくインスタンスを生成できる', () => {
     expect(actual.getTeamName()).toBe('チーム1');
     expect(actual.getMembers()).toEqual(['山田太郎', 'テスト大介']);
     expect(actual.getRobotType()).toBe('leg');
-    expect(actual.getDepartmentType()).toBe('open');
+    expect(actual.getDepartmentType()).toBe(config.departments[0].type);
     expect(actual.getClubName()).toBe('テストクラブ');
   });
 
@@ -43,7 +44,7 @@ describe('正しくインスタンスを生成できる', () => {
       id: '1' as TeamID,
       teamName: 'team1',
       members: ['山田太郎', 'テスト大介'],
-      departmentType: 'open',
+      departmentType: config.departments[0].type,
       robotType: 'leg',
     });
 
@@ -57,7 +58,7 @@ describe('正しくインスタンスを生成できる', () => {
       id: '1' as TeamID,
       teamName: 'team1',
       members: ['山田太郎', 'テスト大介'],
-      departmentType: 'open',
+      departmentType: config.departments[0].type,
       robotType: 'leg',
     });
 

packages/kcms/src/team/service/get.test.ts

@@ -9,11 +9,7 @@ describe('getEntryService', () => {
   const repository = new DummyRepository();
   const service = new FetchTeamService(repository);
 
-  const testEntryData = [
-    TestEntryData['ElementaryMultiWalk'],
-    TestEntryData['ElementaryWheel'],
-    TestEntryData['OpenMultiWalk'],
-  ];
+  const testEntryData = [TestEntryData['ElementaryMultiWalk'], TestEntryData['ElementaryWheel']];
 
   beforeEach(() => {
     testEntryData.map((d) => repository.create(d));

packages/kcms/src/testData/entry.ts

@@ -16,21 +16,6 @@ export const TestEntryData = {
     robotType: 'wheel',
     departmentType: 'elementary',
   }),
-  // Openで車輪型は存在しない
-  OpenMultiWalk: Team.new({
-    id: '3' as TeamID,
-    teamName: 'TestTeam3',
-    members: ['TestTaro3'],
-    robotType: 'leg',
-    departmentType: 'open',
-  }),
-  OpenMultiWalk2: Team.new({
-    id: '4' as TeamID,
-    teamName: 'TestTeam4',
-    members: ['TestTaro4'],
-    robotType: 'leg',
-    departmentType: 'open',
-  }),
   // 1の重複
   ElementaryMultiWalkExists: Team.new({
     id: '1' as TeamID,
@@ -47,14 +32,6 @@ export const TestEntryData = {
     robotType: 'wheel',
     departmentType: 'elementary',
   }),
-  // 3の重複
-  OpenMultiWalkExists: Team.new({
-    id: '3' as TeamID,
-    teamName: 'TestTeam3',
-    members: ['TestTaro3'],
-    robotType: 'leg',
-    departmentType: 'open',
-  }),
   NotEntered: Team.reconstruct({
     id: '6' as TeamID,
     teamName: 'TestTeam6',