From 228f5b13afcf5c4a6961fe3a2c2d319331be0039 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 20 May 2025 16:08:02 -0400 Subject: [PATCH] Landing boats always conquer shore tile (#790) ## Description: Modifies the transport ship landing logic to always conquer the tile. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com> --- src/core/execution/TransportShipExecution.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/execution/TransportShipExecution.ts b/src/core/execution/TransportShipExecution.ts index 027f022c4..2040f9ff6 100644 --- a/src/core/execution/TransportShipExecution.ts +++ b/src/core/execution/TransportShipExecution.ts @@ -178,10 +178,10 @@ export class TransportShipExecution implements Execution { this.active = false; return; } + this.attacker.conquer(this.dst); if (this.target.isPlayer() && this.attacker.isFriendly(this.target)) { - this.target.addTroops(this.troops); + this.attacker.addTroops(this.troops); } else { - this.attacker.conquer(this.dst); this.mg.addExecution( new AttackExecution( this.troops,