From 6e7c0b3ec4253bb58a815979b1f4574d08cb1f53 Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Fri, 10 Jul 2026 00:43:29 -0400 Subject: feat(admin): add triggers to rooms, add global triggers --- internal/admin/static/admin.css | 4 +- internal/admin/static/cardeditor.js | 5 +- internal/admin/static/map.js | 184 ++++--------- internal/admin/static/mobeditor.js | 38 +-- internal/admin/static/triggerseditor.js | 463 ++++++++++++++++++++++++++++++++ 5 files changed, 544 insertions(+), 150 deletions(-) create mode 100644 internal/admin/static/triggerseditor.js (limited to 'internal/admin/static') diff --git a/internal/admin/static/admin.css b/internal/admin/static/admin.css index a5c3497..896ea1a 100644 --- a/internal/admin/static/admin.css +++ b/internal/admin/static/admin.css @@ -457,8 +457,8 @@ g.ud-hover:hover text{font-weight:bold} .ie-step-messages{margin:2px 0} .ie-step-addbar{display:none;flex-wrap:wrap;gap:3px;margin-top:2px} .ie-step-row.show-addbar .ie-step-addbar{display:flex} -.ie-step-addbar-bottom{display:grid;grid-template-columns:repeat(5,1fr);gap:4px;margin-top:6px} -.ie-step-addbar-bottom .btn{width:100%;box-sizing:border-box;text-align:center;padding:4px 10px;font-size:11px} +.ie-step-addbar-bottom{display:flex;flex-wrap:wrap;gap:4px;margin-top:6px} +.ie-step-addbar-bottom .btn{flex:0 0 auto;padding:4px 10px;font-size:11px} /* ── Message rows within a step ── */ .ie-msg-row{display:flex;align-items:center;gap:4px} diff --git a/internal/admin/static/cardeditor.js b/internal/admin/static/cardeditor.js index e430e1d..1e8d259 100644 --- a/internal/admin/static/cardeditor.js +++ b/internal/admin/static/cardeditor.js @@ -92,8 +92,9 @@ function ced_addKVRow(cardID, subKey) { // ---- Search autocomplete ---- -function ced_setupSearchFields() { - document.querySelectorAll('.search-input').forEach(function(input) { +function ced_setupSearchFields(root) { + root = root || document; + root.querySelectorAll('.search-input').forEach(function(input) { if (input._searchSetup) return; input._searchSetup = true; var entityType = input.getAttribute('data-search-type') || 'items'; diff --git a/internal/admin/static/map.js b/internal/admin/static/map.js index ab20a86..7c47b4e 100644 --- a/internal/admin/static/map.js +++ b/internal/admin/static/map.js @@ -26,6 +26,7 @@ var oppositeDir = { up:'down', down:'up' }; var saveTimer = null; +var _triggersDirty = false; var upTarget = {}, downTarget = {}; var _mapMouseCleanup = false; @@ -530,6 +531,7 @@ function updateView() { function selectRoom(id) { if (saveTimer) { clearTimeout(saveTimer); saveTimer = null; } + _triggersDirty = false; var prev = selectedRoom; selectedRoom = id; multiSelectedIds.clear(); @@ -575,8 +577,7 @@ function renderSidePanel(data) { html += ''; html += ''; html += ''; - html += ''; - html += ''; + html += ''; html += ''; html += '
Fires when a player enters this room. First matching entry wins.
'; h += renderTriggerListHTML(r.on_enter, 'on_enter', 'on_enter', false); - h += 'Fires when a player leaves this room. First matching entry wins.
'; h += renderTriggerListHTML(r.on_exit, 'on_exit', 'on_exit', false); return h; } -// ── Triggers tab (on_flag_change / on_global_flag_change) ── - -function renderTriggersTab(r) { - var fc = Array.isArray(r.on_flag_change) ? r.on_flag_change : []; - var gfc = Array.isArray(r.on_global_flag_change) ? r.on_global_flag_change : []; - window._editorData = { on_flag_change: fc, on_global_flag_change: gfc }; - - window._ieRenderCurrent = function() { - if (window._ieSyncAll) window._ieSyncAll(window._editorData, [ - {id: 'on_flag_change', path: 'on_flag_change', isArray: true, interactionStyle: true, itemIDAllowed: false, label: 'Trigger'}, - {id: 'on_global_flag_change', path: 'on_global_flag_change', isArray: true, interactionStyle: true, itemIDAllowed: false, label: 'Trigger'} - ]); - if (currentRoomData && currentRoomData.room) { - currentRoomData.room.on_flag_change = window._editorData.on_flag_change; - currentRoomData.room.on_global_flag_change = window._editorData.on_global_flag_change; - } - switchPanelTab(9); - autoSave(); - }; - window._ieRenderOnly = window._ieRenderCurrent; - window._ieSyncAll = ie_syncAllInteractions; - - var h = 'Fires when a player flag changes. Use the condition\'s "In Room" gate to scope to this room (delete it to make global).
'; - h += renderFlagTriggerListHTML(r.on_flag_change, 'on_flag_change', 'on_flag_change', 'player'); - h += 'Fires when a global flag changes (no player involved).
'; - h += renderFlagTriggerListHTML(r.on_global_flag_change, 'on_global_flag_change', 'on_global_flag_change', 'global'); - return h; -} - // renderTriggerListHTML emits the HTML for a []Trigger block using the shared // ie_renderArraySection. It's a thin shim that builds the ctx the card // editors construct. @@ -3469,61 +3484,10 @@ function renderTriggerListHTML(arr, secId, secPath, allowItem) { return '_mapAddTrigger(\'' + secPath + '\')'; } }; - return ie_renderArraySection(ctx); -} - -// renderFlagTriggerListHTML is like renderTriggerListHTML but adds the -// on_player_flag / on_global_flag subscription header per entry. -function renderFlagTriggerListHTML(arr, secId, secPath, kind) { - var visMap = {}; - arr = Array.isArray(arr) ? arr : []; - var sec = { - id: secId, - path: secPath, - isArray: true, - interactionStyle: true, - itemIDAllowed: false, - label: 'Trigger', - fields: [] - }; - var flagKey = kind === 'player' ? 'on_player_flag' : 'on_global_flag'; - - var h = ''; - arr.forEach(function(item, idx) { - visMap[idx] = visMap[idx] || {}; - var condExists = !!(item.condition && typeof item.condition === 'object'); - var lockVal = !!item.lock; - var steps = item.steps || []; - var flagName = item[flagKey] || ''; - - h += 'No triggers
'; +} + +function loadTriggerItem(id) { + loadTrigger(id); +} + +function loadTrigger(id) { + triggerID = id; + currentID = id; + window.location.hash = id; + renderTriggerList(''); + API.get('/api/triggers/' + encodeURIComponent(id)).then(function(data) { + triggerData = data; + triggerKind = data._kind || ''; + if (!Array.isArray(triggerData.steps)) triggerData.steps = []; + window._editorData = triggerData; + window._ieRenderCurrent = renderCurrent; + window._ieRenderOnly = function() { if (triggerID && triggerData) renderTriggerEditor(triggerID, triggerData); }; + window._ieSyncAll = function(ed) { if (ed) syncCondDOM(ed); }; + renderTriggerEditor(id, data); + }).catch(function(e) { + $('#editorMain').innerHTML = 'Failed to load: ' + esc(e.message) + '
'; + }); +} + +function syncCondDOM(ed) { + if (!ed) return; + var condRoot = document.querySelector('.obj-card[data-card="condition"] .ie-cond-root'); + if (condRoot) { + var cond = ie_collectCond(condRoot); + if (cond) ed.condition = cond; + else delete ed.condition; + } +} + +function renderCurrent() { + if (!triggerData || !triggerID) return; + syncCondDOM(triggerData); + var flagTypeEl = document.querySelector('input[name="trigFlagType"]:checked'); + if (flagTypeEl) { + delete triggerData.on_player_flag; + delete triggerData.on_global_flag; + if (flagTypeEl.value === 'player') { + var n = $('#trigFlagName'); triggerData.on_player_flag = n ? n.value.trim() : ''; + } else { + var n = $('#trigFlagName'); triggerData.on_global_flag = n ? n.value.trim() : ''; + } + } + var valEl = $('#trigValue'); + if (valEl) { + var v = valEl.value.trim(); + if (v === '') delete triggerData.value; + else { try { triggerData.value = JSON.parse(v); } catch(e) { triggerData.value = v; } } + } + var lockEl = $('#trigLock'); + if (lockEl) { if (lockEl.checked) triggerData.lock = true; else delete triggerData.lock; } + var stepRows = document.querySelectorAll('.obj-card[data-card="steps"] .ie-step-row'); + if (!Array.isArray(triggerData.steps)) triggerData.steps = []; + stepRows.forEach(function(stepRow) { + var si = parseInt(stepRow.getAttribute('data-step'), 10); + if (isNaN(si)) return; + if (!triggerData.steps[si]) triggerData.steps[si] = {}; + var waitEl = stepRow.querySelector('.wait-input'); + if (waitEl) triggerData.steps[si].wait = parseInt(waitEl.value) || 0; + syncStepEffects(stepRow, si); + }); + if (triggerData.steps.length > stepRows.length) triggerData.steps.length = stepRows.length; + renderTriggerEditor(triggerID, triggerData); +} + +function syncStepEffects(row, si) { + var effectsEl = row.querySelector('.ie-act-root'); + if (!effectsEl) return; + var step = triggerData.steps[si] || {}; + ['messages','broadcast','broadcast_global','teleport','heal','credits', + 'give_item','take_item','despawn_mob','aps_node'].forEach(function(k) { delete step[k]; }); + delete step.set_global_flags; delete step.set_player_flags; delete step.spawn_mob; + + var msgInputs = effectsEl.querySelectorAll('.trig-msg-input'); + var msgs = []; + msgInputs.forEach(function(inp) { if (inp.value !== '') msgs.push(inp.value); }); + if (msgs.length > 0) step.messages = msgs; + + effectsEl.querySelectorAll('.trig-effect-input').forEach(function(inp) { + var key = inp.getAttribute('data-key'); + var v = inp.value.trim(); + if (v !== '') { if (key === 'teleport' || key === 'heal' || key === 'credits') step[key] = parseInt(v)||0; else step[key] = v; } + }); + + var cb = effectsEl.querySelector('.trig-aps-cb'); + if (cb && cb.checked) step.aps_node = true; + + effectsEl.querySelectorAll('.trig-kv-section').forEach(function(kvSec) { + var kvKey = kvSec.getAttribute('data-kv'); + var kvObj = {}; + kvSec.querySelectorAll('.trig-kv-row').forEach(function(kvRow) { + var kEl = kvRow.querySelector('.trig-kv-key'); + var vEl = kvRow.querySelector('.trig-kv-val'); + if (kEl && kEl.value) { + var v = vEl ? vEl.value : ''; + try { kvObj[kEl.value] = JSON.parse(v); } catch(e) { kvObj[kEl.value] = v; } + } + }); + if (Object.keys(kvObj).length > 0) step[kvKey] = kvObj; + }); + + var smInput = effectsEl.querySelector('.trig-spawn-mob'); + if (smInput && smInput.value.trim()) { + if (!step.spawn_mob) step.spawn_mob = {}; + step.spawn_mob.id = smInput.value.trim(); + } + + triggerData.steps[si] = step; +} + +function renderTriggerEditor(id, data) { + var html = renderRenameableHeader('Trigger', id); + + var kindLabel = data._kind === 'global' ? 'Global Flag' : (data._kind === 'player' ? 'Player Flag' : ''); + if (kindLabel) html += 'Deleted
'; + loadTriggerList(); + }).catch(function(e) { notify('Delete failed: ' + e.message, 'error'); }); +} + +function createNew() { + var baseID = prompt('Trigger ID (filename without .yaml):'); + if (!baseID || !baseID.trim()) return; + var id = baseID.trim(); + API.post('/api/triggers', {id: id, on_player_flag: '', steps: []}).then(function(resp) { + notify('Trigger ' + id + ' created', 'success'); + updateUndoBar(); + loadTriggerList(); + loadTrigger(id); + }).catch(function(e) { notify('Create failed: ' + e.message, 'error'); }); +} -- cgit v1.2.3