diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index e190b507..f4181a7a 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/remui/base.rml b/EXE/remui/base.rml index a5517003..694c4fbb 100644 --- a/EXE/remui/base.rml +++ b/EXE/remui/base.rml @@ -2,6 +2,7 @@ Base manager + - -
+ +
BASE MANAGER\\\ {{ base_name }} @@ -114,10 +115,10 @@ ×
-
+
Depot{{ depot.size }}
All depots
-
Galactic Market
Buy and sell orders, the order book, prices and their history (opens the market window).
+
Galactic Market
Buy and sell orders, the order book, prices and their history.
Crafting{{ craft_jobs.size }}
Research{{ research_jobs.size }}
@@ -126,7 +127,7 @@
Drones{{ drones.size }}
Couriers
-
+
{{ blocked_title }}
{{ blocked_text }}
@@ -188,35 +189,6 @@
- -
-
-
No galactic market here
-
The galactic market is open on trade hubs only.
-
-
-

Galactic market

{{ listings.size }} offers
- -
-
ItemAmountPrice / unitSellerTrade hub
-
-
{{ market_state < 0 ? 'Waiting for the server...' : 'No offers.' }}
-
- {{ r.a }}{{ r.b }}{{ r.c }}{{ r.d }}{{ r.e }} -
-
-
-
{{ listing_pick == '' ? 'Pick an offer in the table.' : listing_pick }}
-
- Amount - - {{ amount_text }} -
Max
-
-
Buy
Buys the amount; it goes into the depot on the seller's trade hub.
-
-
-
@@ -486,6 +458,23 @@
Deliver
Hands the amount of the picked ware from your hold to the module.
+ +
+
+
RecipeCycleNeeds
+
+
No recipe for this module in the catalog.
+
{{ r.a }}{{ r.b }}{{ r.c }}
+
+
+
Per cycle
+
{{ w.a }}{{ w.b }}
+
{{ mod_prod_line }}
+
+
{{ mod_recipe_text }}
The module makes the picked recipe from the next cycle on.
+
Stop
The module stops; nothing is lost.
+
+
{{ mod_remove_text }}
Takes the module out of the slot. Modules are no wares yet: what went into it is lost.
@@ -702,8 +691,11 @@
+ + -
+
Escclose {{ status }}
diff --git a/EXE/remui/market.rcss b/EXE/remui/market.rcss new file mode 100644 index 00000000..61e89170 --- /dev/null +++ b/EXE/remui/market.rcss @@ -0,0 +1,65 @@ +/* the market's view (market.rml): its own window and the base manager's Galactic Market page + (base.rml #mkt-pane, the same RML) - every rule under .mkt, beside the base manager's own */ +.mkt .split { flex: 1; display: flex; flex-direction: row; min-height: 0; } +.mkt .goods { flex: 0 0 31%; display: flex; flex-direction: column; min-height: 0; margin-right: 18dp; } +.mkt .detail { flex: 1; display: flex; flex-direction: column; min-width: 0; min-height: 0; overflow-y: auto; } +.mkt .list { flex: 1 1 0; min-height: 0; overflow-y: auto; } +.mkt .g { display: flex; flex-direction: row; align-items: center; padding: 5dp 10dp; border-bottom: 1dp #ffffff08; border-left: 2dp #00000000; font-size: 14dp; } +.mkt .g:hover { background-color: #122033; } +.mkt .g.selected { background-color: #f2b13c24; border-left-color: #f2b13c; } +.mkt .g .n { flex: 1; } +.mkt .g.quiet .n { color: #8197ad; } +.mkt .g .v { font-family: "IBM Plex Mono"; width: 62dp; text-align: right; font-size: 13dp; } +.mkt .g .v.s { color: #f2b13c; } +.mkt .g .v.b { color: #5fd08a; } +.mkt .g .v.npc { color: #5cc8f0; } +.mkt .ghead { display: flex; flex-direction: row; padding: 0 10dp 4dp 12dp; font-size: 12dp; color: #8197ad; } +.mkt .ghead .n { flex: 1; } +.mkt .ghead .v { width: 62dp; text-align: right; } +.mkt .tools { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; } +.mkt .tools input { flex: 1; margin-right: 8dp; } +.mkt .toggle { font-size: 13dp; color: #8197ad; padding: 4dp 8dp; border-bottom: 2dp #00000000; } +.mkt .toggle.on { color: #f2b13c; border-bottom-color: #f2b13c; } +.mkt .toggle:hover { color: #5cc8f0; } +.mkt .ihead { display: flex; flex-direction: row; align-items: flex-end; margin-bottom: 8dp; } +.mkt .ihead .t { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 22dp; color: #dbe6f0; flex: 1; } +.mkt .ihead .npc { font-size: 13dp; color: #5cc8f0; } +.mkt .chartbar { display: flex; flex-direction: row; align-items: center; margin-bottom: 6dp; } +.mkt .chartbar .toggle { margin-right: 6dp; } +.mkt .legend { margin-left: auto; font-size: 12dp; color: #8197ad; } +.mkt .legend .k { display: inline-block; width: 10dp; height: 10dp; margin: 0 4dp 0 12dp; border-radius: 2dp; } +.mkt .chart { position: relative; height: 190dp; margin-left: 76dp; background-color: #5cc8f008; } +.mkt .chart .grid { position: absolute; left: 0; right: 0; height: 1dp; background-color: #24405c66; } +.mkt .chart .col { position: absolute; top: 0; bottom: 0; } +.mkt .chart .col:hover { background-color: #5cc8f014; } +.mkt .chart .mean { position: absolute; bottom: 0; left: 0; right: 0; background-color: #f2b13c55; border-top: 2dp #f2b13c; border-radius: 2dp 2dp 0 0; } +.mkt .chart .band { position: absolute; left: 35%; width: 30%; min-height: 2dp; background-color: #dbe6f0cc; border-radius: 1dp; } +.mkt .chart .npc { position: absolute; left: 20%; width: 60%; height: 3dp; margin-bottom: -1dp; background-color: #5cc8f0; border-radius: 2dp; } +.mkt .chart .empty { position: absolute; left: 0; right: 0; top: 80dp; text-align: center; color: #8197ad; } +.mkt .axis { position: relative; height: 0; } +.mkt .axis .y { position: absolute; left: 0; width: 70dp; text-align: right; font-family: "IBM Plex Mono"; font-size: 11dp; color: #8197ad; } +.mkt .vol { position: relative; height: 34dp; margin-left: 76dp; margin-top: 3dp; } +.mkt .vol .vb { position: absolute; bottom: 0; background-color: #3d6d96; border-radius: 2dp 2dp 0 0; } +.mkt .dates { display: flex; flex-direction: row; margin-left: 76dp; font-family: "IBM Plex Mono"; font-size: 11dp; color: #8197ad; margin-bottom: 12dp; } +.mkt .dates .r { margin-left: auto; } +.mkt .books { display: flex; flex-direction: row; min-height: 150dp; } +.mkt .book { flex: 1; display: flex; flex-direction: column; min-width: 0; } +.mkt .book.gap { margin-right: 14dp; } +.mkt .book .table { flex: 1; height: 160dp; } +.mkt .table .c2 { width: 60dp; text-align: right; font-family: "IBM Plex Mono"; } +.mkt .table .mine .c1 { color: #5cc8f0; } +.mkt .panel { margin-top: 12dp; padding: 10dp 12dp; background-color: #5cc8f010; } +.mkt .panel .row2 { display: flex; flex-direction: row; align-items: center; } +.mkt .panel .label { width: 120dp; } +.mkt .panel input.text { width: 120dp; margin-right: 10dp; } +.mkt .panel .sum { font-family: "IBM Plex Mono"; color: #f2b13c; margin: 0 14dp; } +.mkt .panel .info { font-size: 13dp; color: #8197ad; margin-top: 6dp; } +.mkt .panel .pick { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 16dp; color: #dbe6f0; margin-bottom: 6dp; } +.mkt .status { margin-top: 10dp; padding: 6dp 10dp; border-left: 3dp #5fd08a; background-color: #0d1622; } +.mkt .status.bad { border-left-color: #ef6a5b; } +.mkt .mine-split { flex: 1; display: flex; flex-direction: column; min-height: 0; } +.mkt .mine-split .table { flex: 1; } +.mkt .mt .c1 { flex: 1; } +.mkt .mt .cs { width: 70dp; } +.mkt .mt .cb { width: 24%; } +.mkt .mt .cn { width: 110dp; text-align: right; font-family: "IBM Plex Mono"; margin-right: 14dp; } diff --git a/EXE/remui/market.rml b/EXE/remui/market.rml index afd5004c..758302d1 100644 --- a/EXE/remui/market.rml +++ b/EXE/remui/market.rml @@ -2,73 +2,9 @@ Market - + - +
MARKET\\\ @@ -79,10 +15,11 @@
+
Market
My orders
-
Refresh
+ updates by itself
@@ -92,25 +29,24 @@ with orders
Only goods somebody offers or wants. Off: every commodity, to place a buy order for it.
-
GoodsellbuyNPC
+
Goodsellbuy
{{ received ? 'No good matches.' : 'Asking the server...' }}
- {{ r.name }}{{ r.sell }}{{ r.buy }}{{ r.npc }} + {{ r.name }}{{ r.sell }}{{ r.buy }}
{{ has_item ? item_name : 'Pick a good' }} - {{ item_npc }}
30 days 90 days all regions {{ here_region != '' ? here_region : 'this region' }} - market meanlow - highNPC pricevolume + market meanlow - highvolume
{{ chart_hi }} @@ -121,7 +57,6 @@
-
{{ b.tip }}
{{ chart_note }}
@@ -223,6 +158,7 @@
+