Connect bounded arrival overlap and Fremen Nexus movement Betrayal
This commit is contained in:
1 parent
8ddd138e87
commit
b2603f6715
26 files changed
+1644
-118
No files matched your search
@@ -11,6 +11,7 @@ import {
|
||||
} from './karama-movement-cancellation';
|
||||
import { TERROR_KINDS } from './moritani-terror';
|
||||
import { validateTerrorEntrySignature } from './terror-entry-receipt';
|
||||
import { overlapOwnsWormTerror } from './arrival-overlap';
|
||||
|
||||
export class MoritaniAllianceCancellationError extends Error {
|
||||
constructor(message: string) {
|
||||
@@ -25,6 +26,7 @@ export type MoritaniAllianceCancellationContext = Pick<
|
||||
| 'phase'
|
||||
| 'players'
|
||||
| 'pendingTerrorEntry'
|
||||
| 'pendingArrivalOverlap'
|
||||
| 'moritaniTerror'
|
||||
| 'pendingAmbassador'
|
||||
| 'ecazAmbassadors'
|
||||
@@ -164,7 +166,7 @@ export function quoteMoritaniAllianceCancellation(
|
||||
requireSource(
|
||||
entry.cause === 'wormRide'
|
||||
? g.phase === 1 &&
|
||||
entry.resume === 'wormRide' &&
|
||||
(entry.resume === 'wormRide' || overlapOwnsWormTerror(g, entry)) &&
|
||||
entrants[0].faction === 'fremen'
|
||||
: g.phase === 5 &&
|
||||
entry.resume === 'none' &&
|
||||
|
||||
Reference in new issue
Block a user