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

REM-Client 6e6d42cd: decal shop in the equipment dealer (decals, masks, clan decals, decal bombs), wheel zoom in the ship views

Browse Source
This commit is contained in:
NekuraMew
2026-11-13 23:06:47 +01:00
parent df776fc166
commit 3a4b259ca2
5 changed files with 132 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EXE/remui/player.rml
+64
View File
@@ -32,6 +32,19 @@
.coin-log .row .c4 { flex: 1; color: #8197ad; }
/* the page Clan */
.clan-head { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; }
/* REM: the clan decal mixer */
.mixrow { display: flex; flex-direction: row; }
.mixprev { width: 160dp; height: 160dp; margin-right: 14dp; background-color: #0f1720; border: 1dp #3d5266; }
.mixprev img { width: 160dp; height: 160dp; }
.mixmasks { display: flex; flex-direction: row; flex-wrap: wrap; margin: 6dp 0; }
.mixmasks .mm { width: 40dp; height: 40dp; margin: 0 4dp 4dp 0; border: 1dp #3d5266; background-color: #0f1720; text-align: center; font-size: 10dp; }
.mixmasks .mm img { width: 38dp; height: 38dp; }
.mixmasks .mm.selected { border: 2dp #f2b13c; }
.mixer .crow { display: flex; flex-direction: row; align-items: center; margin-bottom: 4dp; }
.mixer .cl { width: 70dp; font-size: 12dp; color: #8197ad; }
.mixer .sw { width: 16dp; height: 16dp; margin-right: 3dp; border: 1dp #ffffff30; }
.mixer .sw.selected { border: 2dp #f2b13c; }
.mixer .actions .btn { margin-right: 4dp; }
.clan-head .tagname { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 22dp; letter-spacing: 0.8dp; }
.clan-head .sw { width: 14dp; height: 14dp; margin-right: 10dp; border: 1dp #dbe6f0; }
.clan-head .chip { margin-left: 10dp; }
@@ -193,6 +206,7 @@
<div class="tab" data-class-active="cl_sub == 5" data-action="cl-sub" data-arg="5">Diplomacy</div>
<div class="tab" data-class-active="cl_sub == 6" data-action="cl-sub" data-arg="6">NPC profile</div>
<div class="tab" data-class-active="cl_sub == 4" data-action="cl-sub" data-arg="4">Clan</div>
<div class="tab" data-class-active="cl_sub == 7" data-action="cl-sub" data-arg="7">Decals<div class="tip">The clan's own decals: only its members may put them on their ships.</div></div>
</div>
<!-- members -->
@@ -308,6 +322,56 @@
</div>
</div>
<!-- the clan's decals: uploaded here, used by the members in the Decal Shop (rem_decals.cpp) -->
<div class="colm" data-if="cl_sub == 7">
<div class="hint" style="margin-bottom: 8dp;">{{ cl_decal_info }}</div>
<div class="list" style="flex: 1 1 0;">
<div class="empty" data-if="cl_decals.size == 0">Your clan has no decals yet.</div>
<div class="row" data-for="d : cl_decals" style="display: flex; flex-direction: row; align-items: center; padding: 4dp 0;">
<img data-if="d.c != ''" data-attr-src="d.c" style="width: 48dp; height: 48dp; margin-right: 10dp;"/>
<div data-if="d.c == ''" style="width: 48dp; height: 48dp; margin-right: 10dp; background-color: #0f1720; border: 1dp #3d5266;"></div>
<div style="flex: 1;"><div>{{ d.a }}</div><div class="hint" data-class-warn="!d.on">{{ d.b }}</div></div>
<div class="btn danger" data-if="cl_decal_may" data-action="cl-decal-del" data-attr-data-arg="d.key">Delete<div class="tip">Deletes the decal; it goes off every member's ship.</div></div>
</div>
</div>
<div data-if="cl_decal_may" style="margin-top: 12dp;">
<div class="namefield"><span class="label">Name</span><input class="text" type="text" data-value="cl_decal_name" maxlength="40"/>
<div class="btn primary" data-class-disabled="cl_decal_browsing" data-action="cl-decal-browse" style="margin-left: 8dp;">Browse ...<div class="tip">Picks a picture file (PNG, JPG or BMP). It is fitted into a square (transparent edges, transparency kept) and checked by the server like an admin's upload; a moderator may have to approve it first.</div></div></div>
<div class="hint">Empty name: the file's name.</div>
</div>
<div class="hint" data-if="!cl_decal_may" style="margin-top: 12dp;">Only the leader (or a rank that may edit the clan) uploads clan decals.</div>
<!-- the mixer: the clan's own decal from the shop's patterns and shapes -->
<div data-if="cl_decal_may" class="mixer">
<h3 style="margin: 14dp 0 6dp 0;">Design a clan decal</h3>
<div class="mixrow">
<div class="mixprev"><img data-if="cl_mix_src != ''" data-attr-src="cl_mix_src"/></div>
<div style="flex: 1;">
<div class="subtabs">
<div class="tab" data-for="l : cl_mix_layers" data-class-active="l.selected" data-action="cl-mix-layer" data-attr-data-arg="l.key">{{ l.a }}{{ l.on ? ' *' : '' }}</div>
</div>
<div class="mixmasks">
<div class="mm" data-for="m : cl_mix_masks" data-class-selected="m.selected" data-action="cl-mix-mask" data-attr-data-arg="m.key">
<img data-if="m.c != ''" data-attr-src="m.c"/><span data-if="m.c == ''">{{ m.a }}</span><div class="tip">{{ m.a }}</div>
</div>
</div>
<div class="crow" data-for="a : cl_mix_areas">
<span class="cl">{{ a.a }}</span>
<div class="sw" data-for="c : cl_mix_palette" data-class-selected="c.color == a.color" data-style-background-color="'#' + c.color" data-action="cl-mix-color" data-attr-data-arg="a.key + '|' + c.color"></div>
</div>
<div class="actions">
<div class="btn" data-action="cl-mix-scale" data-arg="-">Smaller</div><div class="btn" data-action="cl-mix-scale" data-arg="+">Larger</div>
<div class="btn" data-action="cl-mix-turn" data-arg="-">Turn left</div><div class="btn" data-action="cl-mix-turn" data-arg="+">Turn right</div>
<div class="btn" data-action="cl-mix-move" data-arg="l">&#8592;</div><div class="btn" data-action="cl-mix-move" data-arg="u">&#8593;</div>
<div class="btn" data-action="cl-mix-move" data-arg="d">&#8595;</div><div class="btn" data-action="cl-mix-move" data-arg="r">&#8594;</div>
<div class="btn" data-action="cl-mix-reset">Clear layer</div>
</div>
<div class="hint">{{ cl_mix_info }}</div>
<div class="actions"><div class="btn primary" data-action="cl-mix-upload">Upload design<div class="tip">Draws the three layers into one decal and uploads it under the name above, like a picture from a file.</div></div></div>
</div>
</div>
</div>
</div>
<!-- diplomacy: the other clans, the picked one's stance -->
<div class="colm" data-if="cl_sub == 5">
<div class="table cl-table" style="flex: 1;">