gahusb/maplecontest
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: codex #98/#99가 revert한 #96 수정 11개 재통합 + Defend 카드 수정

Browse Source 
codex #98/#99(도적 Rogue/시프 카드 확장)가 main을 작업 브랜치에 머지
후 그 머지를 통째로 revert하면서, 먼저 머지됐던 #96의 버그수정 11개가
collateral로 전부 사라졌다. 이를 현재 main(codex 카드 147장) 위에 재통합.

복원된 #96(상세는 PR #96): BindButtons 1회가드·drawDamage per-draw+
CheckCombatEnd 멱등가드·firstCardDamageBonus class→kind·PiercingWail
시뮬 음수힘·Envenom AoE attackPoison·firstShivDamageBonus 시뮬 첫Shiv만·
Prepared 실제방어+설명·DealDamageToAllMonsters isAttack 분리·useAllEnergy
코스트감소 무시·설명 정정 6장(Rage kind Power→Attack 포함).

추가: Defend(아이언 바디) kind Attack→Skill — block만 있는 방어 카드가
Attack 라우팅(몬스터 드롭 필요)이라 위로 스윕으로 사용 불가였던 것 수정.

codex 변경과 라인 충돌 없이 git apply --3way로 소스 재적용 후 재생성.
카드 147장 유지, 테스트 88, propcheck 0, cbgap 0.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UUvHKjrt8jqLzDeCsRRGmj
This commit is contained in:
gahusb
2026-06-30 08:34:54 +09:00
parent 66985c2af6
commit a2e4f16402
8 changed files with 168 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/balance/sim-balance.mjs
View File

@@ -55,7 +55,8 @@ export function calcAttack(base, str, weak, vulnOnTarget) {
}
export function calcEnemyAttack(base, str, weak, vulnOnTarget, strengthLoss = 0) {
return calcAttack(base, Math.max(0, str - strengthLoss), weak, vulnOnTarget);
// Lua EnemyActStep 동기화: 힘 손실은 (value+str) 전체에서 차감(음수 힘 허용), 최종 calcAttack이 0 클램프.
return calcAttack(base, str - strengthLoss, weak, vulnOnTarget);
}
// 방어 우선 차감 후 hp 적용 → { hp, block }
@@ -342,7 +343,7 @@ export function simulateCombat(data, rng, stats) {
if (c.damagePerDiscardedThisTurn) base += turnDiscardedCards * c.damagePerDiscardedThisTurn;
if (c.damagePerSkillInHand) base += countOtherHandSkills(id) * c.damagePerSkillInHand;
if (c.damagePerCardDrawnThisCombat) base += cardsDrawnThisCombat * c.damagePerCardDrawnThisCombat;
if (c.class === 'Attack' && turnCardsPlayedThisTurn === 0 && c.firstCardDamageBonus) base += c.firstCardDamageBonus;
if (c.kind === 'Attack' && turnCardsPlayedThisTurn === 0 && c.firstCardDamageBonus) base += c.firstCardDamageBonus;
if (c.class === 'shiv') {
if (powerFieldTotal('shivDamageBonus') > 0) base += powerFieldTotal('shivDamageBonus');
if (!shivFirstDamageBonusUsed && powerFieldTotal('firstShivDamageBonus') > 0) base += powerFieldTotal('firstShivDamageBonus');
@@ -422,6 +423,9 @@ export function simulateCombat(data, rng, stats) {
const hitN = (c.hits || 1) + bonusHits;
let useAoe = c.aoe === true;
if (c.class === 'shiv' && shivAoeThisCombat === true) useAoe = true;
if (c.class === 'shiv' && !shivFirstDamageBonusUsed && powerFieldTotal('firstShivDamageBonus') > 0) {
shivFirstDamageBonusUsed = true;
}
const perHit = calcAttack(baseDamage || 0, pStr, pWeak, 0) * turnAttackMultiplier;
const dealToTarget = (target, amount) => {
if (!target || !target.alive) return { killed: false, dealt: 0 };
@@ -515,9 +519,6 @@ export function simulateCombat(data, rng, stats) {
}
}
}
if (c.class === 'shiv' && !shivFirstDamageBonusUsed && powerFieldTotal('firstShivDamageBonus') > 0) {
shivFirstDamageBonusUsed = true;
}
}
}
if (c.strength) pStr += c.strength;
@@ -564,7 +565,7 @@ export function simulateCombat(data, rng, stats) {
}
}
if (c.blockPerDamageDealtThisTurn && c.blockPerDamageDealtThisTurn > 0 && c.kind !== 'Power') {
blockGained += Math.max(0, damageDealtThisTurn * c.blockPerDamageDealtThisTurn);
blockGained += addBlock(Math.max(0, damageDealtThisTurn * c.blockPerDamageDealtThisTurn));
}
if (recordStats && stats) stats[id] = bump(stats[id], costSpent, dmg, blockGained);
}
@@ -658,7 +659,7 @@ export function simulateCombat(data, rng, stats) {
const baseCost = c.cost || 0;
const combatReduction = combatCardCostReduction[id] || 0;
const cost = handCostZeroThisTurn === true ? 0 : (c.useAllEnergy === true ? energy : (skillFree ? 0 : (c.kind === 'Skill' ? Math.max(0, baseCost - skillCostReductionThisTurn) : baseCost)));
const finalCost = Math.max(0, cost - combatReduction);
const finalCost = c.useAllEnergy === true ? cost : Math.max(0, cost - combatReduction);
energy -= finalCost;
resolveCardEffects(id, c, finalCost);
const playedBlock = powerFieldTotal('cardPlayedBlock');
@@ -721,7 +722,7 @@ export function simulateCombat(data, rng, stats) {
const it = m.intents.length ? m.intents[Math.floor(rng() * m.intents.length)] : null;
if (it) {
if (it.kind === 'Attack') {
const atk = calcAttack(it.value, Math.max(0, m.str - enemyStrengthLossThisTurn), m.weak, pVuln);
const atk = calcEnemyAttack(it.value, m.str, m.weak, pVuln, enemyStrengthLossThisTurn);
const beforeHp = pHp;
let incoming = atk;
if (pIntangible > 0 && incoming > 1) incoming = 1;