';
+ var h = '
';
h += '';
});
if (!st.single || arr.length === 0) {
- h += '';
+ h += '';
}
h += '
';
return h;
@@ -374,7 +392,9 @@ function mobAddSection() {
if (sec.id === 'drops') {
mobData[sec.path] = {remains:'', loot:[]};
} else if (sec.id === 'talk') {
- mobData[sec.path] = {nodes:{start:{message:'',options:[]}}};
+ mobData[sec.path] = {nodes:{start:{messages:[],options:[]}}};
+ } else if (sec.id === 'shop') {
+ mobData[sec.path] = {buy_percentage:40, change_percentage:3, buys_anything:true, items:[]};
} else {
mobData[sec.path] = {};
}
@@ -467,7 +487,11 @@ function saveMob() {
API.put('/api/mobs/' + encodeURIComponent(mobID), out).then(function(resp) {
notify('Mob ' + mobID + ' saved', 'success');
updateUndoBar();
- if (resp && resp._raw) mobData._raw = resp._raw;
+ if (resp && resp._raw) {
+ mobData._raw = resp._raw;
+ var pre = document.querySelector('#tabYaml pre');
+ if (pre) pre.textContent = mobData._raw;
+ }
}).catch(function(e) { notify('Save failed: ' + e.message, 'error'); });
}
diff --git a/internal/admin/static/objecteditor.js b/internal/admin/static/objecteditor.js
index c2374a7..4d02295 100644
--- a/internal/admin/static/objecteditor.js
+++ b/internal/admin/static/objecteditor.js
@@ -775,9 +775,14 @@ function saveObject() {
out.id = objectID;
- API.put('/api/objects/' + encodeURIComponent(objectID), out).then(function() {
+ API.put('/api/objects/' + encodeURIComponent(objectID), out).then(function(resp) {
notify('Object ' + objectID + ' saved', 'success');
updateUndoBar();
+ if (resp && resp._raw) {
+ objectData._raw = resp._raw;
+ var pre = document.querySelector('#tabYaml pre');
+ if (pre) pre.textContent = objectData._raw;
+ }
}).catch(function(e) { notify('Save failed: ' + e.message, 'error'); });
}
diff --git a/internal/admin/static/talktree.js b/internal/admin/static/talktree.js
index e7079f5..4758918 100644
--- a/internal/admin/static/talktree.js
+++ b/internal/admin/static/talktree.js
@@ -86,11 +86,11 @@
}
// Single clause from flat fields
for (var i = 0; i < CLAUSE_TYPES.length; i++) {
- if (cond[CLAUSE_TYPES[i].key] !== undefined && cond[CLAUSE_TYPES[i].key] !== '') {
+ if (cond[CLAUSE_TYPES[i].key] !== undefined) {
var c = {};
c[CLAUSE_TYPES[i].key] = cond[CLAUSE_TYPES[i].key];
if (cond.not) c.not = cond.not;
- if (cond.value !== undefined && cond.value !== '') c.value = cond.value;
+ if (cond.value !== undefined) c.value = cond.value;
if (cond.has_item && CLAUSE_TYPES[i].key !== 'has_item') c.has_item = cond.has_item;
if (cond.player_flag && CLAUSE_TYPES[i].key !== 'player_flag') c.player_flag = cond.player_flag;
if (cond.flag && CLAUSE_TYPES[i].key !== 'flag') c.flag = cond.flag;
@@ -100,11 +100,11 @@
// Check for has_item or min_credits as the only key
for (var j = 0; j < CLAUSE_TYPES.length; j++) {
var ck = CLAUSE_TYPES[j].key;
- if (cond[ck] !== undefined && cond[ck] !== '') {
+ if (cond[ck] !== undefined) {
var cc = {};
cc[ck] = cond[ck];
if (cond.not) cc.not = cond.not;
- if (cond.value !== undefined && cond.value !== '') cc.value = cond.value;
+ if (cond.value !== undefined) cc.value = cond.value;
return { mode: 'single', clauses: [cc], groupKey: null };
}
}
@@ -115,7 +115,7 @@
function clauseObjType(clause) {
for (var i = 0; i < CLAUSE_TYPES.length; i++) {
var k = CLAUSE_TYPES[i].key;
- if (clause[k] !== undefined && clause[k] !== '') return k;
+ if (clause[k] !== undefined) return k;
}
return null;
}
@@ -126,13 +126,13 @@
if (clauses.length === 1) {
var flat = {};
var c = clauses[0];
- for (var k in c) { if (c[k] !== undefined && c[k] !== '') flat[k] = c[k]; }
+ for (var k in c) { if (c[k] !== undefined) flat[k] = c[k]; }
return flat;
}
var cond = {};
cond[groupKey || 'all_of'] = clauses.map(function(c) {
var sub = {};
- for (var k in c) { if (c[k] !== undefined && c[k] !== '') sub[k] = c[k]; }
+ for (var k in c) { if (c[k] !== undefined) sub[k] = c[k]; }
return sub;
});
return cond;
@@ -141,21 +141,14 @@
// ---- Action field definitions ----
var ACTION_FIELDS = [
- { key: 'give_item', label: 'Give Item', type: 'text' },
- { key: 'take_item', label: 'Take Item', type: 'text' },
- { key: 'teleport', label: 'Teleport Room', type: 'number' },
+ { key: 'give_item', label: 'Give Item', type: 'item_search' },
+ { key: 'take_item', label: 'Take Item', type: 'item_search' },
+ { key: 'credits', label: 'Credits (+/-)', type: 'number' },
+ { key: 'teleport', label: 'TP Room', type: 'number' },
{ key: 'heal', label: 'Heal HP', type: 'number' },
- { key: 'cost', label: 'Cost (Credits)', type: 'number' },
- { key: 'reputation_cost', label: 'Rep Cost', type: 'number' },
];
- var ACTION_BOOLS = [
- { key: 'assign_task', label: 'Assign Task' },
- { key: 'skip_task', label: 'Skip Task' },
- { key: 'extend_task', label: 'Extend Task' },
- { key: 'sawmill', label: 'Sawmill' },
- { key: 'aps_node', label: 'APS Node' },
- ];
+ var ACTION_BOOLS = [];
// ---- Event delegation ----
@@ -173,6 +166,7 @@
else if (type === 'number') { var n = parseFloat(el.value); val = isNaN(n) ? 0 : n; }
else { val = el.value; }
talkSyncPath(path, val);
+ if (path.endsWith('.goto')) renderTalkTree(window._talkData);
} else if (tag === 'SELECT') {
talkSyncPath(path, el.value);
}
@@ -207,11 +201,11 @@
case 'add-node':
addNode();
break;
- case 'add-sequence':
- addSequenceLine(nodeKey);
+ case 'add-message':
+ addMessageLine(nodeKey);
break;
- case 'delete-sequence':
- deleteSequenceLine(nodeKey, parseInt(optIdx, 10));
+ case 'delete-message':
+ deleteMessageLine(nodeKey, parseInt(optIdx, 10));
break;
case 'add-condition':
toggleCondition(nodeKey, optIdx !== null ? parseInt(optIdx, 10) : null);
@@ -240,12 +234,6 @@
case 'remove-kv':
removeKVPair(nodeKey, optIdx !== null ? parseInt(optIdx, 10) : null, el.getAttribute('data-kvk'), subKey);
break;
- case 'add-shop-item':
- addShopItem(nodeKey, optIdx !== null ? parseInt(optIdx, 10) : null);
- break;
- case 'remove-shop-item':
- removeShopItem(nodeKey, optIdx !== null ? parseInt(optIdx, 10) : null, parseInt(subIdx, 10));
- break;
}
}
@@ -255,6 +243,8 @@
var container = document.getElementById('talktree');
if (!container) return;
window._talkData = data;
+ window._talkOpenNodes = window._talkOpenNodes || new Set();
+ window._talkOpenNodes.add('start');
if (!data || !data.talk || !data.talk.nodes) {
container.innerHTML = '
No conversation tree defined.
';
return;
@@ -285,6 +275,9 @@
html += renderAddNodeRow();
html += '