From 87d1a8d69dbfa9f2caf690b3a3715671242d5faa Mon Sep 17 00:00:00 2001
From: Ilan Schemoul <ilanschemoul@gmail.com>
Date: Tue, 11 Mar 2025 01:25:21 +0100
Subject: [PATCH] feat: retreat stops attack + show when ennemy retreats (#209)

---
 src/client/graphics/layers/EventsDisplay.ts | 1 +
 src/core/execution/AttackExecution.ts       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/graphics/layers/EventsDisplay.ts
index d0a9302ec..cc8c305a0 100644
--- a/src/client/graphics/layers/EventsDisplay.ts
+++ b/src/client/graphics/layers/EventsDisplay.ts
@@ -419,6 +419,7 @@ export class EventsDisplay extends LitElement implements Layer {
                         ) as PlayerView
                       )?.name()}
                     </button>
+                    ${attack.retreating ? "(retreating...)" : ""}
                   `,
                 )}
               </td>
diff --git a/src/core/execution/AttackExecution.ts b/src/core/execution/AttackExecution.ts
index 8e8a9cf20..198bc176e 100644
--- a/src/core/execution/AttackExecution.ts
+++ b/src/core/execution/AttackExecution.ts
@@ -185,6 +185,10 @@ export class AttackExecution implements Execution {
       return;
     }
 
+    if (this.attack.retreating()) {
+      return;
+    }
+
     if (!this.attack.isActive()) {
       this.active = false;
       return;