Refresh spell Magic gates when opening the spells menu.
After a Magic level-up the client kept stale canCast flags until reload; gates are now rechecked on panel open and whenever skills update.
@@ -1553,7 +1553,11 @@ async function main ()
1553
1553
});
1554
1554
spells = initSpells({
1555
1555
socket: { send (payload) { socket.send(payload); } },
1556
MessageType
1556
MessageType,
1557
getSkillLevel (skillId)
1558
{
1559
return skills?.skillLevel?.(skillId) ?? 1;
1560
}
1557
1561
});
1558
1562
crafting = initCrafting({
1559
1563
socket: { send (payload) { socket.send(payload); } },
@@ -1769,6 +1773,7 @@ async function main ()
1769
1773
case MessageType.skills:
1770
1774
skills?.render(message.skills);
1771
1775
crafting?.refresh();
1776
spells?.refreshCastGates?.();
1772
1777
break;
1773
1778
case MessageType.spells:
1774
1779
case MessageType.spellsUpdated:
@@ -1553,7 +1553,11 @@ async function main ()1553
});1553
});1554
spells = initSpells({1554
spells = initSpells({1555
socket: { send (payload) { socket.send(payload); } },1555
socket: { send (payload) { socket.send(payload); } },1556
MessageType1556
MessageType,1557
getSkillLevel (skillId)1558
{1559
return skills?.skillLevel?.(skillId) ?? 1;1560
}1557
});1561
});1558
crafting = initCrafting({1562
crafting = initCrafting({1559
socket: { send (payload) { socket.send(payload); } },1563
socket: { send (payload) { socket.send(payload); } },@@ -1769,6 +1773,7 @@ async function main ()1769
case MessageType.skills:1773
case MessageType.skills:1770
skills?.render(message.skills);1774
skills?.render(message.skills);1771
crafting?.refresh();1775
crafting?.refresh();1776
spells?.refreshCastGates?.();1772
break;1777
break;1773
case MessageType.spells:1778
case MessageType.spells:1774
case MessageType.spellsUpdated:1779
case MessageType.spellsUpdated:@@ -1,9 +1,10 @@
1
1
/**
2
2
* Play spells panel: known spells, favourites bar, arm / cast intents.
3
3
*/
4
import { spellMindPowerFromTier } from "/shared/definitions/spells.js";
4
import { spellDefinition, spellMindPowerFromTier, spellMinMagicLevel } from "/shared/definitions/spells.js";
5
import { SkillId } from "/shared/definitions/skills.js";
5
6
6
export function initSpells ({ socket, MessageType })
7
export function initSpells ({ socket, MessageType, getSkillLevel } = {})
7
8
{
8
9
const panel = document.getElementById("spells-panel");
9
10
const list = document.getElementById("spells-list");
@@ -16,6 +17,8 @@ export function initSpells ({ socket, MessageType })
16
17
document.getElementById("spells-toggle")?.addEventListener("click", () =>
17
18
{
18
19
panel.hidden = !panel.hidden;
20
if (!panel.hidden)
21
{ refreshCastGates(); }
19
22
});
20
23
21
24
autoCastToggle?.addEventListener("change", () =>
@@ -26,6 +29,31 @@ export function initSpells ({ socket, MessageType })
26
29
});
27
30
});
28
31
32
/** Re-evaluate Magic gates from the latest client skill levels (e.g. after level-up). */
33
function refreshCastGates ()
34
{
35
if (!spells.length)
36
{ return; }
37
const magicLevel = Math.max(1, getSkillLevel?.(SkillId.magic) | 0 || 1);
38
let changed = false;
39
for (const spell of spells)
40
{
41
const need = spellMinMagicLevel(spellDefinition(spell.spellId));
42
const ok = magicLevel >= need;
43
if (spell.canCast !== ok || spell.canFavorite !== ok)
44
{
45
spell.canCast = ok;
46
spell.canFavorite = ok;
47
changed = true;
48
}
49
}
50
if (changed || !panel.hidden)
51
{
52
renderList();
53
renderBar();
54
}
55
}
56
29
57
function disarmLocal ()
30
58
{
31
59
if (!armedSpellId)
@@ -43,8 +71,7 @@ export function initSpells ({ socket, MessageType })
43
71
{ armedSpellId = payload.armedSpellId; }
44
72
if (autoCastToggle)
45
73
{ autoCastToggle.checked = autoCast; }
46
renderList();
47
renderBar();
74
refreshCastGates();
48
75
}
49
76
50
77
function renderList ()
@@ -204,6 +231,7 @@ export function initSpells ({ socket, MessageType })
204
231
205
232
return {
206
233
render,
234
refreshCastGates,
207
235
getArmedSpell,
208
236
tryCastAtTile,
209
237
tryCastAtEntity,
@@ -1,9 +1,10 @@1
/**1
/**2
* Play spells panel: known spells, favourites bar, arm / cast intents.2
* Play spells panel: known spells, favourites bar, arm / cast intents.3
*/3
*/4
import { spellMindPowerFromTier } from "/shared/definitions/spells.js";4
import { spellDefinition, spellMindPowerFromTier, spellMinMagicLevel } from "/shared/definitions/spells.js";5
import { SkillId } from "/shared/definitions/skills.js";5
6
6
export function initSpells ({ socket, MessageType })7
export function initSpells ({ socket, MessageType, getSkillLevel } = {})7
{8
{8
const panel = document.getElementById("spells-panel");9
const panel = document.getElementById("spells-panel");9
const list = document.getElementById("spells-list");10
const list = document.getElementById("spells-list");@@ -16,6 +17,8 @@ export function initSpells ({ socket, MessageType })16
document.getElementById("spells-toggle")?.addEventListener("click", () =>17
document.getElementById("spells-toggle")?.addEventListener("click", () =>17
{18
{18
panel.hidden = !panel.hidden;19
panel.hidden = !panel.hidden;20
if (!panel.hidden)21
{ refreshCastGates(); }19
});22
});20
23
21
autoCastToggle?.addEventListener("change", () =>24
autoCastToggle?.addEventListener("change", () =>@@ -26,6 +29,31 @@ export function initSpells ({ socket, MessageType })26
});29
});27
});30
});28
31
32
/** Re-evaluate Magic gates from the latest client skill levels (e.g. after level-up). */33
function refreshCastGates ()34
{35
if (!spells.length)36
{ return; }37
const magicLevel = Math.max(1, getSkillLevel?.(SkillId.magic) | 0 || 1);38
let changed = false;39
for (const spell of spells)40
{41
const need = spellMinMagicLevel(spellDefinition(spell.spellId));42
const ok = magicLevel >= need;43
if (spell.canCast !== ok || spell.canFavorite !== ok)44
{45
spell.canCast = ok;46
spell.canFavorite = ok;47
changed = true;48
}49
}50
if (changed || !panel.hidden)51
{52
renderList();53
renderBar();54
}55
}56
29
function disarmLocal ()57
function disarmLocal ()30
{58
{31
if (!armedSpellId)59
if (!armedSpellId)@@ -43,8 +71,7 @@ export function initSpells ({ socket, MessageType })43
{ armedSpellId = payload.armedSpellId; }71
{ armedSpellId = payload.armedSpellId; }44
if (autoCastToggle)72
if (autoCastToggle)45
{ autoCastToggle.checked = autoCast; }73
{ autoCastToggle.checked = autoCast; }46
renderList();74
refreshCastGates();47
renderBar();48
}75
}49
76
50
function renderList ()77
function renderList ()@@ -204,6 +231,7 @@ export function initSpells ({ socket, MessageType })204
231
205
return {232
return {206
render,233
render,234
refreshCastGates,207
getArmedSpell,235
getArmedSpell,208
tryCastAtTile,236
tryCastAtTile,209
tryCastAtEntity,237
tryCastAtEntity,