diff --git a/frontend/react/public/images/units/a-10.png b/frontend/react/public/images/units/a-10.png index 748be4cb..bf231f50 100644 Binary files a/frontend/react/public/images/units/a-10.png and b/frontend/react/public/images/units/a-10.png differ diff --git a/frontend/react/public/images/units/a-20.png b/frontend/react/public/images/units/a-20.png index d0fb8a0c..b9d64924 100644 Binary files a/frontend/react/public/images/units/a-20.png and b/frontend/react/public/images/units/a-20.png differ diff --git a/frontend/react/public/images/units/a-29.png b/frontend/react/public/images/units/a-29.png index 8f2ead6e..71b9b390 100644 Binary files a/frontend/react/public/images/units/a-29.png and b/frontend/react/public/images/units/a-29.png differ diff --git a/frontend/react/public/images/units/a-4.png b/frontend/react/public/images/units/a-4.png index dadcb05c..d846c5b2 100644 Binary files a/frontend/react/public/images/units/a-4.png and b/frontend/react/public/images/units/a-4.png differ diff --git a/frontend/react/public/images/units/a-400.png b/frontend/react/public/images/units/a-400.png index 71863ac1..424c0e58 100644 Binary files a/frontend/react/public/images/units/a-400.png and b/frontend/react/public/images/units/a-400.png differ diff --git a/frontend/react/public/images/units/a-50.png b/frontend/react/public/images/units/a-50.png index a14b837a..96292111 100644 Binary files a/frontend/react/public/images/units/a-50.png and b/frontend/react/public/images/units/a-50.png differ diff --git a/frontend/react/public/images/units/a-6.png b/frontend/react/public/images/units/a-6.png index 8c198a7e..ad4fe2cb 100644 Binary files a/frontend/react/public/images/units/a-6.png and b/frontend/react/public/images/units/a-6.png differ diff --git a/frontend/react/public/images/units/ah-1.png b/frontend/react/public/images/units/ah-1.png index 4d1b3b40..39c3c73e 100644 Binary files a/frontend/react/public/images/units/ah-1.png and b/frontend/react/public/images/units/ah-1.png differ diff --git a/frontend/react/public/images/units/ah-64.png b/frontend/react/public/images/units/ah-64.png index ba5f43b6..b56b62bb 100644 Binary files a/frontend/react/public/images/units/ah-64.png and b/frontend/react/public/images/units/ah-64.png differ diff --git a/frontend/react/public/images/units/airUnit.png b/frontend/react/public/images/units/airUnit.png index 6578221b..29d28433 100644 Binary files a/frontend/react/public/images/units/airUnit.png and b/frontend/react/public/images/units/airUnit.png differ diff --git a/frontend/react/public/images/units/airliner2engine.png b/frontend/react/public/images/units/airliner2engine.png index ae27a626..c296d125 100644 Binary files a/frontend/react/public/images/units/airliner2engine.png and b/frontend/react/public/images/units/airliner2engine.png differ diff --git a/frontend/react/public/images/units/an-26.png b/frontend/react/public/images/units/an-26.png index 2976fdee..0d7be716 100644 Binary files a/frontend/react/public/images/units/an-26.png and b/frontend/react/public/images/units/an-26.png differ diff --git a/frontend/react/public/images/units/av8bna.png b/frontend/react/public/images/units/av8bna.png index bb3fc845..194c13ec 100644 Binary files a/frontend/react/public/images/units/av8bna.png and b/frontend/react/public/images/units/av8bna.png differ diff --git a/frontend/react/public/images/units/b-1.png b/frontend/react/public/images/units/b-1.png index dda58612..964bfb59 100644 Binary files a/frontend/react/public/images/units/b-1.png and b/frontend/react/public/images/units/b-1.png differ diff --git a/frontend/react/public/images/units/b-17.png b/frontend/react/public/images/units/b-17.png index a1515b20..1c0a4dbf 100644 Binary files a/frontend/react/public/images/units/b-17.png and b/frontend/react/public/images/units/b-17.png differ diff --git a/frontend/react/public/images/units/b-2.png b/frontend/react/public/images/units/b-2.png index e68ac71f..afcc4241 100644 Binary files a/frontend/react/public/images/units/b-2.png and b/frontend/react/public/images/units/b-2.png differ diff --git a/frontend/react/public/images/units/b-52.png b/frontend/react/public/images/units/b-52.png index ebc22079..63bfd5d3 100644 Binary files a/frontend/react/public/images/units/b-52.png and b/frontend/react/public/images/units/b-52.png differ diff --git a/frontend/react/public/images/units/b707.png b/frontend/react/public/images/units/b707.png index f8496dd2..267423fe 100644 Binary files a/frontend/react/public/images/units/b707.png and b/frontend/react/public/images/units/b707.png differ diff --git a/frontend/react/public/images/units/bf109.png b/frontend/react/public/images/units/bf109.png index e0d3691c..a4ea8316 100644 Binary files a/frontend/react/public/images/units/bf109.png and b/frontend/react/public/images/units/bf109.png differ diff --git a/frontend/react/public/images/units/c-101.png b/frontend/react/public/images/units/c-101.png index e4372e90..546f8d56 100644 Binary files a/frontend/react/public/images/units/c-101.png and b/frontend/react/public/images/units/c-101.png differ diff --git a/frontend/react/public/images/units/c-130.png b/frontend/react/public/images/units/c-130.png index 74f98897..fd15e590 100644 Binary files a/frontend/react/public/images/units/c-130.png and b/frontend/react/public/images/units/c-130.png differ diff --git a/frontend/react/public/images/units/c-17.png b/frontend/react/public/images/units/c-17.png index 4339ab18..ec37926c 100644 Binary files a/frontend/react/public/images/units/c-17.png and b/frontend/react/public/images/units/c-17.png differ diff --git a/frontend/react/public/images/units/c-5.png b/frontend/react/public/images/units/c-5.png index 00fccd57..c864a11f 100644 Binary files a/frontend/react/public/images/units/c-5.png and b/frontend/react/public/images/units/c-5.png differ diff --git a/frontend/react/public/images/units/ch-47.png b/frontend/react/public/images/units/ch-47.png index 9a1ecd22..96c4ffb5 100644 Binary files a/frontend/react/public/images/units/ch-47.png and b/frontend/react/public/images/units/ch-47.png differ diff --git a/frontend/react/public/images/units/ch-53.png b/frontend/react/public/images/units/ch-53.png index 64a2b083..8327da78 100644 Binary files a/frontend/react/public/images/units/ch-53.png and b/frontend/react/public/images/units/ch-53.png differ diff --git a/frontend/react/public/images/units/e-2.png b/frontend/react/public/images/units/e-2.png index fc797e9e..b2c4a30b 100644 Binary files a/frontend/react/public/images/units/e-2.png and b/frontend/react/public/images/units/e-2.png differ diff --git a/frontend/react/public/images/units/e-3.png b/frontend/react/public/images/units/e-3.png index 1967a347..c7385b45 100644 Binary files a/frontend/react/public/images/units/e-3.png and b/frontend/react/public/images/units/e-3.png differ diff --git a/frontend/react/public/images/units/eurofighter.png b/frontend/react/public/images/units/eurofighter.png index f18076e1..fc0ee314 100644 Binary files a/frontend/react/public/images/units/eurofighter.png and b/frontend/react/public/images/units/eurofighter.png differ diff --git a/frontend/react/public/images/units/f-1.png b/frontend/react/public/images/units/f-1.png index c61eb2ad..03ef0988 100644 Binary files a/frontend/react/public/images/units/f-1.png and b/frontend/react/public/images/units/f-1.png differ diff --git a/frontend/react/public/images/units/f-111.png b/frontend/react/public/images/units/f-111.png index c424ad6b..b80dde96 100644 Binary files a/frontend/react/public/images/units/f-111.png and b/frontend/react/public/images/units/f-111.png differ diff --git a/frontend/react/public/images/units/f-117.png b/frontend/react/public/images/units/f-117.png index 306133d4..37cbc2c7 100644 Binary files a/frontend/react/public/images/units/f-117.png and b/frontend/react/public/images/units/f-117.png differ diff --git a/frontend/react/public/images/units/f-14.png b/frontend/react/public/images/units/f-14.png index d7af7621..78a14e12 100644 Binary files a/frontend/react/public/images/units/f-14.png and b/frontend/react/public/images/units/f-14.png differ diff --git a/frontend/react/public/images/units/f-15.png b/frontend/react/public/images/units/f-15.png index 60e26c1b..4293dc9f 100644 Binary files a/frontend/react/public/images/units/f-15.png and b/frontend/react/public/images/units/f-15.png differ diff --git a/frontend/react/public/images/units/f-16c.png b/frontend/react/public/images/units/f-16c.png index a74de3c0..1a60dc6b 100644 Binary files a/frontend/react/public/images/units/f-16c.png and b/frontend/react/public/images/units/f-16c.png differ diff --git a/frontend/react/public/images/units/f-22.png b/frontend/react/public/images/units/f-22.png index 5f210d30..8f269b17 100644 Binary files a/frontend/react/public/images/units/f-22.png and b/frontend/react/public/images/units/f-22.png differ diff --git a/frontend/react/public/images/units/f-35.png b/frontend/react/public/images/units/f-35.png index 196283fc..0dc21a13 100644 Binary files a/frontend/react/public/images/units/f-35.png and b/frontend/react/public/images/units/f-35.png differ diff --git a/frontend/react/public/images/units/f-4.png b/frontend/react/public/images/units/f-4.png index 21784012..12739dbd 100644 Binary files a/frontend/react/public/images/units/f-4.png and b/frontend/react/public/images/units/f-4.png differ diff --git a/frontend/react/public/images/units/f-5.png b/frontend/react/public/images/units/f-5.png index 087bff8c..96a0fd9a 100644 Binary files a/frontend/react/public/images/units/f-5.png and b/frontend/react/public/images/units/f-5.png differ diff --git a/frontend/react/public/images/units/f-86.png b/frontend/react/public/images/units/f-86.png index ce576340..6ec3c491 100644 Binary files a/frontend/react/public/images/units/f-86.png and b/frontend/react/public/images/units/f-86.png differ diff --git a/frontend/react/public/images/units/fa-18c.png b/frontend/react/public/images/units/fa-18c.png index d6856033..2f11a356 100644 Binary files a/frontend/react/public/images/units/fa-18c.png and b/frontend/react/public/images/units/fa-18c.png differ diff --git a/frontend/react/public/images/units/fw190.png b/frontend/react/public/images/units/fw190.png index 8bc95546..505a15c2 100644 Binary files a/frontend/react/public/images/units/fw190.png and b/frontend/react/public/images/units/fw190.png differ diff --git a/frontend/react/public/images/units/general1.png b/frontend/react/public/images/units/general1.png index bf0bc2bd..2e5e95af 100644 Binary files a/frontend/react/public/images/units/general1.png and b/frontend/react/public/images/units/general1.png differ diff --git a/frontend/react/public/images/units/gripen.png b/frontend/react/public/images/units/gripen.png index 0d5812b2..34eb854e 100644 Binary files a/frontend/react/public/images/units/gripen.png and b/frontend/react/public/images/units/gripen.png differ diff --git a/frontend/react/public/images/units/h-6.png b/frontend/react/public/images/units/h-6.png index 9fb48950..573ffda2 100644 Binary files a/frontend/react/public/images/units/h-6.png and b/frontend/react/public/images/units/h-6.png differ diff --git a/frontend/react/public/images/units/hawk.png b/frontend/react/public/images/units/hawk.png index 5cd07de5..27f2ffe2 100644 Binary files a/frontend/react/public/images/units/hawk.png and b/frontend/react/public/images/units/hawk.png differ diff --git a/frontend/react/public/images/units/helicopter1.png b/frontend/react/public/images/units/helicopter1.png index 454152ff..6e085372 100644 Binary files a/frontend/react/public/images/units/helicopter1.png and b/frontend/react/public/images/units/helicopter1.png differ diff --git a/frontend/react/public/images/units/i-16.png b/frontend/react/public/images/units/i-16.png index eea45594..8e8a92f9 100644 Binary files a/frontend/react/public/images/units/i-16.png and b/frontend/react/public/images/units/i-16.png differ diff --git a/frontend/react/public/images/units/il-76.png b/frontend/react/public/images/units/il-76.png index d0a3cf55..fa697729 100644 Binary files a/frontend/react/public/images/units/il-76.png and b/frontend/react/public/images/units/il-76.png differ diff --git a/frontend/react/public/images/units/j-10.png b/frontend/react/public/images/units/j-10.png index 6fa2dd21..5cf11e78 100644 Binary files a/frontend/react/public/images/units/j-10.png and b/frontend/react/public/images/units/j-10.png differ diff --git a/frontend/react/public/images/units/j-20.png b/frontend/react/public/images/units/j-20.png index 7e5b34f4..4ee50e96 100644 Binary files a/frontend/react/public/images/units/j-20.png and b/frontend/react/public/images/units/j-20.png differ diff --git a/frontend/react/public/images/units/j-7.png b/frontend/react/public/images/units/j-7.png index f1bcfd95..b67a5b2f 100644 Binary files a/frontend/react/public/images/units/j-7.png and b/frontend/react/public/images/units/j-7.png differ diff --git a/frontend/react/public/images/units/jf-17.png b/frontend/react/public/images/units/jf-17.png index 2bfde2f3..da0fe721 100644 Binary files a/frontend/react/public/images/units/jf-17.png and b/frontend/react/public/images/units/jf-17.png differ diff --git a/frontend/react/public/images/units/ju-88.png b/frontend/react/public/images/units/ju-88.png index 59768856..73a540f6 100644 Binary files a/frontend/react/public/images/units/ju-88.png and b/frontend/react/public/images/units/ju-88.png differ diff --git a/frontend/react/public/images/units/ka-27.png b/frontend/react/public/images/units/ka-27.png index be2b243d..7c2ffcff 100644 Binary files a/frontend/react/public/images/units/ka-27.png and b/frontend/react/public/images/units/ka-27.png differ diff --git a/frontend/react/public/images/units/ka-50.png b/frontend/react/public/images/units/ka-50.png index 71a3b4b4..2acf87d8 100644 Binary files a/frontend/react/public/images/units/ka-50.png and b/frontend/react/public/images/units/ka-50.png differ diff --git a/frontend/react/public/images/units/kc-10.png b/frontend/react/public/images/units/kc-10.png index 94868685..205d7e3c 100644 Binary files a/frontend/react/public/images/units/kc-10.png and b/frontend/react/public/images/units/kc-10.png differ diff --git a/frontend/react/public/images/units/kc-135.png b/frontend/react/public/images/units/kc-135.png index 64014a04..a1f23b30 100644 Binary files a/frontend/react/public/images/units/kc-135.png and b/frontend/react/public/images/units/kc-135.png differ diff --git a/frontend/react/public/images/units/l-159.png b/frontend/react/public/images/units/l-159.png index e80c6259..d81d3631 100644 Binary files a/frontend/react/public/images/units/l-159.png and b/frontend/react/public/images/units/l-159.png differ diff --git a/frontend/react/public/images/units/l-39.png b/frontend/react/public/images/units/l-39.png index 0a9558be..868bf651 100644 Binary files a/frontend/react/public/images/units/l-39.png and b/frontend/react/public/images/units/l-39.png differ diff --git a/frontend/react/public/images/units/m2000.png b/frontend/react/public/images/units/m2000.png index 03e618f9..7e3be642 100644 Binary files a/frontend/react/public/images/units/m2000.png and b/frontend/react/public/images/units/m2000.png differ diff --git a/frontend/react/public/images/units/mb-339.png b/frontend/react/public/images/units/mb-339.png index 907ff302..98d3b350 100644 Binary files a/frontend/react/public/images/units/mb-339.png and b/frontend/react/public/images/units/mb-339.png differ diff --git a/frontend/react/public/images/units/mi-24.png b/frontend/react/public/images/units/mi-24.png index 8708f4a7..64c99f81 100644 Binary files a/frontend/react/public/images/units/mi-24.png and b/frontend/react/public/images/units/mi-24.png differ diff --git a/frontend/react/public/images/units/mi-26.png b/frontend/react/public/images/units/mi-26.png index 4ad1cfd8..14c51d70 100644 Binary files a/frontend/react/public/images/units/mi-26.png and b/frontend/react/public/images/units/mi-26.png differ diff --git a/frontend/react/public/images/units/mi-28.png b/frontend/react/public/images/units/mi-28.png index 9e5aefff..6e1acedc 100644 Binary files a/frontend/react/public/images/units/mi-28.png and b/frontend/react/public/images/units/mi-28.png differ diff --git a/frontend/react/public/images/units/mi-8.png b/frontend/react/public/images/units/mi-8.png index 6cb33921..f5c004d6 100644 Binary files a/frontend/react/public/images/units/mi-8.png and b/frontend/react/public/images/units/mi-8.png differ diff --git a/frontend/react/public/images/units/mig-15.png b/frontend/react/public/images/units/mig-15.png index 1f34bc37..8ff2fc25 100644 Binary files a/frontend/react/public/images/units/mig-15.png and b/frontend/react/public/images/units/mig-15.png differ diff --git a/frontend/react/public/images/units/mig-19.png b/frontend/react/public/images/units/mig-19.png index e3ad0cb7..00722e72 100644 Binary files a/frontend/react/public/images/units/mig-19.png and b/frontend/react/public/images/units/mig-19.png differ diff --git a/frontend/react/public/images/units/mig-21.png b/frontend/react/public/images/units/mig-21.png index 09c98941..c5ea25db 100644 Binary files a/frontend/react/public/images/units/mig-21.png and b/frontend/react/public/images/units/mig-21.png differ diff --git a/frontend/react/public/images/units/mig-23.png b/frontend/react/public/images/units/mig-23.png index d1d70ccf..db4816a5 100644 Binary files a/frontend/react/public/images/units/mig-23.png and b/frontend/react/public/images/units/mig-23.png differ diff --git a/frontend/react/public/images/units/mig-25.png b/frontend/react/public/images/units/mig-25.png index 48448104..89e4b4b5 100644 Binary files a/frontend/react/public/images/units/mig-25.png and b/frontend/react/public/images/units/mig-25.png differ diff --git a/frontend/react/public/images/units/mig-29.png b/frontend/react/public/images/units/mig-29.png index 1e16dfa0..8d51acda 100644 Binary files a/frontend/react/public/images/units/mig-29.png and b/frontend/react/public/images/units/mig-29.png differ diff --git a/frontend/react/public/images/units/mosquito.png b/frontend/react/public/images/units/mosquito.png index eba239e5..a7bf07e7 100644 Binary files a/frontend/react/public/images/units/mosquito.png and b/frontend/react/public/images/units/mosquito.png differ diff --git a/frontend/react/public/images/units/oh-58.png b/frontend/react/public/images/units/oh-58.png index e9747103..3429cf59 100644 Binary files a/frontend/react/public/images/units/oh-58.png and b/frontend/react/public/images/units/oh-58.png differ diff --git a/frontend/react/public/images/units/p-47.png b/frontend/react/public/images/units/p-47.png index 72fc236e..23d70951 100644 Binary files a/frontend/react/public/images/units/p-47.png and b/frontend/react/public/images/units/p-47.png differ diff --git a/frontend/react/public/images/units/p-51.png b/frontend/react/public/images/units/p-51.png index cc67b897..a38eea64 100644 Binary files a/frontend/react/public/images/units/p-51.png and b/frontend/react/public/images/units/p-51.png differ diff --git a/frontend/react/public/images/units/rafale.png b/frontend/react/public/images/units/rafale.png index b2370ad4..e577e93d 100644 Binary files a/frontend/react/public/images/units/rafale.png and b/frontend/react/public/images/units/rafale.png differ diff --git a/frontend/react/public/images/units/rq-1.png b/frontend/react/public/images/units/rq-1.png index cf3b0ad4..7490b5ff 100644 Binary files a/frontend/react/public/images/units/rq-1.png and b/frontend/react/public/images/units/rq-1.png differ diff --git a/frontend/react/public/images/units/rq-4.png b/frontend/react/public/images/units/rq-4.png index 090074de..95cbc0ee 100644 Binary files a/frontend/react/public/images/units/rq-4.png and b/frontend/react/public/images/units/rq-4.png differ diff --git a/frontend/react/public/images/units/s-3.png b/frontend/react/public/images/units/s-3.png index ec65bb2e..396fe2d9 100644 Binary files a/frontend/react/public/images/units/s-3.png and b/frontend/react/public/images/units/s-3.png differ diff --git a/frontend/react/public/images/units/sa-342.png b/frontend/react/public/images/units/sa-342.png index fe846183..678776ac 100644 Binary files a/frontend/react/public/images/units/sa-342.png and b/frontend/react/public/images/units/sa-342.png differ diff --git a/frontend/react/public/images/units/sam.png b/frontend/react/public/images/units/sam.png index dc0aa779..7f201afc 100644 Binary files a/frontend/react/public/images/units/sam.png and b/frontend/react/public/images/units/sam.png differ diff --git a/frontend/react/public/images/units/spitfire.png b/frontend/react/public/images/units/spitfire.png index d6b9d2ab..65d3d1ca 100644 Binary files a/frontend/react/public/images/units/spitfire.png and b/frontend/react/public/images/units/spitfire.png differ diff --git a/frontend/react/public/images/units/su-17.png b/frontend/react/public/images/units/su-17.png index 32d8aa37..47dd52e9 100644 Binary files a/frontend/react/public/images/units/su-17.png and b/frontend/react/public/images/units/su-17.png differ diff --git a/frontend/react/public/images/units/su-24.png b/frontend/react/public/images/units/su-24.png index d94b7af7..0928ca61 100644 Binary files a/frontend/react/public/images/units/su-24.png and b/frontend/react/public/images/units/su-24.png differ diff --git a/frontend/react/public/images/units/su-25.png b/frontend/react/public/images/units/su-25.png index fa85f62f..9a9fca64 100644 Binary files a/frontend/react/public/images/units/su-25.png and b/frontend/react/public/images/units/su-25.png differ diff --git a/frontend/react/public/images/units/su-27.png b/frontend/react/public/images/units/su-27.png index cc2ce07a..b2c18cbe 100644 Binary files a/frontend/react/public/images/units/su-27.png and b/frontend/react/public/images/units/su-27.png differ diff --git a/frontend/react/public/images/units/su-34.png b/frontend/react/public/images/units/su-34.png index 110a3c60..de88958e 100644 Binary files a/frontend/react/public/images/units/su-34.png and b/frontend/react/public/images/units/su-34.png differ diff --git a/frontend/react/public/images/units/su-57.png b/frontend/react/public/images/units/su-57.png index c4e83c98..56d835b5 100644 Binary files a/frontend/react/public/images/units/su-57.png and b/frontend/react/public/images/units/su-57.png differ diff --git a/frontend/react/public/images/units/tornado.png b/frontend/react/public/images/units/tornado.png index c66219ea..d3eacb52 100644 Binary files a/frontend/react/public/images/units/tornado.png and b/frontend/react/public/images/units/tornado.png differ diff --git a/frontend/react/public/images/units/tu-160.png b/frontend/react/public/images/units/tu-160.png index 0391ce41..7f2b28f5 100644 Binary files a/frontend/react/public/images/units/tu-160.png and b/frontend/react/public/images/units/tu-160.png differ diff --git a/frontend/react/public/images/units/tu-22.png b/frontend/react/public/images/units/tu-22.png index cb43ca76..c807bd73 100644 Binary files a/frontend/react/public/images/units/tu-22.png and b/frontend/react/public/images/units/tu-22.png differ diff --git a/frontend/react/public/images/units/tu-95.png b/frontend/react/public/images/units/tu-95.png index cfa72a60..73e5cdfa 100644 Binary files a/frontend/react/public/images/units/tu-95.png and b/frontend/react/public/images/units/tu-95.png differ diff --git a/frontend/react/public/images/units/u-28.png b/frontend/react/public/images/units/u-28.png index 6e194456..6577d344 100644 Binary files a/frontend/react/public/images/units/u-28.png and b/frontend/react/public/images/units/u-28.png differ diff --git a/frontend/react/public/images/units/uh-1.png b/frontend/react/public/images/units/uh-1.png index 0d1102a4..1bd45cb4 100644 Binary files a/frontend/react/public/images/units/uh-1.png and b/frontend/react/public/images/units/uh-1.png differ diff --git a/frontend/react/public/images/units/uh-60.png b/frontend/react/public/images/units/uh-60.png index 145fa141..66513c80 100644 Binary files a/frontend/react/public/images/units/uh-60.png and b/frontend/react/public/images/units/uh-60.png differ diff --git a/frontend/react/public/images/units/viggen.png b/frontend/react/public/images/units/viggen.png index 76c5eda0..2e775f55 100644 Binary files a/frontend/react/public/images/units/viggen.png and b/frontend/react/public/images/units/viggen.png differ diff --git a/frontend/react/public/images/units/yak-40.png b/frontend/react/public/images/units/yak-40.png index 42a56792..46fdf8f8 100644 Binary files a/frontend/react/public/images/units/yak-40.png and b/frontend/react/public/images/units/yak-40.png differ diff --git a/frontend/react/public/images/units/yak-52.png b/frontend/react/public/images/units/yak-52.png index 1201b6d0..4b2c4845 100644 Binary files a/frontend/react/public/images/units/yak-52.png and b/frontend/react/public/images/units/yak-52.png differ diff --git a/frontend/react/src/map/map.ts b/frontend/react/src/map/map.ts index 7267796c..a6043272 100644 --- a/frontend/react/src/map/map.ts +++ b/frontend/react/src/map/map.ts @@ -67,6 +67,7 @@ export class Map extends L.Map { #panDown: boolean = false; #lastMousePosition: L.Point = new L.Point(0, 0); + #lastMouseCoordinates: L.LatLng = new L.LatLng(0, 0); #shiftKey: boolean = false; #ctrlKey: boolean = false; @@ -168,7 +169,6 @@ export class Map extends L.Map { this.on('mousedown', (e: any) => this.#onMouseDown(e)); this.on('mouseup', (e: any) => this.#onMouseUp(e)); this.on('mousemove', (e: any) => this.#onMouseMove(e)); - this.on('drag', (e: any) => this.#onMouseMove(e)); this.on('keydown', (e: any) => this.#onKeyDown(e)); this.on('keyup', (e: any) => this.#onKeyUp(e)); this.on('move', (e: any) => { if (this.#slaveDCSCamera) this.#broadcastPosition() }); @@ -326,7 +326,7 @@ export class Map extends L.Map { this.#updateCursor(); - document.dispatchEvent(new CustomEvent("mapStateChanged")); + document.dispatchEvent(new CustomEvent("mapStateChanged", { detail: this.#state })); } getState() { @@ -437,7 +437,7 @@ export class Map extends L.Map { } getMouseCoordinates() { - return this.containerPointToLatLng(this.#lastMousePosition); + return this.#lastMouseCoordinates; } centerOnUnit(ID: number | null) { @@ -778,6 +778,7 @@ export class Map extends L.Map { #onMouseMove(e: any) { this.#lastMousePosition.x = e.originalEvent.x; this.#lastMousePosition.y = e.originalEvent.y; + this.#lastMouseCoordinates = this.mouseEventToLatLng(e.originalEvent); this.#updateCursor(); diff --git a/frontend/react/src/ui/panels/spawnmenu.tsx b/frontend/react/src/ui/panels/spawnmenu.tsx index 0a14d8f1..79a931b0 100644 --- a/frontend/react/src/ui/panels/spawnmenu.tsx +++ b/frontend/react/src/ui/panels/spawnmenu.tsx @@ -51,6 +51,10 @@ export function SpawnMenu(props: { filteredAirDefense = filterUnits(filteredAirDefense, filterString); filteredGroundUnits = filterUnits(filteredGroundUnits, filterString); + /* When the menu is closed, reset the blueprint */ + if (!props.open && blueprint !== null) + setBlueprint(null); + return { return loadout.name === spawnLoadoutName})?.code ?? "" }, - coalition: 'blue' + coalition: spawnCoalition } }); } diff --git a/frontend/react/src/ui/ui.tsx b/frontend/react/src/ui/ui.tsx index 2e3cb5eb..23f34707 100644 --- a/frontend/react/src/ui/ui.tsx +++ b/frontend/react/src/ui/ui.tsx @@ -11,7 +11,7 @@ import { MainMenu } from './panels/mainmenu' import { SideBar } from './panels/sidebar'; import { Options } from './panels/options'; import { MapHiddenTypes, MapOptions } from '../types/types' -import { BLUE_COMMANDER, GAME_MASTER, MAP_HIDDEN_TYPES_DEFAULTS, MAP_OPTIONS_DEFAULTS, RED_COMMANDER } from '../constants/constants' +import { BLUE_COMMANDER, GAME_MASTER, IDLE, MAP_HIDDEN_TYPES_DEFAULTS, MAP_OPTIONS_DEFAULTS, RED_COMMANDER } from '../constants/constants' import { getApp, setupApp } from '../olympusapp' import { LoginModal } from './modals/login' import { sha256 } from 'js-sha256' @@ -50,6 +50,12 @@ export function UI() { setMapOptions({ ...getApp().getMap().getOptions() }); }) + document.addEventListener("mapStateChanged", (ev) => { + if ((ev as CustomEvent).detail == IDLE) { + hideAllMenus(); + } + }) + function hideAllMenus() { setMainMenuVisible(false); setSpawnMenuVisible(false); diff --git a/frontend/server/demo.js b/frontend/server/demo.js index 07fead11..4a51bc1f 100644 --- a/frontend/server/demo.js +++ b/frontend/server/demo.js @@ -353,7 +353,7 @@ module.exports = function (configLocation) { array = this.concat(array, enc.encode(this.padString(TACAN.callsign, 4))); return array; } - + appendRadio(array, radio, datumIndex) { array = this.concat(array, this.uint8ToByteArray(datumIndex)); array = this.concat(array, this.uint32ToByteArray(radio.frequency));