diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 7c761379..363d0572 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/remui/dialog.rml b/EXE/remui/dialog.rml index ea147c00..d8b6e9dd 100644 --- a/EXE/remui/dialog.rml +++ b/EXE/remui/dialog.rml @@ -14,9 +14,11 @@ display: block; decorator: ninepatch(fw, fw-i); } - .box-head { display: flex; flex-direction: row; align-items: center; padding: 12dp 18dp; border-bottom: 1dp #24405c; } - .box-head .title { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 19dp; letter-spacing: 1.2dp; text-transform: uppercase; flex: 1; } - .box-body { padding: 16dp 18dp; } + /* the windows' head (rem.rcss .win-head): clear of the cut corner, the title with its three slashes */ + .box-head { display: flex; flex-direction: row; align-items: center; padding: 12dp 18dp 12dp 28dp; border-bottom: 1dp #2b6f9e; } + .box-head .title { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 20dp; letter-spacing: 2dp; text-transform: uppercase; color: #e8f4ff; } + .box-head .sl { flex: 1; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 20dp; letter-spacing: -1dp; color: #5cc8f0; margin-left: 10dp; } + .box-body { padding: 16dp 18dp 16dp 28dp; } .box-body .text { white-space: pre-line; line-height: 1.5; font-size: 15dp; max-height: 320dp; overflow-y: auto; } .box-body input.text { margin-top: 12dp; } .box-foot { display: flex; flex-direction: row; justify-content: flex-end; padding: 0 18dp 14dp 18dp; } diff --git a/EXE/remui/hud.rml b/EXE/remui/hud.rml index fb99d8c4..759b7494 100644 --- a/EXE/remui/hud.rml +++ b/EXE/remui/hud.rml @@ -32,16 +32,36 @@ .cruise { left: 50%; margin-left: -300dp; top: 90dp; width: 64dp; height: 56dp; display: flex; justify-content: center; align-items: center; } .cruise .ico { width: 40dp; height: 40dp; } - /* --- bottom centre: thrust | shield / hull / power | speed, one panel ----------------- */ - .core { left: 50%; margin-left: -240dp; bottom: 8dp; width: 480dp; height: 66dp; padding: 0 16dp; display: flex; flex-direction: row; align-items: center; } - .core .val { width: 76dp; text-align: center; font-weight: 600; font-size: 22dp; color: #e8f4ff; } - .core .val .u { font-weight: 400; font-size: 11dp; color: #8fb3d0; margin-left: 4dp; } - .core .cap { display: block; font-weight: 600; font-size: 9dp; letter-spacing: 1.5dp; color: #8fb3d0; } - .core .thrust.low { color: #ef6a5b; } - .core .sep { width: 1dp; height: 42dp; background-color: #2b6f9e; margin: 0 10dp; } - .bars { flex: 1; display: flex; flex-direction: column; justify-content: center; } - .brow { display: flex; flex-direction: row; align-items: center; height: 15dp; } - .brow .l { width: 52dp; font-weight: 600; font-size: 10dp; letter-spacing: 1.5dp; color: #b9d4ea; } + /* --- bottom centre: the ship in its shield ring (the hull the red ring inside); power and thrust as a + wing on the left, the speed as one on the right -- arcs of a large circle under the panel rising to the + ring; the rings and wings are lit segments, each turned about its circle's centre (seg16 / seg32) */ + .fp.core { left: 50%; margin-left: -310dp; bottom: 8dp; width: 620dp; height: 170dp; decorator: none; font-effect: shadow(1dp 1dp #000000cc); } + .core .disc { position: absolute; left: 242dp; top: 24dp; width: 134dp; height: 134dp; border: 1dp #2b6f9e; border-radius: 68dp; } + .core .ship { display: block; position: absolute; left: 280dp; top: 58dp; width: 60dp; height: 56dp; } + .core .pc { position: absolute; left: 242dp; top: 114dp; width: 136dp; text-align: center; font-weight: 600; font-size: 11dp; letter-spacing: 1dp; } + .core .pc .s { color: #4fc6ee; margin-right: 8dp; } + .core .pc .h { color: #e0484e; } + .sg2 { position: absolute; } + .ring.sg2 { left: 304.75dp; top: 88.5dp; width: 10.5dp; height: 7dp; background-color: #4fc6ee26; } + .ring.sg2.lit { background-color: #4fc6ee; } + .hring.sg2 { left: 306dp; top: 90.5dp; width: 8dp; height: 3dp; background-color: #e0484e33; } + .hring.sg2.lit { background-color: #e0484e; } + .parc.sg2 { left: 305dp; top: 416dp; width: 10dp; height: 8dp; background-color: #f0943c26; } + .parc.sg2.lit { background-color: #f0943c; } + .tarc.sg2 { left: 305dp; top: 418dp; width: 10dp; height: 4dp; background-color: #dbe6f026; } + .tarc.sg2.lit { background-color: #dbe6f0; } + .tarc.low.sg2.lit { background-color: #ef6a5b; } + .sarc.sg2 { left: 305dp; top: 414dp; width: 10dp; height: 12dp; background-color: #5cc8f026; } + .sarc.sg2.lit { background-color: #5cc8f0; } + .core .side { position: absolute; top: 106dp; width: 180dp; } + .core .side.l { left: 50dp; text-align: right; } + .core .side.r { left: 390dp; text-align: left; } + .core .cap { font-weight: 600; font-size: 10dp; letter-spacing: 1.5dp; color: #8fb3d0; margin: 0 6dp; } + .core .big { font-weight: 600; font-size: 26dp; color: #e8f4ff; } + .core .big.low { color: #ef6a5b; } + .core .big .u { font-weight: 400; font-size: 12dp; color: #8fb3d0; margin-left: 4dp; } + .core .pw { display: block; font-weight: 600; font-size: 13dp; color: #f0943c; } + .core .pw .cap { color: #f0943c; } .bar { position: relative; flex: 1; height: 8dp; } .chips { position: absolute; left: 0; top: 0; right: 0; height: 8dp; display: flex; flex-direction: row; } .sg { flex: 1; height: 8dp; margin-right: 2dp; } @@ -141,18 +161,24 @@
-
{{ grp[1].shown ? 'Hide' : 'Show' }}Ship status
+
{{ grp[1].shown ? 'Hide' : 'Show' }}Ship status
-
THRUST{{ thrust }}
-
-
-
POWER
-
SHIELD
-
HULL
+
+ +
+
+
+
+
+
{{ shield_t }}%{{ hull_t }}%
+
+ THRUST{{ thrust }} + POWER{{ power_t }}% +
+
+ {{ speed }}m/sSPEED
-
-
SPEED{{ speed }}m/s
diff --git a/EXE/remui/inventory.rml b/EXE/remui/inventory.rml index 5a6f20c7..bfcb1172 100644 --- a/EXE/remui/inventory.rml +++ b/EXE/remui/inventory.rml @@ -15,8 +15,8 @@ .inv .n { font-size: 14dp; } .inv .note { font-size: 12dp; color: #8197ad; } .inv .c { font-family: "IBM Plex Mono"; color: #8197ad; margin-left: 8dp; } - #ship { flex: 1; min-height: 200dp; decorator: vertical-gradient(#0a1424 #05080d); margin-bottom: 12dp; } - .card { height: 180dp; overflow-y: auto; white-space: pre-line; line-height: 1.45; padding: 12dp; background-color: #5cc8f008; } + #ship { flex: 1; min-height: 140dp; decorator: vertical-gradient(#0a1424 #05080d); margin-bottom: 12dp; } + .card { height: 110dp; overflow-y: auto; white-space: pre-line; line-height: 1.45; padding: 12dp; background-color: #5cc8f008; } .pick-head { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; } .pick-head img { width: 40dp; height: 40dp; margin-right: 12dp; } .pick-head .t { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 18dp; } @@ -35,10 +35,18 @@ .inv.held.selected { border-left-color: #f2b13c; } .holdrow { display: flex; flex-direction: row; margin-bottom: 8dp; } .holdrow .dstat { margin-left: 0; } + .holdrow .dstat + .dstat { margin-left: 18dp; } + .holdrow .hbar { width: 140dp; } + .holdrow .sv { font-size: 17dp; } .jet .btn { margin: 0; } + /* the picked piece's figures (rem_ui_stats), two to a row */ + .figs { display: flex; flex-direction: row; flex-wrap: wrap; margin-bottom: 8dp; padding: 6dp 10dp; background-color: #5cc8f008; } + .figs .fg { width: 50%; display: flex; flex-direction: row; padding: 2dp 8dp 2dp 0; box-sizing: border-box; } + .figs .fl { flex: 1; white-space: nowrap; overflow: hidden; color: #8fb3d0; font-size: 13dp; } + .figs .fv { font-family: "IBM Plex Mono"; font-size: 13dp; color: #e8f4ff; } - +
INVENTORY\\\ @@ -56,7 +64,7 @@
-
HOLD
{{ hold }}
+
CREDITS{{ credits }}
HOLD
{{ hold }}
HARDPOINTS{{ hp_used }} / {{ hps.size }}
@@ -84,6 +92,7 @@
{{ pick.name }}
{{ pick.note }}
+
{{ f.label }}{{ f.value }}
{{ info }}
{{ mount_label }}
{{ mount_tip }}
diff --git a/EXE/remui/loading.rml b/EXE/remui/loading.rml index 63c00ca7..9282f0f7 100644 --- a/EXE/remui/loading.rml +++ b/EXE/remui/loading.rml @@ -4,16 +4,20 @@
-
LOADING
-
+
LOADING\\\
+
diff --git a/EXE/remui/mainmenu.rml b/EXE/remui/mainmenu.rml index 14a76b3c..08e462e5 100644 --- a/EXE/remui/mainmenu.rml +++ b/EXE/remui/mainmenu.rml @@ -3,38 +3,37 @@ Main menu
-
REMNANT
+
REMNANT\\\
Freelancer