diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index f428a3f8..a2acab89 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/remui/hud.rml b/EXE/remui/hud.rml index 6c13b7ce..fb99d8c4 100644 --- a/EXE/remui/hud.rml +++ b/EXE/remui/hud.rml @@ -55,13 +55,14 @@ .hull .sg.lit { background-color: #e0484e; } /* --- bottom left: target / contacts --------------------------------------------------- */ - .lhead { left: 8dp; bottom: 290dp; width: 310dp; height: 42dp; display: flex; flex-direction: row; align-items: center; padding: 0 8dp 0 22dp; } + .lhead { left: 8dp; bottom: 340dp; width: 310dp; height: 42dp; display: flex; flex-direction: row; align-items: center; padding: 0 8dp 0 22dp; } .lhead .ico { width: 30dp; height: 30dp; } - .lbody { left: 8dp; bottom: 8dp; width: 367dp; height: 284dp; padding: 12dp 16dp; } + /* as high as the weapons panel (symmetric): FL's eight contact rows a little taller */ + .lbody { left: 8dp; bottom: 8dp; width: 367dp; height: 334dp; padding: 12dp 16dp; } .filters { display: flex; flex-direction: row; justify-content: center; margin-bottom: 6dp; padding-bottom: 6dp; border-bottom: 1dp #2b6f9e; } .filters .ico { width: 32dp; height: 32dp; margin: 0 4dp; } - .rows { height: 196dp; margin-right: 22dp; } - .c { display: flex; flex-direction: row; align-items: center; height: 25dp; padding: 0 2dp; border-bottom: 1dp #24405c66; } + .rows { height: 246dp; margin-right: 22dp; } + .c { display: flex; flex-direction: row; align-items: center; height: 30dp; padding: 0 2dp; border-bottom: 1dp #24405c66; } .c:hover { background-color: #3a8fc822; } .c img { width: 20dp; height: 20dp; margin-right: 8dp; } .c .n { flex: 1; white-space: nowrap; overflow: hidden; font-weight: 500; font-size: 16dp; letter-spacing: 1dp; text-transform: uppercase; } @@ -89,10 +90,12 @@ .tbtns .ico { width: 40dp; height: 40dp; } /* --- bottom right: status ------------------------------------------------------------- */ - .rhead { right: 8dp; bottom: 290dp; width: 310dp; height: 42dp; display: flex; flex-direction: row; align-items: center; padding: 0 12dp 0 22dp; } + .rhead { right: 8dp; bottom: 340dp; width: 310dp; height: 42dp; display: flex; flex-direction: row; align-items: center; padding: 0 12dp 0 22dp; } .rhead .ico { width: 26dp; height: 26dp; margin: 0 4dp 0 10dp; } .rhead .cnt { font-weight: 600; font-size: 18dp; } - .rbody { right: 8dp; bottom: 8dp; width: 367dp; height: 284dp; padding: 12dp 16dp; } + /* 10 weapons fit (a ship may carry more: the list scrolls; it drew the 9th and on outside the frame) */ + .rbody { right: 8dp; bottom: 8dp; width: 367dp; height: 334dp; padding: 12dp 16dp; } + .rbody .wl { height: 100%; overflow-y: auto; } .w { display: flex; flex-direction: row; align-items: center; height: 28dp; padding: 0 6dp 0 8dp; border-left: 3dp #00000000; border-bottom: 1dp #24405c66; font-weight: 500; font-size: 16dp; letter-spacing: 1dp; color: #8197ad; text-transform: uppercase; } .w:hover { background-color: #3a8fc822; } .w.on { color: #e8f4ff; border-left-color: #5cc8f0; background-color: #5cc8f014; } @@ -157,7 +160,7 @@
-
{{ grp[2].shown ? 'Hide' : 'Show' }}Contacts & target
+
{{ grp[2].shown ? 'Hide' : 'Show' }}Contacts & target
{{ mode == 1 ? 'TARGET' : 'CONTACTS' }}\\\ @@ -203,7 +206,7 @@
-
{{ grp[3].shown ? 'Hide' : 'Show' }}Weapons & equipment
+
{{ grp[3].shown ? 'Hide' : 'Show' }}Weapons & equipment
WEAPONS\\\ @@ -212,13 +215,13 @@
{{ battery }}
-
+
{{ w.key + 1 }}{{ w.name }}{{ w.ammo }}
{{ cloak_name }}{{ cloak_on ? 'ON' : 'OFF' }}
{{ special }}
-
+