Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0

# Conflicts:
#	client/src/units/unit.ts
#	scripts/unitPayloads.lua
This commit is contained in:
Pax1601
2023-03-12 17:32:36 +01:00
5 changed files with 331 additions and 942 deletions

View File

@@ -458,7 +458,7 @@ export class AirUnit extends Unit {
export class Aircraft extends AirUnit {
constructor(ID: number, data: UnitData) {
super(ID, data,
`<div class="unit unit-air" data-status="" data-coalition="${data.missionData.coalition}" data-is-in-hotgroup="false" data-is-selected="false">
`<div data-object="unit-air-aircraft" data-status="hold" data-coalition="${data.missionData.coalition}">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker-border"></div>
<div class="unit-status"></div>
@@ -496,11 +496,10 @@ export class Helicopter extends AirUnit {
export class GroundUnit extends Unit {
constructor(ID: number, data: UnitData) {
var role = groundUnitsDatabase.getByName(data.baseData.name)?.loadouts[0].roles[0];
var roleType = "ground";
if (role === "SAM")
roleType = "sam"
var roleType = (role === "SAM") ? "sam" : "mi";
super(ID, data, `
<div class="unit unit-${roleType}" data-coalition="${data.missionData.coalition}">
<div data-object="unit-ground-${roleType}" data-coalition="${data.missionData.coalition}">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">${role?.substring(0, 1).toUpperCase()}</div>