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

bugfix: boat attack troops count twice

Browse Source
This commit is contained in:
Evan
2024-11-02 19:55:22 -07:00
parent 9f23388d21
commit e77bb5e118
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execution/AttackExecution.ts
+10 -7
View File
@@ -1,8 +1,8 @@
import {PriorityQueue} from "@datastructures-js/priority-queue";
import {Cell, Execution, MutableGame, MutablePlayer, Player, PlayerID, TerrainType, TerraNullius, Tile} from "../game/Game";
import {PseudoRandom} from "../PseudoRandom";
import {manhattanDist} from "../Util";
import {Terrain} from "../game/TerrainMapLoader";
import { PriorityQueue } from "@datastructures-js/priority-queue";
import { Cell, Execution, MutableGame, MutablePlayer, Player, PlayerID, TerrainType, TerraNullius, Tile } from "../game/Game";
import { PseudoRandom } from "../PseudoRandom";
import { manhattanDist } from "../Util";
import { Terrain } from "../game/TerrainMapLoader";
export class AttackExecution implements Execution {
private breakAlliance = false
@@ -32,6 +32,7 @@ export class AttackExecution implements Execution {
private _targetID: PlayerID | null,
private sourceCell: Cell | null,
private targetCell: Cell | null,
private removeTroops: boolean = true,
) { }
public targetID(): PlayerID {
@@ -57,7 +58,9 @@ export class AttackExecution implements Execution {
this.troops = this.mg.config().attackAmount(this._owner, this.target)
}
this.troops = Math.min(this._owner.troops(), this.troops)
this._owner.removeTroops(this.troops)
if (this.removeTroops) {
this._owner.removeTroops(this.troops)
}
for (const exec of mg.executions()) {
if (exec.isActive() && exec instanceof AttackExecution && exec != this) {
@@ -151,7 +154,7 @@ export class AttackExecution implements Execution {
continue
}
this.addNeighbors(tileToConquer)
const {attackerTroopLoss, defenderTroopLoss, tilesPerTickUsed} = this.mg.config().attackLogic(this.troops, this._owner, this.target, tileToConquer)
const { attackerTroopLoss, defenderTroopLoss, tilesPerTickUsed } = this.mg.config().attackLogic(this.troops, this._owner, this.target, tileToConquer)
numTilesPerTick -= tilesPerTickUsed
this.troops -= attackerTroopLoss
if (this.target.isPlayer()) {
src/core/execution/BoatAttackExecution.ts
+1 -1
View File
@@ -123,7 +123,7 @@ export class BoatAttackExecution implements Execution {
return
}
this.attacker.conquer(this.dst)
this.mg.addExecution(new AttackExecution(this.troops, this.attacker.id(), this.targetID, this.dst.cell(), null))
this.mg.addExecution(new AttackExecution(this.troops, this.attacker.id(), this.targetID, this.dst.cell(), null, false))
this.boat.delete()
this.active = false
return