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

merge: complete tournament betting parity

Browse Source
This commit is contained in:
Hide_D
2026-07-26 04:32:56 +00:00
parent af00b30bdc 35c1c138d7
commit dc74a9a2be
26 changed files with 2475 additions and 1446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/common/src/turnDaemon/types.ts
+112 -111
View File
@@ -155,56 +155,57 @@ export type TurnDaemonCommand =
updates: Record<string, unknown>;
expectedUpdatedAt?: string;
}
| {
type: 'adjustGeneralResources';
requestId?: string;
reason?: string;
adjustments: Array<{
generalId: number;
goldDelta?: number;
riceDelta?: number;
}>;
}
| {
type: 'adjustGeneralMeta';
requestId?: string;
reason?: string;
adjustments: Array<{
generalId: number;
metaDelta: Record<string, number>;
}>;
}
| {
type: 'tournamentMatchResult';
requestId?: string;
tournamentType: number;
attackerId: number;
defenderId: number;
result: 'attacker' | 'defender' | 'draw';
}
| {
type: 'patchGeneral';
requestId?: string;
| {
type: 'adjustGeneralResources';
requestId?: string;
reason?: string;
adjustments: Array<{
generalId: number;
patch: {
meta?: Record<string, unknown>;
turnTime?: string;
stats?: {
leadership?: number;
strength?: number;
intelligence?: number;
};
specialWar?: string;
goldDelta?: number;
riceDelta?: number;
minGoldAfter?: number;
}>;
}
| {
type: 'adjustGeneralMeta';
requestId?: string;
reason?: string;
adjustments: Array<{
generalId: number;
metaDelta: Record<string, number>;
}>;
}
| {
type: 'tournamentMatchResult';
requestId?: string;
tournamentType: number;
attackerId: number;
defenderId: number;
result: 'attacker' | 'defender' | 'draw';
}
| {
type: 'patchGeneral';
requestId?: string;
generalId: number;
patch: {
meta?: Record<string, unknown>;
turnTime?: string;
stats?: {
leadership?: number;
strength?: number;
intelligence?: number;
};
}
| {
type: 'auctionBid';
requestId?: string;
auctionId: number;
generalId: number;
amount: number;
tryExtendCloseDate?: boolean;
specialWar?: string;
};
}
| {
type: 'auctionBid';
requestId?: string;
auctionId: number;
generalId: number;
amount: number;
tryExtendCloseDate?: boolean;
};
export type TurnDaemonCommandResult =
| {
@@ -385,70 +386,70 @@ export type TurnDaemonCommandResult =
reason: string;
currentUpdatedAt?: string;
}
| {
type: 'adjustGeneralResources';
ok: true;
processed: number;
missing: number;
totalGoldDelta: number;
totalRiceDelta: number;
}
| {
type: 'adjustGeneralResources';
ok: false;
reason: string;
}
| {
type: 'adjustGeneralMeta';
ok: true;
processed: number;
missing: number;
}
| {
type: 'adjustGeneralMeta';
ok: false;
reason: string;
}
| {
type: 'tournamentMatchResult';
ok: true;
tournamentType: number;
attackerId: number;
defenderId: number;
result: 'attacker' | 'defender' | 'draw';
}
| {
type: 'tournamentMatchResult';
ok: false;
tournamentType: number;
attackerId: number;
defenderId: number;
result: 'attacker' | 'defender' | 'draw';
reason: string;
}
| {
type: 'patchGeneral';
ok: true;
generalId: number;
}
| {
type: 'patchGeneral';
ok: false;
generalId: number;
reason: string;
}
| {
type: 'auctionBid';
ok: true;
auctionId: number;
closeAt: string;
}
| {
type: 'auctionBid';
ok: false;
auctionId: number;
reason: string;
};
| {
type: 'adjustGeneralResources';
ok: true;
processed: number;
missing: number;
totalGoldDelta: number;
totalRiceDelta: number;
}
| {
type: 'adjustGeneralResources';
ok: false;
reason: string;
}
| {
type: 'adjustGeneralMeta';
ok: true;
processed: number;
missing: number;
}
| {
type: 'adjustGeneralMeta';
ok: false;
reason: string;
}
| {
type: 'tournamentMatchResult';
ok: true;
tournamentType: number;
attackerId: number;
defenderId: number;
result: 'attacker' | 'defender' | 'draw';
}
| {
type: 'tournamentMatchResult';
ok: false;
tournamentType: number;
attackerId: number;
defenderId: number;
result: 'attacker' | 'defender' | 'draw';
reason: string;
}
| {
type: 'patchGeneral';
ok: true;
generalId: number;
}
| {
type: 'patchGeneral';
ok: false;
generalId: number;
reason: string;
}
| {
type: 'auctionBid';
ok: true;
auctionId: number;
closeAt: string;
}
| {
type: 'auctionBid';
ok: false;
auctionId: number;
reason: string;
};
export type TurnDaemonEvent =
| { type: 'status'; requestId?: string; status: TurnDaemonStatus }