latest changes for descriptors.

2025-10-29 16:56:34 +00:00 · 2023-02-18 16:46:26 +00:00 · 2023-02-18 16:46:26 +00:00 · 639939f63a
commit 639939f63a
parent 282d2ff9bf 433b4bdf56
38 changed files with 16814 additions and 2299 deletions
--- a/client/.vscode/settings.json
+++ b/client/.vscode/settings.json
@ -0,0 +1,2 @@
+{
+}
--- a/client/public/images/buttons/question-mark-circle.svg
+++ b/client/public/images/buttons/question-mark-circle.svg
@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="96.000000pt" height="96.000000pt" viewBox="0 0 96.000000 96.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,96.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M386 870 c-63 -16 -153 -70 -197 -117 -22 -24 -55 -74 -72 -111 -29
+-61 -32 -76 -32 -163 0 -90 2 -99 37 -171 45 -91 103 -147 196 -191 61 -29 76
+-32 162 -32 86 0 101 3 162 32 93 44 151 100 196 191 35 72 37 81 37 172 0 91
+-2 100 -37 172 -68 136 -188 217 -336 224 -42 2 -94 -1 -116 -6z m229 -101
+c63 -30 124 -90 155 -154 34 -72 34 -198 0 -270 -31 -64 -91 -124 -155 -155
+-72 -34 -198 -34 -270 0 -260 126 -238 495 35 594 63 23 170 16 235 -15z"/>
+<path d="M415 706 c-37 -16 -70 -52 -84 -89 -19 -49 -15 -57 29 -57 29 0 40 4
+40 15 0 27 47 65 80 65 41 0 80 -39 80 -79 0 -23 -13 -44 -51 -83 -46 -48 -69
+-84 -69 -109 0 -5 18 -9 40 -9 22 0 40 4 40 10 0 5 24 37 54 70 30 34 58 75
+61 91 27 123 -104 226 -220 175z"/>
+<path d="M440 280 l0 -40 40 0 40 0 0 40 0 40 -40 0 -40 0 0 -40z"/>
+</g>
+</svg>
--- a/client/public/images/buttons/question-mark.svg
+++ b/client/public/images/buttons/question-mark.svg
@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="96.000000pt" height="96.000000pt" viewBox="0 0 96.000000 96.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,96.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M400 868 c-48 -16 -133 -104 -147 -151 -14 -45 -9 -64 18 -72 26 -8
+45 8 59 50 6 19 27 48 45 64 81 71 202 45 249 -53 34 -72 16 -128 -69 -216
+-29 -30 -65 -73 -79 -94 -32 -48 -35 -102 -6 -111 27 -8 37 -1 60 46 11 21 50
+70 85 108 100 105 125 183 91 279 -35 97 -107 152 -209 158 -34 2 -78 -2 -97
+-8z"/>
+<path d="M444 146 c-3 -8 -4 -25 -2 -38 2 -19 9 -23 38 -23 33 0 35 2 35 35 0
+32 -3 35 -33 38 -21 2 -34 -2 -38 -12z"/>
+</g>
+</svg>
--- a/client/public/images/buttons/radar.svg
+++ b/client/public/images/buttons/radar.svg
@ -0,0 +1,28 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="50.000000pt" height="50.000000pt" viewBox="0 0 50.000000 50.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,50.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M149 442 c-149 -78 -158 -288 -16 -376 198 -122 423 103 301 301 -21
+34 -44 55 -83 75 -71 37 -131 37 -202 0z m161 -2 c52 -15 76 -36 61 -53 -10
+-13 -17 -12 -48 4 -47 24 -96 24 -147 0 -23 -10 -48 -21 -57 -24 -25 -8 -36
+-132 -16 -179 14 -34 72 -88 94 -88 6 0 16 -7 23 -15 15 -18 46 -20 57 -2 4 7
+23 19 41 27 77 31 114 136 74 212 -17 32 -18 39 -5 49 18 15 38 -10 54 -66 24
+-84 -10 -174 -84 -223 -56 -37 -153 -39 -210 -3 -110 68 -128 220 -37 311 55
+55 124 72 200 50z m2 -66 c27 -14 29 -17 15 -31 -11 -12 -19 -12 -35 -4 -62
+33 -142 -18 -142 -90 0 -32 26 -74 55 -87 37 -17 65 -15 102 8 37 22 53 76 34
+117 -10 21 -9 29 3 41 14 14 17 12 31 -21 26 -63 15 -117 -35 -162 -27 -25
+-133 -30 -168 -8 -34 21 -62 73 -62 113 0 40 7 54 33 63 9 3 17 15 17 26 0 44
+93 65 152 35z m-172 -34 c0 -5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10
+10 6 0 10 -4 10 -10z m148 -18 c15 -10 -12 -38 -43 -44 -14 -2 -20 -11 -20
+-28 0 -20 5 -25 25 -25 17 0 26 6 28 20 6 31 34 58 44 43 13 -21 9 -65 -7 -72
+-8 -3 -15 -12 -15 -20 0 -16 -21 -26 -56 -26 -35 0 -74 42 -74 80 0 57 72 101
+118 72z m-28 -72 c0 -5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10 6 0
+10 -4 10 -10z m0 -150 c0 -5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10
+6 0 10 -4 10 -10z"/>
+</g>
+</svg>
--- a/client/public/stylesheets/layout.css
+++ b/client/public/stylesheets/layout.css
@ -74,6 +74,10 @@ body {

 .control-panel {
 	position: absolute;
+	left: 230px;
+	height: 30px;
+	width: 150;
+	top: 10px;
 	z-index: 1000;
 	display: flex;
 	align-items: center;
--- a/client/src/aic/AICFormation.ts
+++ b/client/src/aic/AICFormation.ts
@ -0,0 +1,54 @@
+import { AICFormationContextDataInterface, AICFormationDescriptor } from "./AICFormationDescriptor";
+import { AICFormationDescriptorPhrase } from "./AICFormationDescriptorPhrase";
+import { AICFormationDescriptorSection } from "./AICFormationDescriptorSection";
+
+export interface AICFormationInterface {
+    "icon"          : string,
+    "label"         : string,
+    "name"          : string,
+    "numGroups"     : number,
+    "summary"       : string,
+    "unitBreakdown" : string[]
+}
+
+
+
+export abstract class AICFormation {
+
+    "icon"          = "";
+    "label"         = "";
+    "name"          = "";
+    "numGroups"     = 1;
+    "summary"       = "";
+    "unitBreakdown":string[] = []
+
+
+    constructor() {
+
+        this.unitBreakdown = [];
+    }
+
+
+    addToDescriptorPhrase( section: AICFormationDescriptorSection, phrase: AICFormationDescriptorPhrase, contextData: AICFormationContextDataInterface ) {
+        return phrase;
+    }
+
+
+    getDescriptor( contextData: AICFormationContextDataInterface ) {
+
+        return new AICFormationDescriptor().generate( this, contextData );
+
+    }
+
+
+    hasUnitBreakdown() {
+        return this.unitBreakdown.length > 0;
+    }
+
+
+    showFormationNameInDescriptor() {
+        return true;
+    }
+
+
+}
--- a/client/src/aic/AICFormation/Azimuth.ts
+++ b/client/src/aic/AICFormation/Azimuth.ts
@ -0,0 +1,38 @@
+import { AICFormation, AICFormationInterface } from "../AICFormation";
+import { AICFormationContextDataInterface } from "../AICFormationDescriptor";
+import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection";
+import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent";
+import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase";
+
+export class AICFormation_Azimuth extends AICFormation implements AICFormationInterface {
+
+    "icon"          = "azimuth.png";
+    "label"         = "Azimuth";
+    "name"          = "azimuth";
+    "numGroups"     = 2;
+    "summary"       = "Two contacts, side-by-side in a line perpedicular to the perspective.";
+    "unitBreakdown" = [ "<compass> group", "<compass> group" ];
+
+    constructor() {
+
+        super();
+        
+    }
+
+    addToDescriptorPhrase( section: AICFormationDescriptorSection, phrase: AICFormationDescriptorPhrase, contextData: AICFormationContextDataInterface ) {
+
+        switch ( section.name ) {
+
+            case "formation":
+
+                phrase.addComponent( new AICFormationDescriptorComponent( "<distance>" ) );
+                phrase.addComponent( new AICFormationDescriptorComponent( "track <compass>" ) );
+
+        }
+
+        return phrase;
+
+
+    }
+
+}
--- a/client/src/aic/AICFormation/Range.ts
+++ b/client/src/aic/AICFormation/Range.ts
@ -0,0 +1,38 @@
+import { AICFormation, AICFormationInterface } from "../AICFormation";
+import { AICFormationContextDataInterface } from "../AICFormationDescriptor";
+import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection";
+import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent";
+import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase";
+
+export class AICFormation_Range extends AICFormation implements AICFormationInterface {
+
+    "icon"          = "range.png";
+    "label"         = "Range";
+    "name"          = "range";
+    "numGroups"     = 2;
+    "summary"       = "Two contacts, one behind the other";
+    "unitBreakdown" = [ "Lead group", "Trail group" ];
+
+    constructor() {
+
+        super();
+        
+    }
+
+    addToDescriptorPhrase( section: AICFormationDescriptorSection, phrase: AICFormationDescriptorPhrase, contextData: AICFormationContextDataInterface ) {
+
+        switch ( section.name ) {
+
+            case "formation":
+
+                phrase.addComponent( new AICFormationDescriptorComponent( "<distance>" ) );
+                phrase.addComponent( new AICFormationDescriptorComponent( "track <compass>" ) );
+
+
+        }
+
+        return phrase;
+
+    }
+
+}
--- a/client/src/aic/AICFormation/Single.ts
+++ b/client/src/aic/AICFormation/Single.ts
@ -0,0 +1,24 @@
+import { AICFormation, AICFormationInterface } from "../AICFormation";
+import { AICFormationContextDataInterface, AICFormationDescriptor } from "../AICFormationDescriptor";
+
+export class AICFormation_Single extends AICFormation implements AICFormationInterface {
+
+    "icon"          = "single.png";
+    "label"         = "Single";
+    "name"          = "single";
+    "numGroups"     = 1;
+    "summary"       = "One contact on its own";
+    "unitBreakdown" = [];
+
+    constructor() {
+
+        super();
+        
+    }
+
+
+    showFormationNameInDescriptor() {
+        return false;
+    }
+
+}
--- a/client/src/aic/AICFormationDescriptor.ts
+++ b/client/src/aic/AICFormationDescriptor.ts
@ -0,0 +1,55 @@
+import { AICFormation } from "./AICFormation";
+import { AICFormationDescriptorSection } from "./AICFormationDescriptorSection";
+import { AICFormationDescriptorSection_Formation } from "./AICFormationDescriptorSection/Formation";
+import { AICFormationDescriptorSection_Unit } from "./AICFormationDescriptorSection/Unit";
+import { AICFormationDescriptorSection_NumGroups } from "./AICFormationDescriptorSection/NumGroups";
+import { AICFormationDescriptorSection_Who } from "./AICFormationDescriptorSection/Who";
+
+
+export interface AICFormationContextDataInterface {
+    "aicCallsign"  : string,
+    "bullseyeName" : string,
+    "control"      : "broadcast" | "tactical",
+    "numGroups"    : number
+}
+
+
+export class AICFormationDescriptor {
+
+    #sections:AICFormationDescriptorSection[] = [
+        new AICFormationDescriptorSection_Who(),
+        new AICFormationDescriptorSection_NumGroups(),
+        new AICFormationDescriptorSection_Formation(),
+        new AICFormationDescriptorSection_Unit()
+    ]
+
+    constructor() {
+    }
+
+
+    addSection( section:AICFormationDescriptorSection ) {
+        this.#sections.push( section );
+    }
+
+
+    getSections() {
+        return this.#sections;
+    }
+
+
+    generate( formation:AICFormation, contextData: AICFormationContextDataInterface ) {
+
+        let output:object[] = [];
+
+        for ( const section of this.#sections ) {
+            output.push(
+                section.generate( formation, contextData )
+            );
+        }
+
+        return output;
+
+    }
+
+
+}
--- a/client/src/aic/AICFormationDescriptorComponent.ts
+++ b/client/src/aic/AICFormationDescriptorComponent.ts
@ -0,0 +1,18 @@
+interface ComponentInterface {
+    "label"    : string;
+    "value"    : string;
+}
+
+export class AICFormationDescriptorComponent implements ComponentInterface {
+
+    label = "(not set)";
+    value = "(not set)";
+
+    constructor( value:any, label?:string ) {
+
+        this.label = label || "(not set)";
+        this.value = value;
+
+    }
+
+}
--- a/client/src/aic/AICFormationDescriptorComponent/Distance.ts
+++ b/client/src/aic/AICFormationDescriptorComponent/Distance.ts
@ -0,0 +1,9 @@
+import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent";
+
+export abstract class AICFormactionDescriptorComponent_Distance extends AICFormationDescriptorComponent {
+
+    constructor( value:string, label?:string ) {
+        super( value, label );
+    }
+
+}
--- a/client/src/aic/AICFormationDescriptorComponent/Distance/Range.ts
+++ b/client/src/aic/AICFormationDescriptorComponent/Distance/Range.ts
@ -0,0 +1,9 @@
+import { AICFormactionDescriptorComponent_Distance } from "../Distance";
+
+export class AICFormationDescriptorComponent_Distance_Range extends AICFormactionDescriptorComponent_Distance {
+
+    constructor( value:string, label?:string ) {
+        super( value, label );
+    }
+    
+}
--- a/client/src/aic/AICFormationDescriptorPhrase.ts
+++ b/client/src/aic/AICFormationDescriptorPhrase.ts
@ -0,0 +1,40 @@
+import { AICFormation } from "./AICFormation";
+import { AICFormationContextDataInterface } from "./AICFormationDescriptor";
+import { AICFormationDescriptorComponent } from "./AICFormationDescriptorComponent";
+
+export interface AICFormationDescriptorPhraseInterface {
+    "generate"      : CallableFunction,
+    "label"         : string,
+    "name"          : string
+}
+
+export class AICFormationDescriptorPhrase {
+
+    #components : AICFormationDescriptorComponent[] = [];
+    label       = "";
+    name        = "";
+
+    constructor() {
+    }
+
+
+    addComponent( component:AICFormationDescriptorComponent ) {
+        this.#components.push( component );
+        return this;
+    }
+
+
+
+    getComponents() {
+        return this.#components;
+    }
+
+
+    generate( formation:AICFormation, contextData: AICFormationContextDataInterface ) {
+
+        return this;
+
+    }
+
+
+}
--- a/client/src/aic/AICFormationDescriptorSection.ts
+++ b/client/src/aic/AICFormationDescriptorSection.ts
@ -0,0 +1,40 @@
+import { AICFormation } from "./AICFormation";
+import { AICFormationContextDataInterface } from "./AICFormationDescriptor";
+import { AICFormationDescriptorPhrase } from "./AICFormationDescriptorPhrase";
+
+export interface AICFormationDescriptorSectionInterface {
+    "generate"      : CallableFunction,
+    "label"         : string,
+    "name"          : string,
+    "omitSection"   : boolean
+}
+
+export abstract class AICFormationDescriptorSection {
+
+    #phrases : AICFormationDescriptorPhrase[] = [];
+    label       = "";
+    name        = "";
+    omitSection = false;
+
+    constructor() {
+    }
+
+
+    addPhrase( phrase:AICFormationDescriptorPhrase ) {
+        this.#phrases.push( phrase );
+    }
+
+
+    generate( formation:AICFormation, contextData: AICFormationContextDataInterface ) {
+
+        return this;
+
+    }
+
+
+    getPhrases() {
+        return this.#phrases;
+    }
+
+
+}
--- a/client/src/aic/AICFormationDescriptorSection/Formation.ts
+++ b/client/src/aic/AICFormationDescriptorSection/Formation.ts
@ -0,0 +1,39 @@
+import { AICFormation } from "../AICFormation";
+import { AICFormationContextDataInterface } from "../AICFormationDescriptor";
+import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection";
+import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent";
+import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase";
+
+export class AICFormationDescriptorSection_Formation extends AICFormationDescriptorSection {
+
+    label = "Formation";
+    name  = "formation";
+
+    constructor() {
+        
+        super();
+
+    }
+
+
+    generate( formation:AICFormation, contextData: AICFormationContextDataInterface ) {
+
+        if ( !formation.showFormationNameInDescriptor() ) {
+            this.omitSection = true;
+            return this;
+        }
+
+        let phrase = new AICFormationDescriptorPhrase();
+
+        phrase.addComponent( new AICFormationDescriptorComponent( formation.label, "Formation" ) );
+
+        phrase = formation.addToDescriptorPhrase( this, phrase, contextData );
+
+        this.addPhrase( phrase );
+
+
+        return this;
+
+    }
+
+}
--- a/client/src/aic/AICFormationDescriptorSection/NumGroups.ts
+++ b/client/src/aic/AICFormationDescriptorSection/NumGroups.ts
@ -0,0 +1,35 @@
+import { AICFormation } from "../AICFormation";
+import { AICFormationContextDataInterface } from "../AICFormationDescriptor";
+import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection";
+import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent";
+import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase";
+
+export class AICFormationDescriptorSection_NumGroups extends AICFormationDescriptorSection {
+
+    label = "Groups";
+    name  = "numgroups";
+
+    constructor() {
+        
+        super();
+
+    }
+
+
+    generate( formation:AICFormation, contextData: AICFormationContextDataInterface ) {
+
+        let value = "Single group";
+
+        if ( contextData.numGroups > 1 ) {
+            value = contextData.numGroups + " groups";
+        }
+
+        let phrase = new AICFormationDescriptorPhrase();
+        phrase.addComponent( new AICFormationDescriptorComponent( value, "Number of groups" ) );
+        this.addPhrase( phrase );
+
+        return this;
+
+    }
+
+}
--- a/client/src/aic/AICFormationDescriptorSection/Unit.ts
+++ b/client/src/aic/AICFormationDescriptorSection/Unit.ts
@ -0,0 +1,83 @@
+import { AICFormation } from "../AICFormation";
+import { AICFormationContextDataInterface } from "../AICFormationDescriptor";
+import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection";
+import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent";
+import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase";
+
+interface addUnitInformationInterface {
+    omitTrack?: boolean
+}
+
+export class AICFormationDescriptorSection_Unit extends AICFormationDescriptorSection {
+
+    label = "Unit";
+    name  = "unit";
+
+    constructor() {
+        
+        super();
+
+    }
+
+
+    addUnitInformation( formation:AICFormation, contextData: AICFormationContextDataInterface, phrase: AICFormationDescriptorPhrase, options?:addUnitInformationInterface ) {
+
+        options = options || {};
+
+        const originPoint = ( contextData.control === "broadcast" ) ? contextData.bullseyeName : "BRAA";
+
+        phrase.addComponent( new AICFormationDescriptorComponent( originPoint, "Bearing origin point" ) );
+        phrase.addComponent( new AICFormationDescriptorComponent( "<bearing>", "Bearing" ) );
+        phrase.addComponent( new AICFormationDescriptorComponent( "<range>", "Range" ) );
+        phrase.addComponent( new AICFormationDescriptorComponent( "<altitude>", "Altitude" ) );
+
+        if ( contextData.control === "broadcast" ) {
+            if ( !options.hasOwnProperty( "omitTrack" ) || options.omitTrack !== true ) {
+                phrase.addComponent( new AICFormationDescriptorComponent( "track <compass>", "Tracking" ) );
+            }
+        } else {
+            phrase.addComponent( new AICFormationDescriptorComponent( "[hot|flanking [left|right]|beam <compass>|cold]", "Azimuth" ) );
+        }
+
+        return phrase;
+
+    }
+
+
+    generate( formation:AICFormation, contextData: AICFormationContextDataInterface ) {
+
+        if ( formation.hasUnitBreakdown() ) {
+
+            for ( const [ i, unitRef ] of formation.unitBreakdown.entries() ) {
+
+                let phrase = new AICFormationDescriptorPhrase();
+
+                phrase.addComponent( new AICFormationDescriptorComponent( unitRef, "Unit reference" ) );
+
+                if ( i === 0 ) {
+                    this.addUnitInformation( formation, contextData, phrase, { "omitTrack": true } );
+                } else {
+                    phrase.addComponent( new AICFormationDescriptorComponent( "<altitude>" ) );
+                }
+
+                phrase.addComponent( new AICFormationDescriptorComponent( "hostile" ) );
+
+                this.addPhrase( phrase );
+                
+
+            }
+
+        } else {
+
+            this.addPhrase(
+                this.addUnitInformation( formation, contextData, new AICFormationDescriptorPhrase() )
+            );
+
+        }
+
+        return this;
+
+    }
+
+
+}
--- a/client/src/aic/AICFormationDescriptorSection/Who.ts
+++ b/client/src/aic/AICFormationDescriptorSection/Who.ts
@ -0,0 +1,35 @@
+import { AICFormation } from "../AICFormation";
+import { AICFormationContextDataInterface } from "../AICFormationDescriptor";
+import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection";
+import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent";
+import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase";
+
+export class AICFormationDescriptorSection_Who extends AICFormationDescriptorSection {
+
+    label = "Who";
+    name  = "who";
+
+    constructor() {
+        
+        super();
+
+    }
+
+
+    generate( formation:AICFormation, contextData: AICFormationContextDataInterface ) {
+
+        let phrase = new AICFormationDescriptorPhrase();
+
+        if ( contextData.control === "tactical" ) {
+            phrase.addComponent( new AICFormationDescriptorComponent( "<their callsign>", "Their callsign" ) );
+        }
+
+        phrase.addComponent( new AICFormationDescriptorComponent( contextData.aicCallsign, "Your callsign" ) );
+
+        this.addPhrase( phrase );
+
+        return this;
+
+    }
+
+}
--- a/client/src/index.ts
+++ b/client/src/index.ts
@ -36,6 +36,7 @@ var climbButton: Button;
 var descendButton: Button;
 var userVisibilityButton: Button;
 var aiVisibilityButton: Button;
+var uncontrolledVisibilityButton: Button;
 var weaponVisibilityButton: Button;
 var deadVisibilityButton: Button;

@ -74,12 +75,14 @@ function setup() {
    airspeedSlider = new Slider("airspeed-slider", 0, 100, "kts", (value: number) => getUnitsManager().selectedUnitsSetSpeed(value / 1.94384));

    /* Visibility buttons */
-    userVisibilityButton = new Button("user-visibility-button", ["images/buttons/user-full.svg", "images/buttons/user-partial.svg", "images/buttons/user-none.svg", "images/buttons/user-hidden.svg"], () => { });
-    aiVisibilityButton = new Button("ai-visibility-button", ["images/buttons/ai-full.svg", "images/buttons/ai-partial.svg", "images/buttons/ai-none.svg", "images/buttons/ai-hidden.svg"], () => { });
-    weaponVisibilityButton = new Button("weapon-visibility-button", ["images/buttons/weapon-partial.svg", "images/buttons/weapon-none.svg", "images/buttons/weapon-hidden.svg"], () => { });
-    deadVisibilityButton = new Button("dead-visibility-button", ["images/buttons/dead.svg", "images/buttons/dead-hidden.svg"], () => { });
+    userVisibilityButton = new Button("user-visibility-button", ["images/buttons/user-full.svg", "images/buttons/user-partial.svg", "images/buttons/user-none.svg", "images/buttons/user-hidden.svg"], () => { getUnitsManager().forceUpdate() });
+    aiVisibilityButton = new Button("ai-visibility-button", ["images/buttons/ai-full.svg", "images/buttons/ai-partial.svg", "images/buttons/ai-none.svg", "images/buttons/ai-hidden.svg"], () => { getUnitsManager().forceUpdate() });
+    uncontrolledVisibilityButton = new Button("uncontrolled-visibility-button", ["images/buttons/ai-full.svg", "images/buttons/ai-partial.svg", "images/buttons/ai-none.svg", "images/buttons/ai-hidden.svg"], () => { getUnitsManager().forceUpdate() });
+    weaponVisibilityButton = new Button("weapon-visibility-button", ["images/buttons/weapon-partial.svg", "images/buttons/weapon-none.svg", "images/buttons/weapon-hidden.svg"], () => { getUnitsManager().forceUpdate() });
+    deadVisibilityButton = new Button("dead-visibility-button", ["images/buttons/dead.svg", "images/buttons/dead-hidden.svg"], () => { getUnitsManager().forceUpdate() });

    aiVisibilityButton.setState(1);
+    uncontrolledVisibilityButton.setState(3);
    weaponVisibilityButton.setState(1);
    deadVisibilityButton.setState(1);

@ -194,6 +197,7 @@ export function getVisibilitySettings() {
    var visibility = {
        user: "",
        ai: "",
+        uncontrolled: "",
        weapon: "",
        dead: ""
    };
@ -220,6 +224,17 @@ export function getVisibilitySettings() {
            visibility.ai = "hidden"; break;
    }

+    switch (uncontrolledVisibilityButton.getState()) {
+        case 0:
+            visibility.uncontrolled = "full"; break;
+        case 1:
+            visibility.uncontrolled = "partial"; break;
+        case 2:
+            visibility.uncontrolled = "none"; break;
+        case 3:
+            visibility.uncontrolled = "hidden"; break;
+    }
+
    switch (weaponVisibilityButton.getState()) {
        case 0:
            visibility.weapon = "partial"; break;
--- a/client/src/map/map.ts
+++ b/client/src/map/map.ts
@ -2,7 +2,7 @@ import * as L from "leaflet"
 import { getSelectionWheel, getSelectionScroll, getUnitsManager, getActiveCoalition, getMouseInfoPanel } from "..";
 import { spawnAircraft, spawnGroundUnit, spawnSmoke } from "../dcs/dcs";
 import { bearing, distance, zeroAppend } from "../other/utils";
-import { payloadNames } from "../units/payloadNames";
+import { aircraftDatabase, getAircraftLabelsByRole, getLoadoutsByName, getLoadoutNamesByRole } from "../units/aircraftDatabase";
 import { unitTypes } from "../units/unitTypes";
 import { BoxSelect } from "./boxselect";

@ -278,6 +278,23 @@ export class Map extends L.Map {
    }

    /* Spawning menus */
+    #aircraftSpawnMenu(e: SpawnEvent) {
+        var options = [
+            { 'coalition': true, 'tooltip': 'CAP', 'src': 'spawnCAP.png', 'callback': () => this.#selectAircraft(e, "cap") },
+            { 'coalition': true, 'tooltip': 'CAS', 'src': 'spawnCAS.png', 'callback': () => this.#selectAircraft(e, "cas") },
+            { 'coalition': true, 'tooltip': 'Strike', 'src': 'spawnStrike.png', 'callback': () => this.#selectAircraft(e, "strike") },
+            { 'coalition': true, 'tooltip': 'Recce', 'src': 'spawnStrike.png', 'callback': () => this.#selectAircraft(e, "reconnaissance") },
+            { 'coalition': true, 'tooltip': 'Tanker', 'src': 'spawnTanker.png', 'callback': () => this.#selectAircraft(e, "tanker") },
+            { 'coalition': true, 'tooltip': 'AWACS', 'src': 'spawnAWACS.png', 'callback': () => this.#selectAircraft(e, "awacs") },
+            { 'coalition': true, 'tooltip': 'Drone', 'src': 'spawnDrone.png', 'callback': () => this.#selectAircraft(e, "drone") },
+            { 'coalition': true, 'tooltip': 'Transport', 'src': 'spawnTransport.png', 'callback': () => this.#selectAircraft(e, "transport") },
+        ]
+        if (e.airbaseName != null)
+            this.showSelectionScroll(e, "Spawn at " + e.airbaseName, options, () => {}, true);
+        else
+            this.showSelectionScroll(e, "Spawn air unit", options, () => {}, true);
+    }
+
    #groundUnitSpawnMenu(e: SpawnEvent) {
        var options = [
            {'coalition': true, 'tooltip': 'Howitzer',   'src': 'spawnHowitzer.png', 'callback': () => this.#selectGroundUnit(e, "Howitzers")},
@ -308,50 +325,31 @@ export class Map extends L.Map {

    }

-    #aircraftSpawnMenu(e: SpawnEvent) {
-        var options = [
-            { 'coalition': true, 'tooltip': 'CAP', 'src': 'spawnCAP.png', 'callback': () => this.#selectAircraft(e, "CAP") },
-            { 'coalition': true, 'tooltip': 'CAS', 'src': 'spawnCAS.png', 'callback': () => this.#selectAircraft(e, "CAS") },
-            { 'coalition': true, 'tooltip': 'Tanker', 'src': 'spawnTanker.png', 'callback': () => this.#selectAircraft(e, "tanker") },
-            { 'coalition': true, 'tooltip': 'AWACS', 'src': 'spawnAWACS.png', 'callback': () => this.#selectAircraft(e, "awacs") },
-            { 'coalition': true, 'tooltip': 'Strike', 'src': 'spawnStrike.png', 'callback': () => this.#selectAircraft(e, "strike") },
-            { 'coalition': true, 'tooltip': 'Drone', 'src': 'spawnDrone.png', 'callback': () => this.#selectAircraft(e, "drone") },
-            { 'coalition': true, 'tooltip': 'Transport', 'src': 'spawnTransport.png', 'callback': () => this.#selectAircraft(e, "transport") },
-        ]
-        if (e.airbaseName != null)
-            this.showSelectionScroll(e, "Spawn at " + e.airbaseName, options, () => {}, true);
-        else
-            this.showSelectionScroll(e, "Spawn air unit", options, () => {}, true);
-    }
-
    /* Show unit selection for air units */
-    #selectAircraft(e: SpawnEvent, group: string) {
+    #selectAircraft(e: SpawnEvent, role: string) {
        this.hideSelectionWheel();
        this.hideSelectionScroll();
-        var options = unitTypes.air[group];
-        if (options != undefined)
-            options.sort();
-        else
-            options = [];
+        var options = getAircraftLabelsByRole(role);
        this.showSelectionScroll(e, "Select aircraft", options, (unitType: string) => {
            this.hideSelectionWheel();
            this.hideSelectionScroll();
-            this.#unitSelectPayload(e, unitType);
+            this.#unitSelectPayload(e, unitType, role);
        }, true);
    }

    /* Show weapon selection for air units */
-    #unitSelectPayload(e: SpawnEvent, unitType: string) {
+    #unitSelectPayload(e: SpawnEvent, unitType: string, role: string) {
        this.hideSelectionWheel();
        this.hideSelectionScroll();
-        var options = [];
-        options = payloadNames[unitType]
+        var options = getLoadoutNamesByRole(unitType, role);
+        //options = payloadNames[unitType]
        if (options != undefined && options.length > 0) {
            options.sort();
-            this.showSelectionScroll({x: e.x, y: e.y, latlng: e.latlng}, "Select loadout", options, (payloadName: string) => {
+            this.showSelectionScroll({x: e.x, y: e.y, latlng: e.latlng}, "Select loadout", options, (loadoutName: string) => {
                this.hideSelectionWheel();
                this.hideSelectionScroll();
-                spawnAircraft(unitType, e.latlng, getActiveCoalition(), payloadName, e.airbaseName);
+                var loadout = getLoadoutsByName(unitType, loadoutName);
+                spawnAircraft(unitType, e.latlng, getActiveCoalition(), loadout.code, e.airbaseName);
            }, true);
        }
        else {
--- a/client/src/units/aircraftDatabase.ts
+++ b/client/src/units/aircraftDatabase.ts
--- a/client/src/units/payloadNames.ts
+++ b/client/src/units/payloadNames.ts
--- a/client/src/units/unit.ts
+++ b/client/src/units/unit.ts
@ -12,6 +12,7 @@ var pathIcon = new Icon({

 export class Unit {
    ID: number = -1;
+    AI: boolean = false;
    formation: string = "";
    name: string = "";
    unitName: string = "";
@ -49,6 +50,7 @@ export class Unit {
    #targetsPolylines: Polyline[];
    #marker: UnitMarker;
    #timer: number = 0;
+    #forceUpdate: boolean = false;

    static getConstructor(name: string) {
        if (name === "GroundUnit") return GroundUnit;
@ -76,6 +78,10 @@ export class Unit {
    }

    update(response: any) {
+        var updateMarker = false;
+        if (this.latitude != response['latitude'] || this.longitude != response['longitude'] || this.alive != response['alive'] || this.#forceUpdate)
+            updateMarker = true;
+
        for (let entry in response) {
            // @ts-ignore TODO handle better
            this[entry] = response[entry];
@ -88,7 +94,8 @@ export class Unit {
        /* Dead units can't be selected */
        this.setSelected(this.getSelected() && this.alive)

-        this.#updateMarker();
+        if (updateMarker)
+            this.#updateMarker();

        this.#clearTargets();
        if (this.getSelected() && this.activePath != null)
@ -164,6 +171,11 @@ export class Unit {
        return wingmen;
    }

+    forceUpdate()
+    {
+        this.#forceUpdate = true;
+    }
+
    #onClick(e: any) {
        this.#timer = setTimeout(() => {
            if (!this.#preventClick) {
@ -218,6 +230,8 @@ export class Unit {
                alive: this.alive
            });
        }
+
+        this.#forceUpdate = false;
    }

    #drawPath() {
@ -374,6 +388,9 @@ export class Unit {

 export class AirUnit extends Unit {
    getHidden() {
+        if (this.AI == false && getVisibilitySettings().uncontrolled === "hidden")
+            return true
+
        if (this.alive)
        {
            if (this.flags.user && getVisibilitySettings().user === "hidden")
@ -408,6 +425,9 @@ export class GroundUnit extends Unit {
    }

    getHidden() {
+        if (this.AI == false && getVisibilitySettings().uncontrolled === "hidden")
+            return true
+
        if (this.alive)
        {
            if (this.flags.user && getVisibilitySettings().user === "hidden")
@ -428,6 +448,9 @@ export class NavyUnit extends Unit {
    }

    getHidden() {
+        if (this.AI == false && getVisibilitySettings().uncontrolled === "hidden")
+            return true
+            
        if (this.alive)
        {
            if (this.flags.user && getVisibilitySettings().user === "hidden")
--- a/client/src/units/unitmarker.ts
+++ b/client/src/units/unitmarker.ts
@ -8,6 +8,7 @@ export interface MarkerOptions {
    human: boolean
    coalitionID: number
    type: any
+    AI: boolean
 }

 export interface MarkerData {
@ -21,6 +22,7 @@ export class UnitMarker extends L.Marker {
    #unitName: string
    #name: string
    #human: boolean
+    #AI: boolean
    #alive: boolean = true
    #selected: boolean = false

@ -29,6 +31,7 @@ export class UnitMarker extends L.Marker {
        this.#unitName = options.unitName;
        this.#name = options.name;
        this.#human = options.human;
+        this.#AI = options.AI;

        var symbol = new Symbol(this.#computeMarkerCode(options), { size: 25 });
        var img = symbol.asCanvas().toDataURL('image/png');
@ -91,7 +94,7 @@ export class UnitMarker extends L.Marker {
                altitudeDiv.style.display = 'none';
                speedDiv.style.display = 'none';
            }
-            if (this.getVisibility() === "none")
+            if (this.getVisibility() === "none" && nameDiv.style.display != 'none')
                nameDiv.style.display = 'none';

            nameDiv.style.left = (-(nameDiv.offsetWidth - container.offsetWidth) / 2) + "px";
@ -127,6 +130,10 @@ export class UnitMarker extends L.Marker {
        return this.#human;
    }

+    getAI() {
+        return this.#AI;
+    }
+
    getAlive() {
        return this.#alive;
    }
@ -226,7 +233,7 @@ export class AirUnitMarker extends UnitMarker {
        else if (!this.getAlive())
            return "none";
        else
-            return getVisibilitySettings().ai;
+            return this.getAI()? getVisibilitySettings().ai: getVisibilitySettings().uncontrolled;
    }
 }

@ -247,7 +254,7 @@ export class GroundUnitMarker extends UnitMarker {
        else if (!this.getAlive())
            return "none";
        else
-            return getVisibilitySettings().ai;
+            return this.getAI()? getVisibilitySettings().ai: getVisibilitySettings().uncontrolled;
    }
 }

@ -259,7 +266,7 @@ export class NavyUnitMarker extends UnitMarker {
        if (!this.getAlive())
            return "none";
        else
-            return getVisibilitySettings().ai;
+            return this.getAI()? getVisibilitySettings().ai: getVisibilitySettings().uncontrolled;
    }
 }

--- a/client/src/units/unitsmanager.ts
+++ b/client/src/units/unitsmanager.ts
@ -39,7 +39,8 @@ export class UnitsManager {
                name: data.name,
                human: data.human,
                coalitionID: data.coalitionID,
-                type: data.type
+                type: data.type,
+                AI: data.AI
            }
            this.#units[ID] = new constructor(ID, options);
        }
@ -88,6 +89,12 @@ export class UnitsManager {
        }
    }

+    forceUpdate() {
+        for (let ID in this.#units) {
+            this.#units[ID].forceUpdate();
+        }
+    }
+
    onUnitSelection() {
        if (this.getSelectedUnits().length > 0) {
            getMap().setState("MOVE_UNIT");
@ -106,10 +113,13 @@ export class UnitsManager {
        this.deselectAllUnits();
        for (let ID in this.#units)
        {
-            var latlng = new LatLng(this.#units[ID].latitude, this.#units[ID].longitude);
-            if (bounds.contains(latlng))
+            if (this.#units[ID].getHidden() == false)
            {
-                this.#units[ID].setSelected(true);
+                var latlng = new LatLng(this.#units[ID].latitude, this.#units[ID].longitude);
+                if (bounds.contains(latlng))
+                {
+                    this.#units[ID].setSelected(true);
+                }
            }
        }
    }
--- a/client/views/index.ejs
+++ b/client/views/index.ejs
@ -25,9 +25,13 @@
  <%- include('selectionwheel.ejs') %>
  <%- include('selectionscroll.ejs') %>
  <div class="olympus-dropdown" id="map-source-dropdown"></div>
+<<<<<<< HEAD
  <div class="olympus-dropdown" id="scenario-dropdown"></div>
  <%- include('aiccontrolpanel.ejs') %>
  <%- include('aicformationpanel.ejs') %>
+=======
+  <!-- <div class="olympus-dropdown" id="scenario-dropdown"></div> -->
+>>>>>>> 433b4bdf569d0aca79794685ee41021190722f5b
  <%- include('unitinfopanel.ejs') %>
  <%- include('unitcontrolpanel.ejs') %>
  <%- include('visibilitycontrolpanel.ejs') %>
--- a/client/views/visibilitycontrolpanel.ejs
+++ b/client/views/visibilitycontrolpanel.ejs
@ -1,6 +1,7 @@
 <div class="olympus-panel control-panel control-panel-top" id="visibility-control-panel">
    <div class="olympus-button" id="user-visibility-button"></div>
    <div class="olympus-button" id="ai-visibility-button"></div>
+    <div class="olympus-button" id="uncontrolled-visibility-button"></div>
    <div class="olympus-button" id="weapon-visibility-button"></div>
    <div class="olympus-button" id="dead-visibility-button"></div>
 </div>
--- a/package-lock.json
+++ b/package-lock.json
@ -0,0 +1,997 @@
+{
+  "name": "DCSOlympus",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "devDependencies": {
+        "chai": "^4.3.7",
+        "mocha": "^10.2.0"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
--- a/package.json
+++ b/package.json
@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "chai": "^4.3.7",
+    "mocha": "^10.2.0"
+  }
+}
--- a/scripts/OlympusCommand.lua
+++ b/scripts/OlympusCommand.lua
@ -2,7 +2,7 @@ Olympus.unitCounter = 1
 Olympus.payloadRegistry = {}
  
 function Olympus.notify(message, displayFor)
-    trigger.action.outText(message, displayFor)
+    -- trigger.action.outText(message, displayFor)
 end

 -- Gets a unit class reference from a given ObjectID (the ID used by Olympus for unit referencing)
--- a/scripts/OlympusMission.lua
+++ b/scripts/OlympusMission.lua
@ -1,5 +1,8 @@

 Olympus = {}
+Olympus.groupIndex = 0
+Olympus.groupStep = 40
+
 function Olympus.notify(message, displayFor)
    trigger.action.outText(message, displayFor)
 end
@ -18,30 +21,44 @@ function Olympus.setMissionData(arg, time)
 	end

 	-- Units tactical data
-	-- TODO find some way to spread the load of getting this data (split)
 	local unitsData = {}
+	
+	local startIndex = Olympus.groupIndex
+	local endIndex = startIndex + Olympus.groupStep
+	local index = 0
 	for groupName, gp in pairs(mist.DBs.groupsByName) do
-		if groupName ~= nil then
-			local group = Group.getByName(groupName)
-			if group ~= nil then
-				local controller = group:getController()
-				for index, unit in pairs(group:getUnits()) do
-					local table = {}
-					table["targets"] = {}
-					table["targets"]["visual"] = controller:getDetectedTargets(1)
-					table["targets"]["radar"] = controller:getDetectedTargets(4)
-					table["targets"]["rwr"] = controller:getDetectedTargets(16)
-					table["targets"]["other"] = controller:getDetectedTargets(2, 8, 32)
+		index = index + 1
+		if index > startIndex then
+			if groupName ~= nil then
+				local group = Group.getByName(groupName)
+				if group ~= nil then
+					local controller = group:getController()
+					for index, unit in pairs(group:getUnits()) do
+						local table = {}
+						table["targets"] = {}
+						table["targets"]["visual"] = controller:getDetectedTargets(1)
+						table["targets"]["radar"] = controller:getDetectedTargets(4)
+						table["targets"]["rwr"] = controller:getDetectedTargets(16)
+						table["targets"]["other"] = controller:getDetectedTargets(2, 8, 32)

-					table["hasTask"] = controller:hasTask()
-					
-					table["ammo"] = unit:getAmmo()
-					table["fuel"] = unit:getFuel()
-					table["life"] = unit:getLife() / unit:getLife0()
-					unitsData[unit:getObjectID()] = table
+						table["hasTask"] = controller:hasTask()
+						
+						table["ammo"] = unit:getAmmo()
+						table["fuel"] = unit:getFuel()
+						table["life"] = unit:getLife() / unit:getLife0()
+						unitsData[unit:getObjectID()] = table
+					end
 				end
 			end
 		end
+		if index == endIndex then
+			break
+		end
+	end
+	if index ~= endIndex then 
+		Olympus.groupIndex = 0
+	else
+		Olympus.groupIndex = endIndex
 	end

 	-- Airbases data
@ -69,7 +86,7 @@ function Olympus.setMissionData(arg, time)

 	local command = "Olympus.missionData = " .. Olympus.serializeTable(missionData) .. "\n" .. "Olympus.OlympusDLL.setMissionData()"
 	net.dostring_in("export", command)
-	return time + 5
+	return time + 1
 end

 function Olympus.serializeTable(val, name, skipnewlines, depth)
--- a/scripts/payLoadConverter.py
+++ b/scripts/payLoadConverter.py
@ -0,0 +1,61 @@
+import pandas as pd
+import json
+
+# Load data from an Excel file
+df = pd.read_excel('data.xlsx')
+
+# Group by 'Name', 'Fuel', 'Loadout Name', 'Role', and 'Code' and aggregate 'Items - Name' and 'Items - Quantity'
+grouped = df.groupby(['Name', 'Fuel', 'Loadout Name', 'Role', 'Code'])['Items - Name', 'Items - Quantity'].agg(lambda x: list(x)).reset_index()
+
+# Convert the grouped data into the desired format
+result = {}
+for index, row in grouped.iterrows():
+    name = row['Name']
+    if name not in result:
+        result[name] = {
+            "name": row['Name'],
+            "label": row['Name'],
+            "loadouts": [
+                {
+                    "fuel": row['Fuel'],
+                    "items": [
+                        {
+                            "name": item,
+                            "quantity": quantity
+                        } for item, quantity in zip(row['Items - Name'], row['Items - Quantity'])
+                    ],
+                    "roles": [row['Role']],
+                    "code": row['Code'],
+                    "loadout_name": row['Loadout Name']
+                }
+            ]
+        }
+    else:
+        found = False
+        for loadout in result[name]["loadouts"]:
+            if loadout["fuel"] == row['Fuel'] and loadout["code"] == row['Code'] and loadout["loadout_name"] == row['Loadout Name']:
+                loadout["items"].extend([
+                    {
+                        "name": item,
+                        "quantity": quantity
+                    } for item, quantity in zip(row['Items - Name'], row['Items - Quantity'])
+                ])
+                loadout["roles"].append(row['Role'])
+                found = True
+                break
+        if not found:
+            result[name]["loadouts"].append({
+                "fuel": row['Fuel'],
+                "items": [
+                    {
+                        "name": item,
+                        "quantity": quantity
+                    } for item, quantity in zip(row['Items - Name'], row['Items - Quantity'])
+                ],
+                "roles": [row['Role']],
+                "code": row['Code'],
+                "loadout_name": row['Loadout Name']
+            })
+
+# Print the result with the correct indents
+print(json.dumps(result, indent=2))
--- a/scripts/payloadNames.js
+++ b/scripts/payloadNames.js
--- a/scripts/unitPayloads.lua
+++ b/scripts/unitPayloads.lua
--- a/src/core/include/Scheduler.h
+++ b/src/core/include/Scheduler.h
@ -12,6 +12,7 @@ public:
 	void appendCommand(Command* command);
 	void execute(lua_State* L);
 	void handleRequest(wstring key, json::value value);
+	

 private:
 	list<Command*> commands;
--- a/src/core/src/Scheduler.cpp
+++ b/src/core/src/Scheduler.cpp
@ -65,9 +65,9 @@ void Scheduler::handleRequest(wstring key, json::value value)
 			wstring unitName = unit->getUnitName();
 			json::value path = value[L"path"];
 			list<Coords> newPath;
-			for (auto const& e : path.as_object())
+			for (int i = 1; i <= path.as_object().size(); i++)
 			{
-				wstring WP = e.first;
+				wstring WP = to_wstring(i);
 				double lat = path[WP][L"lat"].as_double();
 				double lng = path[WP][L"lng"].as_double();
 				log(unitName + L" set path destination " + WP + L" (" + to_wstring(lat) + L", " + to_wstring(lng) + L")");
--- a/src/core/src/Unit.cpp
+++ b/src/core/src/Unit.cpp
@ -98,6 +98,7 @@ json::value Unit::json()
 	auto json = json::value::object();

 	json[L"alive"] = alive;
+	json[L"AI"] = AI;
 	json[L"name"] = json::value::string(name);
 	json[L"unitName"] = json::value::string(unitName);
 	json[L"groupName"] = json::value::string(groupName);