Support Sapho ordering for Great Maker votes
Verify and publish checkpoint container / container (push) Successful in 11m14s

This commit is contained in:
Quintine committed 2026-11-16 21:32:53 +11:00
1 parent e81725e4b2
commit 77d02b3231
18 files changed
+798 -21

No files matched your search

+11 -4
View File
@@ -1,3 +1,5 @@
import type { SaphoGreatMakerOrder } from './sapho-great-maker';
export type GreatMaker = {
arrival: {
territory: string;
@@ -14,10 +16,12 @@ export type GreatMaker = {
order: string[];
votes: { player: string; yes: boolean }[];
ridesBefore: string[];
/** Present only on fresh vote-order-capable encounters. */
saphoOrder?: SaphoGreatMakerOrder;
signature: string;
};
export function greatMakerSignature(frame: GreatMaker): string {
return JSON.stringify([
const values: unknown[] = [
frame.event,
frame.turn,
frame.pile,
@@ -28,7 +32,9 @@ export function greatMakerSignature(frame: GreatMaker): string {
frame.votes,
frame.ridesBefore,
frame.arrival,
]);
];
if (frame.saphoOrder) values.push(frame.saphoOrder);
return JSON.stringify(values);
}
export function validateGreatMaker(
frame: GreatMaker,
@@ -38,8 +44,9 @@ export function validateGreatMaker(
const ids = players.map((player) => player.id);
if (
!frame ||
Object.keys(frame).sort().join(',') !==
'arrival,event,index,order,pile,ridesBefore,signature,stage,territory,turn,votes' ||
Object.keys(frame).sort().join(',') !== (frame.saphoOrder
? 'arrival,event,index,order,pile,ridesBefore,saphoOrder,signature,stage,territory,turn,votes'
: 'arrival,event,index,order,pile,ridesBefore,signature,stage,territory,turn,votes') ||
typeof frame.event !== 'string' ||
!frame.event ||
!Number.isSafeInteger(frame.turn) ||