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

Merge branch 'main' into 747-improve-configurator-for-automatic-saved-games-folder-detection

Browse Source
This commit is contained in:
Pax1601
2023-12-20 16:58:24 +01:00
committed by GitHub
parent 47e4757b6e 6abf7f059a
commit 0ac632cc9b
10 changed files with 50487 additions and 46162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/demo.js
View File

@@ -12,10 +12,10 @@ var app = express();
app.use(logger('dev'));
const aircraftDatabase = require('./public/databases/units/aircraftDatabase.json');
const helicopterDatabase = require('./public/databases/units/helicopterDatabase.json');
const groundUnitDatabase = require('./public/databases/units/groundUnitDatabase.json');
const navyUnitDatabase = require('./public/databases/units/navyUnitDatabase.json');
const aircraftDatabase = require('./public/databases/units/aircraftdatabase.json');
const helicopterDatabase = require('./public/databases/units/helicopterdatabase.json');
const groundUnitDatabase = require('./public/databases/units/groundunitdatabase.json');
const navyUnitDatabase = require('./public/databases/units/navyunitdatabase.json');
const DEMO_UNIT_DATA = {}

66632
client/public/databases/units/aircraftdatabase.json
View File

File diff suppressed because it is too large Load Diff

2
client/public/stylesheets/style/style.css
View File

@@ -985,7 +985,7 @@ nav.ol-panel> :last-child {
#login-status[data-status="failed"]::before {
color: var(--primary-red);
content: "Incorrect username/password!";
content: "Incorrect password!";
}
@keyframes blinker {

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;
}
/**
* 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) {
var string = decimal? num.toFixed(2): String(num);
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 { 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 { SVGInjector } from '@tanem/svg-injector';
import { UnitDatabase } from './databases/unitdatabase';
@@ -1184,7 +1184,7 @@ export abstract class Unit extends CustomMarker {
/* Set altitude and speed */
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"))
(<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 { 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 { SVGInjector } from '@tanem/svg-injector';
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 */
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"))
(<HTMLElement>element.querySelector(".unit-speed")).innerText = String(Math.floor(msToKnots(this.#speed))) + "GS";

4
client/views/other/dialogs/splash.ejs
View File

@@ -8,8 +8,8 @@
</div>
<form id="authentication-form">
<div><h5>Name</h5> <input type="text" id="username" name="username" required autocomplete="username" placeholder="Enter name..."></div>
<div><h5>Server password</h5> <input type="password" id="password" name="password" required autocomplete="current-password" placeholder="Enter server password..."></div>
<div><h5>Display Name</h5> <input type="text" id="username" name="username" required autocomplete="username" placeholder="Enter display name..."></div>
<div><h5>Password</h5> <input type="password" id="password" name="password" required autocomplete="current-password" placeholder="Enter game master/commander password..."></div>
<button type="submit" id="connection-button" class="ol-button-apply">Connect</button>
</form>