added right click option break alliance

src/core/Schemas.ts

@@ -4,7 +4,13 @@ import {PlayerType} from './game/Game';
 export type GameID = string
 export type ClientID = string
 
-export type Intent = SpawnIntent | AttackIntent | BoatAttackIntent | UpdateNameIntent | AllianceRequestIntent | AllianceRequestReplyIntent
+export type Intent = SpawnIntent
+    | AttackIntent
+    | BoatAttackIntent
+    | UpdateNameIntent
+    | AllianceRequestIntent
+    | AllianceRequestReplyIntent
+    | BreakAllianceIntent
 
 export type AttackIntent = z.infer<typeof AttackIntentSchema>
 export type SpawnIntent = z.infer<typeof SpawnIntentSchema>
@@ -12,6 +18,7 @@ export type BoatAttackIntent = z.infer<typeof BoatAttackIntentSchema>
 export type UpdateNameIntent = z.infer<typeof UpdateNameIntentSchema>
 export type AllianceRequestIntent = z.infer<typeof AllianceRequestIntentSchema>
 export type AllianceRequestReplyIntent = z.infer<typeof AllianceRequestReplyIntentSchema>
+export type BreakAllianceIntent = z.infer<typeof BreakAllianceIntentSchema>
 
 
 export type Turn = z.infer<typeof TurnSchema>
@@ -91,13 +98,20 @@ export const AllianceRequestReplyIntentSchema = BaseIntentSchema.extend({
     accept: z.boolean(),
 })
 
+export const BreakAllianceIntentSchema = BaseIntentSchema.extend({
+    type: z.literal('breakAlliance'),
+    requestor: z.string(), // The one who made the original alliance request
+    recipient: z.string(),
+})
+
 const IntentSchema = z.union([
     AttackIntentSchema,
     SpawnIntentSchema,
     BoatAttackIntentSchema,
     UpdateNameIntentSchema,
     AllianceRequestIntentSchema,
-    AllianceRequestReplyIntentSchema
+    AllianceRequestReplyIntentSchema,
+    BreakAllianceIntentSchema
 ]);
 
 const TurnSchema = z.object({

src/core/execution/ExecutionManager.ts

@@ -9,8 +9,9 @@ import {UpdateNameExecution} from "./UpdateNameExecution";
 import {FakeHumanExecution} from "./FakeHumanExecution";
 import Usernames from '../../../resources/Usernames.txt'
 import {simpleHash} from "../Util";
-import {AllianceRequestExecution} from "./AllianceRequestExecution";
-import {AllianceRequestReplyExecution} from "./AllianceRequestReplyExecution";
+import {AllianceRequestExecution} from "./alliance/AllianceRequestExecution";
+import {AllianceRequestReplyExecution} from "./alliance/AllianceRequestReplyExecution";
+import {BreakAllianceExecution} from "./alliance/BreakAllianceExecution";
 
 
 
@@ -61,6 +62,8 @@ export class Executor {
             return new AllianceRequestExecution(intent.requestor, intent.recipient)
         } else if (intent.type == "allianceRequestReply") {
             return new AllianceRequestReplyExecution(intent.requestor, intent.recipient, intent.accept)
+        } else if (intent.type == "breakAlliance") {
+            return new BreakAllianceExecution(intent.requestor, intent.recipient)
         }
         else {
             throw new Error(`intent type ${intent} not found`)

src/core/execution/alliance/AllianceRequestExecution.ts

@@ -1,4 +1,4 @@
-import {AllianceRequest, Execution, MutableGame, MutablePlayer, Player, PlayerID} from "../game/Game";
+import {AllianceRequest, Execution, MutableGame, MutablePlayer, Player, PlayerID} from "../../game/Game";
 
 export class AllianceRequestExecution implements Execution {
     private active = true

src/core/execution/alliance/AllianceRequestReplyExecution.ts

@@ -1,4 +1,4 @@
-import {AllianceRequest, Execution, MutableGame, MutablePlayer, Player, PlayerID} from "../game/Game";
+import {AllianceRequest, Execution, MutableGame, MutablePlayer, Player, PlayerID} from "../../game/Game";
 
 export class AllianceRequestReplyExecution implements Execution {
     private active = true

src/core/execution/alliance/BreakAllianceExecution.ts

@@ -0,0 +1,35 @@
+import {AllianceRequest, Execution, MutableGame, MutablePlayer, Player, PlayerID} from "../../game/Game";
+
+export class BreakAllianceExecution implements Execution {
+    private active = true
+    private requestor: MutablePlayer;
+    private recipient: MutablePlayer
+
+    constructor(private requestorID: PlayerID, private recipientID: PlayerID) { }
+
+    init(mg: MutableGame, ticks: number): void {
+        this.requestor = mg.player(this.requestorID)
+        this.recipient = mg.player(this.recipientID)
+    }
+
+    tick(ticks: number): void {
+        if (!this.requestor.alliedWith(this.recipient)) {
+            console.warn('cant break alliance, not allied')
+        } else {
+            this.requestor.breakAllianceWith(this.recipient)
+        }
+        this.active = false
+    }
+
+    owner(): MutablePlayer {
+        return null
+    }
+
+    isActive(): boolean {
+        return this.active
+    }
+
+    activeDuringSpawnPhase(): boolean {
+        return false
+    }
+}