mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-27 22:44:33 +00:00
Set a targetable status for nukes (#1174)
## Description: Set a targetable status for units (specifically atom bomb and hydro) A nuke is targetable near launch and target but is untargetable mid air. An untargetable unit is half transparent to show that it cannot be destroyed.  ## 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 - [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: Vivacious Box
This commit is contained in:
@@ -13,6 +13,8 @@ import { ParabolaPathFinder } from "../pathfinding/PathFinding";
|
||||
import { PseudoRandom } from "../PseudoRandom";
|
||||
import { NukeType } from "../StatsSchemas";
|
||||
|
||||
const NUKE_TARGETABLE_RADIUS = 120;
|
||||
|
||||
const SPRITE_RADIUS = 16;
|
||||
|
||||
export class NukeExecution implements Execution {
|
||||
@@ -99,6 +101,7 @@ export class NukeExecution implements Execution {
|
||||
this.active = false;
|
||||
return;
|
||||
}
|
||||
this.src = spawn;
|
||||
this.pathFinder.computeControlPoints(
|
||||
spawn,
|
||||
this.dst,
|
||||
@@ -163,10 +166,31 @@ export class NukeExecution implements Execution {
|
||||
this.detonate();
|
||||
return;
|
||||
} else {
|
||||
this.updateNukeTargetable();
|
||||
this.nuke.move(nextTile);
|
||||
}
|
||||
}
|
||||
|
||||
public getNuke(): Unit | null {
|
||||
return this.nuke;
|
||||
}
|
||||
|
||||
private updateNukeTargetable() {
|
||||
if (this.nuke === null || this.nuke.targetTile() === undefined) {
|
||||
return;
|
||||
}
|
||||
const targetRangeSquared = NUKE_TARGETABLE_RADIUS * NUKE_TARGETABLE_RADIUS;
|
||||
const targetTile = this.nuke.targetTile();
|
||||
this.nuke.setTargetable(
|
||||
this.mg.euclideanDistSquared(this.nuke.tile(), targetTile!) <
|
||||
targetRangeSquared ||
|
||||
(this.src !== undefined &&
|
||||
this.src !== null &&
|
||||
this.mg.euclideanDistSquared(this.src, this.nuke.tile()) <
|
||||
targetRangeSquared),
|
||||
);
|
||||
}
|
||||
|
||||
private detonate() {
|
||||
if (this.nuke === null) {
|
||||
throw new Error("Not initialized");
|
||||
|
||||
@@ -37,18 +37,6 @@ export class SAMLauncherExecution implements Execution {
|
||||
this.mg = mg;
|
||||
}
|
||||
|
||||
private nukeTargetInRange(nuke: Unit) {
|
||||
const targetTile = nuke.targetTile();
|
||||
if (this.sam === null || targetTile === undefined) {
|
||||
return false;
|
||||
}
|
||||
const targetRangeSquared = this.targetRangeRadius * this.targetRangeRadius;
|
||||
return (
|
||||
this.mg.euclideanDistSquared(this.sam.tile(), targetTile) <
|
||||
targetRangeSquared
|
||||
);
|
||||
}
|
||||
|
||||
private getSingleTarget(): Unit | null {
|
||||
if (this.sam === null) return null;
|
||||
const nukes = this.mg
|
||||
@@ -60,7 +48,7 @@ export class SAMLauncherExecution implements Execution {
|
||||
({ unit }) =>
|
||||
unit.owner() !== this.player &&
|
||||
!this.player.isFriendly(unit.owner()) &&
|
||||
this.nukeTargetInRange(unit),
|
||||
unit.isTargetable(),
|
||||
);
|
||||
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user