Merge branch 'main' into 296-create-airbases-api

client/public/stylesheets/olympus.css

@@ -553,7 +553,7 @@ nav.ol-panel> :last-child {
 }
 
 .ol-sortable .handle {
-    background-image: url("/images/icons/grip-lines-solid.svg");
+    background-image: url("/resources/theme/images/icons/grip-lines-solid.svg");
     cursor: ns-resize;
     filter: invert();
     height: 12px;

client/public/themes/olympus/images/icons/crosshairs-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M256 0c17.7 0 32 14.3 32 32V42.4c93.7 13.9 167.7 88 181.6 181.6H480c17.7 0 32 14.3 32 32s-14.3 32-32 32H469.6c-13.9 93.7-88 167.7-181.6 181.6V480c0 17.7-14.3 32-32 32s-32-14.3-32-32V469.6C130.3 455.7 56.3 381.7 42.4 288H32c-17.7 0-32-14.3-32-32s14.3-32 32-32H42.4C56.3 130.3 130.3 56.3 224 42.4V32c0-17.7 14.3-32 32-32zM107.4 288c12.5 58.3 58.4 104.1 116.6 116.6V384c0-17.7 14.3-32 32-32s32 14.3 32 32v20.6c58.3-12.5 104.1-58.4 116.6-116.6H384c-17.7 0-32-14.3-32-32s14.3-32 32-32h20.6C392.1 165.7 346.3 119.9 288 107.4V128c0 17.7-14.3 32-32 32s-32-14.3-32-32V107.4C165.7 119.9 119.9 165.7 107.4 224H128c17.7 0 32 14.3 32 32s-14.3 32-32 32H107.4zM256 224a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>

client/src/index.ts

@@ -97,6 +97,7 @@ function readConfig(config: any) {
 }
 
 function setupEvents() {
+
     /* Generic clicks */
     document.addEventListener("click", (ev) => {
         if (ev instanceof MouseEvent && ev.target instanceof HTMLElement) {

client/src/missionhandler/missionhandler.ts

@@ -9,7 +9,6 @@ export class MissionHandler
     #airbases       : {[name: string]: Airbase} = {};
     #theatre        : string = "";
 
-
     #airbaseData : { [name: string]: object } = {};
 
     //  Time
@@ -20,7 +19,6 @@ export class MissionHandler
 
     #updateTime  : any;
 
-
     constructor()
     {
 

client/src/units/unit.ts

@@ -511,7 +511,6 @@ export class Unit extends CustomMarker {
     }
 
     delete() {
-        // TODO: add confirmation popup
         deleteUnit(this.ID);
     }
 

client/src/units/unitsmanager.ts

@@ -20,7 +20,7 @@ export class UnitsManager {
         document.addEventListener('paste', () => this.pasteUnits());
         document.addEventListener('unitSelection', (e: CustomEvent) => this.#onUnitSelection(e.detail));
         document.addEventListener('unitDeselection', (e: CustomEvent) => this.#onUnitDeselection(e.detail));
-        document.addEventListener('keydown', (event) => this.#onKeyDown(event));
+        document.addEventListener('keyup', (event) => this.#onKeyUp(event));
         document.addEventListener('deleteSelectedUnits', () => this.selectedUnitsDelete())
     }
 
@@ -426,9 +426,18 @@ export class UnitsManager {
     }
 
     /***********************************************/
-    #onKeyDown(event: KeyboardEvent) {
-        if (!keyEventWasInInput(event) && event.key === "Delete") {
-            this.selectedUnitsDelete();
+    #onKeyUp(event: KeyboardEvent) {
+        if (!keyEventWasInInput(event) && event.key === "Delete" ) {
+
+            const selectedUnits           = this.getSelectedUnits();
+            const selectionContainsAHuman = selectedUnits.some( ( unit:Unit ) => {
+                return unit.getMissionData().flags.Human === true;
+            });
+
+            if ( !selectionContainsAHuman || confirm( "Your selection includes a human player. Deleting humans causes their vehicle to crash.\n\nAre you sure you want to do this?" ) ) {
+                this.selectedUnitsDelete();
+            }
+
         }
     }
 

client/views/atc/addflight.ejs

@@ -1,5 +1,5 @@
 <form class="ol-strip-board-add-flight">
     <div class="ol-auto-suggest"></div>
     <input type="text" name="unitName" placeholder="Flight search" />
-    <button class="add-flight-by-click" title="Add unit via click"><img src="/resources/theme/images/icons/bullseye-solid.svg" /></button>
+    <button class="add-flight-by-click" title="Add unit via click"><img src="/resources/theme/images/icons/crosshairs-solid.svg" /></button>
 </form>