1 Commits

Author SHA1 Message Date
acf295d56c 도적 카드 공용 효과 추가 2026-06-19 02:57:11 +09:00
9 changed files with 106 additions and 17 deletions

File diff suppressed because one or more lines are too long

View File

@@ -985,8 +985,8 @@
"rarity": "unique",
"desc": "내 턴 시작 시, 모든 적에게 중독을 2 부여합니다.",
"poison": 2,
"powerEffect": "strengthPerTurn",
"value": 1,
"powerEffect": "poisonPerTurn",
"value": 2,
"image": "19361e72087946b1888684185b40d935"
},
"Accuracy": {
@@ -1019,9 +1019,8 @@
"rarity": "unique",
"desc": "내 턴 동안 카드를 뽑을 때마다, 모든 적에게 피해를 2 줍니다.",
"aoe": true,
"powerEffect": "strengthPerTurn",
"value": 1,
"damage": 2,
"powerEffect": "damagePerTurn",
"value": 2,
"image": "91a2d1c16cb041549adbf1a0d7b1f37f"
},
"GrandFinale": {
@@ -1179,8 +1178,8 @@
"class": "bandit",
"rarity": "legend",
"desc": "이번 턴 동안 더 이상 카드를 뽑을 수 없습니다. 이번 턴 동안 손에 있는 모든 카드를 비용 없이 사용할 수 있습니다.",
"powerEffect": "energyPerTurn",
"value": 1,
"handCostZeroThisTurn": true,
"drawDisabledThisTurn": true,
"image": "91a2d1c16cb041549adbf1a0d7b1f37f"
},
"Nightmare": {

View File

@@ -94,7 +94,8 @@ export function chooseAction(hand, cards, energy, ctx = {}) {
const card = cards[x.id];
if (!card || card.unplayable || !canPlayCardNow(card, ctx)) return false;
let effectiveCost = card.cost || 0;
if (card.kind === 'Skill') {
if (ctx.handCostZeroThisTurn === true) effectiveCost = 0;
else if (card.kind === 'Skill') {
if (ctx.nextSkillCostZero === true) effectiveCost = 0;
else effectiveCost = Math.max(0, effectiveCost - (ctx.skillCostReductionThisTurn || 0));
}
@@ -105,7 +106,8 @@ export function chooseAction(hand, cards, energy, ctx = {}) {
const skills = entries.filter((x) => cards[x.id].kind === 'Skill');
const effectiveCost = (card) => {
let cost = card.cost || 0;
if (card.kind === 'Skill') {
if (ctx.handCostZeroThisTurn === true) cost = 0;
else if (card.kind === 'Skill') {
if (ctx.nextSkillCostZero === true) cost = 0;
else cost = Math.max(0, cost - (ctx.skillCostReductionThisTurn || 0));
}
@@ -146,6 +148,8 @@ export function simulateCombat(data, rng, stats) {
let pHp = PLAYER_HP, pBlock = 0;
let pStr = 0, pDex = 0, pThorns = 0, pWeak = 0, pVuln = 0;
let blockGainMultiplier = 1;
let handCostZeroThisTurn = false;
let drawDisabledThisTurn = false;
let nextSkillCostZero = false;
let skillCostReductionThisTurn = 0;
let nextTurnBlock = 0, nextTurnDraw = 0, nextTurnKeepBlock = false;
@@ -162,6 +166,7 @@ export function simulateCombat(data, rng, stats) {
function draw(n) {
const drawn = [];
if (drawDisabledThisTurn === true) return drawn;
for (let k = 0; k < n; k++) {
if (drawPile.length === 0) { drawPile = shuffle(discard, rng); discard = []; }
if (drawPile.length === 0) break;
@@ -270,6 +275,8 @@ export function simulateCombat(data, rng, stats) {
if (c.blockGainMultiplier && c.blockGainMultiplier > 0) blockGainMultiplier *= c.blockGainMultiplier;
if (c.nextSkillCostZero === true) nextSkillCostZero = true;
if (c.skillCostReductionThisTurn && c.skillCostReductionThisTurn > 0) skillCostReductionThisTurn += c.skillCostReductionThisTurn;
if (c.handCostZeroThisTurn === true) handCostZeroThisTurn = true;
if (c.drawDisabledThisTurn === true) drawDisabledThisTurn = true;
if (c.kind === 'Attack') {
if (alive.length && c.damage) {
const baseDamage = attackBaseForCard(id, c);
@@ -365,6 +372,8 @@ export function simulateCombat(data, rng, stats) {
turnAttackCardsPlayed = 0;
turnDiscardedCards = 0;
blockGainMultiplier = 1;
handCostZeroThisTurn = false;
drawDisabledThisTurn = false;
skillCostReductionThisTurn = 0;
// 파워 발동 — Lua StartPlayerTurn 동기화 (블록 리셋 후 strength/energy/block 파워)
if (nextTurnKeepBlock === true) nextTurnKeepBlock = false;
@@ -380,6 +389,16 @@ export function simulateCombat(data, rng, stats) {
if (pc.powerEffect === 'strengthPerTurn') pStr += pc.value;
else if (pc.powerEffect === 'energyPerTurn') energyBonus += pc.value;
else if (pc.powerEffect === 'blockPerTurn') pBlock += pc.value;
else if (pc.powerEffect === 'poisonPerTurn') {
for (const m of mob) if (m.alive) m.poison += pc.value;
} else if (pc.powerEffect === 'damagePerTurn') {
for (const m of mob) {
if (!m.alive) continue;
const r = applyDamage(m.hp, m.block, pc.value || 0);
m.hp = r.hp; m.block = r.block;
if (m.hp <= 0) m.alive = false;
}
}
if (pc.turnStartShiv) addCardsToHand('Shiv', pc.turnStartShiv);
if (pc.turnStartDraw) powerTurnDraw += pc.turnStartDraw;
if (pc.turnStartDiscard) powerTurnDiscard += pc.turnStartDiscard;
@@ -397,12 +416,12 @@ export function simulateCombat(data, rng, stats) {
while (true) {
const alive = aliveList();
if (alive.length === 0) break;
const idx = chooseAction(hand, cards, energy, { drawPileCount: drawPile.length, nextSkillCostZero, skillCostReductionThisTurn });
const idx = chooseAction(hand, cards, energy, { drawPileCount: drawPile.length, nextSkillCostZero, skillCostReductionThisTurn, handCostZeroThisTurn });
if (idx < 0) break;
const id = hand[idx], c = cards[id];
const skillFree = c.kind === 'Skill' && nextSkillCostZero === true;
const baseCost = c.cost || 0;
const cost = skillFree ? 0 : (c.kind === 'Skill' ? Math.max(0, baseCost - skillCostReductionThisTurn) : baseCost);
const cost = handCostZeroThisTurn === true ? 0 : (skillFree ? 0 : (c.kind === 'Skill' ? Math.max(0, baseCost - skillCostReductionThisTurn) : baseCost));
energy -= cost;
resolveCardEffects(id, c, cost);
if (c.kind === 'Attack') turnAttackCardsPlayed++;

View File

@@ -721,6 +721,14 @@ test("chooseAction: skillCostReductionThisTurn allows discounted skills", () =>
assert.equal(chooseAction(["Guard"], cards, 1, {}), -1);
});
test("chooseAction: handCostZeroThisTurn lets expensive cards be played", () => {
const cards = {
Burst: { name: "Burst", cost: 3, kind: "Skill", block: 8 },
};
assert.equal(chooseAction(["Burst"], cards, 0, { handCostZeroThisTurn: true }), 0);
assert.equal(chooseAction(["Burst"], cards, 0, {}), -1);
});
test("simulateCombat: drawSkillBlock grants block for each drawn skill", () => {
const data = {
cards: {
@@ -739,3 +747,33 @@ test("simulateCombat: drawSkillBlock grants block for each drawn skill", () => {
assert.equal(r.draw, true);
assert.equal(stats.Escape.block, 3);
});
test("simulateCombat: poisonPerTurn powers poison all enemies at turn start", () => {
const data = {
cards: {
Fumes: { name: "NoxiousFumes", cost: 1, kind: "Power", powerEffect: "poisonPerTurn", value: 2 },
},
starterDeck: ["Fumes"],
monsters: [
{ name: "DummyA", maxHp: 2, intents: [{ kind: "Attack", value: 0 }] },
{ name: "DummyB", maxHp: 2, intents: [{ kind: "Attack", value: 0 }] },
],
};
const r = simulateCombat(data, () => 0.999999);
assert.equal(r.win, true);
});
test("simulateCombat: damagePerTurn powers damage all enemies at turn start", () => {
const data = {
cards: {
Speed: { name: "Speedster", cost: 2, kind: "Power", powerEffect: "damagePerTurn", value: 2 },
},
starterDeck: ["Speed"],
monsters: [
{ name: "DummyA", maxHp: 2, intents: [{ kind: "Attack", value: 0 }] },
{ name: "DummyB", maxHp: 2, intents: [{ kind: "Attack", value: 0 }] },
],
};
const r = simulateCombat(data, () => 0.999999);
assert.equal(r.win, true);
});

View File

@@ -46,6 +46,9 @@ if self:CanPlayCardNow(c) ~= true then
end
local cost = c.cost or 0
local skillFree = false
if self.HandCostZeroThisTurn == true then
\tcost = 0
end
if c.kind == "Skill" and self.NextSkillCostZero == true then
cost = 0
skillFree = true

View File

@@ -246,6 +246,8 @@ if self.ClayBlockNext > 0 then
end
self.TurnAttackMultiplier = self.NextTurnAttackMultiplier or 1
self.NextTurnAttackMultiplier = 1
self.HandCostZeroThisTurn = false
self.DrawDisabledThisTurn = false
local powerTurnDraw = 0
local powerTurnDiscard = 0
if self.PlayerPowers ~= nil then
@@ -258,6 +260,19 @@ if self.PlayerPowers ~= nil then
self.Energy = self.Energy + pc.value
elseif pc.powerEffect == "blockPerTurn" then
self.PlayerBlock = self.PlayerBlock + pc.value
elseif pc.powerEffect == "poisonPerTurn" then
if self.Monsters ~= nil then
for j = 1, #self.Monsters do
local tm = self.Monsters[j]
if tm ~= nil and tm.alive == true then
tm.poison = (tm.poison or 0) + pc.value
end
end
end
elseif pc.powerEffect == "damagePerTurn" then
if self.Monsters ~= nil then
self:PlayAoeFx(pc.fx or pc.image, pc.value or 0)
end
end
if pc.turnStartShiv ~= nil then
self:AddCardsToHand("Shiv", pc.turnStartShiv)
@@ -418,6 +433,9 @@ self:EnemyTurn()`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attr
method('DrawCards', `local drawnSlots = {}
local drawnCards = {}
local drewAny = false
if self.DrawDisabledThisTurn == true then
\treturn drawnCards
end
for i = 1, amount do
\tif #self.DrawPile <= 0 then
\t\tself:RecycleDiscardIntoDraw()

View File

@@ -382,6 +382,12 @@ end
if c.skillCostReductionThisTurn ~= nil and c.skillCostReductionThisTurn > 0 then
self.SkillCostReductionThisTurn = (self.SkillCostReductionThisTurn or 0) + c.skillCostReductionThisTurn
end
if c.handCostZeroThisTurn == true then
self.HandCostZeroThisTurn = true
end
if c.drawDisabledThisTurn == true then
self.DrawDisabledThisTurn = true
end
if c.kind == "Attack" then
if c.damage ~= nil then
self:PlayerAttackMotion()

View File

@@ -68,6 +68,8 @@ self.MaxEnergy = 3
self.Turn = 0
self.PlayerBlock = 0
self.BlockGainMultiplier = 1
self.HandCostZeroThisTurn = false
self.DrawDisabledThisTurn = false
self.NextSkillCostZero = false
self.SkillCostReductionThisTurn = 0
self.PlayerStr = 0

View File

@@ -162,6 +162,8 @@ function luaCardsTable(cards) {
if (c.damagePerAttackPlayedThisTurn != null) fields.push(`damagePerAttackPlayedThisTurn = ${c.damagePerAttackPlayedThisTurn}`);
if (c.damagePerDiscardedThisTurn != null) fields.push(`damagePerDiscardedThisTurn = ${c.damagePerDiscardedThisTurn}`);
if (c.damagePerSkillInHand != null) fields.push(`damagePerSkillInHand = ${c.damagePerSkillInHand}`);
if (c.damagePerTurn != null) fields.push(`damagePerTurn = ${c.damagePerTurn}`);
if (c.poisonPerTurn != null) fields.push(`poisonPerTurn = ${c.poisonPerTurn}`);
if (c.otherHandAtLeast != null) fields.push(`otherHandAtLeast = ${c.otherHandAtLeast}`);
if (c.bonusHitsWhenOtherHandAtLeast != null) fields.push(`bonusHitsWhenOtherHandAtLeast = ${c.bonusHitsWhenOtherHandAtLeast}`);
if (c.block != null) fields.push(`block = ${c.block}`);
@@ -193,6 +195,8 @@ function luaCardsTable(cards) {
if (c.turnStartShiv != null) fields.push(`turnStartShiv = ${c.turnStartShiv}`);
if (c.turnStartDraw != null) fields.push(`turnStartDraw = ${c.turnStartDraw}`);
if (c.turnStartDiscard != null) fields.push(`turnStartDiscard = ${c.turnStartDiscard}`);
if (c.handCostZeroThisTurn === true) fields.push('handCostZeroThisTurn = true');
if (c.drawDisabledThisTurn === true) fields.push('drawDisabledThisTurn = true');
if (c.addShivPerDiscard === true) fields.push('addShivPerDiscard = true');
if (c.nextTurnBlock != null) fields.push(`nextTurnBlock = ${c.nextTurnBlock}`);
if (c.nextTurnDraw != null) fields.push(`nextTurnDraw = ${c.nextTurnDraw}`);