diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index b40a2ea5..27d04b3b 100644 Binary files a/DLLS/BIN/content.dll and b/DLLS/BIN/content.dll differ diff --git a/EXE/DALib.dll b/EXE/DALib.dll index 78d85927..e3a6a84c 100644 Binary files a/EXE/DALib.dll and b/EXE/DALib.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 3fa8ced0..69ff7b01 100644 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/alchemy.dll b/EXE/alchemy.dll index 9750d12b..3aef4b60 100644 Binary files a/EXE/alchemy.dll and b/EXE/alchemy.dll differ diff --git a/EXE/common.dll b/EXE/common.dll index d4aeaef8..3ec81085 100644 Binary files a/EXE/common.dll and b/EXE/common.dll differ diff --git a/EXE/flmaterials.dll b/EXE/flmaterials.dll index ba998a59..8bd8becc 100644 Binary files a/EXE/flmaterials.dll and b/EXE/flmaterials.dll differ diff --git a/EXE/remgfx.ini b/EXE/remgfx.ini index 9e537fc7..f72f781b 100644 --- a/EXE/remgfx.ini +++ b/EXE/remgfx.ini @@ -116,6 +116,12 @@ MotionLog = 0 ; slow frames: a line in remgfx.log for each frame far slower than the running average (new pipelines, ; ray-tracing meshes, textures / buffers created, presenting and Reflex / Anti-Lag wait); 10 per 600 frames at most HitchLog = 1 +; where RemGfx spends its CPU time per frame (draws, constants, motion, pipelines, ray tracing, post, present): 1 on +CpuLog = 0 +; ray tracing: new meshes (their acceleration structures) built per frame at most, and their triangles; +; the rest waits for the next frames (a group of ships coming into view built everything in one frame) +RtBuildPerFrame = 16 +RtBuildTriangles = 400000 ; R16 distortion: heat haze behind engines and around explosions, refraction at shield hits and ; cloaks, a swirl in the jump tunnel; Distortion switches all of it, the others scale each kind ; (0 = off). Needs Taa = 1 (it shares the scene's extra targets with the motion vectors). diff --git a/EXE/remgfx_pipelines_shipped.keys b/EXE/remgfx_pipelines_shipped.keys new file mode 100644 index 00000000..a94d754c Binary files /dev/null and b/EXE/remgfx_pipelines_shipped.keys differ diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index f20df8c0..59c0eb60 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index 3a3ff9ed..a9494ddc 100644 Binary files a/EXE/remoteserver.dll and b/EXE/remoteserver.dll differ diff --git a/EXE/remui/base.rml b/EXE/remui/base.rml index 8a12c2b0..d83935de 100644 --- a/EXE/remui/base.rml +++ b/EXE/remui/base.rml @@ -40,6 +40,9 @@ .ware .n { margin-left: auto; font-family: "IBM Plex Mono"; } .sys-info { margin-bottom: 8dp; } + /* COURIERS */ + .row.mission { flex-wrap: wrap; } + .row.mission .sub { width: 100%; font-size: 12dp; color: #8197ad; margin-top: 2dp; } /* DRONES */ .dlist { flex: 1; overflow-y: auto; } .drone @@ -120,6 +123,7 @@
System
Drones{{ drones.size }}
+
Couriers
@@ -463,6 +467,59 @@
+ +
+
+

Your transports

couriers fly them for real
+
+
CargoRouteStatus
+
+
No transports yet. Send couriers with cargo from a depot to another of your depots.
+
+ {{ r.a }}{{ r.b }}{{ r.c }} +
{{ r.e }}
+
+
+
+
NPCs leave couriers alone - players and bots can shoot them down, and their cargo is lost.
+
+
+

Send couriers

from your depot here
+
+
No depot on this base
+
Couriers take cargo from your depot on this base to one of your other depots.
+
+
+
Cargo in the depotAmount
+
+
The depot is empty.
+
+ {{ r.a }}{{ r.c }} +
+
+
+
+
To your depot on
+
+
You have no other depot.
+
+ {{ r.a }} +
+
+
+
+ Amount + + {{ amount_text }} +
Max
+
+
{{ courier_msg }}
+
+
Send couriers
The cargo leaves your depot now; couriers fly it to the depot you picked (several when it does not fit one hold).
+
+
+
+
diff --git a/EXE/remui/outfitter.rml b/EXE/remui/outfitter.rml index 1d816c9c..b1a5d09c 100644 --- a/EXE/remui/outfitter.rml +++ b/EXE/remui/outfitter.rml @@ -100,6 +100,7 @@
{{ reason }} {{ total }} +
{{ mount_label }}
{{ mount_tip }}
{{ side == 0 ? 'Buy' : 'Sell' }}
{{ side == 0 ? 'Buys it: onto a free hardpoint of your ship when there is one, else into the hold.' : 'Sells it; used equipment fetches less.' }}
diff --git a/EXE/remui/player.rml b/EXE/remui/player.rml index 2611fc25..ac551777 100644 --- a/EXE/remui/player.rml +++ b/EXE/remui/player.rml @@ -5,7 +5,7 @@ @@ -32,6 +37,7 @@ XP {{ xp }} Bank {{ balance }} + REM Coin {{ coins }} ×
@@ -39,6 +45,7 @@
Statistics
Skills
Account bank
+
REM Coin
@@ -83,6 +90,32 @@
Send amount
Sends the amount from your account to the picked pilot's account.
+ +
+
+

REM Coin

+
{{ coins }}
+
{{ coin_note }}
+
{{ coin_drones }}
+
This character{{ coin_xp }}
+
Amount
+
+
XP to REM Coin
{{ coin_xp_rule }}
+
All XP
Turns all XP of this character into REM Coin.
+
REM Coin to credits
{{ coin_cr_rule }}
+
+
REM Coin belongs to your Discord account - all your characters share it. You earn it with XP and with your drones, and spend it in the shop.
+
+
+

Bookings

+
+
+
No bookings yet.
+
{{ l.time }}{{ l.delta }}{{ l.kind }}{{ l.note }}
+
+
+
+
diff --git a/EXE/remui/radar.rml b/EXE/remui/radar.rml new file mode 100644 index 00000000..2b18f684 --- /dev/null +++ b/EXE/remui/radar.rml @@ -0,0 +1,41 @@ + + + Radar + + + + +
+
+ RADAR{{ count }} + + 2.5K + 5K + 7.5K + 15K +
+
+ +
{{ l.text }}
+
+
+ + diff --git a/EXE/remui/shop.rml b/EXE/remui/shop.rml new file mode 100644 index 00000000..2b36408c --- /dev/null +++ b/EXE/remui/shop.rml @@ -0,0 +1,203 @@ + + + Shop + + + + +
+ + SHOP + + REM Coin {{ coins }} + Bank {{ credits }} + × +
+
+
+
+ {{ p.name }}{{ p.count }} +
+
+
+ +
+
+
+

{{ page_title }}

+ +
+
+
{{ empty }}
+
+ {{ c.qty }} + {{ c.badge }} + +
+
{{ c.title }}
+ {{ c.incart }} +
+ {{ c.coins }} + {{ c.credits }} +
+
{{ c.note }}
+
+
+
+
+

Sell event items for REM Coin

+
The items are taken out of the depot picked on the right. Each item has a daily limit.
+
The shop buys nothing at the moment.
+
+
+ + {{ s.title }} + {{ s.today }} + {{ s.coins }} +
+
+
+
+
+
+
+
{{ pick_title }}
{{ pick_kind }}
+
+
{{ pick_text }}
+
Price{{ pick_coins }}{{ pick_credits }}
+
{{ pick_limit }}
+
+ Amount +
-{{ pick_count }}++10
+
+
Add to cart
Into the cart - you buy everything in it at once.
+
+
+
+
+
{{ sell_title }}
{{ sell_rule }}
+
+
Pick an item on the left.
+
Units
+
You get{{ sell_total }}
+
Sell
Takes the units out of the picked depot and pays REM Coin.
+
+
+
+

Pick a depot ({{ depot_count }})

+ +
+
No depot matches.
+
{{ d.name }}docked here
+
+
+

Cart

+
+
Your cart is empty. Pick something and add it.
+
+ + {{ l.title }} +
-{{ l.count }}+
+ {{ l.price }} + × +
+
+
+
REM Coin{{ sum_coins }}
+
Bank credits{{ sum_credits }}
+
REM Coin afterwards{{ after_coins }}
+
Bank afterwards{{ after_credits }}
+
+
+
{{ selling ? 'Sell out of depot' : 'Deliver to depot' }}
+
You have no depot. Buy one at a base first (Base manager).
+
{{ depot_name }}Change
+
+
Back to the cart
+
+
Buy
{{ buy_tip }}
+
Empty cart
+
+
+
+
+
+
+
+ Escclose + {{ status }} +
+ + diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index 38ee0de4..79e42398 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index 1b18bdda..d888146b 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index 3093a0be..001d0efe 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index 7dffe259..2042ddcc 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 2fb13a51..6661f24f 100644 Binary files a/EXE/shading.dll and b/EXE/shading.dll differ