mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-02 07:38:12 +00:00
Add deletion duration and indicators (#2216)
## Description: Adds a timer before self deleting units Adds a loading bar under deleting units Adds a timer in radial menu for clarity purposes  ## 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: Mr.Box --------- Co-authored-by: Evan <evanpelle@gmail.com>
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
import { Execution, Game, MessageType, Player } from "../game/Game";
|
||||
import { Execution, Game, MessageType, Player, Unit } from "../game/Game";
|
||||
|
||||
export class DeleteUnitExecution implements Execution {
|
||||
private active: boolean = true;
|
||||
private mg: Game;
|
||||
private unit: Unit | null = null;
|
||||
|
||||
constructor(
|
||||
private player: Player,
|
||||
@@ -33,6 +34,7 @@ export class DeleteUnitExecution implements Execution {
|
||||
this.active = false;
|
||||
return;
|
||||
}
|
||||
this.unit = unit;
|
||||
|
||||
const tileOwner = mg.owner(unit.tile());
|
||||
if (!tileOwner.isPlayer() || tileOwner.id() !== this.player.id()) {
|
||||
@@ -61,19 +63,29 @@ export class DeleteUnitExecution implements Execution {
|
||||
return;
|
||||
}
|
||||
|
||||
unit.delete(false);
|
||||
this.player.recordDeleteUnit();
|
||||
|
||||
this.mg.displayMessage(
|
||||
`events_display.unit_voluntarily_deleted`,
|
||||
MessageType.UNIT_DESTROYED,
|
||||
this.player.id(),
|
||||
);
|
||||
|
||||
this.active = false;
|
||||
unit.markForDeletion();
|
||||
}
|
||||
|
||||
tick(ticks: number) {}
|
||||
tick(ticks: number) {
|
||||
if (!this.active || !this.unit) {
|
||||
return;
|
||||
}
|
||||
if (!this.unit.isActive()) {
|
||||
this.active = false;
|
||||
return;
|
||||
}
|
||||
if (this.unit.isOverdueDeletion()) {
|
||||
this.unit.delete(false);
|
||||
|
||||
this.mg.displayMessage(
|
||||
`events_display.unit_voluntarily_deleted`,
|
||||
MessageType.UNIT_DESTROYED,
|
||||
this.player.id(),
|
||||
);
|
||||
this.active = false;
|
||||
}
|
||||
}
|
||||
|
||||
isActive(): boolean {
|
||||
return this.active;
|
||||
|
||||
@@ -19,7 +19,7 @@ export class UpgradeStructureExecution implements Execution {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.player.canUpgradeUnit(this.structure.type())) {
|
||||
if (!this.player.canUpgradeUnit(this.structure)) {
|
||||
console.warn(
|
||||
`[UpgradeStructureExecution] unit type ${this.structure.type()} cannot be upgraded`,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user