Tint friend/bounty/letter portraits with hair and clothing colours.
Include hair in public appearance layers and composite previews with the same magenta-tint path used for dialogue-style portraits.
@@ -1,7 +1,10 @@
1
import { mountLayerPreview } from "./characterPreview.js";
2
1
3
export function initBounty ({
2
4
socket,
3
5
MessageType,
4
6
resolveSpriteUrl,
7
resolveImage = null,
5
8
onSuppressWorldClick
6
9
})
7
10
{
@@ -99,21 +102,12 @@ export function initBounty ({
99
102
function renderPreview (layers)
100
103
{
101
104
previewEl.replaceChildren();
102
const wrap = document.createElement("div");
103
wrap.className = "char-preview";
104
for (const layer of layers ?? [])
105
{
106
const url = resolveSpriteUrl?.(layer.sprite);
107
if (!url)
108
{ continue; }
109
const img = document.createElement("img");
110
img.src = url;
111
img.alt = "";
112
if (layer.tint)
113
{ img.style.filter = `opacity(1)`; }
114
wrap.append(img);
115
}
116
previewEl.append(wrap);
105
previewEl.append(mountLayerPreview(layers, {
106
resolveImage,
107
resolveSpriteUrl,
108
size: 64,
109
className: "char-preview"
110
}));
117
111
}
118
112
119
113
function showTarget (entry)
@@ -1,7 +1,10 @@1
import { mountLayerPreview } from "./characterPreview.js";2
1
export function initBounty ({3
export function initBounty ({2
socket,4
socket,3
MessageType,5
MessageType,4
resolveSpriteUrl,6
resolveSpriteUrl,7
resolveImage = null,5
onSuppressWorldClick8
onSuppressWorldClick6
})9
})7
{10
{@@ -99,21 +102,12 @@ export function initBounty ({99
function renderPreview (layers)102
function renderPreview (layers)100
{103
{101
previewEl.replaceChildren();104
previewEl.replaceChildren();102
const wrap = document.createElement("div");105
previewEl.append(mountLayerPreview(layers, {103
wrap.className = "char-preview";106
resolveImage,104
for (const layer of layers ?? [])107
resolveSpriteUrl,105
{108
size: 64,106
const url = resolveSpriteUrl?.(layer.sprite);109
className: "char-preview"107
if (!url)110
}));108
{ continue; }109
const img = document.createElement("img");110
img.src = url;111
img.alt = "";112
if (layer.tint)113
{ img.style.filter = `opacity(1)`; }114
wrap.append(img);115
}116
previewEl.append(wrap);117
}111
}118
112
119
function showTarget (entry)113
function showTarget (entry)@@ -88,6 +88,69 @@ export function paintAppearanceSnapshot (canvas, layers, {
88
88
return paintDrawListSnapshot(canvas, draws, { size });
89
89
}
90
90
91
/**
92
* Offline / list UI portrait from public appearance layers (hair + clothing tints).
93
* Prefers in-memory Framework images; falls back to loading catalog URLs.
94
* @returns {HTMLDivElement}
95
*/
96
export function mountLayerPreview (layers, {
97
resolveImage = null,
98
resolveSpriteUrl = null,
99
size = 48,
100
className = "char-preview"
101
} = {})
102
{
103
const wrap = document.createElement("div");
104
wrap.className = className;
105
const canvas = document.createElement("canvas");
106
canvas.width = size;
107
canvas.height = size;
108
canvas.style.width = "100%";
109
canvas.style.height = "100%";
110
canvas.style.imageRendering = "pixelated";
111
wrap.append(canvas);
112
113
const list = layers ?? [];
114
const allInMemory = list.length > 0 && list.every((layer) =>
115
!layer?.sprite || !!resolveImage?.(layer.sprite));
116
const painted = allInMemory
117
? paintAppearanceSnapshot(canvas, list, { resolveImage, size })
118
: false;
119
if (!painted && resolveSpriteUrl)
120
{
121
void paintLayersFromUrls(canvas, list, { resolveSpriteUrl, size }).catch(() =>
122
{ /* preview is best-effort */ });
123
}
124
return wrap;
125
}
126
127
/**
128
* Load layer sprites by URL and composite with magenta tints (async fallback).
129
*/
130
export async function paintLayersFromUrls (canvas, layers, {
131
resolveSpriteUrl,
132
size = 48
133
} = {})
134
{
135
if (!canvas)
136
{ return false; }
137
const draws = [];
138
for (const layer of layers ?? [])
139
{
140
const url = resolveSpriteUrl?.(layer?.sprite);
141
if (!url)
142
{ continue; }
143
try
144
{
145
const img = await loadHtmlImage(url);
146
draws.push({ entry: img, tint: layer.tint ?? null, frame: 0 });
147
}
148
catch
149
{ /* skip missing art */ }
150
}
151
return paintDrawListSnapshot(canvas, draws, { size });
152
}
153
91
154
/**
92
155
* Composite the live world render stack (body GameObject + overlays + tints).
93
156
* Matches what the player sees in-world, including hair overlays.
@@ -88,6 +88,69 @@ export function paintAppearanceSnapshot (canvas, layers, {88
return paintDrawListSnapshot(canvas, draws, { size });88
return paintDrawListSnapshot(canvas, draws, { size });89
}89
}90
90
91
/**92
* Offline / list UI portrait from public appearance layers (hair + clothing tints).93
* Prefers in-memory Framework images; falls back to loading catalog URLs.94
* @returns {HTMLDivElement}95
*/96
export function mountLayerPreview (layers, {97
resolveImage = null,98
resolveSpriteUrl = null,99
size = 48,100
className = "char-preview"101
} = {})102
{103
const wrap = document.createElement("div");104
wrap.className = className;105
const canvas = document.createElement("canvas");106
canvas.width = size;107
canvas.height = size;108
canvas.style.width = "100%";109
canvas.style.height = "100%";110
canvas.style.imageRendering = "pixelated";111
wrap.append(canvas);112
113
const list = layers ?? [];114
const allInMemory = list.length > 0 && list.every((layer) =>115
!layer?.sprite || !!resolveImage?.(layer.sprite));116
const painted = allInMemory117
? paintAppearanceSnapshot(canvas, list, { resolveImage, size })118
: false;119
if (!painted && resolveSpriteUrl)120
{121
void paintLayersFromUrls(canvas, list, { resolveSpriteUrl, size }).catch(() =>122
{ /* preview is best-effort */ });123
}124
return wrap;125
}126
127
/**128
* Load layer sprites by URL and composite with magenta tints (async fallback).129
*/130
export async function paintLayersFromUrls (canvas, layers, {131
resolveSpriteUrl,132
size = 48133
} = {})134
{135
if (!canvas)136
{ return false; }137
const draws = [];138
for (const layer of layers ?? [])139
{140
const url = resolveSpriteUrl?.(layer?.sprite);141
if (!url)142
{ continue; }143
try144
{145
const img = await loadHtmlImage(url);146
draws.push({ entry: img, tint: layer.tint ?? null, frame: 0 });147
}148
catch149
{ /* skip missing art */ }150
}151
return paintDrawListSnapshot(canvas, draws, { size });152
}153
91
/**154
/**92
* Composite the live world render stack (body GameObject + overlays + tints).155
* Composite the live world render stack (body GameObject + overlays + tints).93
* Matches what the player sees in-world, including hair overlays.156
* Matches what the player sees in-world, including hair overlays.@@ -14,6 +14,7 @@ import { formatLetterSignature } from "/shared/courier/systemLetters.js";
14
14
import { spellIdFromSpellbookStack } from "/shared/definitions/spellItems.js";
15
15
import { spellDefinition } from "/shared/definitions/spells.js";
16
16
import { applyItemIcon } from "../render/potionIcon.js";
17
import { mountLayerPreview } from "./characterPreview.js";
17
18
18
19
const EQUIP_LABELS = {
19
20
[EQUIPMENT_SLOT.head]: "Head",
@@ -29,6 +30,7 @@ export function initInventory ({
29
30
MessageType,
30
31
contextMenu,
31
32
resolveSpriteUrl,
33
resolveImage = null,
32
34
getFriends,
33
35
getLocalName,
34
36
tipArrows = null,
@@ -817,19 +819,12 @@ export function initInventory ({
817
819
818
820
function characterPreview (layers)
819
821
{
820
const wrap = document.createElement("div");
821
wrap.className = "char-preview";
822
for (const layer of layers ?? [])
823
{
824
const url = resolveSpriteUrl?.(layer.sprite);
825
if (!url)
826
{ continue; }
827
const img = document.createElement("img");
828
img.src = url;
829
img.alt = "";
830
wrap.append(img);
831
}
832
return wrap;
822
return mountLayerPreview(layers, {
823
resolveImage,
824
resolveSpriteUrl,
825
size: 48,
826
className: "char-preview"
827
});
833
828
}
834
829
835
830
function pickTarget (destination, label)
@@ -14,6 +14,7 @@ import { formatLetterSignature } from "/shared/courier/systemLetters.js";14
import { spellIdFromSpellbookStack } from "/shared/definitions/spellItems.js";14
import { spellIdFromSpellbookStack } from "/shared/definitions/spellItems.js";15
import { spellDefinition } from "/shared/definitions/spells.js";15
import { spellDefinition } from "/shared/definitions/spells.js";16
import { applyItemIcon } from "../render/potionIcon.js";16
import { applyItemIcon } from "../render/potionIcon.js";17
import { mountLayerPreview } from "./characterPreview.js";17
18
18
const EQUIP_LABELS = {19
const EQUIP_LABELS = {19
[EQUIPMENT_SLOT.head]: "Head",20
[EQUIPMENT_SLOT.head]: "Head",@@ -29,6 +30,7 @@ export function initInventory ({29
MessageType,30
MessageType,30
contextMenu,31
contextMenu,31
resolveSpriteUrl,32
resolveSpriteUrl,33
resolveImage = null,32
getFriends,34
getFriends,33
getLocalName,35
getLocalName,34
tipArrows = null,36
tipArrows = null,@@ -817,19 +819,12 @@ export function initInventory ({817
819
818
function characterPreview (layers)820
function characterPreview (layers)819
{821
{820
const wrap = document.createElement("div");822
return mountLayerPreview(layers, {821
wrap.className = "char-preview";823
resolveImage,822
for (const layer of layers ?? [])824
resolveSpriteUrl,823
{825
size: 48,824
const url = resolveSpriteUrl?.(layer.sprite);826
className: "char-preview"825
if (!url)827
});826
{ continue; }827
const img = document.createElement("img");828
img.src = url;829
img.alt = "";830
wrap.append(img);831
}832
return wrap;833
}828
}834
829
835
function pickTarget (destination, label)830
function pickTarget (destination, label)@@ -1552,6 +1552,10 @@ async function main ()
1552
1552
resolveSpriteUrl (name)
1553
1553
{
1554
1554
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;
1555
},
1556
resolveImage (name)
1557
{
1558
return game?.images?.[name] ?? null;
1555
1559
}
1556
1560
});
1557
1561
contextMenu = initContextMenu({ onSuppressWorldClick: consumeWorldClick });
@@ -1572,6 +1576,10 @@ async function main ()
1572
1576
{
1573
1577
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;
1574
1578
},
1579
resolveImage (name)
1580
{
1581
return game?.images?.[name] ?? null;
1582
},
1575
1583
getFriends ()
1576
1584
{
1577
1585
return social?.getFriends?.() ?? [];
@@ -1689,6 +1697,10 @@ async function main ()
1689
1697
resolveSpriteUrl (name)
1690
1698
{
1691
1699
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;
1700
},
1701
resolveImage (name)
1702
{
1703
return game?.images?.[name] ?? null;
1692
1704
}
1693
1705
});
1694
1706
barber = initBarber({
@@ -1552,6 +1552,10 @@ async function main ()1552
resolveSpriteUrl (name)1552
resolveSpriteUrl (name)1553
{1553
{1554
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;1554
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;1555
},1556
resolveImage (name)1557
{1558
return game?.images?.[name] ?? null;1555
}1559
}1556
});1560
});1557
contextMenu = initContextMenu({ onSuppressWorldClick: consumeWorldClick });1561
contextMenu = initContextMenu({ onSuppressWorldClick: consumeWorldClick });@@ -1572,6 +1576,10 @@ async function main ()1572
{1576
{1573
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;1577
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;1574
},1578
},1579
resolveImage (name)1580
{1581
return game?.images?.[name] ?? null;1582
},1575
getFriends ()1583
getFriends ()1576
{1584
{1577
return social?.getFriends?.() ?? [];1585
return social?.getFriends?.() ?? [];@@ -1689,6 +1697,10 @@ async function main ()1689
resolveSpriteUrl (name)1697
resolveSpriteUrl (name)1690
{1698
{1691
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;1699
return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;1700
},1701
resolveImage (name)1702
{1703
return game?.images?.[name] ?? null;1692
}1704
}1693
});1705
});1694
barber = initBarber({1706
barber = initBarber({@@ -1,6 +1,8 @@
1
import { mountLayerPreview } from "./characterPreview.js";
2
1
3
const FRIEND_NAME_COLOR = "#e8c84a";
2
4
3
export function initSocial ({ socket, MessageType, resolveSpriteUrl = null })
5
export function initSocial ({ socket, MessageType, resolveSpriteUrl = null, resolveImage = null })
4
6
{
5
7
const nametag = document.getElementById("nametag");
6
8
const inspect = document.getElementById("inspect-modal");
@@ -252,19 +254,12 @@ export function initSocial ({ socket, MessageType, resolveSpriteUrl = null })
252
254
253
255
function characterPreview (layers)
254
256
{
255
const wrap = document.createElement("div");
256
wrap.className = "char-preview friend-char-preview";
257
for (const layer of layers ?? [])
258
{
259
const url = resolveSpriteUrl?.(layer.sprite);
260
if (!url)
261
{ continue; }
262
const img = document.createElement("img");
263
img.src = url;
264
img.alt = "";
265
wrap.append(img);
266
}
267
return wrap;
257
return mountLayerPreview(layers, {
258
resolveImage,
259
resolveSpriteUrl,
260
size: 48,
261
className: "char-preview friend-char-preview"
262
});
268
263
}
269
264
270
265
return {
@@ -1,6 +1,8 @@1
import { mountLayerPreview } from "./characterPreview.js";2
1
const FRIEND_NAME_COLOR = "#e8c84a";3
const FRIEND_NAME_COLOR = "#e8c84a";2
4
3
export function initSocial ({ socket, MessageType, resolveSpriteUrl = null })5
export function initSocial ({ socket, MessageType, resolveSpriteUrl = null, resolveImage = null })4
{6
{5
const nametag = document.getElementById("nametag");7
const nametag = document.getElementById("nametag");6
const inspect = document.getElementById("inspect-modal");8
const inspect = document.getElementById("inspect-modal");@@ -252,19 +254,12 @@ export function initSocial ({ socket, MessageType, resolveSpriteUrl = null })252
254
253
function characterPreview (layers)255
function characterPreview (layers)254
{256
{255
const wrap = document.createElement("div");257
return mountLayerPreview(layers, {256
wrap.className = "char-preview friend-char-preview";258
resolveImage,257
for (const layer of layers ?? [])259
resolveSpriteUrl,258
{260
size: 48,259
const url = resolveSpriteUrl?.(layer.sprite);261
className: "char-preview friend-char-preview"260
if (!url)262
});261
{ continue; }262
const img = document.createElement("img");263
img.src = url;264
img.alt = "";265
wrap.append(img);266
}267
return wrap;268
}263
}269
264
270
return {265
return {@@ -1603,21 +1603,24 @@ button.friend-account-name:hover {
1603
1603
1604
1604
.char-preview {
1605
1605
position: relative;
1606
width: 36px;
1607
height: 48px;
1606
width: 40px;
1607
height: 40px;
1608
1608
flex: 0 0 auto;
1609
1609
image-rendering: pixelated;
1610
1610
background: #101216;
1611
1611
border: 1px solid #2c3340;
1612
overflow: hidden;
1612
1613
}
1613
1614
1614
.char-preview img {
1615
.char-preview img,
1616
.char-preview canvas {
1615
1617
position: absolute;
1616
1618
inset: 0;
1617
1619
width: 100%;
1618
1620
height: 100%;
1619
1621
object-fit: contain;
1620
1622
image-rendering: pixelated;
1623
display: block;
1621
1624
}
1622
1625
1623
1626
#letter-body {
@@ -1603,21 +1603,24 @@ button.friend-account-name:hover {1603
1603
1604
.char-preview {1604
.char-preview {1605
position: relative;1605
position: relative;1606
width: 36px;1606
width: 40px;1607
height: 48px;1607
height: 40px;1608
flex: 0 0 auto;1608
flex: 0 0 auto;1609
image-rendering: pixelated;1609
image-rendering: pixelated;1610
background: #101216;1610
background: #101216;1611
border: 1px solid #2c3340;1611
border: 1px solid #2c3340;1612
overflow: hidden;1612
}1613
}1613
1614
1614
.char-preview img {1615
.char-preview img,1616
.char-preview canvas {1615
position: absolute;1617
position: absolute;1616
inset: 0;1618
inset: 0;1617
width: 100%;1619
width: 100%;1618
height: 100%;1620
height: 100%;1619
object-fit: contain;1621
object-fit: contain;1620
image-rendering: pixelated;1622
image-rendering: pixelated;1623
display: block;1621
}1624
}1622
1625
1623
#letter-body {1626
#letter-body {@@ -4,6 +4,7 @@ import { bountyPayoutLetterBody, formatBountyCopper } from "../../../shared/boun
4
4
import { BOUNTY_OFFICE_AUTHOR } from "../../../shared/courier/systemLetters.js";
5
5
import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
6
6
import { layersFromBag } from "../../../shared/appearance/layers.js";
7
import { hairFromCharacterRow } from "../../../shared/appearance/hair.js";
7
8
import {
8
9
addCoinsToSlots,
9
10
normalizeVault,
@@ -107,7 +108,7 @@ export class BountyService
107
108
firstName: row.first_name,
108
109
lastName: row.last_name,
109
110
sex: row.sex,
110
layers: layersFromBag(row.sex, bag),
111
layers: layersFromBag(row.sex, bag, hairFromCharacterRow(row)),
111
112
amountCopper,
112
113
amountLabel: formatBountyCopper(amountCopper)
113
114
}
@@ -4,6 +4,7 @@ import { bountyPayoutLetterBody, formatBountyCopper } from "../../../shared/boun4
import { BOUNTY_OFFICE_AUTHOR } from "../../../shared/courier/systemLetters.js";4
import { BOUNTY_OFFICE_AUTHOR } from "../../../shared/courier/systemLetters.js";5
import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";5
import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";6
import { layersFromBag } from "../../../shared/appearance/layers.js";6
import { layersFromBag } from "../../../shared/appearance/layers.js";7
import { hairFromCharacterRow } from "../../../shared/appearance/hair.js";7
import {8
import {8
addCoinsToSlots,9
addCoinsToSlots,9
normalizeVault,10
normalizeVault,@@ -107,7 +108,7 @@ export class BountyService107
firstName: row.first_name,108
firstName: row.first_name,108
lastName: row.last_name,109
lastName: row.last_name,109
sex: row.sex,110
sex: row.sex,110
layers: layersFromBag(row.sex, bag),111
layers: layersFromBag(row.sex, bag, hairFromCharacterRow(row)),111
amountCopper,112
amountCopper,112
amountLabel: formatBountyCopper(amountCopper)113
amountLabel: formatBountyCopper(amountCopper)113
}114
}@@ -1,4 +1,5 @@
1
1
import { layersFromBag } from "../../../shared/appearance/layers.js";
2
import { hairFromCharacterRow } from "../../../shared/appearance/hair.js";
2
3
3
4
/**
4
5
* Account-wide friends: requests and friendships key on account_id.
@@ -194,7 +195,7 @@ export class FriendService
194
195
firstName: row.first_name,
195
196
lastName: row.last_name,
196
197
sex: row.sex,
197
layers: layersFromBag(row.sex, bag)
198
layers: layersFromBag(row.sex, bag, hairFromCharacterRow(row))
198
199
};
199
200
}
200
201
@@ -1,4 +1,5 @@1
import { layersFromBag } from "../../../shared/appearance/layers.js";1
import { layersFromBag } from "../../../shared/appearance/layers.js";2
import { hairFromCharacterRow } from "../../../shared/appearance/hair.js";2
3
3
/**4
/**4
* Account-wide friends: requests and friendships key on account_id.5
* Account-wide friends: requests and friendships key on account_id.@@ -194,7 +195,7 @@ export class FriendService194
firstName: row.first_name,195
firstName: row.first_name,195
lastName: row.last_name,196
lastName: row.last_name,196
sex: row.sex,197
sex: row.sex,197
layers: layersFromBag(row.sex, bag)198
layers: layersFromBag(row.sex, bag, hairFromCharacterRow(row))198
};199
};199
}200
}200
201