refactor: rename entityKey to entityId in combat triggers

Rename `entityKey` and `sourceEntityKey` to `entityId` and
`sourceEntityId` across the slay-the-spire-like sample to improve
naming consistency with the rest of the project.
This commit is contained in:
2026-04-23 00:38:10 +08:00
parent 8ec95cbf81
commit 63e55a828e
6 changed files with 103 additions and 103 deletions
@@ -205,9 +205,9 @@ describe("desert triggers", () => {
await triggers.onEffectApplied.execute(ctx, {
effect: attackEffect,
entityKey: "player",
entityId: "player",
stacks: 5,
sourceEntityKey: "enemy-0",
sourceEntityId: "enemy-0",
});
expect(ctx.value.player.hp).toBe(25);
@@ -223,7 +223,7 @@ describe("desert triggers", () => {
await triggers.onEffectApplied.execute(ctx, {
effect: drawEffect,
entityKey: "player",
entityId: "player",
stacks: 2,
});
@@ -239,7 +239,7 @@ describe("desert triggers", () => {
const initialEnergy = ctx.value.player.energy;
await triggers.onEffectApplied.execute(ctx, {
effect: gainEnergyEffect,
entityKey: "player",
entityId: "player",
stacks: 2,
});
@@ -261,7 +261,7 @@ describe("desert triggers", () => {
await triggers.onEffectApplied.execute(ctx, {
effect: removeWoundEffect,
entityKey: "player",
entityId: "player",
stacks: 2,
});
@@ -286,9 +286,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "player",
entityId: "player",
amount: 8,
sourceEntityKey: "enemy-0",
sourceEntityId: "enemy-0",
});
expect(ctx.value.player.hp).toBe(27);
@@ -312,9 +312,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "player",
entityId: "player",
amount: 8,
sourceEntityKey: "enemy-0",
sourceEntityId: "enemy-0",
});
expect(ctx.value.player.hp).toBe(25);
@@ -334,9 +334,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "player",
entityId: "player",
amount: 5,
sourceEntityKey: "enemy-0",
sourceEntityId: "enemy-0",
});
expect(ctx.value.player.hp).toBe(23);
@@ -359,9 +359,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "仙人掌怪-0",
entityId: "仙人掌怪-0",
amount: 5,
sourceEntityKey: "player",
sourceEntityId: "player",
});
expect(ctx.value.player.hp).toBe(27);
@@ -402,9 +402,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "幼沙虫-0",
entityId: "幼沙虫-0",
amount: 5,
sourceEntityKey: "player",
sourceEntityId: "player",
});
expect(ctx.value.player.energy).toBe(2);
@@ -429,9 +429,9 @@ describe("desert triggers", () => {
let threw = false;
try {
await triggers.onDamage.execute(ctx, {
entityKey: "蜥蜴-0",
entityId: "蜥蜴-0",
amount: 1,
sourceEntityKey: "player",
sourceEntityId: "player",
});
} catch (e) {
threw = true;
@@ -457,7 +457,7 @@ describe("desert triggers", () => {
draft.player.effects.discard = { data: discardEffect, stacks: 1 };
});
await triggers.onTurnStart.execute(ctx, { entityKey: "player" });
await triggers.onTurnStart.execute(ctx, { entityId: "player" });
expect(ctx.value.player.deck.regions.hand.childIds.length).toBe(2);
expect(ctx.value.player.deck.regions.discardPile.childIds.length).toBe(1);
@@ -474,7 +474,7 @@ describe("desert triggers", () => {
draft.player.effects.defendNext = { data: defendNextEffect, stacks: 5 };
});
await triggers.onTurnStart.execute(ctx, { entityKey: "player" });
await triggers.onTurnStart.execute(ctx, { entityId: "player" });
expect(ctx.value.player.effects.defend?.stacks).toBe(5);
expect(ctx.value.player.effects.defendNext).toBeUndefined();
@@ -489,7 +489,7 @@ describe("desert triggers", () => {
draft.player.effects.energyNext = { data: energyNextEffect, stacks: 2 };
});
await triggers.onTurnStart.execute(ctx, { entityKey: "player" });
await triggers.onTurnStart.execute(ctx, { entityId: "player" });
expect(ctx.value.player.energy).toBe(5);
expect(ctx.value.player.effects.energyNext).toBeUndefined();
@@ -508,7 +508,7 @@ describe("desert triggers", () => {
draft.player.effects.drawNext = { data: drawNextEffect, stacks: 2 };
});
await triggers.onTurnStart.execute(ctx, { entityKey: "player" });
await triggers.onTurnStart.execute(ctx, { entityId: "player" });
expect(ctx.value.player.deck.regions.hand.childIds.length).toBe(2);
expect(ctx.value.player.effects.drawNext).toBeUndefined();
@@ -530,9 +530,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "仙人掌怪-0",
entityId: "仙人掌怪-0",
amount: 5,
sourceEntityKey: "player",
sourceEntityId: "player",
});
expect(ctx.value.enemies[0].hp).toBe(2);
@@ -552,9 +552,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "仙人掌怪-0",
entityId: "仙人掌怪-0",
amount: 5,
sourceEntityKey: "player",
sourceEntityId: "player",
});
expect(ctx.value.enemies[0].hp).toBe(74);
@@ -576,9 +576,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "player",
entityId: "player",
amount: 5,
sourceEntityKey: "沙蝎-0",
sourceEntityId: "沙蝎-0",
});
expect(ctx.value.player.hp).toBe(23);
@@ -599,9 +599,9 @@ describe("desert triggers", () => {
});
await triggers.onDamage.execute(ctx, {
entityKey: "player",
entityId: "player",
amount: 5,
sourceEntityKey: "骑马枪手-0",
sourceEntityId: "骑马枪手-0",
});
expect(ctx.value.player.hp).toBe(20);
@@ -623,10 +623,10 @@ describe("desert triggers", () => {
await triggers.onEffectApplied.execute(ctx, {
effect: crossbowEffect,
entityKey: "player",
entityId: "player",
stacks: 0,
cardId: "crossbow-1",
sourceEntityKey: "player",
sourceEntityId: "player",
targetId: "仙人掌怪-0",
});
@@ -647,7 +647,7 @@ describe("desert triggers", () => {
await triggers.onCardDiscarded.execute(ctx, {
cardId: "fatigue-1",
sourceEntityKey: "player",
sourceEntityId: "player",
});
expect(ctx.value.enemies[0].hp).toBe(40);
@@ -664,9 +664,9 @@ describe("desert triggers", () => {
const triggers = getTriggers();
await triggers.onDamage.execute(ctx, {
entityKey: "player",
entityId: "player",
amount: 5,
sourceEntityKey: "秃鹫-0",
sourceEntityId: "秃鹫-0",
});
const vultureEyeCards = Object.values(ctx.value.player.deck.cards).filter(