Diuse/noname-shuying
1
0
Fork 0
mirror of https://github.com/Shu-Ying/noname-shuying.git synced 2026-10-21 06:39:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat # 继续补全遗物系统

Browse Source
This commit is contained in:
Diuse
2026-10-08 23:46:57 +08:00
parent 623f53a1d2
commit 1c93c77f4f
335 changed files with 11528 additions and 1797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mengsan/battle/battle-settlement.js
+26 -11
View File
@@ -4,6 +4,8 @@ import { applySharedBattleEndCards } from "../cards/shared-battle-end.js";
import { settleBondBattle } from "../bonds/state.js";
import { recordNormalBattleVictory } from "../progression/encounter-progress.js";
import { stripBattleProgress } from "../progression/map-checkpoint.js";
import { grantGold } from "../relics/progression.js";
import { heldRelics } from "../relics/definitions.js";
import { prepareRewardPackage, applyRewardPackage }
from "../progression/reward-package.js";
@@ -11,9 +13,9 @@ const copy = value => JSON.parse(JSON.stringify(value));
const idFor = (run, node) => JSON.stringify([run.runId, run.actIndex, node.id]);
export function createBattleSettlement({
store, config, getRandomRewardChoices, applyReward, completeNode,
enterNextAct, createRun, now = Date.now, logRewardPackage = () => {},
enterNextAct, createRun, now = Date.now, logRewardPackage = () => {}, resolveRelicChoices = async () => {},
}) {
let item = null, committed = null, commitPromise = null;
let item = null, committed = null, commitPromise = null, choicePromise = null, choiceSignature = null;
const readRun = () => store.read()[config.saveKey];
function current(storage, runId) {
const run = storage[config.saveKey];
@@ -30,7 +32,7 @@ export function createBattleSettlement({
throw new Error("Stale node or revision");
}
}
return Object.freeze({
const api = {
readRun,
// 创建内存候选不调用存档写入；阵亡弹窗等待多久都不改上次地图存档。
async prepare({run: snapshot, node, encounter, hp, outcome = "victory"}) {
@@ -53,7 +55,7 @@ export function createBattleSettlement({
base.statistics.defeatedEnemies += encounter.defeatedEnemies ?? 1;
}
const relicRecovery = hp > 0
? applyBattleEndRelics(base, outcome) : 0;
? applyBattleEndRelics(base, outcome, {node,encounter}) : 0;
const elite = !encounter.boss && encounter.tier === "elite";
const rewardPool = encounter.boss ? "shared.pool.boss.premium"
: elite ? "shared.pool.battle.elite" : encounter.rewardPool;
@@ -62,10 +64,11 @@ export function createBattleSettlement({
}).filter(c => c.name) : [];
const fixedRewards = [...(encounter.fixedRewards || [])];
// 同一内存候选固定这件遗物；选择或跳过卡牌均领取，不在 UI 抽取。
if (outcome === "victory" && elite) {
const [relic] = getRandomRewardChoices(base,
encounter.guaranteedRelicPool || "shared.pool.elite.relics", 1);
if (relic) fixedRewards.push(relic.id);
if (outcome === "victory") {
const extra=heldRelics(base).reduce((n,r)=>n+(elite ? r.rule.eliteRelics || 0 : 0)+(encounter.boss && base.actIndex===0 ? r.rule.actOneBossRelics || 0 : 0),0);
const count=(elite ? 1 : 0)+extra;
const relics=count>0 ? getRandomRewardChoices(base,encounter.guaranteedRelicPool || "shared.pool.elite.relics",count) : [];
for(const relic of relics)fixedRewards.push(relic.id);
}
// 金币随最终结果一次性提交。
const choices = outcome === "victory" && !encounter.rewardPackage
@@ -133,8 +136,7 @@ export function createBattleSettlement({
// 结果只计算一次；保存失败后的重试不再次发放金币。
for (const gold of item.choices.filter(c => c.kind === "gold")) {
if (!Number.isSafeInteger(gold.amount) || gold.amount < 0) throw new Error("Invalid pending gold reward");
result.player.gold += gold.amount;
result.statistics.goldEarned += gold.amount;
grantGold(result,gold.amount);
}
if (reward) {
applyReward(result, reward.effectId || reward.id);
@@ -143,6 +145,7 @@ export function createBattleSettlement({
} else {
for (const rewardId of item.fixedRewards || []) applyReward(result, rewardId);
}
await resolveRelicChoices(result);
if (!completeNode(result, item.nodeId)) throw new Error("Node completion failed");
route = item.boss && !enterNextAct(result) ? "victory" : "map";
} else result.status = "failed";
@@ -194,5 +197,17 @@ export function createBattleSettlement({
}).finally(() => { commitPromise = null; });
return commitPromise;
},
});
};
const chooseOnce=api.choose;
api.choose=(runId,id,choiceId)=>{
const signature=JSON.stringify([runId,id,choiceId]);
if(choicePromise){
if(signature!==choiceSignature)return Promise.reject(new Error("Another reward choice is pending"));
return choicePromise;
}
choiceSignature=signature;
choicePromise=chooseOnce(runId,id,choiceId).finally(()=>{choicePromise=null;choiceSignature=null;});
return choicePromise;
};
return Object.freeze(api);
}
mengsan/battle/combat-rules.js
+6 -5
View File
@@ -5,6 +5,7 @@ import { cardUpgradeLevel, cardUpgradeRule } from "../cards/upgrades.js";
import { cardPackCosts } from "../cards/packs/data.js";
import { ironcladCardOwner, ironcladCost, ironcladCardIsFree } from "../cards/ironclad-hooks.js";
import { sharedCardCost, sharedCardIsFree } from "../cards/shared-hooks.js";
import { relicCardCost, relicFreeCard, relicXBonus } from "../relics/hooks.js";
export const PLAYER_ENERGY = 3;
export const PLAYER_HAND_LIMIT = 3;
export const SHA_DAMAGE = 6;
@@ -20,12 +21,12 @@ const validXEnergy = player => Number.isSafeInteger(xEnergy(player)) && xEnergy(
const xTax = player => player?.storage?.mengsanTangled_shuying > 0 ? 1 : 0;
export const cardCost = (card, player = null) => {
player ||= ironcladCardOwner(card);
if (ironcladCardIsFree(player,card) || sharedCardIsFree(player,card)) return 0;
if (ironcladCardIsFree(player,card) || sharedCardIsFree(player,card) || relicFreeCard(player,card)) return 0;
// 数值接口用于支付；X 的展示标签由牌定义/图鉴和空文本手牌叠层提供。
if (isXCostCard(card)) return validXEnergy(player) ? xEnergy(player) : 0;
const rule = cardUpgradeLevel(card) ? cardUpgradeRule(card.name) : null;
const base = rule?.cost ?? cardPackCosts[card?.name] ?? COSTS[card?.name] ?? 1;
return sharedCardCost(player,card,ironcladCost(player,card,base)) +
return relicCardCost(player,card,sharedCardCost(player,card,ironcladCost(player,card,base))) +
(player?.storage?.mengsanTangled_shuying > 0 && isAttackCard(card) ? 1 : 0);
};
@@ -70,7 +71,7 @@ function isFreeCardUse(player, card, event) {
export const canPayCard = (player, card, event = _status.event) => {
if (isXCostCard(card)) return validXEnergy(player) &&
(isFreeCardUse(player, card, event) || ironcladCardIsFree(player,card) || sharedCardIsFree(player,card) || xEnergy(player) >= xTax(player));
(isFreeCardUse(player, card, event) || ironcladCardIsFree(player,card) || sharedCardIsFree(player,card) || relicFreeCard(player,card) || xEnergy(player) >= xTax(player));
return isFreeCardUse(player, card, event) ||
(player?.storage?.mengsanEnergy_shuying ?? Infinity) >= cardCost(card, player);
};
@@ -82,8 +83,8 @@ export const payCard = (player, card, event = _status.event, battle = null) => {
const existing = xUses.get(event);
if (existing) return existing.player === player && existing.name === card.name;
if (!canPayCard(player, card, event)) return false;
const free = isFreeCardUse(player, card, event) || ironcladCardIsFree(player,card) || sharedCardIsFree(player,card);
const count = xEnergy(player) - (free ? 0 : xTax(player));
const free = isFreeCardUse(player, card, event) || ironcladCardIsFree(player,card) || sharedCardIsFree(player,card) || relicFreeCard(player,card);
const count = xEnergy(player) - (free ? 0 : xTax(player)) + relicXBonus(player);
xUses.set(event, { player, name: card.name, count, battle,
session: battle?.session, taken: false });
if (!free) player.storage.mengsanEnergy_shuying = 0;