Added human and DCS controlled icons

2025-10-29 16:56:34 +00:00 · 2023-04-26 17:42:17 +02:00 · 2023-04-26 17:42:17 +02:00 · 04c7fc3741
commit 04c7fc3741
parent 40bcd46677
7 changed files with 142 additions and 5 deletions
--- a/client/demo.js
+++ b/client/demo.js
@ -18,7 +18,7 @@ const DEMO_UNIT_DATA = {
        },
        missionData:  {
            fuel: 50,
-            flags: {human: false},
+            flags: {human: true},
            ammo: [
                {
                    count: 4,
@ -67,8 +67,8 @@ const DEMO_UNIT_DATA = {
    },
    ["2"]:{
        baseData: {
-            AI: true,
-            name: "F-5E",
+            AI: false,
+            name: "KC-135",
            unitName: "Olympus 1-2",
            groupName: "Group 1",
            alive: true,
--- a/client/public/stylesheets/units.css
+++ b/client/public/stylesheets/units.css
@ -538,6 +538,14 @@
    background-image: var( --unit-aircraft-state-refuel );
 }

+[data-object|="unit"][data-state="human"] .unit-state {
+    background-image: var( --unit-aircraft-state-human );
+}
+
+[data-object|="unit"][data-state="dcs"] .unit-state {
+    background-image: var( --unit-aircraft-state-dcs );
+}
+
 /***  DEAD  ***/
 [data-object|="unit-aircraft"][ data-is-dead ] {
    cursor: default;
--- a/client/public/themes/olympus/images/state_dcs.svg
+++ b/client/public/themes/olympus/images/state_dcs.svg
@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="15"
+   viewBox="0 0 19 15"
+   fill="none"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="state_dcs.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="19.610428"
+     inkscape:cx="1.0453622"
+     inkscape:cy="12.21289"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <rect
+     style="fill:#262626;fill-opacity:1;stroke:none;stroke-width:5.63192;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect4324"
+     width="5.226213"
+     height="7.0879617"
+     x="1.5176032"
+     y="4.8923955"
+     rx="1.6057953" />
+  <rect
+     style="fill:#262626;fill-opacity:1;stroke:none;stroke-width:5.74938;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect4324-6"
+     width="5.5898962"
+     height="6.9061198"
+     x="11.848835"
+     y="4.9978404"
+     rx="1.7175397" />
+  <rect
+     style="fill:#262626;fill-opacity:1;stroke:none;stroke-width:4.02396;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect4324-7"
+     width="3.214294"
+     height="5.8832622"
+     x="7.7873521"
+     y="0.59372008"
+     rx="1.5281793" />
+  <rect
+     style="fill:#262626;fill-opacity:1;stroke:none;stroke-width:3.84388;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect4100"
+     width="12.76161"
+     height="12.015139"
+     x="3.0333979"
+     y="1.9770601"
+     rx="2.5930805" />
+  <path
+     d="m 9.3852027,1.9350755 c 0.358221,0 0.6476303,0.2894099 0.6476303,0.6476303 v 1.2952618 h 2.428616 c 0.805492,0 1.457171,0.6516785 1.457171,1.4571695 v 5.5048619 c 0,0.805491 -0.651679,1.457169 -1.457171,1.457169 H 6.3089565 c -0.8054909,0 -1.4571694,-0.651678 -1.4571694,-1.457169 V 5.3351371 c 0,-0.805491 0.6516785,-1.4571695 1.4571694,-1.4571695 H 8.7375714 V 2.5827058 c 0,-0.3582204 0.2894111,-0.6476303 0.6476313,-0.6476303 z M 7.1184944,9.7066454 c -0.1780979,0 -0.3238152,0.145716 -0.3238152,0.3238146 0,0.178099 0.1457173,0.323817 0.3238152,0.323817 h 0.6476303 c 0.1780991,0 0.3238164,-0.145718 0.3238164,-0.323817 0,-0.1780986 -0.1457173,-0.3238146 -0.3238164,-0.3238146 z m 1.9428933,0 c -0.178099,0 -0.3238163,0.145716 -0.3238163,0.3238146 0,0.178099 0.1457173,0.323817 0.3238163,0.323817 h 0.64763 c 0.178099,0 0.3238153,-0.145718 0.3238153,-0.323817 0,-0.1780986 -0.1457163,-0.3238146 -0.3238153,-0.3238146 z m 1.9428923,0 c -0.178098,0 -0.323815,0.145716 -0.323815,0.3238146 0,0.178099 0.145717,0.323817 0.323815,0.323817 h 0.647631 c 0.178098,0 0.323816,-0.145718 0.323816,-0.323817 0,-0.1780986 -0.145718,-0.3238146 -0.323816,-0.3238146 z M 8.2518487,7.1161213 a 0.8095391,0.8095391 0 1 0 -1.6190782,0 0.8095391,0.8095391 0 1 0 1.6190782,0 z m 3.0762473,0.809538 a 0.80953865,0.80953865 0 1 0 0,-1.6190771 0.80953865,0.80953865 0 1 0 0,1.6190771 z M 3.8803405,6.4684911 h 0.323815 v 3.8857859 h -0.323815 c -0.5363195,0 -0.9714467,-0.4351276 -0.9714467,-0.9714486 V 7.4399365 c 0,-0.5363182 0.4351272,-0.9714454 0.9714467,-0.9714454 z m 11.0097255,0 c 0.536319,0 0.971446,0.4351272 0.971446,0.9714454 v 1.9428919 c 0,0.536321 -0.435127,0.9714486 -0.971446,0.9714486 H 14.566249 V 6.4684911 Z"
+     id="path3711"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.0202384" />
+</svg>
--- a/client/public/themes/olympus/images/state_human.svg
+++ b/client/public/themes/olympus/images/state_human.svg
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="15"
+   viewBox="0 0 19 15"
+   fill="none"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="state_human.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="27.733334"
+     inkscape:cx="1.8930288"
+     inkscape:cy="5.3185095"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <ellipse
+     style="fill:#262626;fill-opacity:1;stroke:none;stroke-width:12.2489;stroke-dashoffset:5.6;paint-order:stroke fill markers"
+     id="path1149"
+     cx="9.2425327"
+     cy="4.9208517"
+     rx="5.0100894"
+     ry="4.9463482" />
+  <path
+     style="fill:none;stroke:#262626;stroke-width:3.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 4.5129051,12.490473 C 3.7913718,12.480652 3.327463,12.244253 3.2890664,11.649084 3.2075443,9.1160904 4.4151773,8.6100056 5.7622404,8.0795609 l 6.6154506,-0.012246 c 2.45028,0.2890709 3.047775,1.846629 3.047775,3.4797821 0.0127,0.360443 -0.331282,0.901957 -1.478805,0.943376 z"
+     id="path1359"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     d="m 9.2659737,7.6041687 c 1.6415273,0 2.9733343,-1.2969197 2.9733343,-2.8954494 0,-1.5985298 -1.331807,-2.8954501 -2.9733343,-2.8954501 -1.6415283,0 -2.973335,1.2969203 -2.973335,2.8954501 0,1.5985297 1.3318067,2.8954494 2.973335,2.8954494 z m 2.6429633,0.6434347 h -1.137714 c -0.458391,0.2050939 -0.9683982,0.3217163 -1.5052493,0.3217163 -0.5368511,0 -1.0447965,-0.1166224 -1.5052498,-0.3217163 H 6.6230093 c -1.4598251,0 -2.6429652,1.152148 -2.6429652,2.5737386 v 0.321716 c 0,0.532843 0.4439358,0.965149 0.991112,0.965149 H 13.56079 c 0.547177,0 0.991112,-0.432306 0.991112,-0.965149 v -0.321716 c 0,-1.4215906 -1.18314,-2.5737386 -2.642965,-2.5737386 z"
+     id="path916"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.0203759" />
+</svg>
--- a/client/public/themes/olympus/olympus.css
+++ b/client/public/themes/olympus/olympus.css
@ -132,6 +132,8 @@
    --unit-aircraft-state-attack: url( "/themes/olympus/images/state_attack.svg" );
    --unit-aircraft-state-follow: url( "/themes/olympus/images/state_follow.svg" );
    --unit-aircraft-state-refuel: url( "/themes/olympus/images/state_refuel.svg" );
+    --unit-aircraft-state-human: url( "/themes/olympus/images/state_human.svg" );
+    --unit-aircraft-state-dcs: url( "/themes/olympus/images/state_dcs.svg" );

    /***  Ground ***/
    --unit-groundunit-marker-height: 50px;
--- a/client/src/missionhandler/missionhandler.ts
+++ b/client/src/missionhandler/missionhandler.ts
@ -1,5 +1,5 @@
 import { Marker, LatLng, Icon } from "leaflet";
-import { getInfoPopup, getMap, getUnitsManager } from "..";
+import { getInfoPopup, getMap } from "..";
 import { Airbase } from "./airbase";

 var bullseyeIcons = [
--- a/client/src/units/unit.ts
+++ b/client/src/units/unit.ts
@ -546,7 +546,12 @@ export class Unit extends Marker {

                element.querySelector(".unit")?.toggleAttribute("data-is-dead", !this.getBaseData().alive);

-                element.querySelector(".unit")?.setAttribute("data-state", this.getTaskData().currentState.toLowerCase());
+                if (this.getMissionData().flags.human) // Unit is human
+                    element.querySelector(".unit")?.setAttribute("data-state", "human");
+                else if (!this.getBaseData().AI) // Unit is under DCS control (no Olympus)
+                    element.querySelector(".unit")?.setAttribute("data-state", "dcs");
+                else    // Unit is under Olympus control
+                    element.querySelector(".unit")?.setAttribute("data-state", this.getTaskData().currentState.toLowerCase());

                var unitHeadingDiv = element.querySelector(".unit-heading");
                if (unitHeadingDiv != null)