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

Multiple fixes

Browse Source 
Refactored classes
Fixed visibility of dead units
Changed visibility handling
Refactored unitDatabase class
This commit is contained in:
Pax1601
2023-03-24 16:18:25 +01:00
parent 1e8c9ed401
commit a5ee5b0ad5
22 changed files with 498 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/views/navbar.ejs
View File

@@ -28,11 +28,11 @@
</div>
<div id="unit-visibility-control" class="ol-group">
<button id="unit-visibility-control-aircraft" title="Toggle aircraft' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "aircraft" }'></button>
<button id="unit-visibility-control-ground" title="Toggle ground units' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "ground" }'></button>
<button id="unit-visibility-control-aircraft" title="Toggle aircrafts' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "aircraft" }'></button>
<button id="unit-visibility-control-groundunit" title="Toggle ground units' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "groundunit" }'></button>
<button id="unit-visibility-control-sam" title="Toggle SAMs' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "sam" }'></button>
<button id="unit-visibility-control-threat" title="Toggle threat rings' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "threat" }'></button>
<button id="unit-visibility-control-naval" title="Toggle naval visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "naval" }'></button>
<button id="unit-visibility-control-navyunit" title="Toggle navy units' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "navyunit" }'></button>
</div>
<div id="coalition-visibility-control" class="ol-group ol-group-button-toggle">

56
client/views/uikit.ejs
View File

@@ -170,7 +170,7 @@
<div class="caption">Neutral</div>
<div data-object="unit-ground-mi" data-coalition="">
<div data-object="unit-groundunit" data-coalition="">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">Z</div>
@@ -182,7 +182,7 @@
<div class="caption">Blue</div>
<div data-object="unit-ground-mi" data-coalition="blue">
<div data-object="unit-groundunit" data-coalition="blue">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">Y</div>
@@ -194,7 +194,7 @@
<div class="caption">Red</div>
<div data-object="unit-ground-mi" data-coalition="red">
<div data-object="unit-groundunit" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">X</div>
@@ -216,7 +216,7 @@
<div class="caption">Neutral</div>
<div data-object="unit-ground-sam" data-coalition="">
<div data-object="unit-sam" data-coalition="">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">Z</div>
@@ -228,7 +228,7 @@
<div class="caption">Blue</div>
<div data-object="unit-ground-sam" data-coalition="blue">
<div data-object="unit-sam" data-coalition="blue">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">Y</div>
@@ -240,7 +240,7 @@
<div class="caption">Red</div>
<div data-object="unit-ground-sam" data-coalition="red">
<div data-object="unit-sam" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">X</div>
@@ -254,14 +254,14 @@
<div class="content">
<div class="content-header">Naval</div>
<div class="content-header">navyunit</div>
<div class="content-body">
<div class="example">
<div class="caption">Neutral</div>
<div data-object="unit-naval" data-coalition="">
<div data-object="unit-navyunit" data-coalition="">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">Z</div>
@@ -273,7 +273,7 @@
<div class="caption">Blue</div>
<div data-object="unit-naval" data-coalition="blue">
<div data-object="unit-navyunit" data-coalition="blue">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">Y</div>
@@ -285,7 +285,7 @@
<div class="caption">Red</div>
<div data-object="unit-naval" data-coalition="red">
<div data-object="unit-navyunit" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-short-label">X</div>
@@ -355,7 +355,7 @@
<div class="example">
<div class="caption">0% (empty)</div>
<div data-object="unit-air-aircraft" data-pilot="ai" data-has-low-fuel data-coalition="red" data-is-selected>
<div data-object="unit-aircraft" data-pilot="ai" data-has-low-fuel data-coalition="red" data-is-selected>
<div class="unit-selected-spotlight"></div>
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
@@ -379,7 +379,7 @@
<div class="caption">10%</div>
<div data-object="unit-air-aircraft" data-pilot="ai" data-has-low-fuel data-coalition="red" data-is-selected>
<div data-object="unit-aircraft" data-pilot="ai" data-has-low-fuel data-coalition="red" data-is-selected>
<div class="unit-selected-spotlight"></div>
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
@@ -402,7 +402,7 @@
<div class="example">
<div class="caption">20%</div>
<div data-object="unit-air-aircraft" data-pilot="ai" data-has-low-fuel data-coalition="red">
<div data-object="unit-aircraft" data-pilot="ai" data-has-low-fuel data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
@@ -425,7 +425,7 @@
<div class="example">
<div class="caption">50%</div>
<div data-object="unit-air-aircraft" data-pilot="ai" data-coalition="red" data-is-selected>
<div data-object="unit-aircraft" data-pilot="ai" data-coalition="red" data-is-selected>
<div class="unit-selected-spotlight"></div>
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
@@ -448,7 +448,7 @@
<div class="example">
<div class="caption">75%</div>
<div data-object="unit-air-aircraft" data-pilot="ai" data-coalition="red">
<div data-object="unit-aircraft" data-pilot="ai" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
@@ -471,7 +471,7 @@
<div class="example">
<div class="caption">100%</div>
<div data-object="unit-air-aircraft" data-pilot="ai" data-coalition="red" data-is-selected>
<div data-object="unit-aircraft" data-pilot="ai" data-coalition="red" data-is-selected>
<div class="unit-selected-spotlight"></div>
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
@@ -502,7 +502,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="rtb" data-pilot="ai">
<div data-object="unit-aircraft" data-status="rtb" data-pilot="ai">
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
@@ -532,7 +532,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="rtb" data-coalition="blue" data-is-in-hotgroup data-is-selected>
<div data-object="unit-aircraft" data-status="rtb" data-coalition="blue" data-is-in-hotgroup data-is-selected>
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(315deg);"></div>
@@ -561,7 +561,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="rtb" data-pilot="ai" data-coalition="red" data-is-in-hotgroup>
<div data-object="unit-aircraft" data-status="rtb" data-pilot="ai" data-coalition="red" data-is-in-hotgroup>
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(270deg);"></div>
@@ -591,7 +591,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="hold" data-pilot="ai">
<div data-object="unit-aircraft" data-status="hold" data-pilot="ai">
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
@@ -621,7 +621,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="hold" data-coalition="blue" data-is-in-hotgroup data-is-selected>
<div data-object="unit-aircraft" data-status="hold" data-coalition="blue" data-is-in-hotgroup data-is-selected>
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(315deg);"></div>
@@ -650,7 +650,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="hold" data-pilot="ai" data-coalition="red" data-is-in-hotgroup>
<div data-object="unit-aircraft" data-status="hold" data-pilot="ai" data-coalition="red" data-is-in-hotgroup>
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(280deg);"></div>
@@ -688,7 +688,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="hold" data-pilot="ai" data-is-dead>
<div data-object="unit-aircraft" data-status="hold" data-pilot="ai" data-is-dead>
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
@@ -718,7 +718,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="hold" data-coalition="blue" data-is-in-hotgroup data-is-selected data-is-dead>
<div data-object="unit-aircraft" data-status="hold" data-coalition="blue" data-is-in-hotgroup data-is-selected data-is-dead>
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(315deg);"></div>
@@ -747,7 +747,7 @@
<div class="example">
<div data-object="unit-air-aircraft" data-status="hold" data-pilot="ai" data-coalition="red" data-is-dead>
<div data-object="unit-aircraft" data-status="hold" data-pilot="ai" data-coalition="red" data-is-dead>
<div class="unit-selected-spotlight"></div>
<div class="unit-status"></div>
<div class="unit-vvi" style="height: 50px; transform:rotate(280deg);"></div>
@@ -790,7 +790,7 @@
<div class="example">
<div data-object="unit-weapon-missile">
<div data-object="unit-missile">
<div class="unit-marker"></div>
</div>
@@ -799,7 +799,7 @@
<div class="example">
<div data-object="unit-weapon-missile" data-coalition="blue">
<div data-object="unit-missile" data-coalition="blue">
<div class="unit-marker" style="transform: rotate( 90deg );"></div>
</div>
@@ -807,7 +807,7 @@
<div class="example">
<div data-object="unit-weapon-missile" data-coalition="red">
<div data-object="unit-missile" data-coalition="red">
<div class="unit-marker" style="transform: rotate( 225deg );"></div>
</div>

2
client/views/unitcontrolpanel.ejs
View File

@@ -3,7 +3,7 @@
<div id="unit-selection">
<div id="unit-identification">
<div data-object="unit-air-aircraft">
<div data-object="unit-aircraft">
<div class="unit-marker"></div>
<div class="unit-short-label"></div>
</div>