{types.groundunit
.sort()
- .filter((type) => {
- return type !== "AAA" && type !== "SAM Site";
- })
+ .filter((type) => type !== "SAM Site")
.map((type) => {
return (
void; children?
`}
>
{filteredBlueprints
- .filter((blueprint) => blueprint.category === "groundunit")
+ .filter((blueprint) => blueprint.category === "groundunit" && blueprint.type !== "SAM Site")
.map((entry) => {
return
setBlueprint(entry)} />;
})}
diff --git a/frontend/react/src/ui/panels/unitcontrolmenu.tsx b/frontend/react/src/ui/panels/unitcontrolmenu.tsx
index ed201264..87baad94 100644
--- a/frontend/react/src/ui/panels/unitcontrolmenu.tsx
+++ b/frontend/react/src/ui/panels/unitcontrolmenu.tsx
@@ -6,7 +6,7 @@ import { OlRangeSlider } from "../components/olrangeslider";
import { getApp } from "../../olympusapp";
import { OlButtonGroup, OlButtonGroupItem } from "../components/olbuttongroup";
import { OlCheckbox } from "../components/olcheckbox";
-import { ROEs, emissionsCountermeasures, reactionsToThreat } from "../../constants/constants";
+import { ROEs, altitudeIncrements, emissionsCountermeasures, maxAltitudeValues, minAltitudeValues, reactionsToThreat, speedIncrements } from "../../constants/constants";
import { OlToggle } from "../components/oltoggle";
import { OlCoalitionToggle } from "../components/olcoalitiontoggle";
import {
@@ -202,26 +202,28 @@ export function UnitControlMenu(props: { open: boolean; onClose: () => void }) {
return category === "Helicopter";
});
- // TODO: use constants
+ /* Speed/altitude increments */
const minAltitude = 0;
const minSpeed = 0;
- let maxAltitude = 60000;
- let maxSpeed = 800;
-
- let altitudeStep = 500;
- let speedStep = 10;
+ let maxAltitude = maxAltitudeValues.aircraft;
+ let maxSpeed = minAltitudeValues.aircraft;
+ let speedStep = speedIncrements.aircraft;
+ let altitudeStep = altitudeIncrements.aircraft;
if (everyUnitIsHelicopter) {
- maxAltitude = 20000;
- maxSpeed = 200;
- speedStep = 5;
- altitudeStep = 100;
+ maxAltitude = maxAltitudeValues.helicopter;
+ maxSpeed = minAltitudeValues.helicopter;
+ speedStep = speedIncrements.helicopter;
+ altitudeStep = altitudeIncrements.helicopter;
}
-
- if (everyUnitIsGround || everyUnitIsNavy) {
- maxSpeed = 60;
- speedStep = 1;
+ else if (everyUnitIsGround) {
+ maxSpeed = minAltitudeValues.groundunit;
+ speedStep = speedIncrements.groundunit;
+ }
+ else if (everyUnitIsNavy) {
+ maxSpeed = minAltitudeValues.navyunit;
+ speedStep = speedIncrements.navyunit;
}
return (
@@ -654,7 +656,6 @@ export function UnitControlMenu(props: { open: boolean; onClose: () => void }) {
)}
{/* ============== Rules of Engagement END ============== */}
-
{selectedCategories.every((category) => {
return ["Aircraft", "Helicopter"].includes(category);
}) && (
diff --git a/frontend/react/src/ui/panels/unitspawnmenu.tsx b/frontend/react/src/ui/panels/unitspawnmenu.tsx
index 5d27415d..4e2cbfc6 100644
--- a/frontend/react/src/ui/panels/unitspawnmenu.tsx
+++ b/frontend/react/src/ui/panels/unitspawnmenu.tsx
@@ -11,15 +11,15 @@ import { getApp } from "../../olympusapp";
import { ftToM } from "../../other/utils";
import { LatLng } from "leaflet";
import { Airbase } from "../../mission/airbase";
-import { OlympusState, SpawnSubState } from "../../constants/constants";
+import { altitudeIncrements, groupUnitCount, maxAltitudeValues, minAltitudeValues, OlympusState, SpawnSubState } from "../../constants/constants";
export function UnitSpawnMenu(props: { blueprint: UnitBlueprint; spawnAtLocation: boolean; airbase?: Airbase | null; coalition?: Coalition }) {
/* Compute the min and max values depending on the unit type */
const minNumber = 1;
- const maxNumber = 4;
- const minAltitude = 0;
- const maxAltitude = 30000;
- const altitudeStep = 500;
+ const maxNumber = groupUnitCount[props.blueprint.category];
+ const minAltitude = minAltitudeValues[props.blueprint.category];
+ const maxAltitude = maxAltitudeValues[props.blueprint.category];
+ const altitudeStep = altitudeIncrements[props.blueprint.category];
/* State initialization */
const [spawnCoalition, setSpawnCoalition] = useState("blue" as Coalition);
@@ -53,7 +53,7 @@ export function UnitSpawnMenu(props: { blueprint: UnitBlueprint; spawnAtLocation
},
coalition: spawnCoalition,
});
- getApp().setState(OlympusState.SPAWN, SpawnSubState.SPAWN_UNIT)
+ getApp().setState(OlympusState.SPAWN, SpawnSubState.SPAWN_UNIT);
} else {
if (getApp().getState() === OlympusState.SPAWN) getApp().setState(OlympusState.IDLE);
}
@@ -141,98 +141,102 @@ export function UnitSpawnMenu(props: { blueprint: UnitBlueprint; spawnAtLocation
}}
/>