diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index 96fc6adc..4afa48e6 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,6 +1,6 @@ REM-Client test build (64-bit) -date: 2026-11-13 09:46 -commit: 00eb6bbb (main) -subject: Net frame set anew when a system is loaded (launched again in the same system, the own state went up off by the last origin shift) +date: 2026-11-13 12:27 +commit: 6145e5dc (main) +subject: Lamp Shop: the lamp places as dots on the 3D ship (the dealers' model view draws no lamps) tree: clean build: OK diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index 830296b6..d3268fb4 100644 Binary files a/DLLS/BIN/content.dll and b/DLLS/BIN/content.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 8889e57f..83b39383 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/common.dll b/EXE/common.dll index df714340..6f00039c 100644 Binary files a/EXE/common.dll and b/EXE/common.dll differ diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index 8978d2e5..94c34575 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/remoteserver.dll b/EXE/remoteserver.dll index 5a396de0..661d7f1d 100644 Binary files a/EXE/remoteserver.dll and b/EXE/remoteserver.dll differ diff --git a/EXE/remui/outfitter.rml b/EXE/remui/outfitter.rml index d2779ae8..35cdd62f 100644 --- a/EXE/remui/outfitter.rml +++ b/EXE/remui/outfitter.rml @@ -72,6 +72,11 @@ .good.held { border-left-color: #f2b13c66; } .good.held.selected { border-left-color: #f2b13c; } .good.held .note { color: #5fd08a; } + /* REM: the lamp shop (category 4) -- a lamp's colour as a glowing dot */ + .dot { width: 18dp; height: 18dp; margin: 0 16dp 0 6dp; border-radius: 9dp; border: 1dp #ffffff40; } + .dot.off { background-color: #1a2533; border-color: #3d5266; } + .good.now { border-left-color: #5cc8f066; } + .good .now-tag { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 10dp; letter-spacing: 1dp; color: #5cc8f0; margin-right: 8dp; } @@ -90,11 +95,31 @@
Ammo
Equipment
Cargo bay
+
Lamp Shop
The lamps of your ship: headlight, running lights and docking lights, one by one or as a set.
HOLD
{{ hold }}
CREDITS{{ credits }}
-
+
+

Lamp Shop

{{ lamp_items.size - 1 }} lamps, {{ lamp_sets.size }} sets
+ +
+
{{ lamp_wait }}
+
SETS · THE WHOLE SHIP{{ lamp_sets.size }}
+
+
+
{{ r.name }}
{{ r.note }}
+ {{ r.price }} +
+
LAMPS · ONE PLACE{{ lamp_items.size - 1 }}
+
+
+
{{ r.name }}
{{ r.note }}
+ {{ r.price }} +
+
+
+

For sale here

{{ market.size }}
⚙ Autobuy
What the server buys by itself when you dock: ammunition for your launchers, nanobots and shield batteries.
@@ -117,7 +142,17 @@
compared with {{ cmp_other }}
-
+
+

Your lamps

{{ lamp_places.size }} places
+
+
Your ship has no lamp places.
+
+
+
{{ r.name }}
{{ r.note }}
+
+
+
+

Your equipment

{{ hide_mounted ? 'ON' : 'OFF' }}
loot only
Leaves out what is mounted and the ammunition, nanobots and shield batteries your ship uses: what is left is loot to sell.
 @@ -166,7 +201,17 @@
Close
-
+
+
+
+
{{ lamp_deal_label }}
+
{{ lamp_deal }}
+
+ {{ lamp_reason }} + {{ lamp_total }} +
{{ lamp_button }}
Fits it now. The old lamp is replaced; lamps are not sold back.
+
+
{{ side == 0 ? 'Buy' : 'Sell' }}
diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index dc9b8f10..c4c264cd 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index a60e707c..25c73ea7 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ