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

FL now has three digits

Browse Source
This commit is contained in:
PeekabooSteam
2023-12-17 19:42:30 +00:00
parent c75e20e58f
commit fb2ecc75eb
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/other/utils.ts
View File

@@ -104,6 +104,14 @@ export function reciprocalHeading(heading: number): number {
return heading > 180? heading - 180: heading + 180; return heading > 180? heading - 180: heading + 180;
} }
/**
* Prepend numbers to the start of a string
*
* @param num <number> subject number
* @param places <number> places to pad
* @param decimal <boolean> whether this is a decimal number or not
*
* */
export const zeroAppend = function (num: number, places: number, decimal: boolean = false) { export const zeroAppend = function (num: number, places: number, decimal: boolean = false) {
var string = decimal? num.toFixed(2): String(num); var string = decimal? num.toFixed(2): String(num);
while (string.length < places) { while (string.length < places) {

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

@@ -1,6 +1,6 @@
import { Marker, LatLng, Polyline, Icon, DivIcon, CircleMarker, Map, Point } from 'leaflet'; import { Marker, LatLng, Polyline, Icon, DivIcon, CircleMarker, Map, Point } from 'leaflet';
import { getApp } from '..'; import { getApp } from '..';
import { enumToCoalition, enumToEmissioNCountermeasure, enumToROE, enumToReactionToThreat, enumToState, getUnitDatabaseByCategory, mToFt, msToKnots, rad2deg, bearing, deg2rad, ftToM, getGroundElevation, coalitionToEnum, nmToFt, nmToM } from '../other/utils'; import { enumToCoalition, enumToEmissioNCountermeasure, enumToROE, enumToReactionToThreat, enumToState, getUnitDatabaseByCategory, mToFt, msToKnots, rad2deg, bearing, deg2rad, ftToM, getGroundElevation, coalitionToEnum, nmToFt, nmToM, zeroAppend } from '../other/utils';
import { CustomMarker } from '../map/markers/custommarker'; import { CustomMarker } from '../map/markers/custommarker';
import { SVGInjector } from '@tanem/svg-injector'; import { SVGInjector } from '@tanem/svg-injector';
import { UnitDatabase } from './databases/unitdatabase'; import { UnitDatabase } from './databases/unitdatabase';
@@ -1184,7 +1184,7 @@ export abstract class Unit extends CustomMarker {
/* Set altitude and speed */ /* Set altitude and speed */
if (element.querySelector(".unit-altitude")) if (element.querySelector(".unit-altitude"))
(<HTMLElement>element.querySelector(".unit-altitude")).innerText = "FL" + String(Math.floor(mToFt(this.#position.alt as number) / 100)); (<HTMLElement>element.querySelector(".unit-altitude")).innerText = "FL" + zeroAppend(Math.floor(mToFt(this.#position.alt as number) / 100), 3);
if (element.querySelector(".unit-speed")) if (element.querySelector(".unit-speed"))
(<HTMLElement>element.querySelector(".unit-speed")).innerText = String(Math.floor(msToKnots(this.#speed))) + "GS"; (<HTMLElement>element.querySelector(".unit-speed")).innerText = String(Math.floor(msToKnots(this.#speed))) + "GS";

4
client/src/weapon/weapon.ts
View File

@@ -1,6 +1,6 @@
import { LatLng, DivIcon, Map } from 'leaflet'; import { LatLng, DivIcon, Map } from 'leaflet';
import { getApp } from '..'; import { getApp } from '..';
import { enumToCoalition, mToFt, msToKnots, rad2deg } from '../other/utils'; import { enumToCoalition, mToFt, msToKnots, rad2deg, zeroAppend } from '../other/utils';
import { CustomMarker } from '../map/markers/custommarker'; import { CustomMarker } from '../map/markers/custommarker';
import { SVGInjector } from '@tanem/svg-injector'; import { SVGInjector } from '@tanem/svg-injector';
import { DLINK, DataIndexes, GAME_MASTER, IRST, OPTIC, RADAR, VISUAL } from '../constants/constants'; import { DLINK, DataIndexes, GAME_MASTER, IRST, OPTIC, RADAR, VISUAL } from '../constants/constants';
@@ -230,7 +230,7 @@ export class Weapon extends CustomMarker {
/* Set altitude and speed */ /* Set altitude and speed */
if (element.querySelector(".unit-altitude")) if (element.querySelector(".unit-altitude"))
(<HTMLElement>element.querySelector(".unit-altitude")).innerText = "FL" + String(Math.floor(mToFt(this.#position.alt as number) / 100)); (<HTMLElement>element.querySelector(".unit-altitude")).innerText = "FL" + zeroAppend(Math.floor(mToFt(this.#position.alt as number) / 100), 3);
if (element.querySelector(".unit-speed")) if (element.querySelector(".unit-speed"))
(<HTMLElement>element.querySelector(".unit-speed")).innerText = String(Math.floor(msToKnots(this.#speed))) + "GS"; (<HTMLElement>element.querySelector(".unit-speed")).innerText = String(Math.floor(msToKnots(this.#speed))) + "GS";