From 3b628314017804436abaa24cbd6add98c24cfde5 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Wed, 19 May 2021 20:41:03 -0700
Subject: [PATCH 1/8] Replace icons for some TGOs.

Only covered about half of the types so far.

This also removes the clustering, since that doesn't really seem to be
needed with the newer icons.
---
 resources/ui/ground_assets/aa_blue_alive.svg  |   1 +
 .../ui/ground_assets/aa_blue_damaged.svg      |   1 +
 .../ui/ground_assets/aa_blue_destroyed.svg    |   1 +
 resources/ui/ground_assets/aa_red_alive.svg   |   1 +
 resources/ui/ground_assets/aa_red_damaged.svg |   1 +
 .../ui/ground_assets/aa_red_destroyed.svg     |   1 +
 .../ui/ground_assets/ammo_blue_alive.svg      |   1 +
 .../ui/ground_assets/ammo_blue_damaged.svg    |   1 +
 .../ui/ground_assets/ammo_blue_destroyed.svg  |   1 +
 resources/ui/ground_assets/ammo_red_alive.svg |   1 +
 .../ui/ground_assets/ammo_red_damaged.svg     |   1 +
 .../ui/ground_assets/ammo_red_destroyed.svg   |   1 +
 .../ui/ground_assets/armor_blue_alive.svg     |   1 +
 .../ui/ground_assets/armor_blue_damaged.svg   |   1 +
 .../ui/ground_assets/armor_blue_destroyed.svg |   1 +
 .../ui/ground_assets/armor_red_alive.svg      |   1 +
 .../ui/ground_assets/armor_red_damaged.svg    |   1 +
 .../ui/ground_assets/armor_red_destroyed.svg  |   1 +
 resources/ui/ground_assets/ewr_blue_alive.svg |   1 +
 .../ui/ground_assets/ewr_blue_damaged.svg     |   1 +
 .../ui/ground_assets/ewr_blue_destroyed.svg   |   1 +
 resources/ui/ground_assets/ewr_red_alive.svg  |   1 +
 .../ui/ground_assets/ewr_red_damaged.svg      |   1 +
 .../ui/ground_assets/ewr_red_destroyed.svg    |   1 +
 .../ui/ground_assets/factory_blue_alive.svg   |   1 +
 .../ui/ground_assets/factory_blue_damaged.svg |   1 +
 .../ground_assets/factory_blue_destroyed.svg  |   1 +
 .../ui/ground_assets/factory_red_alive.svg    |   1 +
 .../ui/ground_assets/factory_red_damaged.svg  |   1 +
 .../ground_assets/factory_red_destroyed.svg   |   1 +
 resources/ui/ground_assets/fob_blue_alive.svg |   1 +
 .../ui/ground_assets/fob_blue_damaged.svg     |   1 +
 .../ui/ground_assets/fob_blue_destroyed.svg   |   1 +
 resources/ui/ground_assets/fob_red_alive.svg  |   1 +
 .../ui/ground_assets/fob_red_damaged.svg      |   1 +
 .../ui/ground_assets/fob_red_destroyed.svg    |   1 +
 resources/ui/ground_assets/oil_blue_alive.svg |   1 +
 .../ui/ground_assets/oil_blue_damaged.svg     |   1 +
 .../ui/ground_assets/oil_blue_destroyed.svg   |   1 +
 resources/ui/ground_assets/oil_red_alive.svg  |   1 +
 .../ui/ground_assets/oil_red_damaged.svg      |   1 +
 .../ui/ground_assets/oil_red_destroyed.svg    |   1 +
 .../ui/ground_assets/ship_blue_alive.svg      |   1 +
 .../ui/ground_assets/ship_blue_damaged.svg    |   1 +
 .../ui/ground_assets/ship_blue_destroyed.svg  |   1 +
 resources/ui/ground_assets/ship_red_alive.svg |   1 +
 .../ui/ground_assets/ship_red_damaged.svg     |   1 +
 .../ui/ground_assets/ship_red_destroyed.svg   |   1 +
 .../ui/ground_assets/ware_blue_alive.svg      |   1 +
 .../ui/ground_assets/ware_blue_damaged.svg    |   1 +
 .../ui/ground_assets/ware_blue_destroyed.svg  |   1 +
 resources/ui/ground_assets/ware_red_alive.svg |   1 +
 .../ui/ground_assets/ware_red_damaged.svg     |   1 +
 .../ui/ground_assets/ware_red_destroyed.svg   |   1 +
 resources/ui/map/canvas.html                  |  14 --
 resources/ui/map/map.js                       | 148 +++++++++++-------
 56 files changed, 144 insertions(+), 72 deletions(-)
 create mode 100644 resources/ui/ground_assets/aa_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/aa_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/aa_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/aa_red_alive.svg
 create mode 100644 resources/ui/ground_assets/aa_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/aa_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ammo_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/ammo_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/ammo_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ammo_red_alive.svg
 create mode 100644 resources/ui/ground_assets/ammo_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/ammo_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/armor_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/armor_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/armor_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/armor_red_alive.svg
 create mode 100644 resources/ui/ground_assets/armor_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/armor_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ewr_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/ewr_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/ewr_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ewr_red_alive.svg
 create mode 100644 resources/ui/ground_assets/ewr_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/ewr_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/factory_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/factory_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/factory_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/factory_red_alive.svg
 create mode 100644 resources/ui/ground_assets/factory_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/factory_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/fob_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/fob_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/fob_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/fob_red_alive.svg
 create mode 100644 resources/ui/ground_assets/fob_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/fob_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/oil_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/oil_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/oil_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/oil_red_alive.svg
 create mode 100644 resources/ui/ground_assets/oil_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/oil_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ship_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/ship_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/ship_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ship_red_alive.svg
 create mode 100644 resources/ui/ground_assets/ship_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/ship_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ware_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/ware_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/ware_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ware_red_alive.svg
 create mode 100644 resources/ui/ground_assets/ware_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/ware_red_destroyed.svg

diff --git a/resources/ui/ground_assets/aa_blue_alive.svg b/resources/ui/ground_assets/aa_blue_alive.svg
new file mode 100644
index 00000000..d6af6e07
--- /dev/null
+++ b/resources/ui/ground_assets/aa_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="108" viewBox="21 46 158 108"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M25,150 C25,110 175,110 175,150" stroke-width="4" stroke="black" fill="none" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/aa_blue_damaged.svg b/resources/ui/ground_assets/aa_blue_damaged.svg
new file mode 100644
index 00000000..c098893b
--- /dev/null
+++ b/resources/ui/ground_assets/aa_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M25,150 C25,110 175,110 175,150" stroke-width="4" stroke="black" fill="none" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/aa_blue_destroyed.svg b/resources/ui/ground_assets/aa_blue_destroyed.svg
new file mode 100644
index 00000000..ed5960aa
--- /dev/null
+++ b/resources/ui/ground_assets/aa_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M25,150 C25,110 175,110 175,150" stroke-width="4" stroke="black" fill="none" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/aa_red_alive.svg b/resources/ui/ground_assets/aa_red_alive.svg
new file mode 100644
index 00000000..3375cf66
--- /dev/null
+++ b/resources/ui/ground_assets/aa_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="152" viewBox="24 24 152 152"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M70,140 C70,115 130,115 130,140" stroke-width="4" stroke="black" fill="none" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/aa_red_damaged.svg b/resources/ui/ground_assets/aa_red_damaged.svg
new file mode 100644
index 00000000..7e56fd59
--- /dev/null
+++ b/resources/ui/ground_assets/aa_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M70,140 C70,115 130,115 130,140" stroke-width="4" stroke="black" fill="none" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/aa_red_destroyed.svg b/resources/ui/ground_assets/aa_red_destroyed.svg
new file mode 100644
index 00000000..b861fc4f
--- /dev/null
+++ b/resources/ui/ground_assets/aa_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M70,140 C70,115 130,115 130,140" stroke-width="4" stroke="black" fill="none" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ammo_blue_alive.svg b/resources/ui/ground_assets/ammo_blue_alive.svg
new file mode 100644
index 00000000..e100dd64
--- /dev/null
+++ b/resources/ui/ground_assets/ammo_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 90,115 0,-25 c 0,-10 20,-10 20,0 l 0,25 m -25,0 30,0" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ammo_blue_damaged.svg b/resources/ui/ground_assets/ammo_blue_damaged.svg
new file mode 100644
index 00000000..39f2f524
--- /dev/null
+++ b/resources/ui/ground_assets/ammo_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 90,115 0,-25 c 0,-10 20,-10 20,0 l 0,25 m -25,0 30,0" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ammo_blue_destroyed.svg b/resources/ui/ground_assets/ammo_blue_destroyed.svg
new file mode 100644
index 00000000..56e7b193
--- /dev/null
+++ b/resources/ui/ground_assets/ammo_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 90,115 0,-25 c 0,-10 20,-10 20,0 l 0,25 m -25,0 30,0" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ammo_red_alive.svg b/resources/ui/ground_assets/ammo_red_alive.svg
new file mode 100644
index 00000000..6672db0d
--- /dev/null
+++ b/resources/ui/ground_assets/ammo_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 90,115 0,-25 c 0,-10 20,-10 20,0 l 0,25 m -25,0 30,0" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ammo_red_damaged.svg b/resources/ui/ground_assets/ammo_red_damaged.svg
new file mode 100644
index 00000000..ec899cba
--- /dev/null
+++ b/resources/ui/ground_assets/ammo_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 90,115 0,-25 c 0,-10 20,-10 20,0 l 0,25 m -25,0 30,0" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ammo_red_destroyed.svg b/resources/ui/ground_assets/ammo_red_destroyed.svg
new file mode 100644
index 00000000..5a5f0e92
--- /dev/null
+++ b/resources/ui/ground_assets/ammo_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 90,115 0,-25 c 0,-10 20,-10 20,0 l 0,25 m -25,0 30,0" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/armor_blue_alive.svg b/resources/ui/ground_assets/armor_blue_alive.svg
new file mode 100644
index 00000000..e8127d8a
--- /dev/null
+++ b/resources/ui/ground_assets/armor_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="108" viewBox="21 46 158 108"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M125,80 C150,80 150,120 125,120 L75,120 C50,120 50,80 75,80 Z" stroke-width="4" stroke="black" fill="none" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/armor_blue_damaged.svg b/resources/ui/ground_assets/armor_blue_damaged.svg
new file mode 100644
index 00000000..22b2b5df
--- /dev/null
+++ b/resources/ui/ground_assets/armor_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M125,80 C150,80 150,120 125,120 L75,120 C50,120 50,80 75,80 Z" stroke-width="4" stroke="black" fill="none" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/armor_blue_destroyed.svg b/resources/ui/ground_assets/armor_blue_destroyed.svg
new file mode 100644
index 00000000..a9390423
--- /dev/null
+++ b/resources/ui/ground_assets/armor_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M125,80 C150,80 150,120 125,120 L75,120 C50,120 50,80 75,80 Z" stroke-width="4" stroke="black" fill="none" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/armor_red_alive.svg b/resources/ui/ground_assets/armor_red_alive.svg
new file mode 100644
index 00000000..60f41ca0
--- /dev/null
+++ b/resources/ui/ground_assets/armor_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="152" viewBox="24 24 152 152"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M125,80 C150,80 150,120 125,120 L75,120 C50,120 50,80 75,80 Z" stroke-width="4" stroke="black" fill="none" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/armor_red_damaged.svg b/resources/ui/ground_assets/armor_red_damaged.svg
new file mode 100644
index 00000000..a02c58ef
--- /dev/null
+++ b/resources/ui/ground_assets/armor_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M125,80 C150,80 150,120 125,120 L75,120 C50,120 50,80 75,80 Z" stroke-width="4" stroke="black" fill="none" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/armor_red_destroyed.svg b/resources/ui/ground_assets/armor_red_destroyed.svg
new file mode 100644
index 00000000..73272413
--- /dev/null
+++ b/resources/ui/ground_assets/armor_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M125,80 C150,80 150,120 125,120 L75,120 C50,120 50,80 75,80 Z" stroke-width="4" stroke="black" fill="none" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ewr_blue_alive.svg b/resources/ui/ground_assets/ewr_blue_alive.svg
new file mode 100644
index 00000000..1ffa8d5b
--- /dev/null
+++ b/resources/ui/ground_assets/ewr_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="128" height="128" viewBox="36 36 128 128"><circle cx="100" cy="100" r="60" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></circle><path d="m 115,90 -15,15 0,-15 -15,15 M 80,85 c 0,25 15,35 35,35" stroke-width="4" stroke="black" fill="none" ></path><text x="68" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >E</text><text x="132" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >W</text><text x="100" y="75" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >G</text></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ewr_blue_damaged.svg b/resources/ui/ground_assets/ewr_blue_damaged.svg
new file mode 100644
index 00000000..99792494
--- /dev/null
+++ b/resources/ui/ground_assets/ewr_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="128" height="158" viewBox="36 36 128 158"><circle cx="100" cy="100" r="60" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></circle><path d="m 115,90 -15,15 0,-15 -15,15 M 80,85 c 0,25 15,35 35,35" stroke-width="4" stroke="black" fill="none" ></path><text x="68" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >E</text><text x="132" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >W</text><text x="100" y="75" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >G</text><path d="M40,165 l120,0 0,25 -120,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ewr_blue_destroyed.svg b/resources/ui/ground_assets/ewr_blue_destroyed.svg
new file mode 100644
index 00000000..81b1872a
--- /dev/null
+++ b/resources/ui/ground_assets/ewr_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="128" height="158" viewBox="36 36 128 158"><circle cx="100" cy="100" r="60" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></circle><path d="m 115,90 -15,15 0,-15 -15,15 M 80,85 c 0,25 15,35 35,35" stroke-width="4" stroke="black" fill="none" ></path><text x="68" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >E</text><text x="132" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >W</text><text x="100" y="75" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >G</text><path d="M40,165 l120,0 0,25 -120,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ewr_red_alive.svg b/resources/ui/ground_assets/ewr_red_alive.svg
new file mode 100644
index 00000000..2447a2fe
--- /dev/null
+++ b/resources/ui/ground_assets/ewr_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="152" viewBox="24 24 152 152"><path d="M100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 115,90 -15,15 0,-15 -15,15 M 80,85 c 0,25 15,35 35,35" stroke-width="4" stroke="black" fill="none" ></path><text x="68" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >E</text><text x="132" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >W</text><text x="100" y="75" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >G</text></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ewr_red_damaged.svg b/resources/ui/ground_assets/ewr_red_damaged.svg
new file mode 100644
index 00000000..4872e6ca
--- /dev/null
+++ b/resources/ui/ground_assets/ewr_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 115,90 -15,15 0,-15 -15,15 M 80,85 c 0,25 15,35 35,35" stroke-width="4" stroke="black" fill="none" ></path><text x="68" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >E</text><text x="132" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >W</text><text x="100" y="75" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >G</text><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ewr_red_destroyed.svg b/resources/ui/ground_assets/ewr_red_destroyed.svg
new file mode 100644
index 00000000..b783ce70
--- /dev/null
+++ b/resources/ui/ground_assets/ewr_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 115,90 -15,15 0,-15 -15,15 M 80,85 c 0,25 15,35 35,35" stroke-width="4" stroke="black" fill="none" ></path><text x="68" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >E</text><text x="132" y="110" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >W</text><text x="100" y="75" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >G</text><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/factory_blue_alive.svg b/resources/ui/ground_assets/factory_blue_alive.svg
new file mode 100644
index 00000000..b89968bd
--- /dev/null
+++ b/resources/ui/ground_assets/factory_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M70,90 c10,0 10,20 0,20 m10,-10 l40,0 m10,-10 c-10,0 -10,20 0,20" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/factory_blue_damaged.svg b/resources/ui/ground_assets/factory_blue_damaged.svg
new file mode 100644
index 00000000..d21c47aa
--- /dev/null
+++ b/resources/ui/ground_assets/factory_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M70,90 c10,0 10,20 0,20 m10,-10 l40,0 m10,-10 c-10,0 -10,20 0,20" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/factory_blue_destroyed.svg b/resources/ui/ground_assets/factory_blue_destroyed.svg
new file mode 100644
index 00000000..2933295b
--- /dev/null
+++ b/resources/ui/ground_assets/factory_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M70,90 c10,0 10,20 0,20 m10,-10 l40,0 m10,-10 c-10,0 -10,20 0,20" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/factory_red_alive.svg b/resources/ui/ground_assets/factory_red_alive.svg
new file mode 100644
index 00000000..d8aaf876
--- /dev/null
+++ b/resources/ui/ground_assets/factory_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M70,90 c10,0 10,20 0,20 m10,-10 l40,0 m10,-10 c-10,0 -10,20 0,20" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/factory_red_damaged.svg b/resources/ui/ground_assets/factory_red_damaged.svg
new file mode 100644
index 00000000..d71c65cd
--- /dev/null
+++ b/resources/ui/ground_assets/factory_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M70,90 c10,0 10,20 0,20 m10,-10 l40,0 m10,-10 c-10,0 -10,20 0,20" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/factory_red_destroyed.svg b/resources/ui/ground_assets/factory_red_destroyed.svg
new file mode 100644
index 00000000..4354ee70
--- /dev/null
+++ b/resources/ui/ground_assets/factory_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M70,90 c10,0 10,20 0,20 m10,-10 l40,0 m10,-10 c-10,0 -10,20 0,20" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fob_blue_alive.svg b/resources/ui/ground_assets/fob_blue_alive.svg
new file mode 100644
index 00000000..01eed590
--- /dev/null
+++ b/resources/ui/ground_assets/fob_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fob_blue_damaged.svg b/resources/ui/ground_assets/fob_blue_damaged.svg
new file mode 100644
index 00000000..e9dacd53
--- /dev/null
+++ b/resources/ui/ground_assets/fob_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fob_blue_destroyed.svg b/resources/ui/ground_assets/fob_blue_destroyed.svg
new file mode 100644
index 00000000..f9b1e2a0
--- /dev/null
+++ b/resources/ui/ground_assets/fob_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fob_red_alive.svg b/resources/ui/ground_assets/fob_red_alive.svg
new file mode 100644
index 00000000..68ee8a5e
--- /dev/null
+++ b/resources/ui/ground_assets/fob_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fob_red_damaged.svg b/resources/ui/ground_assets/fob_red_damaged.svg
new file mode 100644
index 00000000..bfb93b9a
--- /dev/null
+++ b/resources/ui/ground_assets/fob_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fob_red_destroyed.svg b/resources/ui/ground_assets/fob_red_destroyed.svg
new file mode 100644
index 00000000..4b150097
--- /dev/null
+++ b/resources/ui/ground_assets/fob_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/oil_blue_alive.svg b/resources/ui/ground_assets/oil_blue_alive.svg
new file mode 100644
index 00000000..088202c3
--- /dev/null
+++ b/resources/ui/ground_assets/oil_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/oil_blue_damaged.svg b/resources/ui/ground_assets/oil_blue_damaged.svg
new file mode 100644
index 00000000..da58acec
--- /dev/null
+++ b/resources/ui/ground_assets/oil_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/oil_blue_destroyed.svg b/resources/ui/ground_assets/oil_blue_destroyed.svg
new file mode 100644
index 00000000..139ea116
--- /dev/null
+++ b/resources/ui/ground_assets/oil_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/oil_red_alive.svg b/resources/ui/ground_assets/oil_red_alive.svg
new file mode 100644
index 00000000..7a103a23
--- /dev/null
+++ b/resources/ui/ground_assets/oil_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/oil_red_damaged.svg b/resources/ui/ground_assets/oil_red_damaged.svg
new file mode 100644
index 00000000..f6859a06
--- /dev/null
+++ b/resources/ui/ground_assets/oil_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/oil_red_destroyed.svg b/resources/ui/ground_assets/oil_red_destroyed.svg
new file mode 100644
index 00000000..2ba91be4
--- /dev/null
+++ b/resources/ui/ground_assets/oil_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ship_blue_alive.svg b/resources/ui/ground_assets/ship_blue_alive.svg
new file mode 100644
index 00000000..8ae1393f
--- /dev/null
+++ b/resources/ui/ground_assets/ship_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="128" height="128" viewBox="36 36 128 128"><circle cx="100" cy="100" r="60" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></circle><path d="m 100,120 -25,-17 15,2 0,-10 5,0 0,-5 -15,0 0,-5 15,0 0,-5 10,0 0,5 15,0 0,5 -15,0 0,5 5,0 0,10 15,-2 z" stroke-width="4" stroke="none" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ship_blue_damaged.svg b/resources/ui/ground_assets/ship_blue_damaged.svg
new file mode 100644
index 00000000..edcb3cd9
--- /dev/null
+++ b/resources/ui/ground_assets/ship_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="128" height="158" viewBox="36 36 128 158"><circle cx="100" cy="100" r="60" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></circle><path d="m 100,120 -25,-17 15,2 0,-10 5,0 0,-5 -15,0 0,-5 15,0 0,-5 10,0 0,5 15,0 0,5 -15,0 0,5 5,0 0,10 15,-2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M40,165 l120,0 0,25 -120,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ship_blue_destroyed.svg b/resources/ui/ground_assets/ship_blue_destroyed.svg
new file mode 100644
index 00000000..8ed1ee02
--- /dev/null
+++ b/resources/ui/ground_assets/ship_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="128" height="158" viewBox="36 36 128 158"><circle cx="100" cy="100" r="60" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></circle><path d="m 100,120 -25,-17 15,2 0,-10 5,0 0,-5 -15,0 0,-5 15,0 0,-5 10,0 0,5 15,0 0,5 -15,0 0,5 5,0 0,10 15,-2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M40,165 l120,0 0,25 -120,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ship_red_alive.svg b/resources/ui/ground_assets/ship_red_alive.svg
new file mode 100644
index 00000000..538cf721
--- /dev/null
+++ b/resources/ui/ground_assets/ship_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="152" viewBox="24 24 152 152"><path d="M100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 100,120 -25,-17 15,2 0,-10 5,0 0,-5 -15,0 0,-5 15,0 0,-5 10,0 0,5 15,0 0,5 -15,0 0,5 5,0 0,10 15,-2 z" stroke-width="4" stroke="none" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ship_red_damaged.svg b/resources/ui/ground_assets/ship_red_damaged.svg
new file mode 100644
index 00000000..f97a1109
--- /dev/null
+++ b/resources/ui/ground_assets/ship_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 100,120 -25,-17 15,2 0,-10 5,0 0,-5 -15,0 0,-5 15,0 0,-5 10,0 0,5 15,0 0,5 -15,0 0,5 5,0 0,10 15,-2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ship_red_destroyed.svg b/resources/ui/ground_assets/ship_red_destroyed.svg
new file mode 100644
index 00000000..176e9ae5
--- /dev/null
+++ b/resources/ui/ground_assets/ship_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 100,120 -25,-17 15,2 0,-10 5,0 0,-5 -15,0 0,-5 15,0 0,-5 10,0 0,5 15,0 0,5 -15,0 0,5 5,0 0,10 15,-2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ware_blue_alive.svg b/resources/ui/ground_assets/ware_blue_alive.svg
new file mode 100644
index 00000000..ec3b1951
--- /dev/null
+++ b/resources/ui/ground_assets/ware_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ware_blue_damaged.svg b/resources/ui/ground_assets/ware_blue_damaged.svg
new file mode 100644
index 00000000..24c9fca4
--- /dev/null
+++ b/resources/ui/ground_assets/ware_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ware_blue_destroyed.svg b/resources/ui/ground_assets/ware_blue_destroyed.svg
new file mode 100644
index 00000000..1c6f9d56
--- /dev/null
+++ b/resources/ui/ground_assets/ware_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ware_red_alive.svg b/resources/ui/ground_assets/ware_red_alive.svg
new file mode 100644
index 00000000..df4b610d
--- /dev/null
+++ b/resources/ui/ground_assets/ware_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ware_red_damaged.svg b/resources/ui/ground_assets/ware_red_damaged.svg
new file mode 100644
index 00000000..84f029a6
--- /dev/null
+++ b/resources/ui/ground_assets/ware_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ware_red_destroyed.svg b/resources/ui/ground_assets/ware_red_destroyed.svg
new file mode 100644
index 00000000..110ed58d
--- /dev/null
+++ b/resources/ui/ground_assets/ware_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/map/canvas.html b/resources/ui/map/canvas.html
index 10c3186e..84fcb831 100644
--- a/resources/ui/map/canvas.html
+++ b/resources/ui/map/canvas.html
@@ -24,20 +24,6 @@
         integrity="sha384-XAr1poM2RCR9/QQFki7ylrGSdmvYE0NuHghuRuxb/k9zJQA53y6qR5te5jJRZlcL"
         crossorigin="">
     </script>
-
-    <link
-        rel="stylesheet"
-        href="https://unpkg.com/leaflet.markercluster@1.4.1/dist/MarkerCluster.css"
-        crossorigin="">
-    <link
-        rel="stylesheet"
-        href="https://unpkg.com/leaflet.markercluster@1.4.1/dist/MarkerCluster.Default.css"
-        crossorigin="">
-    <script
-        src="https://unpkg.com/leaflet.markercluster@1.4.1/dist/leaflet.markercluster.js"
-        integrity="sha384-RLIyj5q1b5XJTn0tqUhucRZe40nFTocRP91R/NkRJHwAe4XxnTV77FXy/vGLiec2"
-        crossorigin="">
-    </script>
     <style>
         body { padding: 0; margin: 0; }
         html, body, #map { height: 100%; }
diff --git a/resources/ui/map/map.js b/resources/ui/map/map.js
index 0e7e2456..6329eb76 100644
--- a/resources/ui/map/map.js
+++ b/resources/ui/map/map.js
@@ -19,77 +19,107 @@ const Colors = Object.freeze({
 
 const Categories = Object.freeze([
   "aa",
-  "allycamp",
   "ammo",
   "armor",
+  "ewr",
+  "factory",
+  "fob",
+  "oil",
+  "ship",
+  "ware",
+]);
+
+const LegacyCategories = Object.freeze([
+  "allycamp",
   "coastal",
   "comms",
   "derrick",
-  "factory",
   "farp",
-  "fob",
   "fuel",
-  "ewr",
   "missile",
-  "oil",
-  "ship",
   "power",
   "village",
-  "ware",
   "ww2bunker",
 ]);
 
-function makeTgoIcons(player) {
-  const icons = {};
-  const playerSuffix = player ? "_blue" : "";
-  Categories.forEach((category) => {
-    const iconName = `${category}${playerSuffix}`;
-    icons[category] = new L.Icon({
-      iconUrl: `../ground_assets/${iconName}.png`,
-    });
-    if (!icons[category]) {
-      console.log(`Failed to load icon for ${iconName}`);
+const UnitState = Object.freeze({
+  Alive: "alive",
+  Damaged: "damaged",
+  Destroyed: "destroyed",
+});
+
+class TgoIcons {
+  constructor() {
+    this.icons = {};
+    for (const category of Categories) {
+      this.icons[category] = {};
+      for (const player of [true, false]) {
+        this.icons[category][player] = {};
+        for (const state of Object.values(UnitState)) {
+          this.icons[category][player][state] = this.loadIcon(
+            category,
+            player,
+            state
+          );
+        }
+      }
     }
-  });
+    for (const category of LegacyCategories) {
+      this.icons[category] = {};
+      for (const player of [true, false]) {
+        this.icons[category][player] = {};
+        for (const state of Object.values(UnitState)) {
+          this.icons[category][player][state] = this.loadLegacyIcon(
+            category,
+            player
+          );
+        }
+      }
+    }
+  }
 
-  return Object.freeze(icons);
-}
+  icon(category, player, state) {
+    return this.icons[category][player][state];
+  }
 
-function makeIcons(player) {
-  const color = player ? "blue" : "red";
-  const playerSuffix = player ? "_blue" : "";
-  const icons = {
-    ControlPoint: new L.Icon({
-      iconUrl: `https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-${color}.png`,
-      shadowUrl:
-        "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
-      iconSize: [25, 41],
-      iconAnchor: [12, 41],
-      popupAnchor: [1, -34],
-      shadowSize: [41, 41],
-    }),
+  loadIcon(category, player, state) {
+    const color = player ? "blue" : "red";
+    return new L.Icon({
+      iconUrl: `../ground_assets/${category}_${color}_${state}.svg`,
+      iconSize: [32, 32],
+    });
+  }
 
-    Objectives: makeTgoIcons(player),
-
-    Destroyed: new L.Icon({
-      iconUrl: "../ground_assets/destroyed.png",
-    }),
-
-    NoThreat: new L.icon({
-      iconUrl: `../ground_assets/nothreat${playerSuffix}.png`,
-    }),
-  };
-
-  return Object.freeze(icons);
+  loadLegacyIcon(category, player) {
+    const playerSuffix = player ? "_blue" : "";
+    return new L.Icon({
+      iconUrl: `../ground_assets/${category}${playerSuffix}.png`,
+    });
+  }
 }
 
 const Icons = Object.freeze({
-  Friendly: makeIcons(true),
-  Enemy: makeIcons(false),
+  BlueControlPoint: new L.Icon({
+    iconUrl: `https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-blue.png`,
+    shadowUrl:
+      "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
+    iconSize: [25, 41],
+    iconAnchor: [12, 41],
+    popupAnchor: [1, -34],
+    shadowSize: [41, 41],
+  }),
 
-  for(player) {
-    return player ? this.Friendly : this.Enemy;
-  },
+  RedControlPoint: new L.Icon({
+    iconUrl: `https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-red.png`,
+    shadowUrl:
+      "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
+    iconSize: [25, 41],
+    iconAnchor: [12, 41],
+    popupAnchor: [1, -34],
+    shadowSize: [41, 41],
+  }),
+
+  Objectives: new TgoIcons(),
 });
 
 function metersToNauticalMiles(meters) {
@@ -119,9 +149,7 @@ defaultBaseMap.addTo(map);
 
 // Enabled by default, so addTo(map).
 const controlPointsLayer = L.layerGroup().addTo(map);
-const groundObjectsLayer = L.markerClusterGroup({ maxClusterRadius: 40 }).addTo(
-  map
-);
+const groundObjectsLayer = L.layerGroup().addTo(map);
 const supplyRoutesLayer = L.layerGroup().addTo(map);
 const frontLinesLayer = L.layerGroup().addTo(map);
 const redSamThreatLayer = L.layerGroup().addTo(map);
@@ -201,7 +229,10 @@ class ControlPoint {
   }
 
   icon() {
-    return Icons.for(this.cp.blue).ControlPoint;
+    if (this.cp.blue) {
+      return Icons.BlueControlPoint;
+    }
+    return Icons.RedControlPoint;
   }
 
   hasDestination() {
@@ -391,14 +422,15 @@ class TheaterGroundObject {
   }
 
   icon() {
-    const iconSet = Icons.for(this.tgo.blue);
+    let state;
     if (this.tgo.category == "aa" && !this.samIsThreat()) {
-      return iconSet.NoThreat;
+      state = UnitState.Damaged;
     } else if (this.tgo.dead) {
-      return iconSet.Destroyed;
+      state = UnitState.Destroyed;
     } else {
-      return iconSet.Objectives[this.tgo.category];
+      state = UnitState.Alive;
     }
+    return Icons.Objectives.icon(this.tgo.category, this.tgo.blue, state);
   }
 
   drawSamThreats() {

From 80f3857f446a149bd4adb1fdbcfb5d48ce670a94 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Wed, 19 May 2021 20:49:51 -0700
Subject: [PATCH 2/8] Stop forcing open CP tooltips.

These obscure the TGOs around them. Easy enough to mouse over, and the
names aren't the important part.
---
 resources/ui/map/map.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/resources/ui/map/map.js b/resources/ui/map/map.js
index 6329eb76..af3fe91f 100644
--- a/resources/ui/map/map.js
+++ b/resources/ui/map/map.js
@@ -210,8 +210,6 @@ function recenterMap(center) {
   map.setView(center, 8, { animate: true, duration: 1 });
 }
 
-const SHOW_BASE_NAME_AT_ZOOM = 8;
-
 class ControlPoint {
   constructor(cp) {
     this.cp = cp;
@@ -299,13 +297,10 @@ class ControlPoint {
 
   attachTooltipsAndHandlers(dragging = false) {
     this.detachTooltipsAndHandlers();
-    const zoom = map.getZoom();
     const locationMarker = this.locationMarker(dragging);
     const destinationMarker = this.destinationMarker();
     locationMarker
-      .bindTooltip(`<h3 style="margin: 0;">${this.cp.name}</h3>`, {
-        permanent: zoom >= SHOW_BASE_NAME_AT_ZOOM,
-      })
+      .bindTooltip(`<h3 style="margin: 0;">${this.cp.name}</h3>`)
       .on("click", () => {
         this.cp.showInfoDialog();
       })
@@ -740,5 +735,4 @@ function setTooltipZoomThreshold(layerGroup, showAt) {
   });
 }
 
-setTooltipZoomThreshold(controlPointsLayer, SHOW_BASE_NAME_AT_ZOOM);
 setTooltipZoomThreshold(selectedFlightPlansLayer, SHOW_WAYPOINT_INFO_AT_ZOOM);

From 1c7e065c526d4df32489e36a433494593c615f15 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Wed, 19 May 2021 21:24:54 -0700
Subject: [PATCH 3/8] Add more icons.

---
 .../ui/ground_assets/allycamp_blue_alive.svg  |  1 +
 .../ground_assets/allycamp_blue_damaged.svg   |  1 +
 .../ground_assets/allycamp_blue_destroyed.svg |  1 +
 .../ui/ground_assets/allycamp_red_alive.svg   |  1 +
 .../ui/ground_assets/allycamp_red_damaged.svg |  1 +
 .../ground_assets/allycamp_red_destroyed.svg  |  1 +
 .../ui/ground_assets/comms_blue_alive.svg     |  1 +
 .../ui/ground_assets/comms_blue_damaged.svg   |  1 +
 .../ui/ground_assets/comms_blue_destroyed.svg |  1 +
 .../ui/ground_assets/comms_red_alive.svg      |  1 +
 .../ui/ground_assets/comms_red_damaged.svg    |  1 +
 .../ui/ground_assets/comms_red_destroyed.svg  |  1 +
 .../ui/ground_assets/derrick_blue_alive.svg   |  1 +
 .../ui/ground_assets/derrick_blue_damaged.svg |  1 +
 .../ground_assets/derrick_blue_destroyed .svg |  1 +
 .../ui/ground_assets/derrick_red_alive.svg    |  1 +
 .../ui/ground_assets/derrick_red_damaged.svg  |  1 +
 .../ground_assets/derrick_red_destroyed.svg   |  1 +
 .../ui/ground_assets/farp_blue_alive.svg      |  1 +
 .../ui/ground_assets/farp_blue_damaged.svg    |  1 +
 .../ui/ground_assets/farp_blue_destroyed.svg  |  1 +
 resources/ui/ground_assets/farp_red_alive.svg |  1 +
 .../ui/ground_assets/farp_red_damaged.svg     |  1 +
 .../ui/ground_assets/farp_red_destroyed.svg   |  1 +
 .../ui/ground_assets/fuel_blue_alive.svg      |  1 +
 .../ui/ground_assets/fuel_blue_damaged.svg    |  1 +
 .../ui/ground_assets/fuel_blue_destroyed.svg  |  1 +
 resources/ui/ground_assets/fuel_red_alive.svg |  1 +
 .../ui/ground_assets/fuel_red_damaged.svg     |  1 +
 .../ui/ground_assets/fuel_red_destroyed.svg   |  1 +
 .../ui/ground_assets/poewr_blue_damaged.svg   |  1 +
 .../ui/ground_assets/power_blue_alive.svg     |  1 +
 .../ui/ground_assets/power_blue_destroyed.svg |  1 +
 .../ui/ground_assets/power_red_alive.svg      |  1 +
 .../ui/ground_assets/power_red_damaged.svg    |  1 +
 .../ui/ground_assets/power_red_destroyed.svg  |  1 +
 .../ui/ground_assets/village_blue_alive.svg   |  1 +
 .../ui/ground_assets/village_blue_damaged.svg |  1 +
 .../ground_assets/village_blue_destroyed.svg  |  1 +
 .../ui/ground_assets/village_red_alive.svg    |  1 +
 .../ui/ground_assets/village_red_damaged.svg  |  1 +
 .../ground_assets/village_red_destroyed.svg   |  1 +
 .../ui/ground_assets/ww2bunker_blue_alive.svg |  1 +
 .../ground_assets/ww2bunker_blue_damaged.svg  |  1 +
 .../ww2bunker_blue_destroyed.svg              |  1 +
 .../ui/ground_assets/ww2bunker_red_alive.svg  |  1 +
 .../ground_assets/ww2bunker_red_damaged.svg   |  1 +
 .../ground_assets/ww2bunker_red_destroyed.svg |  1 +
 resources/ui/map/map.js                       | 21 ++++++++-----------
 49 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 resources/ui/ground_assets/allycamp_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/allycamp_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/allycamp_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/allycamp_red_alive.svg
 create mode 100644 resources/ui/ground_assets/allycamp_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/allycamp_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/comms_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/comms_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/comms_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/comms_red_alive.svg
 create mode 100644 resources/ui/ground_assets/comms_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/comms_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/derrick_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/derrick_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/derrick_blue_destroyed .svg
 create mode 100644 resources/ui/ground_assets/derrick_red_alive.svg
 create mode 100644 resources/ui/ground_assets/derrick_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/derrick_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/farp_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/farp_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/farp_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/farp_red_alive.svg
 create mode 100644 resources/ui/ground_assets/farp_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/farp_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/fuel_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/fuel_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/fuel_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/fuel_red_alive.svg
 create mode 100644 resources/ui/ground_assets/fuel_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/fuel_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/poewr_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/power_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/power_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/power_red_alive.svg
 create mode 100644 resources/ui/ground_assets/power_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/power_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/village_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/village_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/village_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/village_red_alive.svg
 create mode 100644 resources/ui/ground_assets/village_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/village_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ww2bunker_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/ww2bunker_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/ww2bunker_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/ww2bunker_red_alive.svg
 create mode 100644 resources/ui/ground_assets/ww2bunker_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/ww2bunker_red_destroyed.svg

diff --git a/resources/ui/ground_assets/allycamp_blue_alive.svg b/resources/ui/ground_assets/allycamp_blue_alive.svg
new file mode 100644
index 00000000..fdcb4754
--- /dev/null
+++ b/resources/ui/ground_assets/allycamp_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 65,124.4 10,-37 25,-10 25,10 10,37 z" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/allycamp_blue_damaged.svg b/resources/ui/ground_assets/allycamp_blue_damaged.svg
new file mode 100644
index 00000000..e37e3eab
--- /dev/null
+++ b/resources/ui/ground_assets/allycamp_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 65,124.4 10,-37 25,-10 25,10 10,37 z" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/allycamp_blue_destroyed.svg b/resources/ui/ground_assets/allycamp_blue_destroyed.svg
new file mode 100644
index 00000000..4f58f9c0
--- /dev/null
+++ b/resources/ui/ground_assets/allycamp_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 65,124.4 10,-37 25,-10 25,10 10,37 z" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/allycamp_red_alive.svg b/resources/ui/ground_assets/allycamp_red_alive.svg
new file mode 100644
index 00000000..4c3338fc
--- /dev/null
+++ b/resources/ui/ground_assets/allycamp_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 65,124.4 10,-37 25,-10 25,10 10,37 z" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/allycamp_red_damaged.svg b/resources/ui/ground_assets/allycamp_red_damaged.svg
new file mode 100644
index 00000000..ce234ce9
--- /dev/null
+++ b/resources/ui/ground_assets/allycamp_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 65,124.4 10,-37 25,-10 25,10 10,37 z" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/allycamp_red_destroyed.svg b/resources/ui/ground_assets/allycamp_red_destroyed.svg
new file mode 100644
index 00000000..640ff25d
--- /dev/null
+++ b/resources/ui/ground_assets/allycamp_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 65,124.4 10,-37 25,-10 25,10 10,37 z" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/comms_blue_alive.svg b/resources/ui/ground_assets/comms_blue_alive.svg
new file mode 100644
index 00000000..8492da13
--- /dev/null
+++ b/resources/ui/ground_assets/comms_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 102.5,119.2 12,-8 2.8,9.2 1.3,4 2.1,6.9 -18.2,-12 z m -23,12 3.4,-11.7 2,-5.9 0.8,-2.6 11.9,8.2 -18,12 z m 20.4,-34.6 13,12.2 c -1.5,1 -12.3,8.5 -13.1,8.5 -0.1,0 -11.6,-7.7 -12.7,-8.5 L 99.9,96.6 z m 7.7,-7.1 0.2,0.2 1.8,5.7 2.5,8.7 -10.1,-9.3 5.6,-5.2 0,0 z m -15.5,0.6 v -0.6 l 0.4,0.2 5.4,5 -10,9.4 2.6,-9 1.6,-5 z m 2.9,-1.7 9.8,-0 -5,4.4 -4.8,-4.4 z m 3.6,-23.1 v 3.6 h -4.4 c -0.5,0 -1,0.6 -1,1 v 0.6 c 0,0.7 0.8,1 1.5,1 h 4 v 4.2 h -7.2 c -0.5,0 -1,0.6 -1,1 v 0.2 c 0,1 0.5,1.5 1.5,1.5 h 6.8 v 7 h -6.8 c -0.8,0 -1,0.3 -1.3,0.7 l -0.6,2 -4.9,15.6 -3,9.6 -3.1,9.4 -0.1,0.8 -2.9,8.7 -0.1,0.8 -0.5,2.2 c 1,0.2 0.5,0.6 1.3,0.6 h 0.2 c 0.8,0 20.1,-13.7 23.1,-15.2 2.5,1.7 22.4,15.2 23.5,15.2 0.6,0 1,-0.7 1,-1.3 0,-0.1 -1.4,-4 -1.5,-4.2 l -0.1,-0.8 -3.1,-9.7 -2.9,-9.3 -4.7,-15.7 c -0.6,-0.8 -1.4,-3.8 -1.8,-5 -0.6,-1.8 -0.5,-4.3 -2.5,-4.3 h -6.8 v -7 h 7.2 c 0.5,0 1,-0.6 1,-1 v -0.4 c 0,-0.6 -0.2,-1.3 -0.8,-1.3 h -7.4 v -4.2 h 4 c 0.7,0 1.5,-0.4 1.5,-1 v -0.6 c 0,-0.7 -0.8,-1 -1.5,-1 h -4 v -4 c 0,-0.6 -0.7,-1 -1.3,-1 -0.8,-0 -1.3,0.6 -1.3,1.4 l 0,0 z m -6.6,24.8 0.4,-0.4 -0.4,-0.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/comms_blue_damaged.svg b/resources/ui/ground_assets/comms_blue_damaged.svg
new file mode 100644
index 00000000..c2a82bc8
--- /dev/null
+++ b/resources/ui/ground_assets/comms_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 102.5,119.2 12,-8 2.8,9.2 1.3,4 2.1,6.9 -18.2,-12 z m -23,12 3.4,-11.7 2,-5.9 0.8,-2.6 11.9,8.2 -18,12 z m 20.4,-34.6 13,12.2 c -1.5,1 -12.3,8.5 -13.1,8.5 -0.1,0 -11.6,-7.7 -12.7,-8.5 L 99.9,96.6 z m 7.7,-7.1 0.2,0.2 1.8,5.7 2.5,8.7 -10.1,-9.3 5.6,-5.2 0,0 z m -15.5,0.6 v -0.6 l 0.4,0.2 5.4,5 -10,9.4 2.6,-9 1.6,-5 z m 2.9,-1.7 9.8,-0 -5,4.4 -4.8,-4.4 z m 3.6,-23.1 v 3.6 h -4.4 c -0.5,0 -1,0.6 -1,1 v 0.6 c 0,0.7 0.8,1 1.5,1 h 4 v 4.2 h -7.2 c -0.5,0 -1,0.6 -1,1 v 0.2 c 0,1 0.5,1.5 1.5,1.5 h 6.8 v 7 h -6.8 c -0.8,0 -1,0.3 -1.3,0.7 l -0.6,2 -4.9,15.6 -3,9.6 -3.1,9.4 -0.1,0.8 -2.9,8.7 -0.1,0.8 -0.5,2.2 c 1,0.2 0.5,0.6 1.3,0.6 h 0.2 c 0.8,0 20.1,-13.7 23.1,-15.2 2.5,1.7 22.4,15.2 23.5,15.2 0.6,0 1,-0.7 1,-1.3 0,-0.1 -1.4,-4 -1.5,-4.2 l -0.1,-0.8 -3.1,-9.7 -2.9,-9.3 -4.7,-15.7 c -0.6,-0.8 -1.4,-3.8 -1.8,-5 -0.6,-1.8 -0.5,-4.3 -2.5,-4.3 h -6.8 v -7 h 7.2 c 0.5,0 1,-0.6 1,-1 v -0.4 c 0,-0.6 -0.2,-1.3 -0.8,-1.3 h -7.4 v -4.2 h 4 c 0.7,0 1.5,-0.4 1.5,-1 v -0.6 c 0,-0.7 -0.8,-1 -1.5,-1 h -4 v -4 c 0,-0.6 -0.7,-1 -1.3,-1 -0.8,-0 -1.3,0.6 -1.3,1.4 l 0,0 z m -6.6,24.8 0.4,-0.4 -0.4,-0.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/comms_blue_destroyed.svg b/resources/ui/ground_assets/comms_blue_destroyed.svg
new file mode 100644
index 00000000..7180db20
--- /dev/null
+++ b/resources/ui/ground_assets/comms_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 102.5,119.2 12,-8 2.8,9.2 1.3,4 2.1,6.9 -18.2,-12 z m -23,12 3.4,-11.7 2,-5.9 0.8,-2.6 11.9,8.2 -18,12 z m 20.4,-34.6 13,12.2 c -1.5,1 -12.3,8.5 -13.1,8.5 -0.1,0 -11.6,-7.7 -12.7,-8.5 L 99.9,96.6 z m 7.7,-7.1 0.2,0.2 1.8,5.7 2.5,8.7 -10.1,-9.3 5.6,-5.2 0,0 z m -15.5,0.6 v -0.6 l 0.4,0.2 5.4,5 -10,9.4 2.6,-9 1.6,-5 z m 2.9,-1.7 9.8,-0 -5,4.4 -4.8,-4.4 z m 3.6,-23.1 v 3.6 h -4.4 c -0.5,0 -1,0.6 -1,1 v 0.6 c 0,0.7 0.8,1 1.5,1 h 4 v 4.2 h -7.2 c -0.5,0 -1,0.6 -1,1 v 0.2 c 0,1 0.5,1.5 1.5,1.5 h 6.8 v 7 h -6.8 c -0.8,0 -1,0.3 -1.3,0.7 l -0.6,2 -4.9,15.6 -3,9.6 -3.1,9.4 -0.1,0.8 -2.9,8.7 -0.1,0.8 -0.5,2.2 c 1,0.2 0.5,0.6 1.3,0.6 h 0.2 c 0.8,0 20.1,-13.7 23.1,-15.2 2.5,1.7 22.4,15.2 23.5,15.2 0.6,0 1,-0.7 1,-1.3 0,-0.1 -1.4,-4 -1.5,-4.2 l -0.1,-0.8 -3.1,-9.7 -2.9,-9.3 -4.7,-15.7 c -0.6,-0.8 -1.4,-3.8 -1.8,-5 -0.6,-1.8 -0.5,-4.3 -2.5,-4.3 h -6.8 v -7 h 7.2 c 0.5,0 1,-0.6 1,-1 v -0.4 c 0,-0.6 -0.2,-1.3 -0.8,-1.3 h -7.4 v -4.2 h 4 c 0.7,0 1.5,-0.4 1.5,-1 v -0.6 c 0,-0.7 -0.8,-1 -1.5,-1 h -4 v -4 c 0,-0.6 -0.7,-1 -1.3,-1 -0.8,-0 -1.3,0.6 -1.3,1.4 l 0,0 z m -6.6,24.8 0.4,-0.4 -0.4,-0.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/comms_red_alive.svg b/resources/ui/ground_assets/comms_red_alive.svg
new file mode 100644
index 00000000..48dec8e2
--- /dev/null
+++ b/resources/ui/ground_assets/comms_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 102.5,119.2 12,-8 2.8,9.2 1.3,4 2.1,6.9 -18.2,-12 z m -23,12 3.4,-11.7 2,-5.9 0.8,-2.6 11.9,8.2 -18,12 z m 20.4,-34.6 13,12.2 c -1.5,1 -12.3,8.5 -13.1,8.5 -0.1,0 -11.6,-7.7 -12.7,-8.5 L 99.9,96.6 z m 7.7,-7.1 0.2,0.2 1.8,5.7 2.5,8.7 -10.1,-9.3 5.6,-5.2 0,0 z m -15.5,0.6 v -0.6 l 0.4,0.2 5.4,5 -10,9.4 2.6,-9 1.6,-5 z m 2.9,-1.7 9.8,-0 -5,4.4 -4.8,-4.4 z m 3.6,-23.1 v 3.6 h -4.4 c -0.5,0 -1,0.6 -1,1 v 0.6 c 0,0.7 0.8,1 1.5,1 h 4 v 4.2 h -7.2 c -0.5,0 -1,0.6 -1,1 v 0.2 c 0,1 0.5,1.5 1.5,1.5 h 6.8 v 7 h -6.8 c -0.8,0 -1,0.3 -1.3,0.7 l -0.6,2 -4.9,15.6 -3,9.6 -3.1,9.4 -0.1,0.8 -2.9,8.7 -0.1,0.8 -0.5,2.2 c 1,0.2 0.5,0.6 1.3,0.6 h 0.2 c 0.8,0 20.1,-13.7 23.1,-15.2 2.5,1.7 22.4,15.2 23.5,15.2 0.6,0 1,-0.7 1,-1.3 0,-0.1 -1.4,-4 -1.5,-4.2 l -0.1,-0.8 -3.1,-9.7 -2.9,-9.3 -4.7,-15.7 c -0.6,-0.8 -1.4,-3.8 -1.8,-5 -0.6,-1.8 -0.5,-4.3 -2.5,-4.3 h -6.8 v -7 h 7.2 c 0.5,0 1,-0.6 1,-1 v -0.4 c 0,-0.6 -0.2,-1.3 -0.8,-1.3 h -7.4 v -4.2 h 4 c 0.7,0 1.5,-0.4 1.5,-1 v -0.6 c 0,-0.7 -0.8,-1 -1.5,-1 h -4 v -4 c 0,-0.6 -0.7,-1 -1.3,-1 -0.8,-0 -1.3,0.6 -1.3,1.4 l 0,0 z m -6.6,24.8 0.4,-0.4 -0.4,-0.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/comms_red_damaged.svg b/resources/ui/ground_assets/comms_red_damaged.svg
new file mode 100644
index 00000000..8040ea4a
--- /dev/null
+++ b/resources/ui/ground_assets/comms_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 102.5,119.2 12,-8 2.8,9.2 1.3,4 2.1,6.9 -18.2,-12 z m -23,12 3.4,-11.7 2,-5.9 0.8,-2.6 11.9,8.2 -18,12 z m 20.4,-34.6 13,12.2 c -1.5,1 -12.3,8.5 -13.1,8.5 -0.1,0 -11.6,-7.7 -12.7,-8.5 L 99.9,96.6 z m 7.7,-7.1 0.2,0.2 1.8,5.7 2.5,8.7 -10.1,-9.3 5.6,-5.2 0,0 z m -15.5,0.6 v -0.6 l 0.4,0.2 5.4,5 -10,9.4 2.6,-9 1.6,-5 z m 2.9,-1.7 9.8,-0 -5,4.4 -4.8,-4.4 z m 3.6,-23.1 v 3.6 h -4.4 c -0.5,0 -1,0.6 -1,1 v 0.6 c 0,0.7 0.8,1 1.5,1 h 4 v 4.2 h -7.2 c -0.5,0 -1,0.6 -1,1 v 0.2 c 0,1 0.5,1.5 1.5,1.5 h 6.8 v 7 h -6.8 c -0.8,0 -1,0.3 -1.3,0.7 l -0.6,2 -4.9,15.6 -3,9.6 -3.1,9.4 -0.1,0.8 -2.9,8.7 -0.1,0.8 -0.5,2.2 c 1,0.2 0.5,0.6 1.3,0.6 h 0.2 c 0.8,0 20.1,-13.7 23.1,-15.2 2.5,1.7 22.4,15.2 23.5,15.2 0.6,0 1,-0.7 1,-1.3 0,-0.1 -1.4,-4 -1.5,-4.2 l -0.1,-0.8 -3.1,-9.7 -2.9,-9.3 -4.7,-15.7 c -0.6,-0.8 -1.4,-3.8 -1.8,-5 -0.6,-1.8 -0.5,-4.3 -2.5,-4.3 h -6.8 v -7 h 7.2 c 0.5,0 1,-0.6 1,-1 v -0.4 c 0,-0.6 -0.2,-1.3 -0.8,-1.3 h -7.4 v -4.2 h 4 c 0.7,0 1.5,-0.4 1.5,-1 v -0.6 c 0,-0.7 -0.8,-1 -1.5,-1 h -4 v -4 c 0,-0.6 -0.7,-1 -1.3,-1 -0.8,-0 -1.3,0.6 -1.3,1.4 l 0,0 z m -6.6,24.8 0.4,-0.4 -0.4,-0.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/comms_red_destroyed.svg b/resources/ui/ground_assets/comms_red_destroyed.svg
new file mode 100644
index 00000000..8ed19b3f
--- /dev/null
+++ b/resources/ui/ground_assets/comms_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 102.5,119.2 12,-8 2.8,9.2 1.3,4 2.1,6.9 -18.2,-12 z m -23,12 3.4,-11.7 2,-5.9 0.8,-2.6 11.9,8.2 -18,12 z m 20.4,-34.6 13,12.2 c -1.5,1 -12.3,8.5 -13.1,8.5 -0.1,0 -11.6,-7.7 -12.7,-8.5 L 99.9,96.6 z m 7.7,-7.1 0.2,0.2 1.8,5.7 2.5,8.7 -10.1,-9.3 5.6,-5.2 0,0 z m -15.5,0.6 v -0.6 l 0.4,0.2 5.4,5 -10,9.4 2.6,-9 1.6,-5 z m 2.9,-1.7 9.8,-0 -5,4.4 -4.8,-4.4 z m 3.6,-23.1 v 3.6 h -4.4 c -0.5,0 -1,0.6 -1,1 v 0.6 c 0,0.7 0.8,1 1.5,1 h 4 v 4.2 h -7.2 c -0.5,0 -1,0.6 -1,1 v 0.2 c 0,1 0.5,1.5 1.5,1.5 h 6.8 v 7 h -6.8 c -0.8,0 -1,0.3 -1.3,0.7 l -0.6,2 -4.9,15.6 -3,9.6 -3.1,9.4 -0.1,0.8 -2.9,8.7 -0.1,0.8 -0.5,2.2 c 1,0.2 0.5,0.6 1.3,0.6 h 0.2 c 0.8,0 20.1,-13.7 23.1,-15.2 2.5,1.7 22.4,15.2 23.5,15.2 0.6,0 1,-0.7 1,-1.3 0,-0.1 -1.4,-4 -1.5,-4.2 l -0.1,-0.8 -3.1,-9.7 -2.9,-9.3 -4.7,-15.7 c -0.6,-0.8 -1.4,-3.8 -1.8,-5 -0.6,-1.8 -0.5,-4.3 -2.5,-4.3 h -6.8 v -7 h 7.2 c 0.5,0 1,-0.6 1,-1 v -0.4 c 0,-0.6 -0.2,-1.3 -0.8,-1.3 h -7.4 v -4.2 h 4 c 0.7,0 1.5,-0.4 1.5,-1 v -0.6 c 0,-0.7 -0.8,-1 -1.5,-1 h -4 v -4 c 0,-0.6 -0.7,-1 -1.3,-1 -0.8,-0 -1.3,0.6 -1.3,1.4 l 0,0 z m -6.6,24.8 0.4,-0.4 -0.4,-0.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/derrick_blue_alive.svg b/resources/ui/ground_assets/derrick_blue_alive.svg
new file mode 100644
index 00000000..088202c3
--- /dev/null
+++ b/resources/ui/ground_assets/derrick_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/derrick_blue_damaged.svg b/resources/ui/ground_assets/derrick_blue_damaged.svg
new file mode 100644
index 00000000..da58acec
--- /dev/null
+++ b/resources/ui/ground_assets/derrick_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/derrick_blue_destroyed .svg b/resources/ui/ground_assets/derrick_blue_destroyed .svg
new file mode 100644
index 00000000..139ea116
--- /dev/null
+++ b/resources/ui/ground_assets/derrick_blue_destroyed .svg	
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/derrick_red_alive.svg b/resources/ui/ground_assets/derrick_red_alive.svg
new file mode 100644
index 00000000..7a103a23
--- /dev/null
+++ b/resources/ui/ground_assets/derrick_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/derrick_red_damaged.svg b/resources/ui/ground_assets/derrick_red_damaged.svg
new file mode 100644
index 00000000..f6859a06
--- /dev/null
+++ b/resources/ui/ground_assets/derrick_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/derrick_red_destroyed.svg b/resources/ui/ground_assets/derrick_red_destroyed.svg
new file mode 100644
index 00000000..2ba91be4
--- /dev/null
+++ b/resources/ui/ground_assets/derrick_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(-50,-50)" ><g transform="scale(1.5)" ><path d="m 100,120 0,-20 -15,-20 30,0 -15,20 " stroke-width="4" stroke="black" fill="none" ></path></g></g><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/farp_blue_alive.svg b/resources/ui/ground_assets/farp_blue_alive.svg
new file mode 100644
index 00000000..1c76cbbe
--- /dev/null
+++ b/resources/ui/ground_assets/farp_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M80,70 l10,10 M120,110 l-10,-10 M80,110 l10,-10 M120,70 l-10,10 M100,115 l0,20 M95,135 l10,0" stroke-width="4" stroke="black" fill="none" ></path><path d="m 113,90 c -0.3,8.8 -1.9,20.3 -10.8,24.6 -7.7,2 -12.3,-7.1 -13.8,-13.3 -2.6,-11.5 -2.3,-26 6.9,-34.6 6.0,-4.9 13.1,1.9 14.9,7.8 2,4.9 2.8,10.2 2.8,15.5 z" stroke-width="4" stroke="black" fill="none" ></path><circle cx="100" cy="100" r="40" stroke-width="4" stroke="black" fill="none" ></circle><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/farp_blue_damaged.svg b/resources/ui/ground_assets/farp_blue_damaged.svg
new file mode 100644
index 00000000..2eaec315
--- /dev/null
+++ b/resources/ui/ground_assets/farp_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M80,70 l10,10 M120,110 l-10,-10 M80,110 l10,-10 M120,70 l-10,10 M100,115 l0,20 M95,135 l10,0" stroke-width="4" stroke="black" fill="none" ></path><path d="m 113,90 c -0.3,8.8 -1.9,20.3 -10.8,24.6 -7.7,2 -12.3,-7.1 -13.8,-13.3 -2.6,-11.5 -2.3,-26 6.9,-34.6 6.0,-4.9 13.1,1.9 14.9,7.8 2,4.9 2.8,10.2 2.8,15.5 z" stroke-width="4" stroke="black" fill="none" ></path><circle cx="100" cy="100" r="40" stroke-width="4" stroke="black" fill="none" ></circle><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/farp_blue_destroyed.svg b/resources/ui/ground_assets/farp_blue_destroyed.svg
new file mode 100644
index 00000000..f6af1443
--- /dev/null
+++ b/resources/ui/ground_assets/farp_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M80,70 l10,10 M120,110 l-10,-10 M80,110 l10,-10 M120,70 l-10,10 M100,115 l0,20 M95,135 l10,0" stroke-width="4" stroke="black" fill="none" ></path><path d="m 113,90 c -0.3,8.8 -1.9,20.3 -10.8,24.6 -7.7,2 -12.3,-7.1 -13.8,-13.3 -2.6,-11.5 -2.3,-26 6.9,-34.6 6.0,-4.9 13.1,1.9 14.9,7.8 2,4.9 2.8,10.2 2.8,15.5 z" stroke-width="4" stroke="black" fill="none" ></path><circle cx="100" cy="100" r="40" stroke-width="4" stroke="black" fill="none" ></circle><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/farp_red_alive.svg b/resources/ui/ground_assets/farp_red_alive.svg
new file mode 100644
index 00000000..bfa7662c
--- /dev/null
+++ b/resources/ui/ground_assets/farp_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M80,70 l10,10 M120,110 l-10,-10 M80,110 l10,-10 M120,70 l-10,10 M100,115 l0,20 M95,135 l10,0" stroke-width="4" stroke="black" fill="none" ></path><path d="m 113,90 c -0.3,8.8 -1.9,20.3 -10.8,24.6 -7.7,2 -12.3,-7.1 -13.8,-13.3 -2.6,-11.5 -2.3,-26 6.9,-34.6 6.0,-4.9 13.1,1.9 14.9,7.8 2,4.9 2.8,10.2 2.8,15.5 z" stroke-width="4" stroke="black" fill="none" ></path><circle cx="100" cy="100" r="40" stroke-width="4" stroke="black" fill="none" ></circle><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/farp_red_damaged.svg b/resources/ui/ground_assets/farp_red_damaged.svg
new file mode 100644
index 00000000..3da498bd
--- /dev/null
+++ b/resources/ui/ground_assets/farp_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M80,70 l10,10 M120,110 l-10,-10 M80,110 l10,-10 M120,70 l-10,10 M100,115 l0,20 M95,135 l10,0" stroke-width="4" stroke="black" fill="none" ></path><path d="m 113,90 c -0.3,8.8 -1.9,20.3 -10.8,24.6 -7.7,2 -12.3,-7.1 -13.8,-13.3 -2.6,-11.5 -2.3,-26 6.9,-34.6 6.0,-4.9 13.1,1.9 14.9,7.8 2,4.9 2.8,10.2 2.8,15.5 z" stroke-width="4" stroke="black" fill="none" ></path><circle cx="100" cy="100" r="40" stroke-width="4" stroke="black" fill="none" ></circle><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/farp_red_destroyed.svg b/resources/ui/ground_assets/farp_red_destroyed.svg
new file mode 100644
index 00000000..697ae951
--- /dev/null
+++ b/resources/ui/ground_assets/farp_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M80,70 l10,10 M120,110 l-10,-10 M80,110 l10,-10 M120,70 l-10,10 M100,115 l0,20 M95,135 l10,0" stroke-width="4" stroke="black" fill="none" ></path><path d="m 113,90 c -0.3,8.8 -1.9,20.3 -10.8,24.6 -7.7,2 -12.3,-7.1 -13.8,-13.3 -2.6,-11.5 -2.3,-26 6.9,-34.6 6.0,-4.9 13.1,1.9 14.9,7.8 2,4.9 2.8,10.2 2.8,15.5 z" stroke-width="4" stroke="black" fill="none" ></path><circle cx="100" cy="100" r="40" stroke-width="4" stroke="black" fill="none" ></circle><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fuel_blue_alive.svg b/resources/ui/ground_assets/fuel_blue_alive.svg
new file mode 100644
index 00000000..ec3b1951
--- /dev/null
+++ b/resources/ui/ground_assets/fuel_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fuel_blue_damaged.svg b/resources/ui/ground_assets/fuel_blue_damaged.svg
new file mode 100644
index 00000000..24c9fca4
--- /dev/null
+++ b/resources/ui/ground_assets/fuel_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fuel_blue_destroyed.svg b/resources/ui/ground_assets/fuel_blue_destroyed.svg
new file mode 100644
index 00000000..1c6f9d56
--- /dev/null
+++ b/resources/ui/ground_assets/fuel_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fuel_red_alive.svg b/resources/ui/ground_assets/fuel_red_alive.svg
new file mode 100644
index 00000000..df4b610d
--- /dev/null
+++ b/resources/ui/ground_assets/fuel_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fuel_red_damaged.svg b/resources/ui/ground_assets/fuel_red_damaged.svg
new file mode 100644
index 00000000..84f029a6
--- /dev/null
+++ b/resources/ui/ground_assets/fuel_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fuel_red_destroyed.svg b/resources/ui/ground_assets/fuel_red_destroyed.svg
new file mode 100644
index 00000000..110ed58d
--- /dev/null
+++ b/resources/ui/ground_assets/fuel_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z m -35.7,51.6 h 62.3 V 86.9 h -6.4 V 73.5 h -7.2 v 13.4 h -7.2 V 73.5 h -7.2 v 13.4 h -34.4 v 39.5 z" stroke-width="4" stroke="none" fill="black" ></path><path d="m 104.1,74.8 h 4.5 v 13.4 h 9.9 V 74.8 h 4.5 v 13.4 h 6.7 v 37 H 69.6 V 88.2 h 34.6 l 4e-4,-13.4 0,0 z" stroke-width="4" stroke="none" fill="none" ></path><text x="100" y="113" text-anchor="middle" font-size="23" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >STOR</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/poewr_blue_damaged.svg b/resources/ui/ground_assets/poewr_blue_damaged.svg
new file mode 100644
index 00000000..edc02ac8
--- /dev/null
+++ b/resources/ui/ground_assets/poewr_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(0,15)" ><g transform="translate(25,25)" ><g transform="scale(0.75)" ><path d="m 100,60.5 c -16.4,0 -29.6,13.2 -29.6,29.6 0,12.8 8.3,23.9 19.7,27.8 l 0,19.7 c 3.2,1.2 6.3,1.8 9.9,1.8 3.6,0 6.7,-0.6 9.9,-1.8 l 0,-19.8 c 11.5,-3.9 19.8,-15 19.7,-27.8 0,-16.4 -13.2,-29.6 -29.6,-29.6 z" stroke-width="4" stroke="black" fill="none" ></path></g></g></g><text x="100" y="77" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >GEN</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/power_blue_alive.svg b/resources/ui/ground_assets/power_blue_alive.svg
new file mode 100644
index 00000000..5459d166
--- /dev/null
+++ b/resources/ui/ground_assets/power_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(0,15)" ><g transform="translate(25,25)" ><g transform="scale(0.75)" ><path d="m 100,60.5 c -16.4,0 -29.6,13.2 -29.6,29.6 0,12.8 8.3,23.9 19.7,27.8 l 0,19.7 c 3.2,1.2 6.3,1.8 9.9,1.8 3.6,0 6.7,-0.6 9.9,-1.8 l 0,-19.8 c 11.5,-3.9 19.8,-15 19.7,-27.8 0,-16.4 -13.2,-29.6 -29.6,-29.6 z" stroke-width="4" stroke="black" fill="none" ></path></g></g></g><text x="100" y="77" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >GEN</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/power_blue_destroyed.svg b/resources/ui/ground_assets/power_blue_destroyed.svg
new file mode 100644
index 00000000..1d648453
--- /dev/null
+++ b/resources/ui/ground_assets/power_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><g transform="translate(0,15)" ><g transform="translate(25,25)" ><g transform="scale(0.75)" ><path d="m 100,60.5 c -16.4,0 -29.6,13.2 -29.6,29.6 0,12.8 8.3,23.9 19.7,27.8 l 0,19.7 c 3.2,1.2 6.3,1.8 9.9,1.8 3.6,0 6.7,-0.6 9.9,-1.8 l 0,-19.8 c 11.5,-3.9 19.8,-15 19.7,-27.8 0,-16.4 -13.2,-29.6 -29.6,-29.6 z" stroke-width="4" stroke="black" fill="none" ></path></g></g></g><text x="100" y="77" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >GEN</text><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/power_red_alive.svg b/resources/ui/ground_assets/power_red_alive.svg
new file mode 100644
index 00000000..443b5dd5
--- /dev/null
+++ b/resources/ui/ground_assets/power_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(0,15)" ><g transform="translate(25,25)" ><g transform="scale(0.75)" ><path d="m 100,60.5 c -16.4,0 -29.6,13.2 -29.6,29.6 0,12.8 8.3,23.9 19.7,27.8 l 0,19.7 c 3.2,1.2 6.3,1.8 9.9,1.8 3.6,0 6.7,-0.6 9.9,-1.8 l 0,-19.8 c 11.5,-3.9 19.8,-15 19.7,-27.8 0,-16.4 -13.2,-29.6 -29.6,-29.6 z" stroke-width="4" stroke="black" fill="none" ></path></g></g></g><text x="100" y="77" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >GEN</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/power_red_damaged.svg b/resources/ui/ground_assets/power_red_damaged.svg
new file mode 100644
index 00000000..f628a2a0
--- /dev/null
+++ b/resources/ui/ground_assets/power_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(0,15)" ><g transform="translate(25,25)" ><g transform="scale(0.75)" ><path d="m 100,60.5 c -16.4,0 -29.6,13.2 -29.6,29.6 0,12.8 8.3,23.9 19.7,27.8 l 0,19.7 c 3.2,1.2 6.3,1.8 9.9,1.8 3.6,0 6.7,-0.6 9.9,-1.8 l 0,-19.8 c 11.5,-3.9 19.8,-15 19.7,-27.8 0,-16.4 -13.2,-29.6 -29.6,-29.6 z" stroke-width="4" stroke="black" fill="none" ></path></g></g></g><text x="100" y="77" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >GEN</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/power_red_destroyed.svg b/resources/ui/ground_assets/power_red_destroyed.svg
new file mode 100644
index 00000000..48b8f196
--- /dev/null
+++ b/resources/ui/ground_assets/power_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><g transform="translate(0,15)" ><g transform="translate(25,25)" ><g transform="scale(0.75)" ><path d="m 100,60.5 c -16.4,0 -29.6,13.2 -29.6,29.6 0,12.8 8.3,23.9 19.7,27.8 l 0,19.7 c 3.2,1.2 6.3,1.8 9.9,1.8 3.6,0 6.7,-0.6 9.9,-1.8 l 0,-19.8 c 11.5,-3.9 19.8,-15 19.7,-27.8 0,-16.4 -13.2,-29.6 -29.6,-29.6 z" stroke-width="4" stroke="black" fill="none" ></path></g></g></g><text x="100" y="77" text-anchor="middle" font-size="25" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >GEN</text><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/village_blue_alive.svg b/resources/ui/ground_assets/village_blue_alive.svg
new file mode 100644
index 00000000..c8bdb38f
--- /dev/null
+++ b/resources/ui/ground_assets/village_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 87.9,87.3 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m 24,0 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m -24,2 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24,0 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24.2,37.8 0,-3 -72.1,0 0,3 z m -3,-6.2 0,-2.8 -66.2,0 0,2.8 z M 66.8,98.2 c 0,1.3 -0.7,2.6 -0.7,4.3 -0,1.8 -0.2,3.1 -0.2,5 v 3.2 l 0.6,3.6 h 2.7 l -0.8,-6.4 v -1.8 c 0,-8.1 5,-17.9 9.3,-21.5 5.6,-4.6 11.6,-9.1 21.7,-9.1 h 0.9 c 9,0 17.1,4.4 21.6,8.8 3.2,3.2 4.1,4.7 6.4,8.7 1.4,2.4 3.3,8.4 3.3,12 v 4.3 c 0,1.4 -0.7,3 -0.7,4.4 v 0.5 h 2.7 l 0.6,-6.4 v -3.8 c 0,-1.6 -1,-5.2 -1.4,-6.6 -0.8,-2.5 -1.3,-3.6 -2.3,-5.7 -1.8,-3.8 -3.8,-6.4 -6.7,-9.3 -4.6,-4.6 -13.6,-9.6 -22.6,-9.6 h -2.5 c -7.8,0 -16.6,4.1 -20.6,7.9 -2.8,2.7 -4.4,4.1 -6.7,7.5 -1.1,1.6 -1.5,3 -2.5,4.6 -0.9,1.6 -1.2,4 -2,5.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/village_blue_damaged.svg b/resources/ui/ground_assets/village_blue_damaged.svg
new file mode 100644
index 00000000..c54784b6
--- /dev/null
+++ b/resources/ui/ground_assets/village_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 87.9,87.3 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m 24,0 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m -24,2 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24,0 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24.2,37.8 0,-3 -72.1,0 0,3 z m -3,-6.2 0,-2.8 -66.2,0 0,2.8 z M 66.8,98.2 c 0,1.3 -0.7,2.6 -0.7,4.3 -0,1.8 -0.2,3.1 -0.2,5 v 3.2 l 0.6,3.6 h 2.7 l -0.8,-6.4 v -1.8 c 0,-8.1 5,-17.9 9.3,-21.5 5.6,-4.6 11.6,-9.1 21.7,-9.1 h 0.9 c 9,0 17.1,4.4 21.6,8.8 3.2,3.2 4.1,4.7 6.4,8.7 1.4,2.4 3.3,8.4 3.3,12 v 4.3 c 0,1.4 -0.7,3 -0.7,4.4 v 0.5 h 2.7 l 0.6,-6.4 v -3.8 c 0,-1.6 -1,-5.2 -1.4,-6.6 -0.8,-2.5 -1.3,-3.6 -2.3,-5.7 -1.8,-3.8 -3.8,-6.4 -6.7,-9.3 -4.6,-4.6 -13.6,-9.6 -22.6,-9.6 h -2.5 c -7.8,0 -16.6,4.1 -20.6,7.9 -2.8,2.7 -4.4,4.1 -6.7,7.5 -1.1,1.6 -1.5,3 -2.5,4.6 -0.9,1.6 -1.2,4 -2,5.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/village_blue_destroyed.svg b/resources/ui/ground_assets/village_blue_destroyed.svg
new file mode 100644
index 00000000..827ef39d
--- /dev/null
+++ b/resources/ui/ground_assets/village_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 87.9,87.3 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m 24,0 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m -24,2 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24,0 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24.2,37.8 0,-3 -72.1,0 0,3 z m -3,-6.2 0,-2.8 -66.2,0 0,2.8 z M 66.8,98.2 c 0,1.3 -0.7,2.6 -0.7,4.3 -0,1.8 -0.2,3.1 -0.2,5 v 3.2 l 0.6,3.6 h 2.7 l -0.8,-6.4 v -1.8 c 0,-8.1 5,-17.9 9.3,-21.5 5.6,-4.6 11.6,-9.1 21.7,-9.1 h 0.9 c 9,0 17.1,4.4 21.6,8.8 3.2,3.2 4.1,4.7 6.4,8.7 1.4,2.4 3.3,8.4 3.3,12 v 4.3 c 0,1.4 -0.7,3 -0.7,4.4 v 0.5 h 2.7 l 0.6,-6.4 v -3.8 c 0,-1.6 -1,-5.2 -1.4,-6.6 -0.8,-2.5 -1.3,-3.6 -2.3,-5.7 -1.8,-3.8 -3.8,-6.4 -6.7,-9.3 -4.6,-4.6 -13.6,-9.6 -22.6,-9.6 h -2.5 c -7.8,0 -16.6,4.1 -20.6,7.9 -2.8,2.7 -4.4,4.1 -6.7,7.5 -1.1,1.6 -1.5,3 -2.5,4.6 -0.9,1.6 -1.2,4 -2,5.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/village_red_alive.svg b/resources/ui/ground_assets/village_red_alive.svg
new file mode 100644
index 00000000..d70c0dcb
--- /dev/null
+++ b/resources/ui/ground_assets/village_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 87.9,87.3 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m 24,0 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m -24,2 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24,0 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24.2,37.8 0,-3 -72.1,0 0,3 z m -3,-6.2 0,-2.8 -66.2,0 0,2.8 z M 66.8,98.2 c 0,1.3 -0.7,2.6 -0.7,4.3 -0,1.8 -0.2,3.1 -0.2,5 v 3.2 l 0.6,3.6 h 2.7 l -0.8,-6.4 v -1.8 c 0,-8.1 5,-17.9 9.3,-21.5 5.6,-4.6 11.6,-9.1 21.7,-9.1 h 0.9 c 9,0 17.1,4.4 21.6,8.8 3.2,3.2 4.1,4.7 6.4,8.7 1.4,2.4 3.3,8.4 3.3,12 v 4.3 c 0,1.4 -0.7,3 -0.7,4.4 v 0.5 h 2.7 l 0.6,-6.4 v -3.8 c 0,-1.6 -1,-5.2 -1.4,-6.6 -0.8,-2.5 -1.3,-3.6 -2.3,-5.7 -1.8,-3.8 -3.8,-6.4 -6.7,-9.3 -4.6,-4.6 -13.6,-9.6 -22.6,-9.6 h -2.5 c -7.8,0 -16.6,4.1 -20.6,7.9 -2.8,2.7 -4.4,4.1 -6.7,7.5 -1.1,1.6 -1.5,3 -2.5,4.6 -0.9,1.6 -1.2,4 -2,5.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/village_red_damaged.svg b/resources/ui/ground_assets/village_red_damaged.svg
new file mode 100644
index 00000000..bb32e616
--- /dev/null
+++ b/resources/ui/ground_assets/village_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 87.9,87.3 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m 24,0 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m -24,2 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24,0 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24.2,37.8 0,-3 -72.1,0 0,3 z m -3,-6.2 0,-2.8 -66.2,0 0,2.8 z M 66.8,98.2 c 0,1.3 -0.7,2.6 -0.7,4.3 -0,1.8 -0.2,3.1 -0.2,5 v 3.2 l 0.6,3.6 h 2.7 l -0.8,-6.4 v -1.8 c 0,-8.1 5,-17.9 9.3,-21.5 5.6,-4.6 11.6,-9.1 21.7,-9.1 h 0.9 c 9,0 17.1,4.4 21.6,8.8 3.2,3.2 4.1,4.7 6.4,8.7 1.4,2.4 3.3,8.4 3.3,12 v 4.3 c 0,1.4 -0.7,3 -0.7,4.4 v 0.5 h 2.7 l 0.6,-6.4 v -3.8 c 0,-1.6 -1,-5.2 -1.4,-6.6 -0.8,-2.5 -1.3,-3.6 -2.3,-5.7 -1.8,-3.8 -3.8,-6.4 -6.7,-9.3 -4.6,-4.6 -13.6,-9.6 -22.6,-9.6 h -2.5 c -7.8,0 -16.6,4.1 -20.6,7.9 -2.8,2.7 -4.4,4.1 -6.7,7.5 -1.1,1.6 -1.5,3 -2.5,4.6 -0.9,1.6 -1.2,4 -2,5.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/village_red_destroyed.svg b/resources/ui/ground_assets/village_red_destroyed.svg
new file mode 100644
index 00000000..d8924600
--- /dev/null
+++ b/resources/ui/ground_assets/village_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 87.9,87.3 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m 24,0 c -3.2,0 -5.8,2.6 -5.8,5.8 0,2.8 2.1,5.2 4.8,5.7 l 0,3.3 -3.8,0 0,2 3.8,0 0,9.4 2,0 0,-9.4 3.8,0 0,-2 -3.8,0 0,-3.3 c 2.7,-0.5 4.8,-2.8 4.8,-5.7 0,-3.2 -2.6,-5.8 -5.8,-5.8 z m -24,2 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24,0 c 2.1,0 3.8,1.7 3.8,3.8 0,2.1 -1.7,3.8 -3.8,3.8 -2.1,0 -3.8,-1.7 -3.8,-3.8 0,-2.1 1.7,-3.8 3.8,-3.8 z m 24.2,37.8 0,-3 -72.1,0 0,3 z m -3,-6.2 0,-2.8 -66.2,0 0,2.8 z M 66.8,98.2 c 0,1.3 -0.7,2.6 -0.7,4.3 -0,1.8 -0.2,3.1 -0.2,5 v 3.2 l 0.6,3.6 h 2.7 l -0.8,-6.4 v -1.8 c 0,-8.1 5,-17.9 9.3,-21.5 5.6,-4.6 11.6,-9.1 21.7,-9.1 h 0.9 c 9,0 17.1,4.4 21.6,8.8 3.2,3.2 4.1,4.7 6.4,8.7 1.4,2.4 3.3,8.4 3.3,12 v 4.3 c 0,1.4 -0.7,3 -0.7,4.4 v 0.5 h 2.7 l 0.6,-6.4 v -3.8 c 0,-1.6 -1,-5.2 -1.4,-6.6 -0.8,-2.5 -1.3,-3.6 -2.3,-5.7 -1.8,-3.8 -3.8,-6.4 -6.7,-9.3 -4.6,-4.6 -13.6,-9.6 -22.6,-9.6 h -2.5 c -7.8,0 -16.6,4.1 -20.6,7.9 -2.8,2.7 -4.4,4.1 -6.7,7.5 -1.1,1.6 -1.5,3 -2.5,4.6 -0.9,1.6 -1.2,4 -2,5.2 z" stroke-width="4" stroke="none" fill="black" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ww2bunker_blue_alive.svg b/resources/ui/ground_assets/ww2bunker_blue_alive.svg
new file mode 100644
index 00000000..01eed590
--- /dev/null
+++ b/resources/ui/ground_assets/ww2bunker_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="118" viewBox="21 36 158 118"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ww2bunker_blue_damaged.svg b/resources/ui/ground_assets/ww2bunker_blue_damaged.svg
new file mode 100644
index 00000000..e9dacd53
--- /dev/null
+++ b/resources/ui/ground_assets/ww2bunker_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ww2bunker_blue_destroyed.svg b/resources/ui/ground_assets/ww2bunker_blue_destroyed.svg
new file mode 100644
index 00000000..f9b1e2a0
--- /dev/null
+++ b/resources/ui/ground_assets/ww2bunker_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="148" viewBox="21 36 158 148"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,48 85,40 115,40 115,48 100,46 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ww2bunker_red_alive.svg b/resources/ui/ground_assets/ww2bunker_red_alive.svg
new file mode 100644
index 00000000..68ee8a5e
--- /dev/null
+++ b/resources/ui/ground_assets/ww2bunker_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="162" viewBox="24 14 152 162"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ww2bunker_red_damaged.svg b/resources/ui/ground_assets/ww2bunker_red_damaged.svg
new file mode 100644
index 00000000..bfb93b9a
--- /dev/null
+++ b/resources/ui/ground_assets/ww2bunker_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ww2bunker_red_destroyed.svg b/resources/ui/ground_assets/ww2bunker_red_destroyed.svg
new file mode 100644
index 00000000..4b150097
--- /dev/null
+++ b/resources/ui/ground_assets/ww2bunker_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="192" viewBox="24 14 152 192"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="m 75,85 50,30 m -50,0 50,-30" stroke-width="4" stroke="black" fill="none" ></path><path d="M85,40 85,18 115,18 115,40 100,24 Z" stroke-width="4" stroke="black" fill="black" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/map/map.js b/resources/ui/map/map.js
index af3fe91f..8a160b17 100644
--- a/resources/ui/map/map.js
+++ b/resources/ui/map/map.js
@@ -19,29 +19,26 @@ const Colors = Object.freeze({
 
 const Categories = Object.freeze([
   "aa",
+  "allycamp",
   "ammo",
   "armor",
-  "ewr",
-  "factory",
-  "fob",
-  "oil",
-  "ship",
-  "ware",
-]);
-
-const LegacyCategories = Object.freeze([
-  "allycamp",
-  "coastal",
   "comms",
   "derrick",
+  "ewr",
+  "factory",
   "farp",
+  "fob",
   "fuel",
-  "missile",
+  "oil",
   "power",
+  "ship",
   "village",
+  "ware",
   "ww2bunker",
 ]);
 
+const LegacyCategories = Object.freeze(["coastal", "missile"]);
+
 const UnitState = Object.freeze({
   Alive: "alive",
   Damaged: "damaged",

From 04ebe4c68af37fcaa8aa091c05e448c00b2cedc8 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Wed, 19 May 2021 21:24:54 -0700
Subject: [PATCH 4/8] Add the rest of the TGO icons.

---
 .../ui/ground_assets/coastal_blue_alive.svg      |  1 +
 .../ui/ground_assets/coastal_blue_damaged.svg    |  1 +
 .../ui/ground_assets/coastal_blue_destroyed.svg  |  1 +
 resources/ui/ground_assets/coastal_red_alive.svg |  1 +
 .../ui/ground_assets/coastal_red_damaged.svg     |  1 +
 .../ui/ground_assets/coastal_red_destroyed.svg   |  1 +
 .../ui/ground_assets/missile_blue_alive.svg      |  1 +
 .../ui/ground_assets/missile_blue_damaged.svg    |  1 +
 .../ui/ground_assets/missile_blue_destroyed.svg  |  1 +
 resources/ui/ground_assets/missile_red_alive.svg |  1 +
 .../ui/ground_assets/missile_red_damaged.svg     |  1 +
 .../ui/ground_assets/missile_red_destroyed.svg   |  1 +
 resources/ui/map/map.js                          | 16 ++--------------
 13 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 resources/ui/ground_assets/coastal_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/coastal_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/coastal_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/coastal_red_alive.svg
 create mode 100644 resources/ui/ground_assets/coastal_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/coastal_red_destroyed.svg
 create mode 100644 resources/ui/ground_assets/missile_blue_alive.svg
 create mode 100644 resources/ui/ground_assets/missile_blue_damaged.svg
 create mode 100644 resources/ui/ground_assets/missile_blue_destroyed.svg
 create mode 100644 resources/ui/ground_assets/missile_red_alive.svg
 create mode 100644 resources/ui/ground_assets/missile_red_damaged.svg
 create mode 100644 resources/ui/ground_assets/missile_red_destroyed.svg

diff --git a/resources/ui/ground_assets/coastal_blue_alive.svg b/resources/ui/ground_assets/coastal_blue_alive.svg
new file mode 100644
index 00000000..c978973c
--- /dev/null
+++ b/resources/ui/ground_assets/coastal_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="108" viewBox="21 46 158 108"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/coastal_blue_damaged.svg b/resources/ui/ground_assets/coastal_blue_damaged.svg
new file mode 100644
index 00000000..275bfb74
--- /dev/null
+++ b/resources/ui/ground_assets/coastal_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/coastal_blue_destroyed.svg b/resources/ui/ground_assets/coastal_blue_destroyed.svg
new file mode 100644
index 00000000..a5b66ea1
--- /dev/null
+++ b/resources/ui/ground_assets/coastal_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/coastal_red_alive.svg b/resources/ui/ground_assets/coastal_red_alive.svg
new file mode 100644
index 00000000..80ffd3e8
--- /dev/null
+++ b/resources/ui/ground_assets/coastal_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="152" viewBox="24 24 152 152"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/coastal_red_damaged.svg b/resources/ui/ground_assets/coastal_red_damaged.svg
new file mode 100644
index 00000000..72146d2f
--- /dev/null
+++ b/resources/ui/ground_assets/coastal_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/coastal_red_destroyed.svg b/resources/ui/ground_assets/coastal_red_destroyed.svg
new file mode 100644
index 00000000..bf6f2cd5
--- /dev/null
+++ b/resources/ui/ground_assets/coastal_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/missile_blue_alive.svg b/resources/ui/ground_assets/missile_blue_alive.svg
new file mode 100644
index 00000000..91bfa0b9
--- /dev/null
+++ b/resources/ui/ground_assets/missile_blue_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="108" viewBox="21 46 158 108"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><text x="100" y="145" text-anchor="middle" font-size="30" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >T</text></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/missile_blue_damaged.svg b/resources/ui/ground_assets/missile_blue_damaged.svg
new file mode 100644
index 00000000..841b8ba9
--- /dev/null
+++ b/resources/ui/ground_assets/missile_blue_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><text x="100" y="145" text-anchor="middle" font-size="30" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >T</text><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/missile_blue_destroyed.svg b/resources/ui/ground_assets/missile_blue_destroyed.svg
new file mode 100644
index 00000000..801cc220
--- /dev/null
+++ b/resources/ui/ground_assets/missile_blue_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="158" height="138" viewBox="21 46 158 138"><path d="M25,50 l150,0 0,100 -150,0 z" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><text x="100" y="145" text-anchor="middle" font-size="30" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >T</text><path d="M25,155 l150,0 0,25 -150,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/missile_red_alive.svg b/resources/ui/ground_assets/missile_red_alive.svg
new file mode 100644
index 00000000..faf9b1c9
--- /dev/null
+++ b/resources/ui/ground_assets/missile_red_alive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="152" viewBox="24 24 152 152"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><text x="100" y="145" text-anchor="middle" font-size="30" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >T</text></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/missile_red_damaged.svg b/resources/ui/ground_assets/missile_red_damaged.svg
new file mode 100644
index 00000000..f4b69b86
--- /dev/null
+++ b/resources/ui/ground_assets/missile_red_damaged.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><text x="100" y="145" text-anchor="middle" font-size="30" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >T</text><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,255,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/ground_assets/missile_red_destroyed.svg b/resources/ui/ground_assets/missile_red_destroyed.svg
new file mode 100644
index 00000000..24b2fef3
--- /dev/null
+++ b/resources/ui/ground_assets/missile_red_destroyed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="152" height="182" viewBox="24 24 152 182"><path d="M 100,28 L172,100 100,172 28,100 100,28 Z" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path><path d="M90,120 L90,90 C90,80 110,80 110,90 L110,120 M100,120 L100,80" stroke-width="4" stroke="black" fill="none" ></path><text x="100" y="145" text-anchor="middle" font-size="30" font-family="Arial" font-weight="bold" stroke-width="4" stroke="none" fill="black" >T</text><path d="M28,177 l144,0 0,25 -144,0 z" stroke-width="4" stroke="black" fill="rgb(255,0,0)" ></path></svg>
\ No newline at end of file
diff --git a/resources/ui/map/map.js b/resources/ui/map/map.js
index 8a160b17..3aade142 100644
--- a/resources/ui/map/map.js
+++ b/resources/ui/map/map.js
@@ -22,6 +22,7 @@ const Categories = Object.freeze([
   "allycamp",
   "ammo",
   "armor",
+  "coastal",
   "comms",
   "derrick",
   "ewr",
@@ -29,6 +30,7 @@ const Categories = Object.freeze([
   "farp",
   "fob",
   "fuel",
+  "missile",
   "oil",
   "power",
   "ship",
@@ -37,8 +39,6 @@ const Categories = Object.freeze([
   "ww2bunker",
 ]);
 
-const LegacyCategories = Object.freeze(["coastal", "missile"]);
-
 const UnitState = Object.freeze({
   Alive: "alive",
   Damaged: "damaged",
@@ -61,18 +61,6 @@ class TgoIcons {
         }
       }
     }
-    for (const category of LegacyCategories) {
-      this.icons[category] = {};
-      for (const player of [true, false]) {
-        this.icons[category][player] = {};
-        for (const state of Object.values(UnitState)) {
-          this.icons[category][player][state] = this.loadLegacyIcon(
-            category,
-            player
-          );
-        }
-      }
-    }
   }
 
   icon(category, player, state) {

From 2a77f57aa4e18917a84ff0a8b6440c7fcecf1935 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Wed, 19 May 2021 23:26:59 -0700
Subject: [PATCH 5/8] Improve AI strike targeting.

We were setting up all the correct *target* waypoints but the AI doesn't
use the target waypoints; they use the targets property of the ingress
waypoint. This meant that the flight plan looked correct in the UI and
was correct for players but the tasks were set up incorrectly for the AI
because building TGOs are aggravatingly multiple TGOs with the same name
in the implementation.

Mission targets now enumerate their own strike targets so that this
mistake is harder to make in the future.

This won't be perfect, the AI is still not able to parallelize tasks and
since buildings aren't groups they can only attack one structure at a
time, but they'll now at least switch to the next target after hitting
the first one.

As a bonus, stop bombing the dead buildings.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/235
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/244
---
 changelog.md                        |  1 +
 game/theater/controlpoint.py        |  9 +++++--
 game/theater/missiontarget.py       |  7 +++++-
 game/theater/theatergroundobject.py | 15 ++++++++++-
 gen/aircraft.py                     | 39 +++++++++++------------------
 gen/flights/flight.py               |  5 ++--
 gen/flights/waypointbuilder.py      |  3 +--
 gen/kneeboard.py                    |  4 +--
 8 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/changelog.md b/changelog.md
index cc88f99a..50252a96 100644
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,7 @@ Saves from 2.5 are not compatible with 3.0.
 * **[Campaign AI]** Every 30 minutes the AI will plan a CAP, so players can customize their mission better.
 * **[Campaign AI]** AI now considers Ju-88s for CAS, strike, and DEAD missions.
 * **[Campaign AI]** Fix purchase of aircraft by priority (the faction's list was being used as the priority list rather than the game's).
+* **[Flight Planner]** AI strike flight plans now include the correct target actions for building groups.
 * **[UI]** Added new web based map UI. This is mostly functional but many of the old display options are a WIP. Revert to the old map with --old-map.
 * **[UI]** Campaigns generated for an older or newer version of the game will now be marked as incompatible. They can still be played, but bugs may be present.
 * **[UI]** DCS loadouts are now selectable in the loadout setup menu.
diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py
index 414d18b6..f2e96a88 100644
--- a/game/theater/controlpoint.py
+++ b/game/theater/controlpoint.py
@@ -1,5 +1,4 @@
 from __future__ import annotations
-from game.scenery_group import SceneryGroup
 
 import heapq
 import itertools
@@ -9,7 +8,7 @@ from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from enum import Enum
 from functools import total_ordering
-from typing import Any, Dict, Iterator, List, Optional, Set, TYPE_CHECKING, Type
+from typing import Any, Dict, Iterator, List, Optional, Set, TYPE_CHECKING, Type, Union
 
 from dcs.mapping import Point
 from dcs.ships import (
@@ -19,10 +18,12 @@ from dcs.ships import (
     Type_071_Amphibious_Transport_Dock,
 )
 from dcs.terrain.terrain import Airport, ParkingSlot
+from dcs.unit import Unit
 from dcs.unittype import FlyingType
 
 from game import db
 from game.point_with_heading import PointWithHeading
+from game.scenery_group import SceneryGroup
 from gen.flights.closestairfields import ObjectiveDistanceCache
 from gen.ground_forces.ai_ground_planner_db import TYPE_SHORAD
 from gen.ground_forces.combat_stance import CombatStance
@@ -781,6 +782,10 @@ class ControlPoint(MissionTarget, ABC):
 
         return self.captured != other.captured
 
+    @property
+    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+        return []
+
 
 class Airfield(ControlPoint):
     def __init__(
diff --git a/game/theater/missiontarget.py b/game/theater/missiontarget.py
index 9a5fe8cd..8d026625 100644
--- a/game/theater/missiontarget.py
+++ b/game/theater/missiontarget.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from typing import Iterator, TYPE_CHECKING
+from typing import Iterator, TYPE_CHECKING, List, Union
 
 from dcs.mapping import Point
+from dcs.unit import Unit
 
 if TYPE_CHECKING:
     from gen.flights.flight import FlightType
@@ -42,3 +43,7 @@ class MissionTarget:
                 # TODO: FlightType.EWAR,
                 # TODO: FlightType.RECON,
             ]
+
+    @property
+    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+        raise NotImplementedError
diff --git a/game/theater/theatergroundobject.py b/game/theater/theatergroundobject.py
index f768992d..18131a42 100644
--- a/game/theater/theatergroundobject.py
+++ b/game/theater/theatergroundobject.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import itertools
 import logging
-from typing import Iterator, List, TYPE_CHECKING
+from typing import Iterator, List, TYPE_CHECKING, Union
 
 from dcs.mapping import Point
 from dcs.triggers import TriggerZone
@@ -185,6 +185,10 @@ class TheaterGroundObject(MissionTarget):
         """True if this TGO is the group for the control point itself (CVs and FOBs)."""
         return False
 
+    @property
+    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+        return self.units
+
 
 class BuildingGroundObject(TheaterGroundObject):
     def __init__(
@@ -233,6 +237,15 @@ class BuildingGroundObject(TheaterGroundObject):
     def kill(self) -> None:
         self._dead = True
 
+    def iter_building_group(self) -> Iterator[TheaterGroundObject]:
+        for tgo in self.control_point.ground_objects:
+            if tgo.obj_name == self.obj_name and not tgo.is_dead:
+                yield tgo
+
+    @property
+    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+        return list(self.iter_building_group())
+
 
 class SceneryGroundObject(BuildingGroundObject):
     def __init__(
diff --git a/gen/aircraft.py b/gen/aircraft.py
index 63e9ca1d..92cead03 100644
--- a/gen/aircraft.py
+++ b/gen/aircraft.py
@@ -5,7 +5,7 @@ import random
 from dataclasses import dataclass
 from datetime import timedelta
 from functools import cached_property
-from typing import Dict, List, Optional, TYPE_CHECKING, Type, Union
+from typing import Dict, List, Optional, TYPE_CHECKING, Type, Union, Iterable
 
 from dcs import helicopters
 from dcs.action import AITaskPush, ActivateGroup
@@ -70,6 +70,7 @@ from dcs.task import (
 )
 from dcs.terrain.terrain import Airport, NoParkingSlotError
 from dcs.triggers import Event, TriggerOnce, TriggerRule
+from dcs.unit import Unit
 from dcs.unitgroup import FlyingGroup, ShipGroup, StaticGroup
 from dcs.unittype import FlyingType, UnitType
 
@@ -85,6 +86,7 @@ from game.theater.controlpoint import (
     NavalControlPoint,
     OffMapSpawn,
 )
+from game.theater.missiontarget import MissionTarget
 from game.theater.theatergroundobject import TheaterGroundObject
 from game.transfers import MultiGroupTransport
 from game.unitmap import UnitMap
@@ -1629,7 +1631,9 @@ class PydcsWaypointBuilder:
         else:
             return False
 
-    def register_special_waypoints(self, targets) -> None:
+    def register_special_waypoints(
+        self, targets: Iterable[Union[MissionTarget, Unit]]
+    ) -> None:
         """Create special target waypoints for various aircraft"""
         for i, t in enumerate(targets):
             if self.group.units[0].unit_type == JF_17 and i < 4:
@@ -1850,29 +1854,16 @@ class StrikeIngressBuilder(PydcsWaypointBuilder):
     def build_strike(self) -> MovingPoint:
         waypoint = super().build()
         for target in self.waypoint.targets:
+            bombing = Bombing(target.position)
+            # If there is only one target, drop all ordnance in one pass.
+            if len(self.waypoint.targets) == 1:
+                bombing.params["expend"] = "All"
+            bombing.params["weaponType"] = WeaponType.Auto.value
+            bombing.params["groupAttack"] = True
+            waypoint.tasks.append(bombing)
 
-            targets = [target]
-            # If the target type is a group of units,
-            # then target each unit in the group with a Bombing task on their position
-            # (It is not perfect, we should have an engage Group task instead,
-            # but we don't have the group ref in the model there)
-            # TODO : for building group, engage all the buildings as well
-            if isinstance(target, TheaterGroundObject):
-                if len(target.units) > 0:
-                    targets = target.units
-
-            for t in targets:
-                bombing = Bombing(t.position)
-                # If there is only one target, drop all ordnance in one pass
-                if len(self.waypoint.targets) == 1 and len(targets) == 1:
-                    bombing.params["expend"] = "All"
-                bombing.params["weaponType"] = WeaponType.Auto.value
-                bombing.params["groupAttack"] = True
-                waypoint.tasks.append(bombing)
-                print(bombing)
-
-                # Register special waypoints
-                self.register_special_waypoints(targets)
+            # Register special waypoints
+            self.register_special_waypoints(self.waypoint.targets)
         return waypoint
 
 
diff --git a/gen/flights/flight.py b/gen/flights/flight.py
index 1e3c4d4d..397399ed 100644
--- a/gen/flights/flight.py
+++ b/gen/flights/flight.py
@@ -2,10 +2,11 @@ from __future__ import annotations
 
 from datetime import timedelta
 from enum import Enum
-from typing import List, Optional, TYPE_CHECKING, Type
+from typing import List, Optional, TYPE_CHECKING, Type, Union
 
 from dcs.mapping import Point
 from dcs.point import MovingPoint, PointAction
+from dcs.unit import Unit
 from dcs.unittype import FlyingType
 
 from game import db
@@ -107,7 +108,7 @@ class FlightWaypoint:
         # Only used in the waypoint list in the flight edit page. No sense
         # having three names. A short and long form is enough.
         self.description = ""
-        self.targets: List[MissionTarget] = []
+        self.targets: List[Union[MissionTarget, Unit]] = []
         self.obj_name = ""
         self.pretty_name = ""
         self.only_for_player = False
diff --git a/gen/flights/waypointbuilder.py b/gen/flights/waypointbuilder.py
index d125ac9e..ffb1e6ab 100644
--- a/gen/flights/waypointbuilder.py
+++ b/gen/flights/waypointbuilder.py
@@ -202,8 +202,7 @@ class WaypointBuilder:
         waypoint.pretty_name = "INGRESS on " + objective.name
         waypoint.description = "INGRESS on " + objective.name
         waypoint.name = "INGRESS"
-        # TODO: This seems wrong, but it's what was there before.
-        waypoint.targets.append(objective)
+        waypoint.targets = objective.strike_targets
         return waypoint
 
     def egress(self, position: Point, target: MissionTarget) -> FlightWaypoint:
diff --git a/gen/kneeboard.py b/gen/kneeboard.py
index d1de5456..231c00ca 100644
--- a/gen/kneeboard.py
+++ b/gen/kneeboard.py
@@ -26,7 +26,7 @@ import datetime
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict, List, Optional, TYPE_CHECKING, Tuple
+from typing import Dict, List, Optional, TYPE_CHECKING, Tuple, Iterator
 
 from PIL import Image, ImageDraw, ImageFont
 from dcs.mission import Mission
@@ -38,7 +38,7 @@ from game.utils import meters
 from .aircraft import AIRCRAFT_DATA, FlightData
 from .airsupportgen import AwacsInfo, TankerInfo
 from .briefinggen import CommInfo, JtacInfo, MissionInfoGenerator
-from .flights.flight import FlightWaypoint, FlightWaypointType
+from .flights.flight import FlightWaypoint, FlightWaypointType, FlightType
 from .radios import RadioFrequency
 from .runways import RunwayData
 

From f1adcd18364db78f400b00bd0e5c54f43b299023 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Wed, 19 May 2021 23:33:24 -0700
Subject: [PATCH 6/8] Be permissive about presumably incorrect loadouts.

These might be broken loadouts, or might be broken pydcs data. In case
it's the latter, attempt to load the pylon. DCS will remove the weapon
if it's not compatible automatically.
---
 game/data/weapons.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/data/weapons.py b/game/data/weapons.py
index 38133fe0..9b6d8e0c 100644
--- a/game/data/weapons.py
+++ b/game/data/weapons.py
@@ -85,7 +85,7 @@ class Pylon:
 
     def equip(self, group: FlyingGroup, weapon: Weapon) -> None:
         if not self.can_equip(weapon):
-            raise ValueError(f"Pylon {self.number} cannot equip {weapon.name}")
+            logging.error(f"Pylon {self.number} cannot equip {weapon.name}")
         group.load_pylon(self.make_pydcs_assignment(weapon), self.number)
 
     def make_pydcs_assignment(self, weapon: Weapon) -> PydcsWeaponAssignment:

From 8274e688469a7d8e734ae50b968096a77cdffa98 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Thu, 20 May 2021 00:13:49 -0700
Subject: [PATCH 7/8] Add SEAD/DEAD target info kneeboard page.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/965
---
 game/data/alic.py | 40 +++++++++++++++++++++
 gen/kneeboard.py  | 89 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 19 deletions(-)
 create mode 100644 game/data/alic.py

diff --git a/game/data/alic.py b/game/data/alic.py
new file mode 100644
index 00000000..de99075c
--- /dev/null
+++ b/game/data/alic.py
@@ -0,0 +1,40 @@
+from dcs.unit import Unit
+from dcs.vehicles import AirDefence
+
+
+class AlicCodes:
+    CODES = {
+        AirDefence.EWR_1L13.id: 101,
+        AirDefence.EWR_55G6.id: 102,
+        AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR.id: 103,
+        AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR.id: 104,
+        AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR.id: 107,
+        AirDefence.SAM_SA_6_Kub_Long_Track_STR.id: 108,
+        AirDefence.MCC_SR_Sborka_Dog_Ear_SR.id: 109,
+        AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR.id: 110,
+        AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL.id: 115,
+        AirDefence.SAM_SA_8_Osa_Gecko_TEL.id: 117,
+        AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL.id: 118,
+        AirDefence.SAM_SA_15_Tor_Gauntlet.id: 119,
+        AirDefence.SAM_SA_19_Tunguska_Grison.id: 120,
+        AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish.id: 121,
+        AirDefence.SAM_P19_Flat_Face_SR__SA_2_3.id: 122,
+        AirDefence.SAM_SA_3_S_125_Low_Blow_TR.id: 123,
+        AirDefence.SAM_Rapier_Blindfire_TR.id: 124,
+        AirDefence.SAM_Rapier_LN.id: 125,
+        AirDefence.SAM_SA_2_S_75_Fan_Song_TR.id: 126,
+        AirDefence.HQ_7_Self_Propelled_LN.id: 127,
+        AirDefence.HQ_7_Self_Propelled_STR.id: 128,
+        AirDefence.SAM_Roland_ADS.id: 201,
+        AirDefence.SAM_Patriot_STR.id: 202,
+        AirDefence.SAM_Hawk_SR__AN_MPQ_50.id: 203,
+        AirDefence.SAM_Hawk_TR__AN_MPQ_46.id: 204,
+        AirDefence.SAM_Roland_EWR.id: 205,
+        AirDefence.SAM_Hawk_CWAR_AN_MPQ_55.id: 206,
+        AirDefence.SPAAA_Gepard.id: 207,
+        AirDefence.SPAAA_Vulcan_M163.id: 208,
+    }
+
+    @classmethod
+    def code_for(cls, unit: Unit) -> int:
+        return cls.CODES[unit.type]
diff --git a/gen/kneeboard.py b/gen/kneeboard.py
index 231c00ca..f781776e 100644
--- a/gen/kneeboard.py
+++ b/gen/kneeboard.py
@@ -30,10 +30,13 @@ from typing import Dict, List, Optional, TYPE_CHECKING, Tuple, Iterator
 
 from PIL import Image, ImageDraw, ImageFont
 from dcs.mission import Mission
+from dcs.unit import Unit
 from dcs.unittype import FlyingType
 from tabulate import tabulate
 
-from game.theater import ConflictTheater
+from game.data.alic import AlicCodes
+from game.db import find_unittype, unit_type_from_name
+from game.theater import ConflictTheater, TheaterGroundObject, LatLon
 from game.utils import meters
 from .aircraft import AIRCRAFT_DATA, FlightData
 from .airsupportgen import AwacsInfo, TankerInfo
@@ -42,7 +45,6 @@ from .flights.flight import FlightWaypoint, FlightWaypointType, FlightType
 from .radios import RadioFrequency
 from .runways import RunwayData
 
-
 if TYPE_CHECKING:
     from game import Game
 
@@ -138,6 +140,11 @@ class KneeboardPage:
         """Writes the kneeboard page to the given path."""
         raise NotImplementedError
 
+    def format_ll(self, ll: LatLon) -> str:
+        ns = "N" if ll.latitude >= 0 else "S"
+        ew = "E" if ll.longitude >= 0 else "W"
+        return f"{ll.latitude:.4}°{ns} {ll.longitude:.4}°{ew}"
+
 
 @dataclass(frozen=True)
 class NumberedWaypoint:
@@ -415,21 +422,70 @@ class BriefingPage(KneeboardPage):
         return local_time.strftime(f"%H:%M:%S")
 
 
-class TargetInfoPage(KneeboardPage):
-    """A kneeboard page containing target information."""
+class SeadTaskPage(KneeboardPage):
+    """A kneeboard page containing SEAD/DEAD target information."""
+
+    def __init__(
+        self, flight: FlightData, dark_kneeboard: bool, theater: ConflictTheater
+    ) -> None:
+        self.flight = flight
+        self.dark_kneeboard = dark_kneeboard
+        self.theater = theater
+
+    @property
+    def target_units(self) -> Iterator[Unit]:
+        if isinstance(self.flight.package.target, TheaterGroundObject):
+            yield from self.flight.package.target.units
+
+    @staticmethod
+    def alic_for(unit: Unit) -> str:
+        try:
+            return str(AlicCodes.code_for(unit))
+        except KeyError:
+            return ""
+
+    def write(self, path: Path) -> None:
+        writer = KneeboardPageWriter(dark_theme=self.dark_kneeboard)
+        if self.flight.custom_name is not None:
+            custom_name_title = ' ("{}")'.format(self.flight.custom_name)
+        else:
+            custom_name_title = ""
+        task = "DEAD" if self.flight.flight_type == FlightType.DEAD else "SEAD"
+        writer.title(f"{self.flight.callsign} {task} Target Info{custom_name_title}")
+
+        writer.table(
+            [self.target_info_row(t) for t in self.target_units],
+            headers=["Description", "ALIC", "Location"],
+        )
+
+        writer.write(path)
+
+    def target_info_row(self, unit: Unit) -> List[str]:
+        ll = self.theater.point_to_ll(unit.position)
+        unit_type = unit_type_from_name(unit.type)
+        name = unit.name if unit_type is None else unit_type.name
+        return [name, self.alic_for(unit), self.format_ll(ll)]
+
+
+class StrikeTaskPage(KneeboardPage):
+    """A kneeboard page containing strike target information."""
 
     def __init__(
         self,
         flight: FlightData,
-        targets: List[FlightWaypoint],
         dark_kneeboard: bool,
         theater: ConflictTheater,
     ) -> None:
         self.flight = flight
-        self.targets = targets
         self.dark_kneeboard = dark_kneeboard
         self.theater = theater
 
+    @property
+    def targets(self) -> Iterator[FlightWaypoint]:
+        for waypoint in self.flight.waypoints:
+            if waypoint.waypoint_type == FlightWaypointType.TARGET_POINT:
+                yield waypoint
+
     def write(self, path: Path) -> None:
         writer = KneeboardPageWriter(dark_theme=self.dark_kneeboard)
         if self.flight.custom_name is not None:
@@ -447,7 +503,7 @@ class TargetInfoPage(KneeboardPage):
 
     def target_info_row(self, target: FlightWaypoint) -> List[str]:
         ll = self.theater.point_to_ll(target.position)
-        return [target.pretty_name, f"{ll.latitude} {ll.longitude}"]
+        return [target.pretty_name, self.format_ll(ll)]
 
 
 class KneeboardGenerator(MissionInfoGenerator):
@@ -491,17 +547,12 @@ class KneeboardGenerator(MissionInfoGenerator):
             )
         return all_flights
 
-    def generate_target_page(self, flight: FlightData) -> Optional[KneeboardPage]:
-        target_waypoints = [
-            w
-            for w in flight.waypoints
-            if w.waypoint_type == FlightWaypointType.TARGET_GROUP_LOC
-        ]
-        if not target_waypoints:
-            return None
-        return TargetInfoPage(
-            flight, target_waypoints, self.dark_kneeboard, self.game.theater
-        )
+    def generate_task_page(self, flight: FlightData) -> Optional[KneeboardPage]:
+        if flight.flight_type in (FlightType.DEAD, FlightType.SEAD):
+            return SeadTaskPage(flight, self.dark_kneeboard, self.game.theater)
+        elif flight.flight_type is FlightType.STRIKE:
+            return StrikeTaskPage(flight, self.dark_kneeboard, self.game.theater)
+        return None
 
     def generate_flight_kneeboard(self, flight: FlightData) -> List[KneeboardPage]:
         """Returns a list of kneeboard pages for the given flight."""
@@ -517,7 +568,7 @@ class KneeboardGenerator(MissionInfoGenerator):
             ),
         ]
 
-        if (target_page := self.generate_target_page(flight)) is not None:
+        if (target_page := self.generate_task_page(flight)) is not None:
             pages.append(target_page)
 
         return pages

From 52d96b8518c1c499bf89e932b52c369b7708527e Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Thu, 20 May 2021 00:20:48 -0700
Subject: [PATCH 8/8] Include steerpoint number in strike page.

https://github.com/dcs-liberation/dcs_liberation/issues/1001
---
 gen/kneeboard.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gen/kneeboard.py b/gen/kneeboard.py
index f781776e..c0035b06 100644
--- a/gen/kneeboard.py
+++ b/gen/kneeboard.py
@@ -481,10 +481,10 @@ class StrikeTaskPage(KneeboardPage):
         self.theater = theater
 
     @property
-    def targets(self) -> Iterator[FlightWaypoint]:
-        for waypoint in self.flight.waypoints:
+    def targets(self) -> Iterator[NumberedWaypoint]:
+        for idx, waypoint in enumerate(self.flight.waypoints):
             if waypoint.waypoint_type == FlightWaypointType.TARGET_POINT:
-                yield waypoint
+                yield NumberedWaypoint(idx, waypoint)
 
     def write(self, path: Path) -> None:
         writer = KneeboardPageWriter(dark_theme=self.dark_kneeboard)
@@ -492,18 +492,18 @@ class StrikeTaskPage(KneeboardPage):
             custom_name_title = ' ("{}")'.format(self.flight.custom_name)
         else:
             custom_name_title = ""
-        writer.title(f"{self.flight.callsign} Target Info{custom_name_title}")
+        writer.title(f"{self.flight.callsign} Strike Task Info{custom_name_title}")
 
         writer.table(
             [self.target_info_row(t) for t in self.targets],
-            headers=["Description", "Location"],
+            headers=["Steerpoint", "Description", "Location"],
         )
 
         writer.write(path)
 
-    def target_info_row(self, target: FlightWaypoint) -> List[str]:
-        ll = self.theater.point_to_ll(target.position)
-        return [target.pretty_name, self.format_ll(ll)]
+    def target_info_row(self, target: NumberedWaypoint) -> List[str]:
+        ll = self.theater.point_to_ll(target.waypoint.position)
+        return [str(target.number), target.waypoint.pretty_name, self.format_ll(ll)]
 
 
 class KneeboardGenerator(MissionInfoGenerator):