diff --git a/game/sidc.py b/game/sidc.py
index 7ae4ace2..9a6761ff 100644
--- a/game/sidc.py
+++ b/game/sidc.py
@@ -8,10 +8,11 @@ APP-6) are not implemented. The third set of ten digits are optional and will be
from the output.
https://nso.nato.int/nso/nsdd/main/standards/ap-details/1912/EN
-https://www.spatialillusions.com/milsymbol/docs/milsymbol-2525d.html
+https://www.spatialillusions.com/milsymbol/docs/milsymbol-APP6d.html
"""
from __future__ import annotations
+from abc import ABC, abstractmethod
from dataclasses import dataclass
from enum import IntEnum, unique
@@ -208,14 +209,43 @@ class AirEntity(Entity):
UNSPECIFIED = 0
+@unique
+class LandUnitEntity(Entity):
+ """Land Unit Entity/Entity Type/Entity Subtype defined by table A-19."""
+
+ UNSPECIFIED = 0
+
+ ARMOR_ARMORED_MECHANIZED_SELF_PROPELLED_TRACKED = 120500
+ AIR_DEFENSE = 130100
+ MISSILE = 130700
+
+
+@unique
+class LandEquipmentEntity(Entity):
+ """Land Equipment Entity/Entity Type/Entity Subtype defined by table A-25."""
+
+ UNSPECIFIED = 0
+
+ RADAR = 220300
+
+
@unique
class LandInstallationEntity(Entity):
"""Land Installation Entity/Entity Type/Entity Subtype defined by table A-27."""
UNSPECIFIED = 0
+ AMMUNITION_CACHE = 110300
+ WAREHOUSE_STORAGE_FACILITY = 112000
+ TENTED_CAMP = 111900
+ GENERATION_STATION = 120502
+ PETROLEUM_FACILITY = 120504
MILITARY_BASE = 120802
+ PUBLIC_VENUES_INFRASTRUCTURE = 121000
+ TELECOMMUNICATIONS_TOWER = 121203
AIPORT_AIR_BASE = 121301
+ HELICOPTER_LANDING_SITE = 121305
+ MAINTENANCE_FACILITY = 121306
@unique
@@ -225,6 +255,7 @@ class SeaSurfaceEntity(Entity):
UNSPECIFIED = 0
CARRIER = 120100
+ SURFACE_COMBATANT_LINE = 120200
AMPHIBIOUS_ASSAULT_SHIP_GENERAL = 120303
@@ -274,3 +305,29 @@ class SymbolIdentificationCode:
str(self.sector_two_modifier),
]
)
+
+
+class SidcDescribable(ABC):
+ @property
+ @abstractmethod
+ def standard_identity(self) -> StandardIdentity:
+ ...
+
+ @property
+ @abstractmethod
+ def sidc_status(self) -> Status:
+ ...
+
+ @property
+ @abstractmethod
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ ...
+
+ def sidc(self) -> SymbolIdentificationCode:
+ symbol_set, entity = self.symbol_set_and_entity
+ return SymbolIdentificationCode(
+ standard_identity=self.standard_identity,
+ symbol_set=symbol_set,
+ status=self.sidc_status,
+ entity=entity,
+ )
diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py
index 3821adf2..d96b0748 100644
--- a/game/theater/controlpoint.py
+++ b/game/theater/controlpoint.py
@@ -36,9 +36,9 @@ from game.sidc import (
Entity,
LandInstallationEntity,
SeaSurfaceEntity,
+ SidcDescribable,
StandardIdentity,
Status,
- SymbolIdentificationCode,
SymbolSet,
)
from game.utils import Heading
@@ -282,7 +282,7 @@ class ControlPointStatus(IntEnum):
StartingPosition = ShipGroup | StaticGroup | Airport | Point
-class ControlPoint(MissionTarget, ABC):
+class ControlPoint(MissionTarget, SidcDescribable, ABC):
# Not sure what distance DCS uses, but assuming it's about 2NM since that's roughly
# the distance of the circle on the map.
CAPTURE_DISTANCE = nautical_miles(2)
@@ -351,28 +351,21 @@ class ControlPoint(MissionTarget, ABC):
def captured(self) -> bool:
return self.coalition.player
- def sidc(self) -> SymbolIdentificationCode:
- iff = (
+ @property
+ def standard_identity(self) -> StandardIdentity:
+ return (
StandardIdentity.FRIEND if self.captured else StandardIdentity.HOSTILE_FAKER
)
+ @property
+ def sidc_status(self) -> Status:
if self.status is ControlPointStatus.Functional:
- status = Status.PRESENT
- elif self.status is ControlPointStatus.Damaged:
- status = Status.PRESENT_DAMAGED
- elif self.status is ControlPointStatus.Destroyed:
- status = Status.PRESENT_DESTROYED
- else:
- raise ValueError(f"Unexpected ControlPointStatus: {self.status}")
-
- symbol_set, entity = self.symbol_set_and_entity()
- return SymbolIdentificationCode(
- standard_identity=iff, symbol_set=symbol_set, status=status, entity=entity
- )
-
- @abstractmethod
- def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
- ...
+ return Status.PRESENT
+ if self.status is ControlPointStatus.Damaged:
+ return Status.PRESENT_DAMAGED
+ if self.status is ControlPointStatus.Destroyed:
+ return Status.PRESENT_DESTROYED
+ raise ValueError(f"Unexpected ControlPointStatus: {self.status}")
@property
def ground_objects(self) -> List[TheaterGroundObject]:
@@ -907,6 +900,7 @@ class Airfield(ControlPoint):
self.airport = airport
self._runway_status = RunwayStatus()
+ @property
def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
return SymbolSet.LAND_INSTALLATIONS, LandInstallationEntity.AIPORT_AIR_BASE
@@ -1093,6 +1087,7 @@ class Carrier(NavalControlPoint):
cptype=ControlPointType.AIRCRAFT_CARRIER_GROUP,
)
+ @property
def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
return SymbolSet.SEA_SURFACE, SeaSurfaceEntity.CARRIER
@@ -1137,6 +1132,7 @@ class Lha(NavalControlPoint):
cptype=ControlPointType.LHA_GROUP,
)
+ @property
def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
return SymbolSet.SEA_SURFACE, SeaSurfaceEntity.AMPHIBIOUS_ASSAULT_SHIP_GENERAL
@@ -1174,6 +1170,7 @@ class OffMapSpawn(ControlPoint):
cptype=ControlPointType.OFF_MAP,
)
+ @property
def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
return SymbolSet.LAND_INSTALLATIONS, LandInstallationEntity.AIPORT_AIR_BASE
@@ -1239,6 +1236,7 @@ class Fob(ControlPoint):
)
self.name = name
+ @property
def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
return SymbolSet.LAND_INSTALLATIONS, LandInstallationEntity.MILITARY_BASE
diff --git a/game/theater/theatergroundobject.py b/game/theater/theatergroundobject.py
index 039ce266..8dd4789e 100644
--- a/game/theater/theatergroundobject.py
+++ b/game/theater/theatergroundobject.py
@@ -1,17 +1,23 @@
from __future__ import annotations
import itertools
-import logging
from abc import ABC
-from typing import Iterator, List, TYPE_CHECKING, Optional
-
-from dcs.unittype import VehicleType
-from dcs.vehicles import vehicle_map
+from typing import Iterator, List, Optional, TYPE_CHECKING
from dcs.mapping import Point
+from dcs.unittype import VehicleType
-
-from game.dcs.helpers import unit_type_from_name
+from game.sidc import (
+ Entity,
+ LandEquipmentEntity,
+ LandInstallationEntity,
+ LandUnitEntity,
+ SeaSurfaceEntity,
+ SidcDescribable,
+ StandardIdentity,
+ Status,
+ SymbolSet,
+)
from ..data.radar_db import LAUNCHER_TRACKER_PAIRS, TELARS, TRACK_RADARS
from ..utils import Distance, Heading, meters
@@ -45,7 +51,7 @@ NAME_BY_CATEGORY = {
}
-class TheaterGroundObject(MissionTarget):
+class TheaterGroundObject(MissionTarget, SidcDescribable, ABC):
def __init__(
self,
name: str,
@@ -62,6 +68,18 @@ class TheaterGroundObject(MissionTarget):
self.sea_object = sea_object
self.groups: List[TheaterGroup] = []
+ @property
+ def sidc_status(self) -> Status:
+ return Status.PRESENT_DESTROYED if self.is_dead else Status.PRESENT
+
+ @property
+ def standard_identity(self) -> StandardIdentity:
+ return (
+ StandardIdentity.FRIEND
+ if self.control_point.captured
+ else StandardIdentity.HOSTILE_FAKER
+ )
+
@property
def is_dead(self) -> bool:
return self.alive_unit_count == 0
@@ -232,6 +250,36 @@ class BuildingGroundObject(TheaterGroundObject):
)
self.is_fob_structure = is_fob_structure
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ if self.category == "allycamp":
+ entity = LandInstallationEntity.TENTED_CAMP
+ elif self.category == "ammo":
+ entity = LandInstallationEntity.AMMUNITION_CACHE
+ elif self.category == "comms":
+ entity = LandInstallationEntity.TELECOMMUNICATIONS_TOWER
+ elif self.category == "derrick":
+ entity = LandInstallationEntity.PETROLEUM_FACILITY
+ elif self.category == "factory":
+ entity = LandInstallationEntity.MAINTENANCE_FACILITY
+ elif self.category == "farp":
+ entity = LandInstallationEntity.HELICOPTER_LANDING_SITE
+ elif self.category == "fuel":
+ entity = LandInstallationEntity.WAREHOUSE_STORAGE_FACILITY
+ elif self.category == "oil":
+ entity = LandInstallationEntity.PETROLEUM_FACILITY
+ elif self.category == "power":
+ entity = LandInstallationEntity.GENERATION_STATION
+ elif self.category == "village":
+ entity = LandInstallationEntity.PUBLIC_VENUES_INFRASTRUCTURE
+ elif self.category == "ware":
+ entity = LandInstallationEntity.WAREHOUSE_STORAGE_FACILITY
+ elif self.category == "ww2bunker":
+ entity = LandInstallationEntity.MILITARY_BASE
+ else:
+ raise ValueError(f"Unhandled building category: {self.category}")
+ return SymbolSet.LAND_INSTALLATIONS, entity
+
@property
def mark_locations(self) -> Iterator[Point]:
# Special handling to mark all buildings of the TGO
@@ -257,7 +305,7 @@ class BuildingGroundObject(TheaterGroundObject):
return meters(0)
-class NavalGroundObject(TheaterGroundObject):
+class NavalGroundObject(TheaterGroundObject, ABC):
def mission_types(self, for_player: bool) -> Iterator[FlightType]:
from game.ato import FlightType
@@ -278,7 +326,7 @@ class NavalGroundObject(TheaterGroundObject):
return False
-class GenericCarrierGroundObject(NavalGroundObject):
+class GenericCarrierGroundObject(NavalGroundObject, ABC):
@property
def is_control_point(self) -> bool:
return True
@@ -296,6 +344,10 @@ class CarrierGroundObject(GenericCarrierGroundObject):
sea_object=True,
)
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return SymbolSet.SEA_SURFACE, SeaSurfaceEntity.CARRIER
+
@property
def group_name(self) -> str:
# Prefix the group names with the side color so Skynet can find them,
@@ -318,6 +370,10 @@ class LhaGroundObject(GenericCarrierGroundObject):
sea_object=True,
)
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return SymbolSet.SEA_SURFACE, SeaSurfaceEntity.AMPHIBIOUS_ASSAULT_SHIP_GENERAL
+
@property
def group_name(self) -> str:
# Prefix the group names with the side color so Skynet can find them,
@@ -341,6 +397,10 @@ class MissileSiteGroundObject(TheaterGroundObject):
sea_object=False,
)
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return SymbolSet.LAND_UNIT, LandUnitEntity.MISSILE
+
@property
def capturable(self) -> bool:
return False
@@ -367,6 +427,10 @@ class CoastalSiteGroundObject(TheaterGroundObject):
sea_object=False,
)
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return SymbolSet.LAND_UNIT, LandUnitEntity.MISSILE
+
@property
def capturable(self) -> bool:
return False
@@ -405,6 +469,18 @@ class SamGroundObject(IadsGroundObject):
sea_object=False,
)
+ @property
+ def sidc_status(self) -> Status:
+ if self.is_dead:
+ return Status.PRESENT_DESTROYED
+ if self.max_threat_range() > meters(0):
+ return Status.PRESENT
+ return Status.PRESENT_DAMAGED
+
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return SymbolSet.LAND_UNIT, LandUnitEntity.AIR_DEFENSE
+
def mission_types(self, for_player: bool) -> Iterator[FlightType]:
from game.ato import FlightType
@@ -473,6 +549,13 @@ class VehicleGroupGroundObject(TheaterGroundObject):
sea_object=False,
)
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return (
+ SymbolSet.LAND_UNIT,
+ LandUnitEntity.ARMOR_ARMORED_MECHANIZED_SELF_PROPELLED_TRACKED,
+ )
+
@property
def capturable(self) -> bool:
return False
@@ -499,6 +582,10 @@ class EwrGroundObject(IadsGroundObject):
sea_object=False,
)
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return SymbolSet.LAND_EQUIPMENT, LandEquipmentEntity.RADAR
+
@property
def group_name(self) -> str:
# Prefix the group names with the side color so Skynet can find them.
@@ -529,6 +616,10 @@ class ShipGroundObject(NavalGroundObject):
sea_object=True,
)
+ @property
+ def symbol_set_and_entity(self) -> tuple[SymbolSet, Entity]:
+ return SymbolSet.SEA_SURFACE, SeaSurfaceEntity.SURFACE_COMBATANT_LINE
+
@property
def group_name(self) -> str:
# Prefix the group names with the side color so Skynet can find them,
diff --git a/qt_ui/widgets/map/model/groundobjectjs.py b/qt_ui/widgets/map/model/groundobjectjs.py
index 09d4bd44..f389a9e5 100644
--- a/qt_ui/widgets/map/model/groundobjectjs.py
+++ b/qt_ui/widgets/map/model/groundobjectjs.py
@@ -14,6 +14,7 @@ from qt_ui.windows.groundobject.QGroundObjectMenu import QGroundObjectMenu
class GroundObjectJs(QObject):
nameChanged = Signal()
controlPointNameChanged = Signal()
+ sidcChanged = Signal()
unitsChanged = Signal()
blueChanged = Signal()
positionChanged = Signal()
@@ -52,6 +53,10 @@ class GroundObjectJs(QObject):
def controlPointName(self) -> str:
return self.tgo.control_point.name
+ @Property(str, notify=sidcChanged)
+ def sidc(self) -> str:
+ return str(self.tgo.sidc())
+
@Property(str, notify=categoryChanged)
def category(self) -> str:
return self.tgo.category
diff --git a/resources/ui/ground_assets/aa.png b/resources/ui/ground_assets/aa.png
deleted file mode 100644
index 87d8a6ef..00000000
Binary files a/resources/ui/ground_assets/aa.png and /dev/null differ
diff --git a/resources/ui/ground_assets/aa_blue.png b/resources/ui/ground_assets/aa_blue.png
deleted file mode 100644
index 2a7b3020..00000000
Binary files a/resources/ui/ground_assets/aa_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/aa_blue_alive.svg b/resources/ui/ground_assets/aa_blue_alive.svg
deleted file mode 100644
index d6af6e07..00000000
--- a/resources/ui/ground_assets/aa_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index c098893b..00000000
--- a/resources/ui/ground_assets/aa_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index ed5960aa..00000000
--- a/resources/ui/ground_assets/aa_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 3375cf66..00000000
--- a/resources/ui/ground_assets/aa_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 7e56fd59..00000000
--- a/resources/ui/ground_assets/aa_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index b861fc4f..00000000
--- a/resources/ui/ground_assets/aa_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/allycamp.png b/resources/ui/ground_assets/allycamp.png
deleted file mode 100644
index a57564bc..00000000
Binary files a/resources/ui/ground_assets/allycamp.png and /dev/null differ
diff --git a/resources/ui/ground_assets/allycamp_blue.png b/resources/ui/ground_assets/allycamp_blue.png
deleted file mode 100644
index 5941d57d..00000000
Binary files a/resources/ui/ground_assets/allycamp_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/allycamp_blue_alive.svg b/resources/ui/ground_assets/allycamp_blue_alive.svg
deleted file mode 100644
index fdcb4754..00000000
--- a/resources/ui/ground_assets/allycamp_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index e37e3eab..00000000
--- a/resources/ui/ground_assets/allycamp_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 4f58f9c0..00000000
--- a/resources/ui/ground_assets/allycamp_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 4c3338fc..00000000
--- a/resources/ui/ground_assets/allycamp_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index ce234ce9..00000000
--- a/resources/ui/ground_assets/allycamp_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 640ff25d..00000000
--- a/resources/ui/ground_assets/allycamp_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ammo.png b/resources/ui/ground_assets/ammo.png
deleted file mode 100644
index 5f6a5a6a..00000000
Binary files a/resources/ui/ground_assets/ammo.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ammo_blue.png b/resources/ui/ground_assets/ammo_blue.png
deleted file mode 100644
index 011bbdd6..00000000
Binary files a/resources/ui/ground_assets/ammo_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ammo_blue_alive.svg b/resources/ui/ground_assets/ammo_blue_alive.svg
deleted file mode 100644
index e100dd64..00000000
--- a/resources/ui/ground_assets/ammo_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 39f2f524..00000000
--- a/resources/ui/ground_assets/ammo_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 56e7b193..00000000
--- a/resources/ui/ground_assets/ammo_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 6672db0d..00000000
--- a/resources/ui/ground_assets/ammo_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index ec899cba..00000000
--- a/resources/ui/ground_assets/ammo_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 5a5f0e92..00000000
--- a/resources/ui/ground_assets/ammo_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/armor.png b/resources/ui/ground_assets/armor.png
deleted file mode 100644
index 6034304c..00000000
Binary files a/resources/ui/ground_assets/armor.png and /dev/null differ
diff --git a/resources/ui/ground_assets/armor_blue.png b/resources/ui/ground_assets/armor_blue.png
deleted file mode 100644
index 6034304c..00000000
Binary files a/resources/ui/ground_assets/armor_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/armor_blue_alive.svg b/resources/ui/ground_assets/armor_blue_alive.svg
deleted file mode 100644
index e8127d8a..00000000
--- a/resources/ui/ground_assets/armor_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 22b2b5df..00000000
--- a/resources/ui/ground_assets/armor_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index a9390423..00000000
--- a/resources/ui/ground_assets/armor_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 60f41ca0..00000000
--- a/resources/ui/ground_assets/armor_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index a02c58ef..00000000
--- a/resources/ui/ground_assets/armor_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 73272413..00000000
--- a/resources/ui/ground_assets/armor_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/cleared.png b/resources/ui/ground_assets/cleared.png
deleted file mode 100644
index 412dbc25..00000000
Binary files a/resources/ui/ground_assets/cleared.png and /dev/null differ
diff --git a/resources/ui/ground_assets/coastal.png b/resources/ui/ground_assets/coastal.png
deleted file mode 100644
index 6a6740c8..00000000
Binary files a/resources/ui/ground_assets/coastal.png and /dev/null differ
diff --git a/resources/ui/ground_assets/coastal_blue.png b/resources/ui/ground_assets/coastal_blue.png
deleted file mode 100644
index 5c9e16b1..00000000
Binary files a/resources/ui/ground_assets/coastal_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/coastal_blue_alive.svg b/resources/ui/ground_assets/coastal_blue_alive.svg
deleted file mode 100644
index c978973c..00000000
--- a/resources/ui/ground_assets/coastal_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 275bfb74..00000000
--- a/resources/ui/ground_assets/coastal_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index a5b66ea1..00000000
--- a/resources/ui/ground_assets/coastal_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 80ffd3e8..00000000
--- a/resources/ui/ground_assets/coastal_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 72146d2f..00000000
--- a/resources/ui/ground_assets/coastal_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index bf6f2cd5..00000000
--- a/resources/ui/ground_assets/coastal_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/comms.png b/resources/ui/ground_assets/comms.png
deleted file mode 100644
index fc75eafc..00000000
Binary files a/resources/ui/ground_assets/comms.png and /dev/null differ
diff --git a/resources/ui/ground_assets/comms_blue.png b/resources/ui/ground_assets/comms_blue.png
deleted file mode 100644
index 0fdc9898..00000000
Binary files a/resources/ui/ground_assets/comms_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/comms_blue_alive.svg b/resources/ui/ground_assets/comms_blue_alive.svg
deleted file mode 100644
index 8492da13..00000000
--- a/resources/ui/ground_assets/comms_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index c2a82bc8..00000000
--- a/resources/ui/ground_assets/comms_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 7180db20..00000000
--- a/resources/ui/ground_assets/comms_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 48dec8e2..00000000
--- a/resources/ui/ground_assets/comms_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 8040ea4a..00000000
--- a/resources/ui/ground_assets/comms_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 8ed19b3f..00000000
--- a/resources/ui/ground_assets/comms_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/derrick.png b/resources/ui/ground_assets/derrick.png
deleted file mode 100644
index 4317ff30..00000000
Binary files a/resources/ui/ground_assets/derrick.png and /dev/null differ
diff --git a/resources/ui/ground_assets/derrick_blue.png b/resources/ui/ground_assets/derrick_blue.png
deleted file mode 100644
index e06a2e74..00000000
Binary files a/resources/ui/ground_assets/derrick_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/derrick_blue_alive.svg b/resources/ui/ground_assets/derrick_blue_alive.svg
deleted file mode 100644
index 088202c3..00000000
--- a/resources/ui/ground_assets/derrick_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index da58acec..00000000
--- a/resources/ui/ground_assets/derrick_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 139ea116..00000000
--- a/resources/ui/ground_assets/derrick_blue_destroyed .svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 7a103a23..00000000
--- a/resources/ui/ground_assets/derrick_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index f6859a06..00000000
--- a/resources/ui/ground_assets/derrick_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 2ba91be4..00000000
--- a/resources/ui/ground_assets/derrick_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/destroyed.png b/resources/ui/ground_assets/destroyed.png
deleted file mode 100644
index 06a51dc2..00000000
Binary files a/resources/ui/ground_assets/destroyed.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ewr.png b/resources/ui/ground_assets/ewr.png
deleted file mode 100644
index 1f902ac2..00000000
Binary files a/resources/ui/ground_assets/ewr.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ewr_blue.png b/resources/ui/ground_assets/ewr_blue.png
deleted file mode 100644
index e4b01cc2..00000000
Binary files a/resources/ui/ground_assets/ewr_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ewr_blue_alive.svg b/resources/ui/ground_assets/ewr_blue_alive.svg
deleted file mode 100644
index 1ffa8d5b..00000000
--- a/resources/ui/ground_assets/ewr_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 99792494..00000000
--- a/resources/ui/ground_assets/ewr_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 81b1872a..00000000
--- a/resources/ui/ground_assets/ewr_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 2447a2fe..00000000
--- a/resources/ui/ground_assets/ewr_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 4872e6ca..00000000
--- a/resources/ui/ground_assets/ewr_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index b783ce70..00000000
--- a/resources/ui/ground_assets/ewr_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/factory.png b/resources/ui/ground_assets/factory.png
deleted file mode 100644
index 427f0c61..00000000
Binary files a/resources/ui/ground_assets/factory.png and /dev/null differ
diff --git a/resources/ui/ground_assets/factory_blue.png b/resources/ui/ground_assets/factory_blue.png
deleted file mode 100644
index db863f9e..00000000
Binary files a/resources/ui/ground_assets/factory_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/factory_blue_alive.svg b/resources/ui/ground_assets/factory_blue_alive.svg
deleted file mode 100644
index b89968bd..00000000
--- a/resources/ui/ground_assets/factory_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index d21c47aa..00000000
--- a/resources/ui/ground_assets/factory_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 2933295b..00000000
--- a/resources/ui/ground_assets/factory_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index d8aaf876..00000000
--- a/resources/ui/ground_assets/factory_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index d71c65cd..00000000
--- a/resources/ui/ground_assets/factory_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 4354ee70..00000000
--- a/resources/ui/ground_assets/factory_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/farp.png b/resources/ui/ground_assets/farp.png
deleted file mode 100644
index 93614760..00000000
Binary files a/resources/ui/ground_assets/farp.png and /dev/null differ
diff --git a/resources/ui/ground_assets/farp_blue.png b/resources/ui/ground_assets/farp_blue.png
deleted file mode 100644
index 1b5734d9..00000000
Binary files a/resources/ui/ground_assets/farp_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/farp_blue_alive.svg b/resources/ui/ground_assets/farp_blue_alive.svg
deleted file mode 100644
index 1c76cbbe..00000000
--- a/resources/ui/ground_assets/farp_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 2eaec315..00000000
--- a/resources/ui/ground_assets/farp_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index f6af1443..00000000
--- a/resources/ui/ground_assets/farp_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index bfa7662c..00000000
--- a/resources/ui/ground_assets/farp_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 3da498bd..00000000
--- a/resources/ui/ground_assets/farp_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 697ae951..00000000
--- a/resources/ui/ground_assets/farp_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/fob.png b/resources/ui/ground_assets/fob.png
deleted file mode 100644
index b651d7d7..00000000
Binary files a/resources/ui/ground_assets/fob.png and /dev/null differ
diff --git a/resources/ui/ground_assets/fuel.png b/resources/ui/ground_assets/fuel.png
deleted file mode 100644
index 0210b9c3..00000000
Binary files a/resources/ui/ground_assets/fuel.png and /dev/null differ
diff --git a/resources/ui/ground_assets/fuel_blue.png b/resources/ui/ground_assets/fuel_blue.png
deleted file mode 100644
index 1db5fcca..00000000
Binary files a/resources/ui/ground_assets/fuel_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/fuel_blue_alive.svg b/resources/ui/ground_assets/fuel_blue_alive.svg
deleted file mode 100644
index ec3b1951..00000000
--- a/resources/ui/ground_assets/fuel_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 24c9fca4..00000000
--- a/resources/ui/ground_assets/fuel_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 1c6f9d56..00000000
--- a/resources/ui/ground_assets/fuel_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index df4b610d..00000000
--- a/resources/ui/ground_assets/fuel_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 84f029a6..00000000
--- a/resources/ui/ground_assets/fuel_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 110ed58d..00000000
--- a/resources/ui/ground_assets/fuel_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/missile.png b/resources/ui/ground_assets/missile.png
deleted file mode 100644
index 29c706fa..00000000
Binary files a/resources/ui/ground_assets/missile.png and /dev/null differ
diff --git a/resources/ui/ground_assets/missile_blue.png b/resources/ui/ground_assets/missile_blue.png
deleted file mode 100644
index 0e341502..00000000
Binary files a/resources/ui/ground_assets/missile_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/missile_blue_alive.svg b/resources/ui/ground_assets/missile_blue_alive.svg
deleted file mode 100644
index 91bfa0b9..00000000
--- a/resources/ui/ground_assets/missile_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 841b8ba9..00000000
--- a/resources/ui/ground_assets/missile_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 801cc220..00000000
--- a/resources/ui/ground_assets/missile_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index faf9b1c9..00000000
--- a/resources/ui/ground_assets/missile_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index f4b69b86..00000000
--- a/resources/ui/ground_assets/missile_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 24b2fef3..00000000
--- a/resources/ui/ground_assets/missile_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/nothreat.png b/resources/ui/ground_assets/nothreat.png
deleted file mode 100644
index 175fa290..00000000
Binary files a/resources/ui/ground_assets/nothreat.png and /dev/null differ
diff --git a/resources/ui/ground_assets/nothreat_blue.png b/resources/ui/ground_assets/nothreat_blue.png
deleted file mode 100644
index 46f2532a..00000000
Binary files a/resources/ui/ground_assets/nothreat_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/oil.png b/resources/ui/ground_assets/oil.png
deleted file mode 100644
index ea59b953..00000000
Binary files a/resources/ui/ground_assets/oil.png and /dev/null differ
diff --git a/resources/ui/ground_assets/oil_blue.png b/resources/ui/ground_assets/oil_blue.png
deleted file mode 100644
index b69d2692..00000000
Binary files a/resources/ui/ground_assets/oil_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/oil_blue_alive.svg b/resources/ui/ground_assets/oil_blue_alive.svg
deleted file mode 100644
index 088202c3..00000000
--- a/resources/ui/ground_assets/oil_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index da58acec..00000000
--- a/resources/ui/ground_assets/oil_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 139ea116..00000000
--- a/resources/ui/ground_assets/oil_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 7a103a23..00000000
--- a/resources/ui/ground_assets/oil_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index f6859a06..00000000
--- a/resources/ui/ground_assets/oil_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 2ba91be4..00000000
--- a/resources/ui/ground_assets/oil_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/original/aa.png b/resources/ui/ground_assets/original/aa.png
deleted file mode 100644
index 43343a6a..00000000
Binary files a/resources/ui/ground_assets/original/aa.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/aa_blue.png b/resources/ui/ground_assets/original/aa_blue.png
deleted file mode 100644
index d8256a86..00000000
Binary files a/resources/ui/ground_assets/original/aa_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/allycamp.png b/resources/ui/ground_assets/original/allycamp.png
deleted file mode 100644
index 72ea6ef1..00000000
Binary files a/resources/ui/ground_assets/original/allycamp.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/allycamp_blue.png b/resources/ui/ground_assets/original/allycamp_blue.png
deleted file mode 100644
index fc146c24..00000000
Binary files a/resources/ui/ground_assets/original/allycamp_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ammo.png b/resources/ui/ground_assets/original/ammo.png
deleted file mode 100644
index 2278a248..00000000
Binary files a/resources/ui/ground_assets/original/ammo.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ammo_blue.png b/resources/ui/ground_assets/original/ammo_blue.png
deleted file mode 100644
index cc3e85e8..00000000
Binary files a/resources/ui/ground_assets/original/ammo_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/cleared.png b/resources/ui/ground_assets/original/cleared.png
deleted file mode 100644
index 2912f6de..00000000
Binary files a/resources/ui/ground_assets/original/cleared.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/comms.png b/resources/ui/ground_assets/original/comms.png
deleted file mode 100644
index cc800ebb..00000000
Binary files a/resources/ui/ground_assets/original/comms.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/comms_blue.png b/resources/ui/ground_assets/original/comms_blue.png
deleted file mode 100644
index 44f01b1d..00000000
Binary files a/resources/ui/ground_assets/original/comms_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/derrick.png b/resources/ui/ground_assets/original/derrick.png
deleted file mode 100644
index b9d21808..00000000
Binary files a/resources/ui/ground_assets/original/derrick.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/derrick_blue.png b/resources/ui/ground_assets/original/derrick_blue.png
deleted file mode 100644
index f8de3263..00000000
Binary files a/resources/ui/ground_assets/original/derrick_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/destroyed.png b/resources/ui/ground_assets/original/destroyed.png
deleted file mode 100644
index be8d5262..00000000
Binary files a/resources/ui/ground_assets/original/destroyed.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/factory.png b/resources/ui/ground_assets/original/factory.png
deleted file mode 100644
index 3df84192..00000000
Binary files a/resources/ui/ground_assets/original/factory.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/factory_blue.png b/resources/ui/ground_assets/original/factory_blue.png
deleted file mode 100644
index 1ae62b17..00000000
Binary files a/resources/ui/ground_assets/original/factory_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/farp.png b/resources/ui/ground_assets/original/farp.png
deleted file mode 100644
index 72b4bd4c..00000000
Binary files a/resources/ui/ground_assets/original/farp.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/farp_blue.png b/resources/ui/ground_assets/original/farp_blue.png
deleted file mode 100644
index 0b71b39f..00000000
Binary files a/resources/ui/ground_assets/original/farp_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/fob.png b/resources/ui/ground_assets/original/fob.png
deleted file mode 100644
index 564cc88b..00000000
Binary files a/resources/ui/ground_assets/original/fob.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/fob_blue.png b/resources/ui/ground_assets/original/fob_blue.png
deleted file mode 100644
index e203a114..00000000
Binary files a/resources/ui/ground_assets/original/fob_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/fuel.png b/resources/ui/ground_assets/original/fuel.png
deleted file mode 100644
index f8d2bf6e..00000000
Binary files a/resources/ui/ground_assets/original/fuel.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/fuel_blue.png b/resources/ui/ground_assets/original/fuel_blue.png
deleted file mode 100644
index 93162fe6..00000000
Binary files a/resources/ui/ground_assets/original/fuel_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/oil.png b/resources/ui/ground_assets/original/oil.png
deleted file mode 100644
index 3f9e945e..00000000
Binary files a/resources/ui/ground_assets/original/oil.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/oil_blue.png b/resources/ui/ground_assets/original/oil_blue.png
deleted file mode 100644
index bf8eaf24..00000000
Binary files a/resources/ui/ground_assets/original/oil_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/power.png b/resources/ui/ground_assets/original/power.png
deleted file mode 100644
index d6b6f0cc..00000000
Binary files a/resources/ui/ground_assets/original/power.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/power_blue.png b/resources/ui/ground_assets/original/power_blue.png
deleted file mode 100644
index d85d2c67..00000000
Binary files a/resources/ui/ground_assets/original/power_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ship.png b/resources/ui/ground_assets/original/ship.png
deleted file mode 100644
index 92602b16..00000000
Binary files a/resources/ui/ground_assets/original/ship.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ship_blue.png b/resources/ui/ground_assets/original/ship_blue.png
deleted file mode 100644
index 9dcaa889..00000000
Binary files a/resources/ui/ground_assets/original/ship_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/target.png b/resources/ui/ground_assets/original/target.png
deleted file mode 100644
index 0ad063f1..00000000
Binary files a/resources/ui/ground_assets/original/target.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/target_blue.png b/resources/ui/ground_assets/original/target_blue.png
deleted file mode 100644
index ee0edbab..00000000
Binary files a/resources/ui/ground_assets/original/target_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/village.png b/resources/ui/ground_assets/original/village.png
deleted file mode 100644
index bfb83f53..00000000
Binary files a/resources/ui/ground_assets/original/village.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/village_blue.png b/resources/ui/ground_assets/original/village_blue.png
deleted file mode 100644
index 7adfc845..00000000
Binary files a/resources/ui/ground_assets/original/village_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ware.png b/resources/ui/ground_assets/original/ware.png
deleted file mode 100644
index e0ccd054..00000000
Binary files a/resources/ui/ground_assets/original/ware.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ware_blue.png b/resources/ui/ground_assets/original/ware_blue.png
deleted file mode 100644
index 45587207..00000000
Binary files a/resources/ui/ground_assets/original/ware_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ww2bunker.png b/resources/ui/ground_assets/original/ww2bunker.png
deleted file mode 100644
index 32019d19..00000000
Binary files a/resources/ui/ground_assets/original/ww2bunker.png and /dev/null differ
diff --git a/resources/ui/ground_assets/original/ww2bunker_blue.png b/resources/ui/ground_assets/original/ww2bunker_blue.png
deleted file mode 100644
index cfb28c54..00000000
Binary files a/resources/ui/ground_assets/original/ww2bunker_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/poewr_blue_damaged.svg b/resources/ui/ground_assets/poewr_blue_damaged.svg
deleted file mode 100644
index edc02ac8..00000000
--- a/resources/ui/ground_assets/poewr_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/power.png b/resources/ui/ground_assets/power.png
deleted file mode 100644
index 203fcf76..00000000
Binary files a/resources/ui/ground_assets/power.png and /dev/null differ
diff --git a/resources/ui/ground_assets/power_blue.png b/resources/ui/ground_assets/power_blue.png
deleted file mode 100644
index 48dac6cf..00000000
Binary files a/resources/ui/ground_assets/power_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/power_blue_alive.svg b/resources/ui/ground_assets/power_blue_alive.svg
deleted file mode 100644
index 5459d166..00000000
--- a/resources/ui/ground_assets/power_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 1d648453..00000000
--- a/resources/ui/ground_assets/power_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 443b5dd5..00000000
--- a/resources/ui/ground_assets/power_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index f628a2a0..00000000
--- a/resources/ui/ground_assets/power_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 48b8f196..00000000
--- a/resources/ui/ground_assets/power_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ship.png b/resources/ui/ground_assets/ship.png
deleted file mode 100644
index 097d01dc..00000000
Binary files a/resources/ui/ground_assets/ship.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ship_blue.png b/resources/ui/ground_assets/ship_blue.png
deleted file mode 100644
index 25bb7918..00000000
Binary files a/resources/ui/ground_assets/ship_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ship_blue_alive.svg b/resources/ui/ground_assets/ship_blue_alive.svg
deleted file mode 100644
index 8ae1393f..00000000
--- a/resources/ui/ground_assets/ship_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index edcb3cd9..00000000
--- a/resources/ui/ground_assets/ship_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 8ed1ee02..00000000
--- a/resources/ui/ground_assets/ship_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 538cf721..00000000
--- a/resources/ui/ground_assets/ship_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index f97a1109..00000000
--- a/resources/ui/ground_assets/ship_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 176e9ae5..00000000
--- a/resources/ui/ground_assets/ship_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/target.png b/resources/ui/ground_assets/target.png
deleted file mode 100644
index 91913868..00000000
Binary files a/resources/ui/ground_assets/target.png and /dev/null differ
diff --git a/resources/ui/ground_assets/target_blue.png b/resources/ui/ground_assets/target_blue.png
deleted file mode 100644
index 793dc720..00000000
Binary files a/resources/ui/ground_assets/target_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/village.png b/resources/ui/ground_assets/village.png
deleted file mode 100644
index 599e532c..00000000
Binary files a/resources/ui/ground_assets/village.png and /dev/null differ
diff --git a/resources/ui/ground_assets/village_blue.png b/resources/ui/ground_assets/village_blue.png
deleted file mode 100644
index a1b65e17..00000000
Binary files a/resources/ui/ground_assets/village_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/village_blue_alive.svg b/resources/ui/ground_assets/village_blue_alive.svg
deleted file mode 100644
index c8bdb38f..00000000
--- a/resources/ui/ground_assets/village_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index c54784b6..00000000
--- a/resources/ui/ground_assets/village_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 827ef39d..00000000
--- a/resources/ui/ground_assets/village_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index d70c0dcb..00000000
--- a/resources/ui/ground_assets/village_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index bb32e616..00000000
--- a/resources/ui/ground_assets/village_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index d8924600..00000000
--- a/resources/ui/ground_assets/village_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ware.png b/resources/ui/ground_assets/ware.png
deleted file mode 100644
index eec7b0a0..00000000
Binary files a/resources/ui/ground_assets/ware.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ware_blue.png b/resources/ui/ground_assets/ware_blue.png
deleted file mode 100644
index dfeb4782..00000000
Binary files a/resources/ui/ground_assets/ware_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ware_blue_alive.svg b/resources/ui/ground_assets/ware_blue_alive.svg
deleted file mode 100644
index ec3b1951..00000000
--- a/resources/ui/ground_assets/ware_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 24c9fca4..00000000
--- a/resources/ui/ground_assets/ware_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 1c6f9d56..00000000
--- a/resources/ui/ground_assets/ware_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index df4b610d..00000000
--- a/resources/ui/ground_assets/ware_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 84f029a6..00000000
--- a/resources/ui/ground_assets/ware_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 110ed58d..00000000
--- a/resources/ui/ground_assets/ware_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/ground_assets/ww2bunker.png b/resources/ui/ground_assets/ww2bunker.png
deleted file mode 100644
index ced23ea0..00000000
Binary files a/resources/ui/ground_assets/ww2bunker.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ww2bunker_blue.png b/resources/ui/ground_assets/ww2bunker_blue.png
deleted file mode 100644
index 7af7b531..00000000
Binary files a/resources/ui/ground_assets/ww2bunker_blue.png and /dev/null differ
diff --git a/resources/ui/ground_assets/ww2bunker_blue_alive.svg b/resources/ui/ground_assets/ww2bunker_blue_alive.svg
deleted file mode 100644
index 01eed590..00000000
--- a/resources/ui/ground_assets/ww2bunker_blue_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index e9dacd53..00000000
--- a/resources/ui/ground_assets/ww2bunker_blue_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index f9b1e2a0..00000000
--- a/resources/ui/ground_assets/ww2bunker_blue_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 68ee8a5e..00000000
--- a/resources/ui/ground_assets/ww2bunker_red_alive.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index bfb93b9a..00000000
--- a/resources/ui/ground_assets/ww2bunker_red_damaged.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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
deleted file mode 100644
index 4b150097..00000000
--- a/resources/ui/ground_assets/ww2bunker_red_destroyed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/ui/map/map.js b/resources/ui/map/map.js
index 55a3c3e6..fab0395d 100644
--- a/resources/ui/map/map.js
+++ b/resources/ui/map/map.js
@@ -61,44 +61,6 @@ const UnitState = Object.freeze({
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
- );
- }
- }
- }
- }
-
- icon(category, player, state) {
- return this.icons[category][player][state];
- }
-
- loadIcon(category, player, state) {
- const color = player ? "blue" : "red";
- return new L.Icon({
- iconUrl: `../ground_assets/${category}_${color}_${state}.svg`,
- iconSize: [32, 32],
- });
- }
-
- loadLegacyIcon(category, player) {
- const playerSuffix = player ? "_blue" : "";
- return new L.Icon({
- iconUrl: `../ground_assets/${category}${playerSuffix}.png`,
- });
- }
-}
-
class AirIcons {
constructor() {
this.icons = {};
@@ -132,8 +94,15 @@ class AirIcons {
}
}
+function milSymbolIcon(sidc, options = {}) {
+ const symbol = new ms.Symbol(sidc, options);
+ return L.icon({
+ iconUrl: symbol.toDataURL(),
+ iconAnchor: L.point(symbol.getAnchor().x, symbol.getAnchor().y),
+ });
+}
+
const Icons = Object.freeze({
- Objectives: new TgoIcons(),
AirIcons: new AirIcons(),
});
@@ -427,14 +396,10 @@ class ControlPoint {
}
icon() {
- const symbol = new ms.Symbol(this.cp.sidc, {
+ return milSymbolIcon(this.cp.sidc, {
size: 24,
colorMode: "Dark",
});
- return L.icon({
- iconUrl: symbol.toDataURL(),
- iconAnchor: L.point(symbol.getAnchor().x, symbol.getAnchor().y),
- });
}
hasDestination() {
@@ -613,26 +578,8 @@ class TheaterGroundObject {
this.tgo = tgo;
}
- samIsThreat() {
- for (const range of this.tgo.samThreatRanges) {
- if (range > 0) {
- return true;
- }
- }
-
- return false;
- }
-
icon() {
- let state;
- if (this.tgo.dead) {
- state = UnitState.Destroyed;
- } else if (this.tgo.category == "aa" && !this.samIsThreat()) {
- state = UnitState.Damaged;
- } else {
- state = UnitState.Alive;
- }
- return Icons.Objectives.icon(this.tgo.category, this.tgo.blue, state);
+ return milSymbolIcon(this.tgo.sidc, { size: 24 });
}
layer() {