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 errors in lua clone units

Browse Source
This commit is contained in:
Pax1601
2023-09-04 21:44:22 +02:00
parent d684f91a5a
commit cbb878cf96
3 changed files with 76 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/server/server.ts
View File

@@ -201,7 +201,7 @@ export function followUnit(ID: number, targetID: number, offset: { "x": number,
export function cloneUnits(units: {ID: number, location: LatLng}[], callback: CallableFunction = () => {}) {
var command = { "units": units };
var data = { "cloneUnit": command }
var data = { "cloneUnits": command }
POST(data, callback);
}

12
client/src/unit/unitsmanager.ts
View File

@@ -557,14 +557,18 @@ export class UnitsManager {
// TODO handle from lua
selectedUnitsCreateGroup() {
var selectedUnits = this.getSelectedUnits({ excludeHumans: true, onlyOnePerGroup: false });
var units = [];
var units: { ID: number, location: LatLng }[] = [];
var coalition = "neutral";
for (let idx in selectedUnits) {
var unit = selectedUnits[idx];
coalition = unit.getCoalition();
units.push({ ID: unit.ID, location: unit.getPosition() });
}
cloneUnits(units);
cloneUnits(units, () => {
units.forEach((unit: any) => {
deleteUnit(unit.ID, false, false);
});
});
}
@@ -597,8 +601,8 @@ export class UnitsManager {
});
/* Clone the units in groups */
var units: { ID: number, location: LatLng }[] = [];
for (let groupName in groups) {
var units: { ID: number, location: LatLng }[] = [];
groups[groupName].forEach((unit: any) => {
var position = new LatLng(getMap().getMouseCoordinates().lat + unit.position.lat - avgLat, getMap().getMouseCoordinates().lng + unit.position.lng - avgLng);
getMap().addTemporaryMarker(position, unit.name, unit.coalition);
@@ -606,7 +610,7 @@ export class UnitsManager {
});
cloneUnits(units);
}
getInfoPopup().setText(`${this.#copiedUnits.length - 1} units pasted`);
getInfoPopup().setText(`${this.#copiedUnits.length} units pasted`);
}
else {
getInfoPopup().setText(`Unit cloning is disabled in ${getMissionHandler().getCommandModeOptions().commandMode} mode`);