bugfix: boat attack now donates troops instead of attacking when alliance is created during boat attack

2026-06-21 08:20:50 +00:00 · 2024-11-07 19:40:38 -08:00
parent 7ab91c9520
commit 8b8c42ea16
1 changed files with 6 additions and 2 deletions
@@ -122,8 +122,12 @@ export class BoatAttackExecution implements Execution {
                this.active = false
                return
            }
+            if (this.target.isPlayer() && this.attacker.isAlliedWith(this.target)) {
+                this.target.addTroops(this.troops)
+            } else {
                this.attacker.conquer(this.dst)
                this.mg.addExecution(new AttackExecution(this.troops, this.attacker.id(), this.targetID, this.dst.cell(), null, false))
+            }
            this.boat.delete()
            this.active = false
            return