mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 23:51:55 +00:00
d3c4cd6620
## Description: Some stats are missing from the recorded game stats: - Unit upgrade - Gold from trade and from steal The gold from trade/steal was introduced with [PR 784](https://github.com/openfrontio/OpenFrontIO/pull/784) but was quickly reverted with [PR 927](https://github.com/openfrontio/OpenFrontIO/pull/927), probably involuntarily. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: IngloriousTom
190 lines
5.2 KiB
TypeScript
190 lines
5.2 KiB
TypeScript
import { renderNumber } from "../../client/Utils";
|
|
import {
|
|
Execution,
|
|
Game,
|
|
MessageType,
|
|
Player,
|
|
Unit,
|
|
UnitType,
|
|
} from "../game/Game";
|
|
import { TileRef } from "../game/GameMap";
|
|
import { PathFindResultType } from "../pathfinding/AStar";
|
|
import { PathFinder } from "../pathfinding/PathFinding";
|
|
import { distSortUnit } from "../Util";
|
|
|
|
export class TradeShipExecution implements Execution {
|
|
private active = true;
|
|
private mg: Game;
|
|
private tradeShip: Unit | undefined;
|
|
private wasCaptured = false;
|
|
private pathFinder: PathFinder;
|
|
private tilesTraveled = 0;
|
|
|
|
constructor(
|
|
private origOwner: Player,
|
|
private srcPort: Unit,
|
|
private _dstPort: Unit,
|
|
) {}
|
|
|
|
init(mg: Game, ticks: number): void {
|
|
this.mg = mg;
|
|
this.pathFinder = PathFinder.Mini(mg, 2500);
|
|
}
|
|
|
|
tick(ticks: number): void {
|
|
if (this.tradeShip === undefined) {
|
|
const spawn = this.origOwner.canBuild(
|
|
UnitType.TradeShip,
|
|
this.srcPort.tile(),
|
|
);
|
|
if (spawn === false) {
|
|
console.warn(`cannot build trade ship`);
|
|
this.active = false;
|
|
return;
|
|
}
|
|
this.tradeShip = this.origOwner.buildUnit(UnitType.TradeShip, spawn, {
|
|
targetUnit: this._dstPort,
|
|
lastSetSafeFromPirates: ticks,
|
|
});
|
|
this.mg.stats().boatSendTrade(this.origOwner, this._dstPort.owner());
|
|
}
|
|
|
|
if (!this.tradeShip.isActive()) {
|
|
this.active = false;
|
|
return;
|
|
}
|
|
|
|
const tradeShipOwner = this.tradeShip.owner();
|
|
const dstPortOwner = this._dstPort.owner();
|
|
if (this.wasCaptured !== true && this.origOwner !== tradeShipOwner) {
|
|
// Store as variable in case ship is recaptured by previous owner
|
|
this.wasCaptured = true;
|
|
}
|
|
|
|
// If a player captures another player's port while trading we should delete
|
|
// the ship.
|
|
if (dstPortOwner.id() === this.srcPort.owner().id()) {
|
|
this.tradeShip.delete(false);
|
|
this.active = false;
|
|
return;
|
|
}
|
|
|
|
if (
|
|
!this.wasCaptured &&
|
|
(!this._dstPort.isActive() || !tradeShipOwner.canTrade(dstPortOwner))
|
|
) {
|
|
this.tradeShip.delete(false);
|
|
this.active = false;
|
|
return;
|
|
}
|
|
|
|
if (
|
|
this.wasCaptured &&
|
|
(tradeShipOwner !== dstPortOwner || !this._dstPort.isActive())
|
|
) {
|
|
const ports = this.tradeShip
|
|
.owner()
|
|
.units(UnitType.Port)
|
|
.sort(distSortUnit(this.mg, this.tradeShip));
|
|
if (ports.length === 0) {
|
|
this.tradeShip.delete(false);
|
|
this.active = false;
|
|
return;
|
|
} else {
|
|
this._dstPort = ports[0];
|
|
this.tradeShip.setTargetUnit(this._dstPort);
|
|
}
|
|
}
|
|
|
|
const curTile = this.tradeShip.tile();
|
|
if (curTile === this.dstPort()) {
|
|
this.complete();
|
|
return;
|
|
}
|
|
|
|
const result = this.pathFinder.nextTile(curTile, this._dstPort.tile());
|
|
|
|
switch (result.type) {
|
|
case PathFindResultType.Pending:
|
|
// Fire unit event to rerender.
|
|
this.tradeShip.move(curTile);
|
|
break;
|
|
case PathFindResultType.NextTile:
|
|
// Update safeFromPirates status
|
|
if (this.mg.isWater(result.node) && this.mg.isShoreline(result.node)) {
|
|
this.tradeShip.setSafeFromPirates();
|
|
}
|
|
this.tradeShip.move(result.node);
|
|
this.tilesTraveled++;
|
|
break;
|
|
case PathFindResultType.Completed:
|
|
this.complete();
|
|
break;
|
|
case PathFindResultType.PathNotFound:
|
|
console.warn("captured trade ship cannot find route");
|
|
if (this.tradeShip.isActive()) {
|
|
this.tradeShip.delete(false);
|
|
}
|
|
this.active = false;
|
|
break;
|
|
}
|
|
}
|
|
|
|
private complete() {
|
|
this.active = false;
|
|
this.tradeShip!.delete(false);
|
|
const gold = this.mg
|
|
.config()
|
|
.tradeShipGold(
|
|
this.tilesTraveled,
|
|
this.tradeShip!.owner().unitCount(UnitType.Port),
|
|
);
|
|
|
|
if (this.wasCaptured) {
|
|
this.tradeShip!.owner().addGold(gold, this._dstPort.tile());
|
|
this.mg.displayMessage(
|
|
`Received ${renderNumber(gold)} gold from ship captured from ${this.origOwner.displayName()}`,
|
|
MessageType.CAPTURED_ENEMY_UNIT,
|
|
this.tradeShip!.owner().id(),
|
|
gold,
|
|
);
|
|
// Record stats
|
|
this.mg
|
|
.stats()
|
|
.boatCapturedTrade(this.tradeShip!.owner(), this.origOwner, gold);
|
|
} else {
|
|
this.srcPort.owner().addGold(gold);
|
|
this._dstPort.owner().addGold(gold, this._dstPort.tile());
|
|
this.mg.displayMessage(
|
|
`Received ${renderNumber(gold)} gold from trade with ${this.srcPort.owner().displayName()}`,
|
|
MessageType.RECEIVED_GOLD_FROM_TRADE,
|
|
this._dstPort.owner().id(),
|
|
gold,
|
|
);
|
|
this.mg.displayMessage(
|
|
`Received ${renderNumber(gold)} gold from trade with ${this._dstPort.owner().displayName()}`,
|
|
MessageType.RECEIVED_GOLD_FROM_TRADE,
|
|
this.srcPort.owner().id(),
|
|
gold,
|
|
);
|
|
// Record stats
|
|
this.mg
|
|
.stats()
|
|
.boatArriveTrade(this.srcPort.owner(), this._dstPort.owner(), gold);
|
|
}
|
|
return;
|
|
}
|
|
|
|
isActive(): boolean {
|
|
return this.active;
|
|
}
|
|
|
|
activeDuringSpawnPhase(): boolean {
|
|
return false;
|
|
}
|
|
|
|
dstPort(): TileRef {
|
|
return this._dstPort.tile();
|
|
}
|
|
}
|