mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-21 02:46:04 +00:00
Add SAM interception FX (#830)
## Description: Add SAM interception animation: https://github.com/user-attachments/assets/5bfae4f2-f040-41cb-8fba-790538091807 Previously an intercepted nuke detonated with the regular nuke explosion, which was confusing. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: IngloriousTom
This commit is contained in:
@@ -180,7 +180,10 @@ export class SAMLauncherExecution implements Execution {
|
||||
this.sam.owner().id(),
|
||||
);
|
||||
// Delete warheads
|
||||
mirvWarheadTargets.forEach((u) => u.delete());
|
||||
mirvWarheadTargets.forEach((u) => {
|
||||
u.setInterceptedBySam();
|
||||
u.delete();
|
||||
});
|
||||
} else if (target !== null) {
|
||||
target.setTargetedBySAM(true);
|
||||
this.mg.addExecution(
|
||||
|
||||
@@ -66,6 +66,7 @@ export class SAMMissileExecution implements Execution {
|
||||
this._owner.id(),
|
||||
);
|
||||
this.active = false;
|
||||
this.target.setInterceptedBySam();
|
||||
this.target.delete(true, this._owner);
|
||||
this.SAMMissile.delete(false);
|
||||
|
||||
|
||||
@@ -345,6 +345,8 @@ export interface Unit {
|
||||
targetUnit(): Unit | undefined;
|
||||
setTargetedBySAM(targeted: boolean): void;
|
||||
targetedBySAM(): boolean;
|
||||
setInterceptedBySam(): void;
|
||||
interceptedBySam(): boolean;
|
||||
|
||||
// Health
|
||||
hasHealth(): boolean;
|
||||
|
||||
@@ -73,6 +73,7 @@ export interface UnitUpdate {
|
||||
pos: TileRef;
|
||||
lastPos: TileRef;
|
||||
isActive: boolean;
|
||||
wasIntercepted: boolean;
|
||||
retreating: boolean;
|
||||
targetUnitId?: number; // Only for trade ships
|
||||
targetTile?: TileRef; // Only for nukes
|
||||
|
||||
@@ -93,6 +93,9 @@ export class UnitView {
|
||||
isActive(): boolean {
|
||||
return this.data.isActive;
|
||||
}
|
||||
wasInterceptedBySAM(): boolean {
|
||||
return this.data.wasIntercepted;
|
||||
}
|
||||
hasHealth(): boolean {
|
||||
return this.data.health !== undefined;
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ export class UnitImpl implements Unit {
|
||||
private _lastTile: TileRef;
|
||||
private _retreating: boolean = false;
|
||||
private _targetedBySAM = false;
|
||||
private _interceptedBySAM = false;
|
||||
private _lastSetSafeFromPirates: number; // Only for trade ships
|
||||
private _constructionType: UnitType | undefined;
|
||||
private _lastOwner: PlayerImpl | null = null;
|
||||
@@ -85,6 +86,7 @@ export class UnitImpl implements Unit {
|
||||
ownerID: this._owner.smallID(),
|
||||
lastOwnerID: this._lastOwner?.smallID(),
|
||||
isActive: this._active,
|
||||
wasIntercepted: this._interceptedBySAM,
|
||||
retreating: this._retreating,
|
||||
pos: this._tile,
|
||||
lastPos: this._lastTile,
|
||||
@@ -304,6 +306,14 @@ export class UnitImpl implements Unit {
|
||||
return this._targetedBySAM;
|
||||
}
|
||||
|
||||
setInterceptedBySam(): void {
|
||||
this._interceptedBySAM = true;
|
||||
}
|
||||
|
||||
interceptedBySam(): boolean {
|
||||
return this._interceptedBySAM;
|
||||
}
|
||||
|
||||
setSafeFromPirates(): void {
|
||||
this._lastSetSafeFromPirates = this.mg.ticks();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user