cannot attack ally

src/client/ClientGame.ts

@@ -12,7 +12,7 @@ import {TerrainLayer} from "./graphics/layers/TerrainLayer";
 import {WinCheckExecution} from "../core/execution/WinCheckExecution";
 import {SendAllianceRequestUIEvent, SendBreakAllianceUIEvent} from "./graphics/layers/UILayer";
 import {createCanvas} from "./graphics/Utils";
-import {AllianceRequestReplyUIEvent as SendAllianceRequestReplyUIEvent} from "./graphics/layers/EventsDisplay";
+import {DisplayMessageEvent, MessageType, AllianceRequestReplyUIEvent as SendAllianceRequestReplyUIEvent} from "./graphics/layers/EventsDisplay";
 
 
 
@@ -208,6 +208,10 @@ export class ClientGame {
         if (tile.owner() == this.myPlayer) {
             return
         }
+        if (tile.owner().isPlayer() && this.myPlayer.alliedWith(tile.owner() as Player)) {
+            this.eventBus.emit(new DisplayMessageEvent("Cannot attack ally", MessageType.WARN))
+            return
+        }
 
         let bordersOcean = false
         let bordersEnemy = false

src/client/graphics/layers/EventsDisplay.ts

@@ -11,6 +11,17 @@ export class AllianceRequestReplyUIEvent implements GameEvent {
     ) { }
 }
 
+export enum MessageType {
+    SUCCESS,
+    INFO,
+    WARN,
+    ERROR,
+}
+
+export class DisplayMessageEvent implements GameEvent {
+    constructor(public readonly message: string, public readonly type: MessageType) { }
+}
+
 interface Event {
     description: string;
     buttons?: {
@@ -41,6 +52,7 @@ export class EventsDisplay implements Layer {
     init() {
         this.eventBus.on(AllianceRequestEvent, a => this.onAllianceRequestEvent(a))
         this.eventBus.on(AllianceRequestReplyEvent, a => this.onAllianceRequestReplyEvent(a))
+        this.eventBus.on(DisplayMessageEvent, e => this.onDisplayMessageEvent(e))
         this.renderTable()
     }
 
@@ -75,6 +87,15 @@ export class EventsDisplay implements Layer {
         return false
     }
 
+    onDisplayMessageEvent(event: DisplayMessageEvent) {
+        this.addEvent({
+            description: event.message,
+            createdAt: this.game.ticks(),
+            highlight: true,
+        })
+        this.renderTable()
+    }
+
     onAllianceRequestEvent(event: AllianceRequestEvent): void {
         const myPlayer = this.game.playerByClientID(this.clientID)
         if (myPlayer == null) {
@@ -106,6 +127,7 @@ export class EventsDisplay implements Layer {
         this.renderTable()
     }
 
+    // TODO: move this to DisplayMessageEvent
     onAllianceRequestReplyEvent(event: AllianceRequestReplyEvent) {
         const myPlayer = this.game.playerByClientID(this.clientID)
         if (myPlayer == null) {