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

Fixed error in spawn menu

Browse Source
This commit is contained in:
Pax1601
2023-03-24 17:06:50 +01:00
parent d549898428
commit a6eaacea11
1 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
client/src/controls/mapcontextmenu.ts
View File

@@ -21,7 +21,7 @@ export class MapContextMenu extends ContextMenu {
#aircraftLoadoutDropdown: Dropdown; #aircraftLoadoutDropdown: Dropdown;
#groundUnitRoleDropdown: Dropdown; #groundUnitRoleDropdown: Dropdown;
#groundUnitTypeDropdown: Dropdown; #groundUnitTypeDropdown: Dropdown;
#spawnOptions: SpawnOptions = {role: "", type: "", latlng: new LatLng(0, 0), loadout: null, coalition: "blue", airbaseName: null}; #spawnOptions: SpawnOptions = { role: "", type: "", latlng: new LatLng(0, 0), loadout: null, coalition: "blue", airbaseName: null };
constructor(id: string) { constructor(id: string) {
super(id); super(id);
@@ -60,13 +60,13 @@ export class MapContextMenu extends ContextMenu {
} }
show(x: number, y: number, latlng: LatLng) { show(x: number, y: number, latlng: LatLng) {
this.#spawnOptions = {role: "", type: "", latlng: new LatLng(0, 0), loadout: null, coalition: "blue", airbaseName: null}; this.#spawnOptions.airbaseName = null;
super.show(x, y, latlng); super.show(x, y, latlng);
this.#spawnOptions.latlng = latlng; this.#spawnOptions.latlng = latlng;
this.showUpperBar(); this.showUpperBar();
} }
showSubMenu(type: string){ showSubMenu(type: string) {
this.getContainer()?.querySelector("#aircraft-spawn-menu")?.classList.toggle("hide", type !== "aircraft"); this.getContainer()?.querySelector("#aircraft-spawn-menu")?.classList.toggle("hide", type !== "aircraft");
this.getContainer()?.querySelector("#aircraft-spawn-button")?.classList.toggle("is-open", type === "aircraft"); this.getContainer()?.querySelector("#aircraft-spawn-button")?.classList.toggle("is-open", type === "aircraft");
this.getContainer()?.querySelector("#ground-unit-spawn-menu")?.classList.toggle("hide", type !== "ground-unit"); this.getContainer()?.querySelector("#ground-unit-spawn-menu")?.classList.toggle("hide", type !== "ground-unit");
@@ -89,31 +89,28 @@ export class MapContextMenu extends ContextMenu {
this.getContainer()?.querySelector("#upper-bar")?.classList.toggle("hide", true); this.getContainer()?.querySelector("#upper-bar")?.classList.toggle("hide", true);
} }
setAirbaseName(airbaseName: string) setAirbaseName(airbaseName: string) {
{
this.#spawnOptions.airbaseName = airbaseName; this.#spawnOptions.airbaseName = airbaseName;
} }
setLatLng(latlng: LatLng) setLatLng(latlng: LatLng) {
{
this.#spawnOptions.latlng = latlng; this.#spawnOptions.latlng = latlng;
} }
#onSwitch(e: any) { #onSwitch(e: any) {
if (this.getContainer() != null) { if (this.getContainer() != null) {
if (e.srcElement.checked) if (e.srcElement.checked)
setActiveCoalition("red"); setActiveCoalition("red");
else else
setActiveCoalition("blue"); setActiveCoalition("blue");
} }
} }
/********* Aircraft spawn menu *********/ /********* Aircraft spawn menu *********/
#setAircraftRole(role: string) #setAircraftRole(role: string) {
{
this.#spawnOptions.role = role; this.#spawnOptions.role = role;
this.#resetAircraftType(); this.#resetAircraftType();
this.#aircraftTypeDropdown.setOptions(aircraftDatabase.getByRole(role).map((blueprint) => {return blueprint.label})); this.#aircraftTypeDropdown.setOptions(aircraftDatabase.getByRole(role).map((blueprint) => { return blueprint.label }));
this.#aircraftTypeDropdown.selectValue(0); this.#aircraftTypeDropdown.selectValue(0);
this.clip(); this.clip();
} }
@@ -127,20 +124,18 @@ export class MapContextMenu extends ContextMenu {
this.clip(); this.clip();
} }
#setAircraftType(label: string) #setAircraftType(label: string) {
{
this.#resetAircraftType(); this.#resetAircraftType();
var type = aircraftDatabase.getByLabel(label)?.name || null; var type = aircraftDatabase.getByLabel(label)?.name || null;
if (type != null) if (type != null) {
{
this.#spawnOptions.type = type; this.#spawnOptions.type = type;
this.#aircraftLoadoutDropdown.setOptions(aircraftDatabase.getLoadoutNamesByRole(type, this.#spawnOptions.role)); this.#aircraftLoadoutDropdown.setOptions(aircraftDatabase.getLoadoutNamesByRole(type, this.#spawnOptions.role));
this.#aircraftLoadoutDropdown.selectValue(0); this.#aircraftLoadoutDropdown.selectValue(0);
var image = (<HTMLImageElement>this.getContainer()?.querySelector("#unit-image")); var image = (<HTMLImageElement>this.getContainer()?.querySelector("#unit-image"));
image.src = `images/units/${aircraftDatabase.getByLabel(label)?.filename}`; image.src = `images/units/${aircraftDatabase.getByLabel(label)?.filename}`;
image.classList.toggle("hide", false); image.classList.toggle("hide", false);
} }
this.clip(); this.clip();
} }
@@ -152,15 +147,13 @@ export class MapContextMenu extends ContextMenu {
this.clip(); this.clip();
} }
#setAircraftLoadout(loadoutName: string) #setAircraftLoadout(loadoutName: string) {
{
var loadout = aircraftDatabase.getLoadoutByName(this.#spawnOptions.type, loadoutName); var loadout = aircraftDatabase.getLoadoutByName(this.#spawnOptions.type, loadoutName);
if (loadout) if (loadout) {
{
this.#spawnOptions.loadout = loadout.code; this.#spawnOptions.loadout = loadout.code;
(<HTMLButtonElement>this.getContainer()?.querySelector("#aircraft-spawn-menu")?.querySelector(".deploy-unit-button")).disabled = false; (<HTMLButtonElement>this.getContainer()?.querySelector("#aircraft-spawn-menu")?.querySelector(".deploy-unit-button")).disabled = false;
var items = loadout.items.map((item: any) => {return `${item.quantity}x ${item.name}`;}); var items = loadout.items.map((item: any) => { return `${item.quantity}x ${item.name}`; });
items.length == 0? items.push("Empty loadout"): ""; items.length == 0 ? items.push("Empty loadout") : "";
(<HTMLButtonElement>this.getContainer()?.querySelector("#loadout-list")).replaceChildren( (<HTMLButtonElement>this.getContainer()?.querySelector("#loadout-list")).replaceChildren(
...items.map((item: any) => { ...items.map((item: any) => {
var div = document.createElement('div'); var div = document.createElement('div');
@@ -173,11 +166,10 @@ export class MapContextMenu extends ContextMenu {
} }
/********* Ground unit spawn menu *********/ /********* Ground unit spawn menu *********/
#setGroundUnitRole(role: string) #setGroundUnitRole(role: string) {
{
this.#spawnOptions.role = role; this.#spawnOptions.role = role;
this.#resetGroundUnitRole(); this.#resetGroundUnitRole();
this.#groundUnitTypeDropdown.setOptions(groundUnitsDatabase.getByRole(role).map((blueprint) => {return blueprint.label})); this.#groundUnitTypeDropdown.setOptions(groundUnitsDatabase.getByRole(role).map((blueprint) => { return blueprint.label }));
this.#groundUnitTypeDropdown.selectValue(0); this.#groundUnitTypeDropdown.selectValue(0);
this.clip(); this.clip();
} }
@@ -191,12 +183,10 @@ export class MapContextMenu extends ContextMenu {
this.clip(); this.clip();
} }
#setGroundUnitType(label: string) #setGroundUnitType(label: string) {
{
this.#resetGroundUnitType(); this.#resetGroundUnitType();
var type = groundUnitsDatabase.getByLabel(label)?.name || null; var type = groundUnitsDatabase.getByLabel(label)?.name || null;
if (type != null) if (type != null) {
{
this.#spawnOptions.type = type; this.#spawnOptions.type = type;
(<HTMLButtonElement>this.getContainer()?.querySelector("#ground-unit-spawn-menu")?.querySelector(".deploy-unit-button")).disabled = false; (<HTMLButtonElement>this.getContainer()?.querySelector("#ground-unit-spawn-menu")?.querySelector(".deploy-unit-button")).disabled = false;
} }