wip

Author: kjirou

src/data/cards.test.ts

@@ -110,7 +110,8 @@ for (const card of cards) {
       if (
         card.id !== "shikonoentame" &&
         card.id !== "kagayakukimihe" &&
-        card.id !== "nanikiteruno"
+        card.id !== "nanikiteruno" &&
+        card.id !== "tsukiyonoranuei"
       ) {
         for (const content of getCardContentDataList(card)) {
           const hasScorePerformance = content.effects.some(

src/lesson-mutation.test.ts

@@ -470,6 +470,7 @@ describe("activateEffectsEachProducerItemsAccordingToCardUsage", () => {
         kind: "afterCardEffectActivation",
         cardDataId: "apirunokihon",
         diffs: [],
+        modifiers: [],
       },
       () => 0,
       createIdGenerator(),
@@ -660,6 +661,7 @@ describe("activateEffectsEachProducerItemsAccordingToCardUsage", () => {
           kind: "afterCardEffectActivation",
           cardDataId: "apirunokihon",
           diffs: [],
+          modifiers: [],
         },
         () => 0,
         createIdGenerator(),
@@ -705,6 +707,7 @@ describe("activateEffectsEachProducerItemsAccordingToCardUsage", () => {
           kind: "afterCardEffectActivation",
           cardDataId: "apirunokihon",
           diffs: [],
+          modifiers: [],
         },
         () => 0,
         createIdGenerator(),
@@ -5671,6 +5674,7 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "apirunokihon",
           diffs: [],
           idolParameterKind: "vocal",
+          modifiers: [],
         },
       ],
       expected: true,
@@ -5687,6 +5691,7 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "pozunokihon",
           diffs: [],
           idolParameterKind: "vocal",
+          modifiers: [],
         },
       ],
       expected: false,
@@ -5703,6 +5708,7 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "apirunokihon",
           diffs: [],
           idolParameterKind: "vocal",
+          modifiers: [],
         },
       ],
       expected: true,
@@ -5719,6 +5725,7 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "hyogennokihon",
           diffs: [],
           idolParameterKind: "vocal",
+          modifiers: [],
         },
       ],
       expected: false,
@@ -5735,6 +5742,7 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "hyogennokihon",
           diffs: [{ kind: "vitality", actual: 1, max: 1 }],
           idolParameterKind: "vocal",
+          modifiers: [],
         },
       ],
       expected: true,
@@ -5751,6 +5759,7 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "apirunokihon",
           diffs: [{ kind: "score", actual: 1, max: 1 }],
           idolParameterKind: "vocal",
+          modifiers: [],
         },
       ],
       expected: false,
@@ -5767,10 +5776,61 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "apirunokihon",
           diffs: [{ kind: "vitality", actual: 0, max: 0 }],
           idolParameterKind: "vocal",
+          modifiers: [],
         },
       ],
       expected: false,
     },
+    // 基本的には scanIncreasedModifierKinds のテストで検証するので、パターンを増やしすぎない
+    {
+      name: "afterCardEffectActivation - effectKind - positiveImpression - 好印象を新規追加する時、満たす",
+      args: [
+        {
+          kind: "afterCardEffectActivation",
+          effectKind: "positiveImpression",
+        },
+        {
+          kind: "afterCardEffectActivation",
+          cardDataId: "mesennokihon",
+          diffs: [
+            {
+              kind: "modifiers.addition",
+              actual: { kind: "positiveImpression", amount: 1, id: "m1" },
+              max: { kind: "positiveImpression", amount: 1, id: "m1" },
+            },
+          ],
+          idolParameterKind: "vocal",
+          modifiers: [],
+        },
+      ],
+      expected: true,
+    },
+    // 基本的には scanIncreasedModifierKinds のテストで検証するので、パターンを増やしすぎない
+    {
+      name: "afterCardEffectActivation - effectKind - positiveImpression - 好印象の値を増加する時、満たす",
+      args: [
+        {
+          kind: "afterCardEffectActivation",
+          effectKind: "positiveImpression",
+        },
+        {
+          kind: "afterCardEffectActivation",
+          cardDataId: "mesennokihon",
+          diffs: [
+            {
+              kind: "modifiers.update",
+              propertyNameKind: "amount",
+              actual: 1,
+              max: 1,
+              id: "m1",
+            },
+          ],
+          idolParameterKind: "vocal",
+          modifiers: [{ kind: "positiveImpression", amount: 1, id: "m1" }],
+        },
+      ],
+      expected: true,
+    },
     {
       name: "afterCardEffectActivation - idolParameterKind - after - 満たさない",
       args: [
@@ -5783,6 +5843,7 @@ describe("validateQueryOfReactiveEffectTrigger", () => {
           cardDataId: "apirunokihon",
           diffs: [],
           idolParameterKind: "dance",
+          modifiers: [],
         },
       ],
       expected: false,

src/lesson-mutation.ts

@@ -272,6 +272,10 @@ export const validateQueryOfReactiveEffectTrigger = (
             (trigger.effectKind === "vitality" &&
               query.diffs.some(
                 (diff) => diff.kind === "vitality" && diff.max > 0,
+              )) ||
+            (trigger.effectKind === "positiveImpression" &&
+              scanIncreasedModifierKinds(query.modifiers, query.diffs).includes(
+                "positiveImpression",
               ));
           return (
             cardSummaryKindCondition &&
@@ -2478,6 +2482,7 @@ export const useCard = (
             kind: "afterCardEffectActivation",
             cardDataId: card.data.id,
             diffs: mainEffectDiffs,
+            modifiers: newLesson.idol.modifiers,
           },
           params.getRandom,
           params.idGenerator,
@@ -2505,6 +2510,7 @@ export const useCard = (
             diffs: mainEffectDiffs,
             idolParameterKind:
               getIdolParameterKindOnTurnConsideringIgnoring(newLesson),
+            modifiers: newLesson.idol.modifiers,
           }),
         );
       for (const { effect } of effectsAfterCardEffectActivation) {

src/types.ts

@@ -244,6 +244,8 @@ export type ReactiveEffectQueryWithoutIdolParameterKind = Readonly<
       cardDataId: CardData["id"];
       /** スキルカード使用による更新差分リスト */
       diffs: LessonUpdateDiff[];
+      /** 判定時の状態修正リスト */
+      modifiers: Modifier[];
     }
   | {
       kind: "beforeCardEffectActivation";