BlueGit

timfa questward

Use searchable dimension comboboxes in quest conditions.

atTile, inDimension, and hasVisitedDimension pick dimensions from the editor list with type-to-filter.

timfa Tim Falken · pushed by timfa

Authored 2026-09-06 · 2 months ago

Hash
e528f76785c0d872f07cb3a86c76747508a53c32
Parent
7d71a775
3 files changed +42 −7
client/src/editor/main.js +7 −1
@@ -1513,7 +1513,13 @@ async function main ()
1513 1513 socket,
1514 1514 MessageType,
1515 1515 describeWorldTile,
1516 centerEditorOnTile
1516 centerEditorOnTile,
1517 getDimensionOptions: () => [...dimensionsById.values()].map((dim) => ({
1518 id: dim.dimensionId,
1519 label: dim.displayName || dim.dimensionId,
1520 disabled: dim.deletedAt != null,
1521 hint: dim.deletedAt != null ? "soft-deleted" : null
1522 }))
1517 1523 });
1518 1524 dialoguesModal = initDialoguesModal({ socket, MessageType });
1519 1525 giftsModal = initGiftsModal({ socket, MessageType });
@@ -1513,7 +1513,13 @@ async function main ()
1513 socket,
1513 socket,
1514 MessageType,
1514 MessageType,
1515 describeWorldTile,
1515 describeWorldTile,
1516 centerEditorOnTile
1516 centerEditorOnTile,
1517 getDimensionOptions: () => [...dimensionsById.values()].map((dim) => ({
1518 id: dim.dimensionId,
1519 label: dim.displayName || dim.dimensionId,
1520 disabled: dim.deletedAt != null,
1521 hint: dim.deletedAt != null ? "soft-deleted" : null
1522 }))
1517 });
1523 });
1518 dialoguesModal = initDialoguesModal({ socket, MessageType });
1524 dialoguesModal = initDialoguesModal({ socket, MessageType });
1519 giftsModal = initGiftsModal({ socket, MessageType });
1525 giftsModal = initGiftsModal({ socket, MessageType });
client/src/editor/questsModal.js +30 −6
@@ -2,6 +2,8 @@ import { normalizeQuestDef, normalizeDialogueTree } from "/shared/quests/normali
2 2 import { ConditionKind, emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
3 3 import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
4 4 import { listSpawnableMobTypes } from "/shared/definitions/mobs.js";
5 import { createDimensionCombobox } from "./dimensionCombobox.js";
6 import { OVERWORLD_ID } from "/shared/world/dimensions.js";
5 7
6 8 const SIMPLE_KINDS = [
7 9 ConditionKind.hasItem,
@@ -17,7 +19,8 @@ export function initQuestsModal ({
17 19 socket,
18 20 MessageType,
19 21 describeWorldTile = null,
20 centerEditorOnTile = null
22 centerEditorOnTile = null,
23 getDimensionOptions = null
21 24 })
22 25 {
23 26 const backdrop = document.getElementById("quests-backdrop");
@@ -176,7 +179,7 @@ export function initQuestsModal ({
176 179 obj.when = next;
177 180 if (remount)
178 181 { renderEditor(); }
179 }, { quests, dialogues, describeWorldTile, centerEditorOnTile }));
182 }, { quests, dialogues, describeWorldTile, centerEditorOnTile, getDimensionOptions }));
180 183 box.append(objBox);
181 184 });
182 185 editorEl.append(box);
@@ -418,9 +421,8 @@ function renderConditionSet (when, onChange, ctx = {})
418 421 || cond.kind === ConditionKind.hasVisitedDimension
419 422 )
420 423 {
421 row.append(miniField("dimensionId", cond.dimensionId ?? "overworld", (v) =>
424 row.append(dimensionConditionField(cond, ctx, () =>
422 425 {
423 cond.dimensionId = String(v || "overworld");
424 426 set.all[index].condition = cond;
425 427 bump(false);
426 428 }));
@@ -490,9 +492,8 @@ function atTileConditionFields (cond, ctx, onChanged)
490 492 {
491 493 const wrap = document.createElement("div");
492 494 wrap.className = "quest-condition-attile";
493 const dimField = miniField("dimensionId", cond.dimensionId ?? "overworld", (v) =>
495 const dimField = dimensionConditionField(cond, ctx, () =>
494 496 {
495 cond.dimensionId = String(v || "overworld");
496 497 refreshInfo();
497 498 onChanged();
498 499 });
@@ -559,6 +560,29 @@ function atTileConditionFields (cond, ctx, onChanged)
559 560 return wrap;
560 561 }
561 562
563 /** Searchable dimension combobox bound to condition.dimensionId. */
564 function dimensionConditionField (cond, ctx, onChanged)
565 {
566 const root = document.createElement("div");
567 root.className = "quest-condition-dim";
568 const combo = createDimensionCombobox({
569 root,
570 allowCreate: false,
571 placeholder: "Dimension…",
572 onSelect (id)
573 {
574 cond.dimensionId = id || OVERWORLD_ID;
575 onChanged();
576 }
577 });
578 const options = typeof ctx.getDimensionOptions === "function"
579 ? ctx.getDimensionOptions()
580 : [{ id: OVERWORLD_ID, label: "Overworld" }];
581 combo.setOptions(options);
582 combo.setValue(cond.dimensionId || OVERWORLD_ID);
583 return root;
584 }
585
562 586 /** Mob selector + kill quantity for killCount conditions. */
563 587 function killCountConditionFields (cond, onChanged)
564 588 {
@@ -2,6 +2,8 @@ import { normalizeQuestDef, normalizeDialogueTree } from "/shared/quests/normali
2import { ConditionKind, emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
2import { ConditionKind, emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
3import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
3import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
4import { listSpawnableMobTypes } from "/shared/definitions/mobs.js";
4import { listSpawnableMobTypes } from "/shared/definitions/mobs.js";
5import { createDimensionCombobox } from "./dimensionCombobox.js";
6import { OVERWORLD_ID } from "/shared/world/dimensions.js";
5
7
6const SIMPLE_KINDS = [
8const SIMPLE_KINDS = [
7 ConditionKind.hasItem,
9 ConditionKind.hasItem,
@@ -17,7 +19,8 @@ export function initQuestsModal ({
17 socket,
19 socket,
18 MessageType,
20 MessageType,
19 describeWorldTile = null,
21 describeWorldTile = null,
20 centerEditorOnTile = null
22 centerEditorOnTile = null,
23 getDimensionOptions = null
21})
24})
22{
25{
23 const backdrop = document.getElementById("quests-backdrop");
26 const backdrop = document.getElementById("quests-backdrop");
@@ -176,7 +179,7 @@ export function initQuestsModal ({
176 obj.when = next;
179 obj.when = next;
177 if (remount)
180 if (remount)
178 { renderEditor(); }
181 { renderEditor(); }
179 }, { quests, dialogues, describeWorldTile, centerEditorOnTile }));
182 }, { quests, dialogues, describeWorldTile, centerEditorOnTile, getDimensionOptions }));
180 box.append(objBox);
183 box.append(objBox);
181 });
184 });
182 editorEl.append(box);
185 editorEl.append(box);
@@ -418,9 +421,8 @@ function renderConditionSet (when, onChange, ctx = {})
418 || cond.kind === ConditionKind.hasVisitedDimension
421 || cond.kind === ConditionKind.hasVisitedDimension
419 )
422 )
420 {
423 {
421 row.append(miniField("dimensionId", cond.dimensionId ?? "overworld", (v) =>
424 row.append(dimensionConditionField(cond, ctx, () =>
422 {
425 {
423 cond.dimensionId = String(v || "overworld");
424 set.all[index].condition = cond;
426 set.all[index].condition = cond;
425 bump(false);
427 bump(false);
426 }));
428 }));
@@ -490,9 +492,8 @@ function atTileConditionFields (cond, ctx, onChanged)
490{
492{
491 const wrap = document.createElement("div");
493 const wrap = document.createElement("div");
492 wrap.className = "quest-condition-attile";
494 wrap.className = "quest-condition-attile";
493 const dimField = miniField("dimensionId", cond.dimensionId ?? "overworld", (v) =>
495 const dimField = dimensionConditionField(cond, ctx, () =>
494 {
496 {
495 cond.dimensionId = String(v || "overworld");
496 refreshInfo();
497 refreshInfo();
497 onChanged();
498 onChanged();
498 });
499 });
@@ -559,6 +560,29 @@ function atTileConditionFields (cond, ctx, onChanged)
559 return wrap;
560 return wrap;
560}
561}
561
562
563/** Searchable dimension combobox bound to condition.dimensionId. */
564function dimensionConditionField (cond, ctx, onChanged)
565{
566 const root = document.createElement("div");
567 root.className = "quest-condition-dim";
568 const combo = createDimensionCombobox({
569 root,
570 allowCreate: false,
571 placeholder: "Dimension…",
572 onSelect (id)
573 {
574 cond.dimensionId = id || OVERWORLD_ID;
575 onChanged();
576 }
577 });
578 const options = typeof ctx.getDimensionOptions === "function"
579 ? ctx.getDimensionOptions()
580 : [{ id: OVERWORLD_ID, label: "Overworld" }];
581 combo.setOptions(options);
582 combo.setValue(cond.dimensionId || OVERWORLD_ID);
583 return root;
584}
585
562/** Mob selector + kill quantity for killCount conditions. */
586/** Mob selector + kill quantity for killCount conditions. */
563function killCountConditionFields (cond, onChanged)
587function killCountConditionFields (cond, onChanged)
564{
588{
client/ui/editor.css +5 −0
@@ -1588,6 +1588,11 @@ label {
1588 1588 border-radius: 4px;
1589 1589 }
1590 1590
1591 .quest-condition-dim {
1592 min-width: 14rem;
1593 max-width: 22rem;
1594 }
1595
1591 1596 .dialogue-reward-item-search {
1592 1597 display: flex;
1593 1598 flex-direction: column;
@@ -1588,6 +1588,11 @@ label {
1588 border-radius: 4px;
1588 border-radius: 4px;
1589}
1589}
1590
1590
1591.quest-condition-dim {
1592 min-width: 14rem;
1593 max-width: 22rem;
1594}
1595
1591.dialogue-reward-item-search {
1596.dialogue-reward-item-search {
1592 display: flex;
1597 display: flex;
1593 flex-direction: column;
1598 flex-direction: column;