REM-Freelancer/REM-Mod
5
0
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

REM-Client 6145e5dc: Lamp Shop tab in the equipment dealer (rem-server lamp shop), the lamp places as dots on the 3D ship

Browse Source
This commit is contained in:
NekuraMew
2026-11-13 12:27:47 +01:00
parent 24f3602ed7
commit 0288ef0777
9 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD_INFO.txt
+3 -3
View File
@@ -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
DLLS/BIN/content.dll
BIN
View File
Binary file not shown.
EXE/Freelancer.exe
BIN
View File
Binary file not shown.
EXE/common.dll
BIN
View File
Binary file not shown.
EXE/remoteclient.dll
BIN
View File
Binary file not shown.
EXE/remoteserver.dll
BIN
View File
Binary file not shown.
EXE/remui/outfitter.rml
+48 -3
View File
@@ -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; }
</style>
</head>
<body class="window" data-model="outfitter">
@@ -90,11 +95,31 @@
<div class="tab" data-class-active="category == 1" data-action="category" data-arg="1">Ammo</div>
<div class="tab" data-class-active="category == 2" data-action="category" data-arg="2">Equipment</div>
<div class="tab" data-class-active="category == 3" data-action="category" data-arg="3">Cargo bay</div>
<div class="tab" data-if="lamps_on" data-class-active="category == 4" data-action="category" data-arg="4">Lamp Shop<div class="tip">The lamps of your ship: headlight, running lights and docking lights, one by one or as a set.</div></div>
<div class="dstat" style="margin-left: auto;"><span class="sk">HOLD</span><div class="hbar"><div class="hf" data-class-warn="hold_pct &gt;= 75" data-class-bad="hold_pct &gt;= 100" data-style-width="hold_pct + '%'"></div><span class="ht">{{ hold }}</span></div></div>
<div class="dstat"><span class="sk">CREDITS</span><span class="sv">{{ credits }}</span></div>
</div>
<div class="split">
<div class="colm">
<div class="colm" data-if="category == 4">
<div class="col-h"><h3>Lamp Shop</h3><span class="hint" style="margin-left: 10dp;">{{ lamp_items.size - 1 }} lamps, {{ lamp_sets.size }} sets</span></div>
<input class="text search" type="text" data-value="filter" maxlength="40"/>
<div class="list">
<div class="hint" style="padding: 10dp;" data-if="lamp_wait != ''">{{ lamp_wait }}</div>
<div class="sec" data-if="lamp_sets.size &gt; 0"><span>SETS &#183; THE WHOLE SHIP</span><span class="cnt">{{ lamp_sets.size }}</span></div>
<div class="good" data-for="r : lamp_sets" data-class-selected="r.selected" data-action="lamp-set" data-dbl="lamp-buy" data-attr-data-arg="r.key">
<div class="dot" data-class-off="r.color == ''" data-style-background-color="r.color"></div>
<div class="txt"><div class="n">{{ r.name }}</div><div class="note">{{ r.note }}</div></div>
<span class="p">{{ r.price }}</span>
</div>
<div class="sec" data-if="lamp_items.size &gt; 0"><span>LAMPS &#183; ONE PLACE</span><span class="cnt">{{ lamp_items.size - 1 }}</span></div>
<div class="good" data-for="r : lamp_items" data-class-selected="r.selected" data-action="lamp-pick" data-dbl="lamp-buy" data-attr-data-arg="r.key">
<div class="dot" data-class-off="r.color == ''" data-style-background-color="r.color"></div>
<div class="txt"><div class="n">{{ r.name }}</div><div class="note">{{ r.note }}</div></div>
<span class="p">{{ r.price }}</span>
</div>
</div>
</div>
<div class="colm" data-if="category != 4">
<div class="col-h"><h3>For sale here</h3><span class="hint" style="margin-left: 10dp;">{{ market.size }}</span>
<span class="tools"><div class="btn" data-class-active="panel == 1" data-action="autobuy-panel"><span class="gear">&#9881;</span> Autobuy<div class="tip">What the server buys by itself when you dock: ammunition for your launchers, nanobots and shield batteries.</div></div></span>
</div>
@@ -117,7 +142,17 @@
<div class="cn" data-if="cmp_other != ''">compared with {{ cmp_other }}</div>
</div>
</div>
<div class="colm">
<div class="colm" data-if="category == 4">
<div class="col-h"><h3>Your lamps</h3><span class="hint" style="margin-left: 10dp;">{{ lamp_places.size }} places</span></div>
<div class="list">
<div class="hint" style="padding: 10dp;" data-if="lamp_places.size == 0 &amp;&amp; lamp_wait == ''">Your ship has no lamp places.</div>
<div class="good" data-for="r : lamp_places" data-class-selected="r.selected" data-action="lamp-place" data-attr-data-arg="r.key">
<div class="dot" data-class-off="r.color == ''" data-style-background-color="r.color"></div>
<div class="txt"><div class="n">{{ r.name }}</div><div class="slot">{{ r.note }}</div></div>
</div>
</div>
</div>
<div class="colm" data-if="category != 4">
<div class="col-h"><h3>Your equipment</h3>
<span class="tools">
<span class="flag"><div class="switch" data-class-on="hide_mounted" data-action="hide-mounted">{{ hide_mounted ? 'ON' : 'OFF' }}</div>loot only<div class="tip">Leaves out what is mounted and the ammunition, nanobots and shield batteries your ship uses: what is left is loot to sell.</div></span>
@@ -166,7 +201,17 @@
</div>
<div class="pfoot"><div class="btn" data-action="keep-panel">Close</div></div>
</div>
<div class="deal">
<div class="deal" data-if="category == 4">
<div class="dot" data-class-off="lamp_deal_color == ''" data-style-background-color="lamp_deal_color" style="width: 30dp; height: 30dp; border-radius: 15dp;"></div>
<div class="what" style="flex: 1; width: auto;">
<div class="label">{{ lamp_deal_label }}</div>
<div class="t">{{ lamp_deal }}</div>
</div>
<span class="why" data-if="lamp_reason != ''">{{ lamp_reason }}</span>
<span class="sum">{{ lamp_total }}</span>
<div class="btn primary" data-class-disabled="lamp_reason != ''" data-action="lamp-buy">{{ lamp_button }}<div class="tip">Fits it now. The old lamp is replaced; lamps are not sold back.</div></div>
</div>
<div class="deal" data-if="category != 4">
<img data-if="has_pick &amp;&amp; pick.icon != ''" data-attr-src="pick.icon"/>
<div class="what">
<div class="label">{{ side == 0 ? 'Buy' : 'Sell' }}</div>
EXE/rpclocal.dll
BIN
View File
Binary file not shown.
EXE/server.dll
BIN
View File
Binary file not shown.