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

More bugfixing

Browse Source
This commit is contained in:
Pax1601
2023-08-04 12:53:14 +02:00
parent 2f839624a8
commit f111e513c5
7 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/public/stylesheets/olympus.css
View File

@@ -721,8 +721,8 @@ nav.ol-panel> :last-child {
}
#rapid-controls svg {
height: 25px;
width: 25px;
height: 20px;
width: 20px;
fill: white;
stroke: white;
}

4
client/public/stylesheets/panels/unitcontrol.css
View File

@@ -100,6 +100,10 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
margin-top: 15px;
}
#advanced-settings-dialog .ol-text-input input {
height: 40px;
}
#general-settings-grid {
display: grid;
grid-template-columns: 1fr 1fr;

15
client/src/map/map.ts
View File

@@ -1,5 +1,5 @@
import * as L from "leaflet"
import { getUnitsManager } from "..";
import { getMissionHandler, getUnitsManager } from "..";
import { BoxSelect } from "./boxselect";
import { MapContextMenu } from "../controls/mapcontextmenu";
import { UnitContextMenu } from "../controls/unitcontextmenu";
@@ -117,11 +117,20 @@ export class Map extends L.Map {
Object.values(getUnitsManager().getUnits()).forEach((unit: Unit) => unit.updateVisibility());
});
document.addEventListener("toggleUnitVisibility", (ev: CustomEventInit) => {
document.addEventListener("toggleMarkerVisibility", (ev: CustomEventInit) => {
const el = ev.detail._element;
el?.classList.toggle("off");
ev.detail.types.forEach((type: string) => getUnitsManager().setHiddenType(type, !el?.classList.contains("off")));
Object.values(getUnitsManager().getUnits()).forEach((unit: Unit) => unit.updateVisibility());
if (ev.detail.types.includes("airbase")) {
Object.values(getMissionHandler().getAirbases()).forEach((airbase: Airbase) => {
if (el?.classList.contains("off"))
airbase.removeFrom(this);
else
airbase.addTo(this);
})
}
});
@@ -152,7 +161,7 @@ export class Map extends L.Map {
this.#optionButtons["visibility"] = visibilityControls.map((option: string, index: number) => {
var typesArrayString = `"${visibilityControlsTypes[index][0]}"`;
visibilityControlsTypes[index].forEach((type: string, idx: number) => {if (idx > 0) typesArrayString = `${typesArrayString}, "${type}"`});
return this.#createOptionButton(option, `visibility/${option.toLowerCase()}.svg`, visibilityControlsTootlips[index], "toggleUnitVisibility", `{"types": [${typesArrayString}]}`);
return this.#createOptionButton(option, `visibility/${option.toLowerCase()}.svg`, visibilityControlsTootlips[index], "toggleMarkerVisibility", `{"types": [${typesArrayString}]}`);
});
document.querySelector("#unit-visibility-control")?.append(...this.#optionButtons["visibility"]);

1
client/src/mission/airbase.ts
View File

@@ -38,6 +38,7 @@ export class Airbase extends CustomMarker
img.onload = () => SVGInjector(img);
el.appendChild(img);
this.getElement()?.appendChild(el);
el.dataset.coalition = this.#coalition;
}
setCoalition(coalition: string)

4
client/src/unit/aircraftdatabase.ts
View File

@@ -2847,7 +2847,7 @@ export class AircraftDatabase extends UnitDatabase {
"roles": [
"CAP"
],
"code": "R-73*2,R-27R*2,Fuel-1500",
"code": "R-73*4,R-27R*2,Fuel-1500",
"name": "Heavy / Fox 1, HOBS Fox 2 / Medium Range"
},
{
@@ -2935,7 +2935,7 @@ export class AircraftDatabase extends UnitDatabase {
"CAP"
],
"code": "R-73*2,R-27R*2,Fuel-1500",
"name": "Heavy / Fox 1 / Medium Range"
"name": "Heavy / Fox 1, HOBS Fox 2 / Medium Range"
},
{
"fuel": 1,

2
client/views/panels/unitcontrol.ejs
View File

@@ -82,7 +82,7 @@
<div id="rapid-controls" class="ol-panel">
<button title="Increase units altitude" class="ol-button" data-on-click="selectedUnitsChangeAltitude" data-on-click-params='{ "type": "climb" }'><img src="/resources/theme/images/icons/climb.svg" inject-svg></button>
<button title="Descrease units altitude" class="ol-button" data-on-click="selectedUnitsChangeAltitude" data-on-click-params='{ "type": "descent" }'><img src="/resources/theme/images/icons/descent.svg" inject-svg></button>
<button title="Descrease units altitude" class="ol-button" data-on-click="selectedUnitsChangeAltitude" data-on-click-params='{ "type": "descend" }'><img src="/resources/theme/images/icons/descent.svg" inject-svg></button>
<button title="Increase units speed" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "fast" }'><img src="/resources/theme/images/icons/speed-increase.svg" inject-svg></button>
<button title="Decrease units speed" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "slow" }'><img src="/resources/theme/images/icons/speed-decrease.svg" inject-svg></button>
<button title="Stop unit and go back to idle state" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "stop" }'><img src="/resources/theme/images/icons/hand-solid.svg" inject-svg></button>