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 checkbox and frequency

Browse Source
This commit is contained in:
Pax1601 2023-04-14 07:59:24 +02:00
parent 4a90193426
commit b56f1ca547
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ dl.ol-data-grid dd {
.ol-checkbox input[type="checkbox"]::before {
align-self: center;
background-image: url("/images/icons/square-check-solid.svg");
background-image: url("/images/icons/square-regular.svg");
background-repeat: no-repeat;
content: "";
filter: invert(100%);
@ -166,7 +166,7 @@ dl.ol-data-grid dd {
}
.ol-checkbox input[type="checkbox"]:checked::before {
background-image: url("/images/icons/square-regular.svg");
background-image: url("/images/icons/square-check-solid.svg");
}
.ol-text-input input {

13
client/src/panels/unitcontrolpanel.ts
View File

@ -210,12 +210,14 @@ export class UnitControlPanel extends Panel {
(<HTMLElement>this.#advancedSettingsDialog.querySelector("#unit-name")).innerText = unit.getBaseData().unitName;
if (getUnitsManager().getSelectedUnits().length == 1){
this.#radioCallsignDropdown.setOptions(["Enfield", "Springfield", "Uzi", "Colt", "Dodge", "Ford", "Chevy", "Pontiac"]);
this.#radioCallsignDropdown.selectValue(unit.getTaskData().radioCallsign);
this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isTanker));
this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isAWACS));
var roles = aircraftDatabase.getByName(unit.getBaseData().name)?.loadouts.map((loadout) => {return loadout.roles})
if (roles != undefined && Array.prototype.concat.apply([], roles)?.includes("Tanker")){
this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isTanker));
this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.classList.remove("hide");
this.#radioCallsignDropdown.setOptions(["Texaco", "Arco", "Shell"]);
this.#radioCallsignDropdown.selectValue(unit.getTaskData().radioCallsign);
@ -225,7 +227,6 @@ export class UnitControlPanel extends Panel {
}
if (roles != undefined && Array.prototype.concat.apply([], roles)?.includes("AWACS")){
this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isAWACS));
this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.classList.remove("hide");
this.#radioCallsignDropdown.setOptions(["Overlord", "Magic", "Wizard", "Focus", "Darkstar"]);
this.#radioCallsignDropdown.selectValue(unit.getTaskData().radioCallsign);
@ -238,10 +239,8 @@ export class UnitControlPanel extends Panel {
#applyAdvancedSettings()
{
this.#advancedSettingsDialog.classList.add("hide");
const isTanker = <boolean> this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.checked;
const isAWACS= <boolean> this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.checked;
const isTanker = this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.checked? true: false;
const isAWACS = false; //this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.checked? true: false;
const TACANChannel = Number(this.#advancedSettingsDialog.querySelector("#TACAN-channel")?.querySelector("input")?.value);
const TACANXY = this.#TACANXYDropdown.getValue();
const TACANCallsign = <string> this.#advancedSettingsDialog.querySelector("#tacan-callsign")?.querySelector("input")?.value
@ -255,5 +254,7 @@ export class UnitControlPanel extends Panel {
var units = getUnitsManager().getSelectedUnits();
if (units.length > 0)
units[0].setAdvancedOptions(isTanker, isAWACS, TACANChannel, TACANXY, TACANCallsign, radioFrequency, radioCallsign, radioCallsignNumber);
this.#advancedSettingsDialog.classList.add("hide");
}
}

2
client/views/unitcontrolpanel.ejs
View File

@ -112,7 +112,7 @@
<div id="tanker-checkbox" class="ol-checkbox">
<label>
<input type="checkbox"/>
<input type="checkbox" />
Operate as tanker
</label>
</div>

4
src/core/src/unit.cpp
View File

@ -393,7 +393,7 @@ void Unit::setTACAN()
commandSS << "{"
<< "id = 'ActivateBeacon',"
<< "params = {"
<< "type = 4,"
<< "type = " << ((TACANXY.compare(L"X") == 0)? 4: 5) << ","
<< "system = 4,"
<< "name = Olympus_TACAN,"
<< "callsign = " << TACANCallsign << ", "
@ -412,7 +412,7 @@ void Unit::setRadio()
<< "id = 'SetFrequency',"
<< "params = {"
<< "modulation = 0," // TODO Allow selection
<< "frequency = " << TACANChannelToFrequency(TACANChannel, TACANXY) << ","
<< "frequency = " << radioFrequency << ","
<< "}"
<< "}";
Command* command = dynamic_cast<Command*>(new SetCommand(ID, commandSS.str()));