SSR「ようこそ初星温泉」千奈を追加

合わせて、multiplyModifier へ focus を追加

src/data/cards.ts

@@ -7101,6 +7101,46 @@ export const cardsAsConst = [
       {},
     ],
   },
+  {
+    id: "kokuritohitokuchi",
+    name: "こくりとひとくち",
+    cardPossessionKind: "sense",
+    cardSummaryKind: "mental",
+    cardProviderKind: "idol",
+    nonDuplicative: true,
+    rarity: "ssr",
+    contents: [
+      {
+        cost: { kind: "normal", value: 5 },
+        effects: [
+          { kind: "getModifier", modifier: { kind: "focus", amount: 3 } },
+          {
+            kind: "getModifier",
+            modifier: { kind: "additionalCardUsageCount", amount: 1 },
+          },
+        ],
+        innate: true,
+        usableOncePerLesson: true,
+      },
+      {
+        effects: [
+          { kind: "getModifier", modifier: { kind: "focus", amount: 4 } },
+          {
+            kind: "getModifier",
+            modifier: { kind: "halfLifeConsumption", duration: 1 },
+          },
+          {
+            kind: "getModifier",
+            modifier: { kind: "additionalCardUsageCount", amount: 1 },
+          },
+        ],
+      },
+      // TODO: ++
+      {},
+      // TODO: +++
+      {},
+    ],
+  },
   {
     id: "yosomihadame",
     name: "よそ見はダメ♪",

src/data/idols.ts

@@ -339,6 +339,18 @@ export const idolsAsConst = [
     specificProducerItemId: "midorinoosoroiburesu",
     title: "学園生活",
   },
+  {
+    id: "kuramotochina-ssr-3",
+    characterId: "kuramotochina",
+    producePlan: {
+      kind: "sense",
+      recommendedModifierKind: "focus",
+    },
+    rarity: "ssr",
+    specificCardId: "kokuritohitokuchi",
+    specificProducerItemId: "onsennoatonootanoshimi",
+    title: "ようこそ初星温泉",
+  },
   {
     id: "kuramotochina-ssr-2",
     characterId: "kuramotochina",

src/data/producer-items.ts

@@ -1318,6 +1318,43 @@ export const producerItemsAsConst = [
       trigger: { kind: "turnStart" },
     },
   },
+  {
+    id: "onsennoatonootanoshimi",
+    name: "温泉の後のお楽しみ",
+    producerItemPossessionKind: "sense",
+    producerItemProviderKind: "idol",
+    rarity: "ssr",
+    base: {
+      effects: [
+        {
+          kind: "multiplyModifier",
+          modifierKind: "focus",
+          multiplier: 1.3,
+        },
+        {
+          kind: "perform",
+          vitality: { fixedValue: true, value: 2 },
+        },
+      ],
+      times: 2,
+      trigger: { kind: "beforeCardEffectActivationEveryNTimes", interval: 4 },
+    },
+    enhanced: {
+      effects: [
+        {
+          kind: "multiplyModifier",
+          modifierKind: "focus",
+          multiplier: 1.3,
+        },
+        {
+          kind: "perform",
+          vitality: { fixedValue: true, value: 7 },
+        },
+      ],
+      times: 2,
+      trigger: { kind: "beforeCardEffectActivationEveryNTimes", interval: 4 },
+    },
+  },
   {
     id: "piggudorimuchokimbako",
     name: "ピッグドリーム貯金箱",

src/lesson-mutation.test.ts

@@ -323,7 +323,36 @@ describe("activateEffectIf", () => {
       ],
     },
     {
-      name: "multiplyModifier",
+      name: "multiplyModifier - focus",
+      args: [
+        (() => {
+          const lesson = createLessonForTest();
+          lesson.idol.modifiers = [
+            { kind: "focus", amount: 10, id: "m1" },
+            { kind: "positiveImpression", amount: 100, id: "m2" },
+          ];
+          return lesson;
+        })(),
+        {
+          kind: "multiplyModifier",
+          modifierKind: "focus",
+          multiplier: 1.5,
+        },
+        () => 0,
+        createIdGenerator(),
+      ],
+      expected: [
+        {
+          kind: "modifiers.update",
+          propertyNameKind: "amount",
+          id: "m1",
+          actual: 5,
+          max: 5,
+        },
+      ],
+    },
+    {
+      name: "multiplyModifier - positiveImpression",
       args: [
         (() => {
           const lesson = createLessonForTest();

src/lesson-mutation.ts

@@ -1091,17 +1091,39 @@ export const activateEffect = <
       const modifier = lesson.idol.modifiers.find(
         (e) => e.kind === effect.modifierKind,
       );
-      // 現在は、好印象に対してしか存在しない効果なので、そのこと前提で実装している
-      if (modifier?.kind === "positiveImpression") {
-        const amount =
-          Math.ceil(modifier.amount * effect.multiplier) - modifier.amount;
-        diffs.push({
-          kind: "modifiers.update",
-          propertyNameKind: "amount",
-          id: modifier.id,
-          actual: amount,
-          max: amount,
-        });
+      switch (effect.modifierKind) {
+        case "focus": {
+          if (modifier && "amount" in modifier) {
+            const amount =
+              Math.ceil(modifier.amount * effect.multiplier) - modifier.amount;
+            diffs.push({
+              kind: "modifiers.update",
+              propertyNameKind: "amount",
+              id: modifier.id,
+              actual: amount,
+              max: amount,
+            });
+          }
+          break;
+        }
+        case "positiveImpression": {
+          if (modifier && "amount" in modifier) {
+            const amount =
+              Math.ceil(modifier.amount * effect.multiplier) - modifier.amount;
+            diffs.push({
+              kind: "modifiers.update",
+              propertyNameKind: "amount",
+              id: modifier.id,
+              actual: amount,
+              max: amount,
+            });
+          }
+          break;
+        }
+        default: {
+          const unreachable: never = effect;
+          throw new Error(`Unreachable statement`);
+        }
       }
       break;
     }

src/text-generation.test.ts

@@ -478,6 +478,17 @@ describe("generateCardDescription", () => {
         "{{レッスン中1回}}{{重複不可}}",
       ].join("\n"),
     },
+    {
+      cardId: "kokuritohitokuchi",
+      enhancements: [{ kind: "original" }],
+      expected: [
+        "レッスン開始時手札に入る",
+        "{{集中}}+4",
+        "{{消費体力減少}}1ターン",
+        "{{スキルカード使用数追加}}+1",
+        "{{レッスン中1回}}{{重複不可}}",
+      ].join("\n"),
+    },
   ];
   test.each(testParameters)(
     '$cardId => "$expected"',
@@ -1348,6 +1359,23 @@ describe("generateProducerItemDescription", () => {
         "（レッスン内2回）",
       ].join("\n"),
     },
+    {
+      producerItemId: "onsennoatonootanoshimi",
+      expected: [
+        "スキルカードを4回使用するごとに、{{集中}}1.3倍",
+        "{{固定元気}}+2",
+        "（レッスン内2回）",
+      ].join("\n"),
+    },
+    {
+      producerItemId: "onsennoatonootanoshimi",
+      enhanced: true,
+      expected: [
+        "スキルカードを4回使用するごとに、{{集中}}1.3倍",
+        "{{固定元気}}+7",
+        "（レッスン内2回）",
+      ].join("\n"),
+    },
   ];
   test.each(testParameters)(
     '$producerItemId => "$expected"',

src/types.ts

@@ -690,7 +690,7 @@ export type EffectWithoutCondition = Readonly<
        *   - 現状は「夢へのライフログ」の1.5倍しかないので、本実装では切り上げる
        */
       kind: "multiplyModifier";
-      modifierKind: "positiveImpression";
+      modifierKind: "focus" | "positiveImpression";
       multiplier: number;
     }
   | {