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

fix boat only captures single tile bug

Browse Source
This commit is contained in:
evanpelle
2024-09-21 20:32:39 -07:00
parent c87d0ef3b8
commit e559af941f
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execution/AttackExecution.ts
+2 -2
View File
@@ -46,14 +46,14 @@ export class AttackExecution implements Execution {
if (!this.active) {
return
}
this.mg = mg
this.targetCell = null
this._owner = mg.player(this._ownerID)
this.target = this._targetID == null ? mg.terraNullius() : mg.player(this._targetID)
this.target = this._targetID == this.mg.terraNullius().id() ? mg.terraNullius() : mg.player(this._targetID)
this.troops = Math.min(this._owner.troops(), this.troops)
this._owner.setTroops(this._owner.troops() - this.troops)
this.mg = mg
for (const exec of mg.executions()) {
if (exec.isActive() && exec instanceof AttackExecution && exec != this) {
src/core/execution/BoatAttackExecution.ts
+2 -6
View File
@@ -57,7 +57,7 @@ export class BoatAttackExecution implements Execution {
return
}
if (this.targetID == null) {
if (this.targetID == null || this.targetID == this.mg.terraNullius().id()) {
this.target = mg.terraNullius()
} else {
this.target = mg.player(this.targetID)
@@ -67,11 +67,7 @@ export class BoatAttackExecution implements Execution {
this.attacker.removeTroops(this.troops)
this.src = this.closestShoreTile(this.attacker, this.cell)
if (this.target.isPlayer()) {
this.dst = this.closestShoreTile(this.target, this.cell)
} else {
this.dst = this.mg.tile(this.cell)
}
this.dst = this.mg.tile(this.cell)
if (this.src == null || this.dst == null) {
this.active = false