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

do not allow attacking same team

Browse Source
This commit is contained in:
evanpelle
2025-05-23 11:29:43 -07:00
parent 69280d6273
commit e2d85e906f
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execution/AttackExecution.ts
+16 -8
View File
@@ -90,15 +90,23 @@ export class AttackExecution implements Execution {
return; return;
} }
if ( if (this.target.isPlayer()) {
this.target.isPlayer() && if (
this.mg.config().numSpawnPhaseTurns() + this.mg.config().numSpawnPhaseTurns() +
this.mg.config().spawnImmunityDuration() > this.mg.config().spawnImmunityDuration() >
this.mg.ticks() this.mg.ticks()
) { ) {
console.warn("cannot attack player during immunity phase"); console.warn("cannot attack player during immunity phase");
this.active = false; this.active = false;
return; return;
}
if (this._owner.isOnSameTeam(this.target)) {
console.warn(
`${this._owner.displayName()} cannot attack ${this.target.displayName()} because they are on the same team`,
);
this.active = false;
return;
}
} }
if (this.startTroops == null) { if (this.startTroops == null) {