alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-06-21 06:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
evanpelle
2024-11-07 19:40:38 -08:00
parent 7ab91c9520
commit 8b8c42ea16
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execution/BoatAttackExecution.ts
+6 -2
View File
@@ -122,8 +122,12 @@ export class BoatAttackExecution implements Execution {
this.active = false
return
}
this.attacker.conquer(this.dst)
this.mg.addExecution(new AttackExecution(this.troops, this.attacker.id(), this.targetID, this.dst.cell(), null, false))
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