devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix live sortie turn lifecycle parity

Browse Source
This commit is contained in:
Hide_D
2026-07-26 23:33:26 +00:00
parent fc019a786c
commit 740c4bb1db
8 changed files with 103 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/logic/src/domain/entities.ts
+2
View File
@@ -100,6 +100,8 @@ export interface General<TriggerState extends GeneralTriggerState = GeneralTrigg
itemInventory?: GeneralItemInventory;
meta: GeneralMeta;
lastTurn?: GeneralLastTurn;
turnTime?: Date;
recentWarTime?: Date | null;
}
export interface City {
packages/logic/src/turn/calendar.ts
+1 -28
View File
@@ -13,12 +13,6 @@ const MINUTES_PER_DAY = 24 * 60;
const toMinuteOfDay = (date: Date): number => date.getHours() * 60 + date.getMinutes();
const toLocalDateAtMinute = (date: Date, minuteOfDay: number, dayOffset = 0): Date => {
const hour = Math.floor(minuteOfDay / 60);
const minute = minuteOfDay % 60;
return new Date(date.getFullYear(), date.getMonth(), date.getDate() + dayOffset, hour, minute, 0, 0);
};
const normalizeEntries = (entries: TurnScheduleEntries): TurnScheduleEntries => {
const normalized = entries
.map((entry) => ({
@@ -52,26 +46,5 @@ export const getTickMinutesAt = (date: Date, schedule: TurnSchedule): number =>
};
export const getNextTurnAt = (date: Date, schedule: TurnSchedule): Date => {
const entries = normalizeEntries(schedule.entries);
const minuteOfDay = toMinuteOfDay(date);
const index = findCurrentEntryIndex(minuteOfDay, entries);
const currentIndex = index >= 0 ? index : entries.length - 1;
const startDayOffset = index >= 0 ? 0 : -1;
const nextIndex = (currentIndex + 1) % entries.length;
const nextDayOffset = startDayOffset + (nextIndex > currentIndex ? 0 : 1);
const currentEntry = getEntryAt(entries, currentIndex);
const nextEntry = getEntryAt(entries, nextIndex);
const segmentStart = toLocalDateAtMinute(date, currentEntry.startMinute, startDayOffset);
const segmentEnd = toLocalDateAtMinute(date, nextEntry.startMinute, nextDayOffset);
const elapsedMinutes = (date.getTime() - segmentStart.getTime()) / 60000;
const nextStep = Math.floor(elapsedMinutes / currentEntry.tickMinutes) + 1;
const nextCandidate = new Date(segmentStart.getTime() + nextStep * currentEntry.tickMinutes * 60000);
if (nextCandidate.getTime() < segmentEnd.getTime()) {
return nextCandidate;
}
return segmentEnd;
return new Date(date.getTime() + getTickMinutesAt(date, schedule) * 60_000);
};
packages/logic/src/war/units/general.ts
+6 -10
View File
@@ -15,7 +15,7 @@ import { getTechAbility, getTechCost } from '@sammo-ts/logic/world/unitSet.js';
import type { WarActionPipeline, WarActionContext } from '../actions.js';
import type { WarEngineConfig } from '../types.js';
import type { WarCrewType } from '../crewType.js';
import { clamp, clampMin, getMetaNumber, getMetaString, increaseMetaNumber, round } from '../utils.js';
import { clamp, clampMin, getMetaNumber, increaseMetaNumber, round } from '../utils.js';
import { WAR_CRITICAL_RANGE, WarUnit, resolveNationTech } from './base.js';
type CityUnit = WarUnit & { getCityId: () => number };
@@ -23,8 +23,6 @@ const isCityUnit = (unit: WarUnit | null): unit is CityUnit =>
Boolean(unit && typeof (unit as CityUnit).getCityId === 'function');
const META_EXP_LEVEL = 'explevel';
const META_TURN_TIME = 'turnTime';
const META_RECENT_WAR = 'recentWar';
const META_DEX_PREFIX = 'dex';
const META_RANK_PREFIX = 'rank_';
const META_INTEL_EXP = 'intel_exp';
@@ -119,18 +117,16 @@ export class WarUnitGeneral<
}
const baseTurnTime = this.isAttacker()
? getMetaString(this.general.meta, META_TURN_TIME)
? this.general.turnTime
: oppose instanceof WarUnitGeneral
? getMetaString(oppose.general.meta, META_TURN_TIME)
: getMetaString(this.general.meta, META_TURN_TIME);
? oppose.general.turnTime
: this.general.turnTime;
if (!baseTurnTime) {
return;
}
const base = baseTurnTime.slice(0, Math.max(0, baseTurnTime.length - 2));
const phase = clamp(this.getRealPhase(), 0, 99);
const phaseText = phase.toString().padStart(2, '0');
this.general.meta[META_RECENT_WAR] = `${base}${phaseText}`;
this.general.recentWarTime = new Date(baseTurnTime.getTime());
this.general.meta.recent_war_phase = phase;
}
public override getMaxPhase(): number {