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' of https://github.com/Pax1601/DCSOlympus into unit-list

Browse Source
This commit is contained in:
PeekabooSteam
2023-03-20 11:54:53 +00:00
parent 2a8ab0f8cf d87139b619
commit fa03e9dbd8
12 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/demo.js
View File

@@ -19,7 +19,20 @@ const DEMO_UNIT_DATA = {
missionData: { missionData: {
fuel: 50, fuel: 50,
flags: {human: false}, flags: {human: false},
ammo: [], ammo: [
{
count: 4,
desc: {
displayName: "AIM-120"
}
},
{
count: 2,
desc: {
displayName: "AIM-7"
}
}
],
targets: [], targets: [],
hasTask: true, hasTask: true,
coalition: "blue" coalition: "blue"

4
client/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "DCSOlympus", "name": "DCSOlympus",
"version": "0.0.0", "version": "0.1.0-alpha",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "DCSOlympus", "name": "DCSOlympus",
"version": "0.0.0", "version": "0.1.0-alpha",
"dependencies": { "dependencies": {
"@types/geojson": "^7946.0.10", "@types/geojson": "^7946.0.10",
"@types/leaflet": "^1.9.0", "@types/leaflet": "^1.9.0",

2
client/package.json
View File

@@ -2,7 +2,7 @@
"name": "DCSOlympus", "name": "DCSOlympus",
"node-main": "./bin/www", "node-main": "./bin/www",
"main": "http://localhost:3000", "main": "http://localhost:3000",
"version": "0.0.0", "version": "0.1.0-alpha",
"private": true, "private": true,
"scripts": { "scripts": {
"copy": "copy .\\node_modules\\leaflet\\dist\\leaflet.css .\\public\\stylesheets\\leaflet.css", "copy": "copy .\\node_modules\\leaflet\\dist\\leaflet.css .\\public\\stylesheets\\leaflet.css",

5
client/public/stylesheets/airbase.css
View File

@@ -1,6 +1,6 @@
:root { :root {
--airbase-marker-height: 63px; --airbase-marker-height: 40px;
--airbase-marker-width: 63px; --airbase-marker-width: 40px;
} }
[data-object|="airbase"] { [data-object|="airbase"] {
@@ -31,6 +31,7 @@ Marker
/* Airbase */ /* Airbase */
[data-object|="airbase"] .airbase-marker { [data-object|="airbase"] .airbase-marker {
background-image: var(--airbase-marker-neutral-url); background-image: var(--airbase-marker-neutral-url);
background-size: contain;
height: var(--airbase-marker-height); height: var(--airbase-marker-height);
width: var(--airbase-marker-width); width: var(--airbase-marker-width);
} }

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

@@ -56,5 +56,5 @@
} }
#unit-info-panel #loadout-container .loadout-item::before { #unit-info-panel #loadout-container .loadout-item::before {
content: attr( data-loadout-item ) ' \d7 ' attr( data-loadout-qty ); content: attr( data-loadout-qty )'\d7 ' attr( data-loadout-item ) ;
} }

24
client/src/panels/unitinfopanel.ts
View File

@@ -58,24 +58,16 @@ export class UnitInfoPanel extends Panel {
this.#task.classList.toggle("neutral", unit.getMissionData().coalition === "neutral"); this.#task.classList.toggle("neutral", unit.getMissionData().coalition === "neutral");
/* Add the loadout elements */ /* Add the loadout elements */
var els = this.getElement().getElementsByClassName("js-loadout-element"); this.#loadoutContainer.replaceChildren(...unit.getMissionData().ammo.map(
while (els.length > 0) (ammo: any) => {
this.#loadoutContainer.removeChild(els[0]); var el = document.createElement("div");
el.classList.add("pill", "loadout-item");
for (let index in unit.getMissionData().ammo) el.dataset.loadoutQty = ammo.count;
this.#addLoadoutElement(unit, index); el.dataset.loadoutItem = ammo.desc.displayName;
return el;
} }
))
} }
#addLoadoutElement(unit: Unit, index: string)
{
var ammo = unit.getMissionData().ammo[index];
var displayName = ammo.desc.displayName;
var amount = ammo.count;
var el = document.createElement("div")
el.classList.add("js-loadout-element", "ol-rectangular-container-dark")
el.innerText = amount + "x" + displayName;
this.#loadoutContainer.appendChild(el);
} }
#onUnitsSelection(units: Unit[]){ #onUnitsSelection(units: Unit[]){

5
client/views/unitinfopanel.ejs
View File

@@ -22,10 +22,7 @@
</dl> </dl>
<div id="loadout-container" class="ol-group wrap"> <div id="loadout-container" class="ol-group wrap">
<div class="pill loadout-item" data-loadout-qty="4" data-loadout-item="AIM-120"></div> <!-- Here the loadout elements will be shown -->
<div class="pill loadout-item" data-loadout-qty="4" data-loadout-item="AIM-54"></div>
<div class="pill loadout-item" data-loadout-qty="2" data-loadout-item="AIM-9P"></div>
<div class="pill loadout-item" data-loadout-qty="895" data-loadout-item="bullets"></div>
</div> </div>
</div> </div>

2
installer/olympus.iss
View File

@@ -2,7 +2,7 @@
[Setup] [Setup]
AppName=DCS Olympus AppName=DCS Olympus
AppVerName=DCS Olympus Alpha v0.0.7 AppVerName=DCS Olympus Alpha v0.1.0
DefaultDirName={usersavedgames}\DCS.openbeta DefaultDirName={usersavedgames}\DCS.openbeta
DefaultGroupName=DCSOlympus DefaultGroupName=DCSOlympus
OutputBaseFilename=DCSOlympus OutputBaseFilename=DCSOlympus

2
mod/entry.lua
View File

@@ -15,7 +15,7 @@ declare_plugin(self_ID,
shortName = "Olympus", shortName = "Olympus",
fileMenuName = "Olympus", fileMenuName = "Olympus",
version = "0.0.7", version = "0.1.0-alpha",
state = "installed", state = "installed",
developerName= "DCS Refugees 767 squadron", developerName= "DCS Refugees 767 squadron",
info = _("DCS Olympus is a mod for DCS World. It allows users to spawn, control, task, group, and remove units from a DCS World server using a real-time map interface, similarly to Real Time Strategy games. The user interface also provides useful informations units, like loadouts, fuel, tasking, and so on. In the future, more features for DCS World GCI and JTAC will be available."), info = _("DCS Olympus is a mod for DCS World. It allows users to spawn, control, task, group, and remove units from a DCS World server using a real-time map interface, similarly to Real Time Strategy games. The user interface also provides useful informations units, like loadouts, fuel, tasking, and so on. In the future, more features for DCS World GCI and JTAC will be available."),

4
scripts/OlympusExport.lua
View File

@@ -1,3 +1,5 @@
local version = 'v0.1.0-alpha'
Olympus = {} Olympus = {}
Olympus.OlympusDLL = nil Olympus.OlympusDLL = nil
Olympus.cppRESTDLL = nil Olympus.cppRESTDLL = nil
@@ -24,7 +26,7 @@ end
do do
if isOlympusModuleInitialized~=true then if isOlympusModuleInitialized~=true then
local OlympusName = 'Olympus 0.0.1 C++ module'; local OlympusName = 'Olympus ' .. version .. ' C++ module';
isOlympusModuleInitialized=true; isOlympusModuleInitialized=true;
Olympus.DLLsloaded = Olympus.loadDLLs() Olympus.DLLsloaded = Olympus.loadDLLs()
if Olympus.DLLsloaded then if Olympus.DLLsloaded then

4
scripts/OlympusHook.lua
View File

@@ -1,3 +1,5 @@
local version = 'v0.1.0-alpha'
Olympus = {} Olympus = {}
Olympus.OlympusDLL = nil Olympus.OlympusDLL = nil
Olympus.cppRESTDLL = nil Olympus.cppRESTDLL = nil
@@ -24,7 +26,7 @@ end
do do
if isOlympusModuleInitialized~=true then if isOlympusModuleInitialized~=true then
local OlympusName = 'Olympus 0.0.1 C++ module'; local OlympusName = 'Olympus ' .. version .. ' C++ module';
Olympus.loadDLLs(); Olympus.loadDLLs();
-- Register callbacks -- Register callbacks

3
scripts/OlympusMission.lua
View File

@@ -1,3 +1,4 @@
local version = 'v0.1.0-alpha'
Olympus = {} Olympus = {}
Olympus.groupIndex = 0 Olympus.groupIndex = 0
@@ -131,4 +132,4 @@ function Olympus.serializeTable(val, name, skipnewlines, depth)
end end
timer.scheduleFunction(Olympus.setMissionData, {}, timer.getTime() + 1) timer.scheduleFunction(Olympus.setMissionData, {}, timer.getTime() + 1)
Olympus.notify("OlympusMission script loaded correctly", 10) Olympus.notify("OlympusMission " .. version .. " script loaded correctly", 10)