BlueGit

timfa questward

Add skill requirement dropdown and palette search.

skillLevelAtLeast picks skills (plus Combat/Total Level) from a select; Select placeable filters live by name.

timfa Tim Falken · pushed by timfa

Authored 2026-09-08 · 2 months ago

Hash
edd76aaa52659b38bcb469a5932f3a8b53b35364
Parent
8372faf8
10 files changed +192 −20
client/editor.html +1 −0
@@ -229,6 +229,7 @@
229 229 <h2>Select placeable</h2>
230 230 <button id="palette-close" type="button">Close</button>
231 231 </header>
232 <input id="palette-search" type="search" placeholder="Search by name…" autocomplete="off">
232 233 <div id="palette-tabs" class="settings-tabs" role="tablist"></div>
233 234 <div id="palette-panels"></div>
234 235 </div>
@@ -229,6 +229,7 @@
229 <h2>Select placeable</h2>
229 <h2>Select placeable</h2>
230 <button id="palette-close" type="button">Close</button>
230 <button id="palette-close" type="button">Close</button>
231 </header>
231 </header>
232 <input id="palette-search" type="search" placeholder="Search by name…" autocomplete="off">
232 <div id="palette-tabs" class="settings-tabs" role="tablist"></div>
233 <div id="palette-tabs" class="settings-tabs" role="tablist"></div>
233 <div id="palette-panels"></div>
234 <div id="palette-panels"></div>
234 </div>
235 </div>
client/src/editor/conditionSetEditor.js +73 −9
@@ -1,6 +1,11 @@
1 1 import { ConditionKind, emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
2 2 import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
3 3 import { listSpawnableMobTypes } from "/shared/definitions/mobs.js";
4 import {
5 isMetaSkillId,
6 listSkillRequirementOptions,
7 MetaSkillId
8 } from "/shared/definitions/skills.js";
4 9 import { createDimensionCombobox } from "./dimensionCombobox.js";
5 10 import { OVERWORLD_ID } from "/shared/world/dimensions.js";
6 11
@@ -226,15 +231,8 @@ export function renderConditionSet (when, onChange, ctx = {})
226 231 }
227 232 else if (cond.kind === ConditionKind.skillLevelAtLeast)
228 233 {
229 row.append(miniField("skillId", cond.skillId ?? "", (v) =>
234 row.append(skillRequirementFields(cond, () =>
230 235 {
231 cond.skillId = v;
232 set.all[index].condition = cond;
233 bump(false);
234 }));
235 row.append(miniField("level", cond.level ?? 1, (v) =>
236 {
237 cond.level = Math.max(1, Math.min(99, Number(v) || 1));
238 236 set.all[index].condition = cond;
239 237 bump(false);
240 238 }));
@@ -767,10 +765,76 @@ function defaultCondition (kind)
767 765 case ConditionKind.staminaPercentAtLeast:
768 766 return { kind, percent: 50 };
769 767 case ConditionKind.skillLevelAtLeast:
770 return { kind, skillId: "attack", level: 1 };
768 return { kind, skillId: MetaSkillId.combatLevel, level: 1 };
771 769 case ConditionKind.interactBlock:
772 770 return { kind, dimensionId: OVERWORLD_ID, tileX: 0, tileY: 0 };
773 771 default:
774 772 return { kind };
775 773 }
776 774 }
775
776 function skillRequirementFields (cond, onChange)
777 {
778 const wrap = document.createElement("span");
779 wrap.style.display = "inline-flex";
780 wrap.style.gap = "0.35rem";
781 wrap.style.alignItems = "center";
782 wrap.style.flexWrap = "wrap";
783
784 const skillLabel = document.createElement("label");
785 skillLabel.textContent = "skill ";
786 const select = document.createElement("select");
787 const options = listSkillRequirementOptions();
788 const current = String(cond.skillId ?? MetaSkillId.combatLevel);
789 let found = false;
790 for (const entry of options)
791 {
792 const opt = document.createElement("option");
793 opt.value = entry.skillId;
794 opt.textContent = entry.displayName;
795 if (entry.skillId === current)
796 {
797 opt.selected = true;
798 found = true;
799 }
800 select.append(opt);
801 }
802 if (!found && current)
803 {
804 const opt = document.createElement("option");
805 opt.value = current;
806 opt.textContent = current;
807 opt.selected = true;
808 select.append(opt);
809 }
810 select.addEventListener("change", () =>
811 {
812 cond.skillId = select.value;
813 const max = isMetaSkillId(cond.skillId) ? 99_999 : 99;
814 cond.level = Math.max(1, Math.min(max, Number(cond.level) || 1));
815 levelInput.max = String(max);
816 levelInput.value = String(cond.level);
817 onChange();
818 });
819 skillLabel.append(select);
820
821 const levelLabel = document.createElement("label");
822 levelLabel.textContent = "level ";
823 const levelInput = document.createElement("input");
824 levelInput.type = "number";
825 levelInput.min = "1";
826 const maxLevel = isMetaSkillId(cond.skillId) ? 99_999 : 99;
827 levelInput.max = String(maxLevel);
828 levelInput.value = String(cond.level ?? 1);
829 levelInput.style.width = "5rem";
830 levelInput.addEventListener("input", () =>
831 {
832 const max = isMetaSkillId(cond.skillId) ? 99_999 : 99;
833 cond.level = Math.max(1, Math.min(max, Number(levelInput.value) || 1));
834 onChange();
835 });
836 levelLabel.append(levelInput);
837
838 wrap.append(skillLabel, levelLabel);
839 return wrap;
840 }
@@ -1,6 +1,11 @@
1import { ConditionKind, emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
1import { ConditionKind, emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
2import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
2import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
3import { listSpawnableMobTypes } from "/shared/definitions/mobs.js";
3import { listSpawnableMobTypes } from "/shared/definitions/mobs.js";
4import {
5 isMetaSkillId,
6 listSkillRequirementOptions,
7 MetaSkillId
8} from "/shared/definitions/skills.js";
4import { createDimensionCombobox } from "./dimensionCombobox.js";
9import { createDimensionCombobox } from "./dimensionCombobox.js";
5import { OVERWORLD_ID } from "/shared/world/dimensions.js";
10import { OVERWORLD_ID } from "/shared/world/dimensions.js";
6
11
@@ -226,15 +231,8 @@ export function renderConditionSet (when, onChange, ctx = {})
226 }
231 }
227 else if (cond.kind === ConditionKind.skillLevelAtLeast)
232 else if (cond.kind === ConditionKind.skillLevelAtLeast)
228 {
233 {
229 row.append(miniField("skillId", cond.skillId ?? "", (v) =>
234 row.append(skillRequirementFields(cond, () =>
230 {
235 {
231 cond.skillId = v;
232 set.all[index].condition = cond;
233 bump(false);
234 }));
235 row.append(miniField("level", cond.level ?? 1, (v) =>
236 {
237 cond.level = Math.max(1, Math.min(99, Number(v) || 1));
238 set.all[index].condition = cond;
236 set.all[index].condition = cond;
239 bump(false);
237 bump(false);
240 }));
238 }));
@@ -767,10 +765,76 @@ function defaultCondition (kind)
767 case ConditionKind.staminaPercentAtLeast:
765 case ConditionKind.staminaPercentAtLeast:
768 return { kind, percent: 50 };
766 return { kind, percent: 50 };
769 case ConditionKind.skillLevelAtLeast:
767 case ConditionKind.skillLevelAtLeast:
770 return { kind, skillId: "attack", level: 1 };
768 return { kind, skillId: MetaSkillId.combatLevel, level: 1 };
771 case ConditionKind.interactBlock:
769 case ConditionKind.interactBlock:
772 return { kind, dimensionId: OVERWORLD_ID, tileX: 0, tileY: 0 };
770 return { kind, dimensionId: OVERWORLD_ID, tileX: 0, tileY: 0 };
773 default:
771 default:
774 return { kind };
772 return { kind };
775 }
773 }
776}
774}
775
776function skillRequirementFields (cond, onChange)
777{
778 const wrap = document.createElement("span");
779 wrap.style.display = "inline-flex";
780 wrap.style.gap = "0.35rem";
781 wrap.style.alignItems = "center";
782 wrap.style.flexWrap = "wrap";
783
784 const skillLabel = document.createElement("label");
785 skillLabel.textContent = "skill ";
786 const select = document.createElement("select");
787 const options = listSkillRequirementOptions();
788 const current = String(cond.skillId ?? MetaSkillId.combatLevel);
789 let found = false;
790 for (const entry of options)
791 {
792 const opt = document.createElement("option");
793 opt.value = entry.skillId;
794 opt.textContent = entry.displayName;
795 if (entry.skillId === current)
796 {
797 opt.selected = true;
798 found = true;
799 }
800 select.append(opt);
801 }
802 if (!found && current)
803 {
804 const opt = document.createElement("option");
805 opt.value = current;
806 opt.textContent = current;
807 opt.selected = true;
808 select.append(opt);
809 }
810 select.addEventListener("change", () =>
811 {
812 cond.skillId = select.value;
813 const max = isMetaSkillId(cond.skillId) ? 99_999 : 99;
814 cond.level = Math.max(1, Math.min(max, Number(cond.level) || 1));
815 levelInput.max = String(max);
816 levelInput.value = String(cond.level);
817 onChange();
818 });
819 skillLabel.append(select);
820
821 const levelLabel = document.createElement("label");
822 levelLabel.textContent = "level ";
823 const levelInput = document.createElement("input");
824 levelInput.type = "number";
825 levelInput.min = "1";
826 const maxLevel = isMetaSkillId(cond.skillId) ? 99_999 : 99;
827 levelInput.max = String(maxLevel);
828 levelInput.value = String(cond.level ?? 1);
829 levelInput.style.width = "5rem";
830 levelInput.addEventListener("input", () =>
831 {
832 const max = isMetaSkillId(cond.skillId) ? 99_999 : 99;
833 cond.level = Math.max(1, Math.min(max, Number(levelInput.value) || 1));
834 onChange();
835 });
836 levelLabel.append(levelInput);
837
838 wrap.append(skillLabel, levelLabel);
839 return wrap;
840}
client/src/editor/paletteModal.js +43 −2
@@ -11,8 +11,10 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
11 11 const modal = document.getElementById("palette-modal");
12 12 const tabs = document.getElementById("palette-tabs");
13 13 const panels = document.getElementById("palette-panels");
14 const searchInput = document.getElementById("palette-search");
14 15 let open = false;
15 16 let activeTab = "grounds";
17 let searchQuery = "";
16 18
17 19 const tabsSpec = [
18 20 { id: "grounds", label: "Ground tiles" },
@@ -26,7 +28,21 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
26 28 backdrop.hidden = !visible;
27 29 modal.hidden = !visible;
28 30 if (visible)
29 { render(); }
31 {
32 searchQuery = "";
33 if (searchInput)
34 { searchInput.value = ""; }
35 render();
36 searchInput?.focus();
37 }
38 }
39
40 function matchesSearch (label)
41 {
42 const q = searchQuery.trim().toLowerCase();
43 if (!q)
44 { return true; }
45 return String(label ?? "").toLowerCase().includes(q);
30 46 }
31 47
32 48 function render ()
@@ -49,10 +65,14 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
49 65 panels.innerHTML = "";
50 66 const grid = document.createElement("div");
51 67 grid.className = "palette-grid";
68 let shown = 0;
52 69 if (activeTab === "grounds")
53 70 {
54 71 for (const def of listPlaceableGrounds())
55 72 {
73 if (!matchesSearch(def.displayName))
74 { continue; }
75 shown += 1;
56 76 const state = defaultStateForType(catalog, "ground", def.key);
57 77 const name = spriteImageName("ground", def.key, resolveState(
58 78 catalog.grounds?.[def.key]?.states ?? [],
@@ -74,6 +94,9 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
74 94 {
75 95 for (const entry of listPlaceableBlockPaletteEntries(catalog))
76 96 {
97 if (!matchesSearch(entry.displayName))
98 { continue; }
99 shown += 1;
77 100 grid.append(tileCard({
78 101 label: entry.displayName,
79 102 url: imageUrlFor?.(entry.spriteName),
@@ -93,6 +116,9 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
93 116 {
94 117 for (const def of listSpawnableMobTypes())
95 118 {
119 if (!matchesSearch(def.displayName))
120 { continue; }
121 shown += 1;
96 122 grid.append(tileCard({
97 123 label: def.displayName,
98 124 url: imageUrlFor?.(mobSpriteName(def.mobTypeId)),
@@ -104,12 +130,27 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
104 130 }));
105 131 }
106 132 }
107 panels.append(grid);
133 if (shown === 0)
134 {
135 const empty = document.createElement("p");
136 empty.className = "hint";
137 empty.textContent = searchQuery.trim()
138 ? "No matches for that search."
139 : "Nothing to show.";
140 panels.append(empty);
141 }
142 else
143 { panels.append(grid); }
108 144 }
109 145
110 146 document.getElementById("open-palette").addEventListener("click", () => show(true));
111 147 document.getElementById("palette-close").addEventListener("click", () => show(false));
112 148 backdrop.addEventListener("click", () => show(false));
149 searchInput?.addEventListener("input", () =>
150 {
151 searchQuery = searchInput.value ?? "";
152 render();
153 });
113 154
114 155 return {
115 156 isOpen: () => open,
@@ -11,8 +11,10 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
11 const modal = document.getElementById("palette-modal");
11 const modal = document.getElementById("palette-modal");
12 const tabs = document.getElementById("palette-tabs");
12 const tabs = document.getElementById("palette-tabs");
13 const panels = document.getElementById("palette-panels");
13 const panels = document.getElementById("palette-panels");
14 const searchInput = document.getElementById("palette-search");
14 let open = false;
15 let open = false;
15 let activeTab = "grounds";
16 let activeTab = "grounds";
17 let searchQuery = "";
16
18
17 const tabsSpec = [
19 const tabsSpec = [
18 { id: "grounds", label: "Ground tiles" },
20 { id: "grounds", label: "Ground tiles" },
@@ -26,7 +28,21 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
26 backdrop.hidden = !visible;
28 backdrop.hidden = !visible;
27 modal.hidden = !visible;
29 modal.hidden = !visible;
28 if (visible)
30 if (visible)
29 { render(); }
31 {
32 searchQuery = "";
33 if (searchInput)
34 { searchInput.value = ""; }
35 render();
36 searchInput?.focus();
37 }
38 }
39
40 function matchesSearch (label)
41 {
42 const q = searchQuery.trim().toLowerCase();
43 if (!q)
44 { return true; }
45 return String(label ?? "").toLowerCase().includes(q);
30 }
46 }
31
47
32 function render ()
48 function render ()
@@ -49,10 +65,14 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
49 panels.innerHTML = "";
65 panels.innerHTML = "";
50 const grid = document.createElement("div");
66 const grid = document.createElement("div");
51 grid.className = "palette-grid";
67 grid.className = "palette-grid";
68 let shown = 0;
52 if (activeTab === "grounds")
69 if (activeTab === "grounds")
53 {
70 {
54 for (const def of listPlaceableGrounds())
71 for (const def of listPlaceableGrounds())
55 {
72 {
73 if (!matchesSearch(def.displayName))
74 { continue; }
75 shown += 1;
56 const state = defaultStateForType(catalog, "ground", def.key);
76 const state = defaultStateForType(catalog, "ground", def.key);
57 const name = spriteImageName("ground", def.key, resolveState(
77 const name = spriteImageName("ground", def.key, resolveState(
58 catalog.grounds?.[def.key]?.states ?? [],
78 catalog.grounds?.[def.key]?.states ?? [],
@@ -74,6 +94,9 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
74 {
94 {
75 for (const entry of listPlaceableBlockPaletteEntries(catalog))
95 for (const entry of listPlaceableBlockPaletteEntries(catalog))
76 {
96 {
97 if (!matchesSearch(entry.displayName))
98 { continue; }
99 shown += 1;
77 grid.append(tileCard({
100 grid.append(tileCard({
78 label: entry.displayName,
101 label: entry.displayName,
79 url: imageUrlFor?.(entry.spriteName),
102 url: imageUrlFor?.(entry.spriteName),
@@ -93,6 +116,9 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
93 {
116 {
94 for (const def of listSpawnableMobTypes())
117 for (const def of listSpawnableMobTypes())
95 {
118 {
119 if (!matchesSearch(def.displayName))
120 { continue; }
121 shown += 1;
96 grid.append(tileCard({
122 grid.append(tileCard({
97 label: def.displayName,
123 label: def.displayName,
98 url: imageUrlFor?.(mobSpriteName(def.mobTypeId)),
124 url: imageUrlFor?.(mobSpriteName(def.mobTypeId)),
@@ -104,12 +130,27 @@ export function initPaletteModal ({ onSelect, catalog, imageUrlFor })
104 }));
130 }));
105 }
131 }
106 }
132 }
107 panels.append(grid);
133 if (shown === 0)
134 {
135 const empty = document.createElement("p");
136 empty.className = "hint";
137 empty.textContent = searchQuery.trim()
138 ? "No matches for that search."
139 : "Nothing to show.";
140 panels.append(empty);
141 }
142 else
143 { panels.append(grid); }
108 }
144 }
109
145
110 document.getElementById("open-palette").addEventListener("click", () => show(true));
146 document.getElementById("open-palette").addEventListener("click", () => show(true));
111 document.getElementById("palette-close").addEventListener("click", () => show(false));
147 document.getElementById("palette-close").addEventListener("click", () => show(false));
112 backdrop.addEventListener("click", () => show(false));
148 backdrop.addEventListener("click", () => show(false));
149 searchInput?.addEventListener("input", () =>
150 {
151 searchQuery = searchInput.value ?? "";
152 render();
153 });
113
154
114 return {
155 return {
115 isOpen: () => open,
156 isOpen: () => open,
client/ui/editor.css +10 −0
@@ -1067,6 +1067,16 @@ label {
1067 1067 border-bottom: 1px solid #2c3340;
1068 1068 }
1069 1069
1070 #palette-search {
1071 margin: 0.65rem 1rem 0;
1072 padding: 0.45rem 0.65rem;
1073 border: 1px solid #2c3340;
1074 border-radius: 4px;
1075 background: #0d1016;
1076 color: #e8ecf1;
1077 font: inherit;
1078 }
1079
1070 1080 #tile-config-modal>footer {
1071 1081 border-bottom: 0;
1072 1082 border-top: 1px solid #2c3340;
@@ -1067,6 +1067,16 @@ label {
1067 border-bottom: 1px solid #2c3340;
1067 border-bottom: 1px solid #2c3340;
1068}
1068}
1069
1069
1070#palette-search {
1071 margin: 0.65rem 1rem 0;
1072 padding: 0.45rem 0.65rem;
1073 border: 1px solid #2c3340;
1074 border-radius: 4px;
1075 background: #0d1016;
1076 color: #e8ecf1;
1077 font: inherit;
1078}
1079
1070#tile-config-modal>footer {
1080#tile-config-modal>footer {
1071 border-bottom: 0;
1081 border-bottom: 0;
1072 border-top: 1px solid #2c3340;
1082 border-top: 1px solid #2c3340;
server/src/doors/conditionContext.js +2 −2
@@ -4,7 +4,7 @@
4 4 */
5 5 import { Component } from "../ecs/components.js";
6 6 import { countItemInSlots } from "../../../shared/items/inventory.js";
7 import { skillLevel } from "../../../shared/definitions/skills.js";
7 import { resolveSkillRequirementLevel } from "../../../shared/combat/combatLevel.js";
8 8 import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
9 9 import { OVERWORLD_ID, normalizeDimensionId } from "../../../shared/world/dimensions.js";
10 10 import { doorHasRequirements, doorRequirementsMet } from "../../../shared/world/doorRequirements.js";
@@ -107,7 +107,7 @@ export function buildEntityConditionContext (world, entityId)
107 107 questState: (questId) => questStates[String(questId)] ?? "not-started",
108 108 dialogueHeard: (dialogueId, stepId) => heard.has(`${dialogueId}\0${stepId}`),
109 109 dialogueTriggerLatched: (dialogueId, trigger) => triggers.has(`${dialogueId}\0${trigger}`),
110 skillLevel: (skillId) => skillLevel(skills ?? {}, skillId),
110 skillLevel: (skillId) => resolveSkillRequirementLevel(skills ?? {}, skillId),
111 111 hasVisitedDimension: (dimId) => visited.has(normalizeDimensionId(dimId)),
112 112 killCount: (condition) =>
113 113 {
@@ -4,7 +4,7 @@
4 */
4 */
5import { Component } from "../ecs/components.js";
5import { Component } from "../ecs/components.js";
6import { countItemInSlots } from "../../../shared/items/inventory.js";
6import { countItemInSlots } from "../../../shared/items/inventory.js";
7import { skillLevel } from "../../../shared/definitions/skills.js";
7import { resolveSkillRequirementLevel } from "../../../shared/combat/combatLevel.js";
8import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
8import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
9import { OVERWORLD_ID, normalizeDimensionId } from "../../../shared/world/dimensions.js";
9import { OVERWORLD_ID, normalizeDimensionId } from "../../../shared/world/dimensions.js";
10import { doorHasRequirements, doorRequirementsMet } from "../../../shared/world/doorRequirements.js";
10import { doorHasRequirements, doorRequirementsMet } from "../../../shared/world/doorRequirements.js";
@@ -107,7 +107,7 @@ export function buildEntityConditionContext (world, entityId)
107 questState: (questId) => questStates[String(questId)] ?? "not-started",
107 questState: (questId) => questStates[String(questId)] ?? "not-started",
108 dialogueHeard: (dialogueId, stepId) => heard.has(`${dialogueId}\0${stepId}`),
108 dialogueHeard: (dialogueId, stepId) => heard.has(`${dialogueId}\0${stepId}`),
109 dialogueTriggerLatched: (dialogueId, trigger) => triggers.has(`${dialogueId}\0${trigger}`),
109 dialogueTriggerLatched: (dialogueId, trigger) => triggers.has(`${dialogueId}\0${trigger}`),
110 skillLevel: (skillId) => skillLevel(skills ?? {}, skillId),
110 skillLevel: (skillId) => resolveSkillRequirementLevel(skills ?? {}, skillId),
111 hasVisitedDimension: (dimId) => visited.has(normalizeDimensionId(dimId)),
111 hasVisitedDimension: (dimId) => visited.has(normalizeDimensionId(dimId)),
112 killCount: (condition) =>
112 killCount: (condition) =>
113 {
113 {
server/src/quests/runtime.js +3 −2
@@ -8,7 +8,8 @@ import { countItemInSlots, insertStack, takeMatchingFromSlots, takeMatchingUpToF
8 8 import { attachOrigins, godsOrigin } from "../../../shared/items/origin.js";
9 9 import { itemDefinition, itemDisplayName } from "../../../shared/definitions/items.js";
10 10 import { applySkillXp, publicSkillsPayload } from "../../../shared/skills/state.js";
11 import { skillLevel, SKILL_DEFINITIONS } from "../../../shared/definitions/skills.js";
11 import { SKILL_DEFINITIONS } from "../../../shared/definitions/skills.js";
12 import { resolveSkillRequirementLevel } from "../../../shared/combat/combatLevel.js";
12 13 import {
13 14 formatDialogueRewardMessage,
14 15 formatDialogueQuestRewardMessage,
@@ -181,7 +182,7 @@ export class QuestRuntime
181 182 dialogueHeard: (dialogueId, stepId) => this.stateDb.isDialogueHeard(characterId, dialogueId, stepId),
182 183 dialogueTriggerLatched: (dialogueId, trigger) =>
183 184 this.stateDb.isDialogueTriggerLatched(characterId, dialogueId, trigger),
184 skillLevel: (skillId) => skillLevel(playerView?.skills ?? {}, skillId),
185 skillLevel: (skillId) => resolveSkillRequirementLevel(playerView?.skills ?? {}, skillId),
185 186 hasVisitedDimension: (dimId) => this.stateDb.hasVisitedDimension(characterId, dimId),
186 187 killCount: (condition) =>
187 188 {
@@ -8,7 +8,8 @@ import { countItemInSlots, insertStack, takeMatchingFromSlots, takeMatchingUpToF
8import { attachOrigins, godsOrigin } from "../../../shared/items/origin.js";
8import { attachOrigins, godsOrigin } from "../../../shared/items/origin.js";
9import { itemDefinition, itemDisplayName } from "../../../shared/definitions/items.js";
9import { itemDefinition, itemDisplayName } from "../../../shared/definitions/items.js";
10import { applySkillXp, publicSkillsPayload } from "../../../shared/skills/state.js";
10import { applySkillXp, publicSkillsPayload } from "../../../shared/skills/state.js";
11import { skillLevel, SKILL_DEFINITIONS } from "../../../shared/definitions/skills.js";
11import { SKILL_DEFINITIONS } from "../../../shared/definitions/skills.js";
12import { resolveSkillRequirementLevel } from "../../../shared/combat/combatLevel.js";
12import {
13import {
13 formatDialogueRewardMessage,
14 formatDialogueRewardMessage,
14 formatDialogueQuestRewardMessage,
15 formatDialogueQuestRewardMessage,
@@ -181,7 +182,7 @@ export class QuestRuntime
181 dialogueHeard: (dialogueId, stepId) => this.stateDb.isDialogueHeard(characterId, dialogueId, stepId),
182 dialogueHeard: (dialogueId, stepId) => this.stateDb.isDialogueHeard(characterId, dialogueId, stepId),
182 dialogueTriggerLatched: (dialogueId, trigger) =>
183 dialogueTriggerLatched: (dialogueId, trigger) =>
183 this.stateDb.isDialogueTriggerLatched(characterId, dialogueId, trigger),
184 this.stateDb.isDialogueTriggerLatched(characterId, dialogueId, trigger),
184 skillLevel: (skillId) => skillLevel(playerView?.skills ?? {}, skillId),
185 skillLevel: (skillId) => resolveSkillRequirementLevel(playerView?.skills ?? {}, skillId),
185 hasVisitedDimension: (dimId) => this.stateDb.hasVisitedDimension(characterId, dimId),
186 hasVisitedDimension: (dimId) => this.stateDb.hasVisitedDimension(characterId, dimId),
186 killCount: (condition) =>
187 killCount: (condition) =>
187 {
188 {
shared/combat/combatLevel.js +12 −1
@@ -1,4 +1,4 @@
1 import { SkillId, skillLevel } from "../definitions/skills.js";
1 import { SkillId, skillLevel, MetaSkillId, totalLevelFromSkills } from "../definitions/skills.js";
2 2
3 3 /** Minutes in one chunk before aggressive (non-boss) mobs stop auto-aggroing the player. */
4 4 export const CHUNK_AGGRO_PEACE_MS = 15 * 60 * 1000;
@@ -38,6 +38,17 @@ export function combatLevelFromSkills (skillsComponent)
38 38 return Math.floor(Math.max(M, R, S) + D);
39 39 }
40 40
41 /** Resolve skillLevelAtLeast against a real skill or Combat/Total Level. */
42 export function resolveSkillRequirementLevel (skills, skillId)
43 {
44 const id = String(skillId ?? "");
45 if (id === MetaSkillId.combatLevel)
46 { return combatLevelFromSkills(skills); }
47 if (id === MetaSkillId.totalLevel)
48 { return totalLevelFromSkills(skills); }
49 return skillLevel(skills, id);
50 }
51
41 52 /** Mob level used for aggression immunity (creature.level, spawn origin, or def.attackSkill). */
42 53 export function mobAggressionLevel (creature, spawnOrigin, mobDef)
43 54 {
@@ -1,4 +1,4 @@
1import { SkillId, skillLevel } from "../definitions/skills.js";
1import { SkillId, skillLevel, MetaSkillId, totalLevelFromSkills } from "../definitions/skills.js";
2
2
3/** Minutes in one chunk before aggressive (non-boss) mobs stop auto-aggroing the player. */
3/** Minutes in one chunk before aggressive (non-boss) mobs stop auto-aggroing the player. */
4export const CHUNK_AGGRO_PEACE_MS = 15 * 60 * 1000;
4export const CHUNK_AGGRO_PEACE_MS = 15 * 60 * 1000;
@@ -38,6 +38,17 @@ export function combatLevelFromSkills (skillsComponent)
38 return Math.floor(Math.max(M, R, S) + D);
38 return Math.floor(Math.max(M, R, S) + D);
39}
39}
40
40
41/** Resolve skillLevelAtLeast against a real skill or Combat/Total Level. */
42export function resolveSkillRequirementLevel (skills, skillId)
43{
44 const id = String(skillId ?? "");
45 if (id === MetaSkillId.combatLevel)
46 { return combatLevelFromSkills(skills); }
47 if (id === MetaSkillId.totalLevel)
48 { return totalLevelFromSkills(skills); }
49 return skillLevel(skills, id);
50}
51
41/** Mob level used for aggression immunity (creature.level, spawn origin, or def.attackSkill). */
52/** Mob level used for aggression immunity (creature.level, spawn origin, or def.attackSkill). */
42export function mobAggressionLevel (creature, spawnOrigin, mobDef)
53export function mobAggressionLevel (creature, spawnOrigin, mobDef)
43{
54{
shared/definitions/skills.js +34 −0
@@ -27,6 +27,18 @@ export const SkillId = Object.freeze({
27 27 alchemy: "alchemy"
28 28 });
29 29
30 /** Pseudo-ids for skillLevelAtLeast requirements (not real skills). */
31 export const MetaSkillId = Object.freeze({
32 combatLevel: "combatLevel",
33 totalLevel: "totalLevel"
34 });
35
36 export function isMetaSkillId (skillId)
37 {
38 const id = String(skillId ?? "");
39 return id === MetaSkillId.combatLevel || id === MetaSkillId.totalLevel;
40 }
41
30 42 /** Display order for the skills panel (two columns, top to bottom). */
31 43 export const ALL_SKILL_IDS = Object.freeze([
32 44 SkillId.health,
@@ -116,6 +128,28 @@ export function skillLevel (skills, skillId)
116 128 return Math.min(MAX_SKILL_LEVEL, Math.max(1, levels[skillId] | 0 || 1));
117 129 }
118 130
131 /** Sum of all skill levels (used by skillLevelAtLeast totalLevel requirements). */
132 export function totalLevelFromSkills (skills)
133 {
134 let sum = 0;
135 for (const skillId of ALL_SKILL_IDS)
136 { sum += skillLevel(skills, skillId); }
137 return sum;
138 }
139
140 /** Editor picker entries: Combat Level + Total Level first, then every skill. */
141 export function listSkillRequirementOptions ()
142 {
143 return [
144 { skillId: MetaSkillId.combatLevel, displayName: "Combat Level" },
145 { skillId: MetaSkillId.totalLevel, displayName: "Total Level" },
146 ...ALL_SKILL_IDS.map((skillId) => ({
147 skillId,
148 displayName: SKILL_DEFINITIONS[skillId]?.displayName ?? skillId
149 }))
150 ];
151 }
152
119 153 export function playerMaxHealth (skills)
120 154 {
121 155 return skillLevel(skills, SkillId.health);
@@ -27,6 +27,18 @@ export const SkillId = Object.freeze({
27 alchemy: "alchemy"
27 alchemy: "alchemy"
28});
28});
29
29
30/** Pseudo-ids for skillLevelAtLeast requirements (not real skills). */
31export const MetaSkillId = Object.freeze({
32 combatLevel: "combatLevel",
33 totalLevel: "totalLevel"
34});
35
36export function isMetaSkillId (skillId)
37{
38 const id = String(skillId ?? "");
39 return id === MetaSkillId.combatLevel || id === MetaSkillId.totalLevel;
40}
41
30/** Display order for the skills panel (two columns, top to bottom). */
42/** Display order for the skills panel (two columns, top to bottom). */
31export const ALL_SKILL_IDS = Object.freeze([
43export const ALL_SKILL_IDS = Object.freeze([
32 SkillId.health,
44 SkillId.health,
@@ -116,6 +128,28 @@ export function skillLevel (skills, skillId)
116 return Math.min(MAX_SKILL_LEVEL, Math.max(1, levels[skillId] | 0 || 1));
128 return Math.min(MAX_SKILL_LEVEL, Math.max(1, levels[skillId] | 0 || 1));
117}
129}
118
130
131/** Sum of all skill levels (used by skillLevelAtLeast totalLevel requirements). */
132export function totalLevelFromSkills (skills)
133{
134 let sum = 0;
135 for (const skillId of ALL_SKILL_IDS)
136 { sum += skillLevel(skills, skillId); }
137 return sum;
138}
139
140/** Editor picker entries: Combat Level + Total Level first, then every skill. */
141export function listSkillRequirementOptions ()
142{
143 return [
144 { skillId: MetaSkillId.combatLevel, displayName: "Combat Level" },
145 { skillId: MetaSkillId.totalLevel, displayName: "Total Level" },
146 ...ALL_SKILL_IDS.map((skillId) => ({
147 skillId,
148 displayName: SKILL_DEFINITIONS[skillId]?.displayName ?? skillId
149 }))
150 ];
151}
152
119export function playerMaxHealth (skills)
153export function playerMaxHealth (skills)
120{
154{
121 return skillLevel(skills, SkillId.health);
155 return skillLevel(skills, SkillId.health);
shared/quests/conditions.js +11 −1
@@ -1,6 +1,7 @@
1 1 /** Shared condition kinds + ConditionSet evaluation (server provides snapshot). */
2 2
3 3 import { OVERWORLD_ID, normalizeDimensionId } from "../world/dimensions.js";
4 import { isMetaSkillId } from "../definitions/skills.js";
4 5
5 6 export const ConditionKind = Object.freeze({
6 7 hasItem: "hasItem",
@@ -23,6 +24,15 @@ export const ConditionKind = Object.freeze({
23 24 interactBlock: "interactBlock"
24 25 });
25 26
27 /** Required threshold for skillLevelAtLeast (meta levels may exceed 99). */
28 export function skillRequirementThreshold (condition)
29 {
30 const level = Math.max(1, Number(condition?.level) || 1) | 0;
31 if (isMetaSkillId(condition?.skillId))
32 { return Math.min(99_999, level); }
33 return Math.min(99, level);
34 }
35
26 36 export function emptyConditionSet ()
27 37 {
28 38 return { all: [] };
@@ -181,7 +191,7 @@ export function evaluateCondition (condition, ctx)
181 191 return pct >= Math.min(100, Math.max(0, Number(condition.percent) || 0));
182 192 }
183 193 case ConditionKind.skillLevelAtLeast:
184 return (ctx.skillLevel?.(condition.skillId) ?? 1) >= Math.max(1, Math.min(99, Number(condition.level) || 1));
194 return (ctx.skillLevel?.(condition.skillId) ?? 1) >= skillRequirementThreshold(condition);
185 195 case ConditionKind.killCount:
186 196 return (ctx.killCount?.(condition) ?? 0) >= Math.max(1, Number(condition.count) || 1);
187 197 case ConditionKind.interactBlock:
@@ -1,6 +1,7 @@
1/** Shared condition kinds + ConditionSet evaluation (server provides snapshot). */
1/** Shared condition kinds + ConditionSet evaluation (server provides snapshot). */
2
2
3import { OVERWORLD_ID, normalizeDimensionId } from "../world/dimensions.js";
3import { OVERWORLD_ID, normalizeDimensionId } from "../world/dimensions.js";
4import { isMetaSkillId } from "../definitions/skills.js";
4
5
5export const ConditionKind = Object.freeze({
6export const ConditionKind = Object.freeze({
6 hasItem: "hasItem",
7 hasItem: "hasItem",
@@ -23,6 +24,15 @@ export const ConditionKind = Object.freeze({
23 interactBlock: "interactBlock"
24 interactBlock: "interactBlock"
24});
25});
25
26
27/** Required threshold for skillLevelAtLeast (meta levels may exceed 99). */
28export function skillRequirementThreshold (condition)
29{
30 const level = Math.max(1, Number(condition?.level) || 1) | 0;
31 if (isMetaSkillId(condition?.skillId))
32 { return Math.min(99_999, level); }
33 return Math.min(99, level);
34}
35
26export function emptyConditionSet ()
36export function emptyConditionSet ()
27{
37{
28 return { all: [] };
38 return { all: [] };
@@ -181,7 +191,7 @@ export function evaluateCondition (condition, ctx)
181 return pct >= Math.min(100, Math.max(0, Number(condition.percent) || 0));
191 return pct >= Math.min(100, Math.max(0, Number(condition.percent) || 0));
182 }
192 }
183 case ConditionKind.skillLevelAtLeast:
193 case ConditionKind.skillLevelAtLeast:
184 return (ctx.skillLevel?.(condition.skillId) ?? 1) >= Math.max(1, Math.min(99, Number(condition.level) || 1));
194 return (ctx.skillLevel?.(condition.skillId) ?? 1) >= skillRequirementThreshold(condition);
185 case ConditionKind.killCount:
195 case ConditionKind.killCount:
186 return (ctx.killCount?.(condition) ?? 0) >= Math.max(1, Number(condition.count) || 1);
196 return (ctx.killCount?.(condition) ?? 0) >= Math.max(1, Number(condition.count) || 1);
187 case ConditionKind.interactBlock:
197 case ConditionKind.interactBlock:
shared/quests/objectiveProgress.js +3 −3
@@ -1,4 +1,4 @@
1 import { ConditionKind } from "./conditions.js";
1 import { ConditionKind, skillRequirementThreshold } from "./conditions.js";
2 2
3 3 /**
4 4 * Progress for countable objective conditions (hasItem, killCount, skillLevelAtLeast).
@@ -41,8 +41,8 @@ export function countableConditionProgress (condition, ctx)
41 41 }
42 42 if (kind === ConditionKind.skillLevelAtLeast)
43 43 {
44 const required = Math.max(1, Math.min(99, Number(condition.level) || 1));
45 const current = Math.max(1, ctx.skillLevel?.(condition.skillId) ?? 1);
44 const required = skillRequirementThreshold(condition);
45 const current = Math.max(0, ctx.skillLevel?.(condition.skillId) ?? 0);
46 46 return { current: Math.min(current, required), required };
47 47 }
48 48 return null;
@@ -1,4 +1,4 @@
1import { ConditionKind } from "./conditions.js";
1import { ConditionKind, skillRequirementThreshold } from "./conditions.js";
2
2
3/**
3/**
4 * Progress for countable objective conditions (hasItem, killCount, skillLevelAtLeast).
4 * Progress for countable objective conditions (hasItem, killCount, skillLevelAtLeast).
@@ -41,8 +41,8 @@ export function countableConditionProgress (condition, ctx)
41 }
41 }
42 if (kind === ConditionKind.skillLevelAtLeast)
42 if (kind === ConditionKind.skillLevelAtLeast)
43 {
43 {
44 const required = Math.max(1, Math.min(99, Number(condition.level) || 1));
44 const required = skillRequirementThreshold(condition);
45 const current = Math.max(1, ctx.skillLevel?.(condition.skillId) ?? 1);
45 const current = Math.max(0, ctx.skillLevel?.(condition.skillId) ?? 0);
46 return { current: Math.min(current, required), required };
46 return { current: Math.min(current, required), required };
47 }
47 }
48 return null;
48 return null;