weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor bugfixes

Browse Source
This commit is contained in:
Pax1601
2024-11-20 08:09:00 +01:00
parent 38f6788fa8
commit 73c8ce2fe7
5 changed files with 68 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/react/src/audio/audiomanager.ts
View File

@@ -76,7 +76,7 @@ export class AudioManager {
if (!this.#socket) return; if (!this.#socket) return;
//this.#socket = new WebSocket(`wss://refugees.dcsolympus.com/audio`); // TODO: remove, used for testing! this.#socket = new WebSocket(`wss://refugees.dcsolympus.com/audio`); // TODO: remove, used for testing!
/* Log the opening of the connection */ /* Log the opening of the connection */
this.#socket.addEventListener("open", (event) => { this.#socket.addEventListener("open", (event) => {

9
frontend/react/src/other/utils.ts
View File

@@ -243,6 +243,15 @@ export function enumToROE(ROE: number) {
else return ROEs[0]; else return ROEs[0];
} }
export function convertROE(idx: number) {
let roe = 0;
if (idx === 0) roe = 4;
else if (idx === 1) roe = 3;
else if (idx === 2) roe = 1;
else roe = 0;
return roe;
}
export function enumToReactionToThreat(reactionToThreat: number) { export function enumToReactionToThreat(reactionToThreat: number) {
if (reactionToThreat < reactionsToThreat.length) return reactionsToThreat[reactionToThreat]; if (reactionToThreat < reactionsToThreat.length) return reactionsToThreat[reactionToThreat];
else return reactionsToThreat[0]; else return reactionsToThreat[0];

11
frontend/react/src/ui/panels/coordinatespanel.tsx
View File

@@ -48,9 +48,9 @@ export function CoordinatesPanel(props: {}) {
`} `}
> >
<FaBullseye /> <FaBullseye />
</span> </span> {bearing(bullseyes[2].getLatLng().lat, bullseyes[2].getLatLng().lng, latlng.lat, latlng.lng).toFixed()}° / {" "}
{(bullseyes[2].getLatLng().distanceTo(latlng) / 1852).toFixed(0)} /{" "} {(bullseyes[2].getLatLng().distanceTo(latlng) / 1852).toFixed(0)}
{bearing(bullseyes[2].getLatLng().lat, bullseyes[2].getLatLng().lng, latlng.lat, latlng.lng).toFixed()}°
</div> </div>
<div className="flex w-[50%] justify-start gap-2"> <div className="flex w-[50%] justify-start gap-2">
<span <span
@@ -61,8 +61,9 @@ export function CoordinatesPanel(props: {}) {
> >
<FaBullseye /> <FaBullseye />
</span> </span>
{(bullseyes[1].getLatLng().distanceTo(latlng) / 1852).toFixed(0)} /{" "} {bearing(bullseyes[1].getLatLng().lat, bullseyes[1].getLatLng().lng, latlng.lat, latlng.lng).toFixed()}° / {" "}
{bearing(bullseyes[1].getLatLng().lat, bullseyes[1].getLatLng().lng, latlng.lat, latlng.lng).toFixed()}° {(bullseyes[1].getLatLng().distanceTo(latlng) / 1852).toFixed(0)}
</div> </div>
</div> </div>
{/*}<div className="flex justify-start gap-2"> {/*}<div className="flex justify-start gap-2">

98
frontend/react/src/ui/panels/unitcontrolmenu.tsx
View File

@@ -6,7 +6,16 @@ import { OlRangeSlider } from "../components/olrangeslider";
import { getApp } from "../../olympusapp"; import { getApp } from "../../olympusapp";
import { OlButtonGroup, OlButtonGroupItem } from "../components/olbuttongroup"; import { OlButtonGroup, OlButtonGroupItem } from "../components/olbuttongroup";
import { OlCheckbox } from "../components/olcheckbox"; import { OlCheckbox } from "../components/olcheckbox";
import { ROEs, altitudeIncrements, emissionsCountermeasures, maxAltitudeValues, maxSpeedValues, minAltitudeValues, reactionsToThreat, speedIncrements } from "../../constants/constants"; import {
ROEs,
altitudeIncrements,
emissionsCountermeasures,
maxAltitudeValues,
maxSpeedValues,
minAltitudeValues,
reactionsToThreat,
speedIncrements,
} from "../../constants/constants";
import { OlToggle } from "../components/oltoggle"; import { OlToggle } from "../components/oltoggle";
import { OlCoalitionToggle } from "../components/olcoalitiontoggle"; import { OlCoalitionToggle } from "../components/olcoalitiontoggle";
import { import {
@@ -38,7 +47,7 @@ import {
olButtonsVisibilityOlympus, olButtonsVisibilityOlympus,
} from "../components/olicons"; } from "../components/olicons";
import { Coalition } from "../../types/types"; import { Coalition } from "../../types/types";
import { ftToM, knotsToMs, mToFt, msToKnots } from "../../other/utils"; import { convertROE, ftToM, knotsToMs, mToFt, msToKnots } from "../../other/utils";
import { FaCog, FaGasPump, FaSignal, FaTag } from "react-icons/fa"; import { FaCog, FaGasPump, FaSignal, FaTag } from "react-icons/fa";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { OlSearchBar } from "../components/olsearchbar"; import { OlSearchBar } from "../components/olsearchbar";
@@ -216,12 +225,10 @@ export function UnitControlMenu(props: { open: boolean; onClose: () => void }) {
maxSpeed = maxSpeedValues.helicopter; maxSpeed = maxSpeedValues.helicopter;
speedStep = speedIncrements.helicopter; speedStep = speedIncrements.helicopter;
altitudeStep = altitudeIncrements.helicopter; altitudeStep = altitudeIncrements.helicopter;
} } else if (everyUnitIsGround) {
else if (everyUnitIsGround) {
maxSpeed = maxSpeedValues.groundunit; maxSpeed = maxSpeedValues.groundunit;
speedStep = speedIncrements.groundunit; speedStep = speedIncrements.groundunit;
} } else if (everyUnitIsNavy) {
else if (everyUnitIsNavy) {
maxSpeed = maxSpeedValues.navyunit; maxSpeed = maxSpeedValues.navyunit;
speedStep = speedIncrements.navyunit; speedStep = speedIncrements.navyunit;
} }
@@ -622,39 +629,39 @@ export function UnitControlMenu(props: { open: boolean; onClose: () => void }) {
</div> </div>
{/* ============== Airspeed selector END ============== */} {/* ============== Airspeed selector END ============== */}
{/* ============== Rules of Engagement START ============== */} {/* ============== Rules of Engagement START ============== */}
{!(selectedUnits.length === 1 && selectedUnits[0].isTanker()) && {!(selectedUnits.length === 1 && selectedUnits[0].isTanker()) && !(selectedUnits.length === 1 && selectedUnits[0].isAWACS()) && (
!(selectedUnits.length === 1 && selectedUnits[0].isAWACS()) && ( <div className="flex flex-col gap-2">
<div className="flex flex-col gap-2"> <span
<span className={`
className={` my-auto font-normal
my-auto font-normal dark:text-white
dark:text-white `}
`} >
> Rules of engagement
Rules of engagement </span>
</span> <OlButtonGroup>
<OlButtonGroup> {[olButtonsRoeHold, olButtonsRoeReturn, olButtonsRoeDesignated, olButtonsRoeFree].map((icon, idx) => {
{[olButtonsRoeHold, olButtonsRoeReturn, olButtonsRoeDesignated, olButtonsRoeFree].map((icon, idx) => { return (
return ( <OlButtonGroupItem
<OlButtonGroupItem key={idx}
key={idx} onClick={() => {
onClick={() => {
selectedUnits.forEach((unit) => { selectedUnits.forEach((unit) => {
unit.setROE(ROEs[idx]); unit.setROE(ROEs[convertROE(idx)]);
setSelectedUnitsData({ setSelectedUnitsData({
...selectedUnitsData, ...selectedUnitsData,
ROE: ROEs[idx], ROE: ROEs[convertROE(idx)],
});
}); });
}} });
active={selectedUnitsData.ROE === ROEs[idx]} }}
icon={icon} active={selectedUnitsData.ROE === ROEs[convertROE(idx)]}
/> icon={icon}
); />
})} );
</OlButtonGroup> })}
</div> </OlButtonGroup>
)} </div>
)}
{/* ============== Rules of Engagement END ============== */} {/* ============== Rules of Engagement END ============== */}
{selectedCategories.every((category) => { {selectedCategories.every((category) => {
return ["Aircraft", "Helicopter"].includes(category); return ["Aircraft", "Helicopter"].includes(category);
@@ -1174,10 +1181,9 @@ export function UnitControlMenu(props: { open: boolean; onClose: () => void }) {
value={activeAdvancedSettings ? activeAdvancedSettings.TACAN.channel : 1} value={activeAdvancedSettings ? activeAdvancedSettings.TACAN.channel : 1}
></OlNumberInput> ></OlNumberInput>
<OlDropdown <OlDropdown label={activeAdvancedSettings ? activeAdvancedSettings.TACAN.XY : "X"} className={`
label={activeAdvancedSettings ? activeAdvancedSettings.TACAN.XY : "X"} my-auto w-20
className={`my-auto w-20`} `}>
>
<OlDropdownItem <OlDropdownItem
key={"X"} key={"X"}
onClick={() => { onClick={() => {
@@ -1296,11 +1302,9 @@ export function UnitControlMenu(props: { open: boolean; onClose: () => void }) {
className={` className={`
flex content-center gap-2 rounded-full flex content-center gap-2 rounded-full
${selectedUnits[0].getFuel() > 40 && `bg-green-700`} ${selectedUnits[0].getFuel() > 40 && `bg-green-700`}
${ ${selectedUnits[0].getFuel() > 10 && selectedUnits[0].getFuel() <= 40 && `
selectedUnits[0].getFuel() > 10 && bg-yellow-700
selectedUnits[0].getFuel() <= 40 && `}
`bg-yellow-700`
}
${selectedUnits[0].getFuel() <= 10 && `bg-red-700`} ${selectedUnits[0].getFuel() <= 10 && `bg-red-700`}
px-2 py-1 text-sm font-bold text-white px-2 py-1 text-sm font-bold text-white
`} `}

2
frontend/react/src/ui/ui.tsx
View File

@@ -28,7 +28,7 @@ import { AppStateChangedEvent, MapOptionsChangedEvent } from "../events";
import { GameMasterMenu } from "./panels/gamemastermenu"; import { GameMasterMenu } from "./panels/gamemastermenu";
import { InfoBar } from "./panels/infobar"; import { InfoBar } from "./panels/infobar";
import { HotGroupBar } from "./panels/hotgroupsbar"; import { HotGroupBar } from "./panels/hotgroupsbar";
import { SpawnContextMenu } from "./contextmenus/SpawnContextmenu"; import { SpawnContextMenu } from "./contextmenus/spawncontextmenu";
import { CoordinatesPanel } from "./panels/coordinatespanel"; import { CoordinatesPanel } from "./panels/coordinatespanel";
export type OlympusUIState = { export type OlympusUIState = {