Show cumulative +XP beside temporary skill gain bars.
While a top-right XP bar is visible, tally XP earned for that skill since it appeared and reset when the bar times out.
@@ -1,4 +1,5 @@
1
1
import { equipmentBonusesFromSlots } from "/shared/equipment/stats.js";
2
import { totalXpForLevel } from "/shared/skills/progression.js";
2
3
3
4
const XP_GAIN_VISIBLE_MS = 5000;
4
5
@@ -10,7 +11,7 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})
10
11
const gainHud = document.getElementById("xp-gain-hud");
11
12
let current = [];
12
13
let combatLevel = 0;
13
/** @type {Map<string, { skill: object, gainedAt: number, timer: number|null }>} */
14
/** @type {Map<string, { skill: object, gainedAt: number, gainedXp: number, timer: number|null }>} */
14
15
const recentGains = new Map();
15
16
16
17
document.getElementById("skills-toggle").addEventListener("click", () =>
@@ -83,10 +84,12 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})
83
84
if (skillGainedXp(prev, skill))
84
85
{
85
86
const existing = recentGains.get(skill.skillId);
87
const delta = skillXpDelta(prev, skill);
86
88
clearGainTimer(existing);
87
89
recentGains.set(skill.skillId, {
88
90
skill: { ...skill },
89
gainedAt: now,
91
gainedAt: existing?.gainedAt ?? now,
92
gainedXp: Math.max(0, (existing?.gainedXp | 0) + delta),
90
93
timer: null
91
94
});
92
95
scheduleGainHide(skill.skillId);
@@ -116,7 +119,7 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})
116
119
.sort((a, b) => b.gainedAt - a.gainedAt);
117
120
gainHud.replaceChildren();
118
121
for (const entry of rows)
119
{ gainHud.append(renderGainRow(entry.skill)); }
122
{ gainHud.append(renderGainRow(entry)); }
120
123
gainHud.hidden = false;
121
124
}
122
125
@@ -195,16 +198,35 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})
195
198
};
196
199
}
197
200
201
function approximateTotalXp (skill)
202
{
203
const level = Math.max(1, skill?.level | 0 || 1);
204
return totalXpForLevel(level) + Math.max(0, skill?.xp | 0);
205
}
206
207
function skillXpDelta (prev, next)
208
{
209
if (!prev || !next)
210
{ return 0; }
211
return Math.max(0, approximateTotalXp(next) - approximateTotalXp(prev));
212
}
213
198
214
function xpPercent (skill)
199
215
{
200
216
return skill.xpToNext > 0 ? Math.min(100, (skill.xp / skill.xpToNext) * 100) : 100;
201
217
}
202
218
203
function renderGainRow (skill)
219
function renderGainRow (entry)
204
220
{
221
const skill = entry.skill;
205
222
const row = document.createElement("div");
206
223
row.className = "xp-gain-row";
207
224
225
const delta = document.createElement("span");
226
delta.className = "xp-gain-delta";
227
delta.textContent = `+${Math.max(0, entry.gainedXp | 0)}`;
228
delta.title = `${entry.gainedXp | 0} XP gained`;
229
208
230
const icon = document.createElement("img");
209
231
icon.className = "xp-gain-icon";
210
232
icon.src = skill.icon;
@@ -220,7 +242,7 @@ function renderGainRow (skill)
220
242
fill.style.width = `${xpPercent(skill)}%`;
221
243
track.append(fill);
222
244
223
row.append(icon, track);
245
row.append(delta, icon, track);
224
246
return row;
225
247
}
226
248
@@ -1,4 +1,5 @@1
import { equipmentBonusesFromSlots } from "/shared/equipment/stats.js";1
import { equipmentBonusesFromSlots } from "/shared/equipment/stats.js";2
import { totalXpForLevel } from "/shared/skills/progression.js";2
3
3
const XP_GAIN_VISIBLE_MS = 5000;4
const XP_GAIN_VISIBLE_MS = 5000;4
5
@@ -10,7 +11,7 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})10
const gainHud = document.getElementById("xp-gain-hud");11
const gainHud = document.getElementById("xp-gain-hud");11
let current = [];12
let current = [];12
let combatLevel = 0;13
let combatLevel = 0;13
/** @type {Map<string, { skill: object, gainedAt: number, timer: number|null }>} */14
/** @type {Map<string, { skill: object, gainedAt: number, gainedXp: number, timer: number|null }>} */14
const recentGains = new Map();15
const recentGains = new Map();15
16
16
document.getElementById("skills-toggle").addEventListener("click", () =>17
document.getElementById("skills-toggle").addEventListener("click", () =>@@ -83,10 +84,12 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})83
if (skillGainedXp(prev, skill))84
if (skillGainedXp(prev, skill))84
{85
{85
const existing = recentGains.get(skill.skillId);86
const existing = recentGains.get(skill.skillId);87
const delta = skillXpDelta(prev, skill);86
clearGainTimer(existing);88
clearGainTimer(existing);87
recentGains.set(skill.skillId, {89
recentGains.set(skill.skillId, {88
skill: { ...skill },90
skill: { ...skill },89
gainedAt: now,91
gainedAt: existing?.gainedAt ?? now,92
gainedXp: Math.max(0, (existing?.gainedXp | 0) + delta),90
timer: null93
timer: null91
});94
});92
scheduleGainHide(skill.skillId);95
scheduleGainHide(skill.skillId);@@ -116,7 +119,7 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})116
.sort((a, b) => b.gainedAt - a.gainedAt);119
.sort((a, b) => b.gainedAt - a.gainedAt);117
gainHud.replaceChildren();120
gainHud.replaceChildren();118
for (const entry of rows)121
for (const entry of rows)119
{ gainHud.append(renderGainRow(entry.skill)); }122
{ gainHud.append(renderGainRow(entry)); }120
gainHud.hidden = false;123
gainHud.hidden = false;121
}124
}122
125
@@ -195,16 +198,35 @@ export function initSkills ({ getEquipmentSlots, getSettings } = {})195
};198
};196
}199
}197
200
201
function approximateTotalXp (skill)202
{203
const level = Math.max(1, skill?.level | 0 || 1);204
return totalXpForLevel(level) + Math.max(0, skill?.xp | 0);205
}206
207
function skillXpDelta (prev, next)208
{209
if (!prev || !next)210
{ return 0; }211
return Math.max(0, approximateTotalXp(next) - approximateTotalXp(prev));212
}213
198
function xpPercent (skill)214
function xpPercent (skill)199
{215
{200
return skill.xpToNext > 0 ? Math.min(100, (skill.xp / skill.xpToNext) * 100) : 100;216
return skill.xpToNext > 0 ? Math.min(100, (skill.xp / skill.xpToNext) * 100) : 100;201
}217
}202
218
203
function renderGainRow (skill)219
function renderGainRow (entry)204
{220
{221
const skill = entry.skill;205
const row = document.createElement("div");222
const row = document.createElement("div");206
row.className = "xp-gain-row";223
row.className = "xp-gain-row";207
224
225
const delta = document.createElement("span");226
delta.className = "xp-gain-delta";227
delta.textContent = `+${Math.max(0, entry.gainedXp | 0)}`;228
delta.title = `${entry.gainedXp | 0} XP gained`;229
208
const icon = document.createElement("img");230
const icon = document.createElement("img");209
icon.className = "xp-gain-icon";231
icon.className = "xp-gain-icon";210
icon.src = skill.icon;232
icon.src = skill.icon;@@ -220,7 +242,7 @@ function renderGainRow (skill)220
fill.style.width = `${xpPercent(skill)}%`;242
fill.style.width = `${xpPercent(skill)}%`;221
track.append(fill);243
track.append(fill);222
244
223
row.append(icon, track);245
row.append(delta, icon, track);224
return row;246
return row;225
}247
}226
248
@@ -80,7 +80,7 @@ body {
80
80
flex-direction: column;
81
81
gap: 0.35rem;
82
82
align-items: stretch;
83
width: min(200px, 42vw);
83
width: min(220px, 46vw);
84
84
pointer-events: none;
85
85
}
86
86
@@ -94,6 +94,18 @@ body {
94
94
gap: 0.45rem;
95
95
}
96
96
97
.xp-gain-delta {
98
flex: 0 0 auto;
99
min-width: 1.75rem;
100
font-size: 0.78rem;
101
font-weight: 700;
102
line-height: 1;
103
text-align: right;
104
color: #e8d9a0;
105
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.85);
106
font-variant-numeric: tabular-nums;
107
}
108
97
109
.xp-gain-icon {
98
110
flex: 0 0 28px;
99
111
width: 28px;
@@ -80,7 +80,7 @@ body {80
flex-direction: column;80
flex-direction: column;81
gap: 0.35rem;81
gap: 0.35rem;82
align-items: stretch;82
align-items: stretch;83
width: min(200px, 42vw);83
width: min(220px, 46vw);84
pointer-events: none;84
pointer-events: none;85
}85
}86
86
@@ -94,6 +94,18 @@ body {94
gap: 0.45rem;94
gap: 0.45rem;95
}95
}96
96
97
.xp-gain-delta {98
flex: 0 0 auto;99
min-width: 1.75rem;100
font-size: 0.78rem;101
font-weight: 700;102
line-height: 1;103
text-align: right;104
color: #e8d9a0;105
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.85);106
font-variant-numeric: tabular-nums;107
}108
97
.xp-gain-icon {109
.xp-gain-icon {98
flex: 0 0 28px;110
flex: 0 0 28px;99
width: 28px;111
width: 28px;