merge: 최신 main 변경을 Web Push 작업에 반영한다
This commit is contained in:
@@ -119,7 +119,8 @@ export const createNeutralAuctionRegistrar = async (options: {
|
||||
hiddenSeed,
|
||||
seedYear: context.previousYear,
|
||||
seedMonth: context.previousMonth,
|
||||
nationCount: options.getNationPowerRollCount?.() ?? world.listNations().length,
|
||||
nationCount:
|
||||
options.getNationPowerRollCount?.() ?? world.listNations().filter((nation) => nation.id > 0).length,
|
||||
consumeTournamentRoll,
|
||||
averageGold: average(eligibleGenerals.map((general) => general.gold)),
|
||||
averageRice: average(eligibleGenerals.map((general) => general.rice)),
|
||||
|
||||
@@ -25,7 +25,10 @@ export const createScoutBlockHandler = (options: {
|
||||
// changing nation or game state. No provided scenario invokes it.
|
||||
throw new Error('update(): at least 3 arguments expected');
|
||||
}
|
||||
for (const nation of world.listNations()) {
|
||||
// Ref updates every row in its nation table. Core additionally keeps a
|
||||
// synthetic id=0 neutral row, which is not a Ref nation row and must
|
||||
// remain outside the last-nation scout policy.
|
||||
for (const nation of world.listNations().filter((entry) => entry.id > 0)) {
|
||||
world.updateNation(nation.id, {
|
||||
meta: {
|
||||
...nation.meta,
|
||||
|
||||
@@ -414,7 +414,8 @@ const createMonthlyCalendarRuntime = async (options: {
|
||||
clock: Clock;
|
||||
}) => {
|
||||
const cache: MonthlyRuntimeCache = {
|
||||
nationPowerRollCount: options.snapshot.nations.length,
|
||||
// Ref's monthly nation query has no Core-only id=0 neutral row.
|
||||
nationPowerRollCount: options.snapshot.nations.filter((nation) => nation.id > 0).length,
|
||||
tournamentRollConsumed: false,
|
||||
};
|
||||
const unification = options.calendarHandlerOverride
|
||||
|
||||
Reference in New Issue
Block a user