';
+ html += '
';
html += '';
html += '
';
- html += renderSteps(steps);
- html += '+ Add Step ';
+ html += ie_renderArraySection({
+ sec: TRIG_SEC,
+ data: window._editorData,
+ visMap: window._interVis || {},
+ showField: function() { return 'void(0)'; },
+ hideField: function() { return 'void(0)'; },
+ renderField: function() { return ''; },
+ showRemove: function() { return 'void(0)'; },
+ onAdd: function() { return 'void(0)'; }
+ });
html += '
';
html += '
';
@@ -236,207 +177,7 @@ function renderTriggerEditor(id, data) {
ced_setupSearchFields();
}
-function renderSteps(steps) {
- var h = '';
- (steps || []).forEach(function(step, si) {
- h += '
';
- h += '';
-
- h += '
';
- h += '
';
- h += renderStepEffects(step, si);
- h += '
';
- h += '
';
-
- h += '
';
- IE_STEP_KINDS.forEach(function(sk) {
- h += '+ ' + esc(sk.label) + ' ';
- });
- h += '
';
- h += '
';
- });
- return h;
-}
-
-function renderStepEffects(step, si) {
- var h = '';
-
- var msgs = Array.isArray(step.messages) ? step.messages : [];
- msgs.forEach(function(msg, mi) {
- h += '
';
- h += 'Message ';
- h += '
';
- });
-
- if (step.broadcast !== undefined) {
- h += '
Broadcast ';
- h += '
';
- }
- if (step.broadcast_global !== undefined) {
- h += '
Broadcast Global ';
- h += '
';
- }
- if (step.teleport !== undefined) {
- h += '
Teleport ';
- h += '
';
- }
- if (step.heal !== undefined) {
- h += '
Heal ';
- h += '
';
- }
- if (step.credits !== undefined) {
- h += '
Credits ';
- h += '
';
- }
- if (step.spawn_mob && step.spawn_mob.id) {
- h += '
';
- }
- if (step.despawn_mob !== undefined) {
- h += '
Despawn Mob ';
- h += '
';
- }
- if (step.give_item !== undefined) {
- h += '
Give Item ';
- h += '
';
- }
- if (step.take_item !== undefined) {
- h += '
Take Item ';
- h += '
';
- }
- if (step.aps_node) {
- h += '
APS Node ';
- h += '
';
- }
-
- function renderKVSection(label, key, obj) {
- var h2 = '
';
- return h2;
- }
-
- if (step.set_global_flags && typeof step.set_global_flags === 'object' && Object.keys(step.set_global_flags).length > 0) {
- h += renderKVSection('Set Global Flags', 'set_global_flags', step.set_global_flags);
- }
- if (step.set_player_flags && typeof step.set_player_flags === 'object' && Object.keys(step.set_player_flags).length > 0) {
- h += renderKVSection('Set Player Flags', 'set_player_flags', step.set_player_flags);
- }
-
- if (Array.isArray(step.drop_table) || step.drop_table !== undefined) {
- h += '
';
- h += ie_renderDropTableBlock(step.drop_table, 'trigAddDropRow('+si+',\'item\')', 'trigAddDropRow('+si+',\'table\')', 'trigRemoveDropRow('+si+',__RI__)');
- h += '
';
- }
-
- return h;
-}
-
-function trigAddDropRow(si, kind) {
- if (!triggerData || !Array.isArray(triggerData.steps) || !triggerData.steps[si]) return;
- syncAllStepEffects();
- var step = triggerData.steps[si];
- if (!Array.isArray(step.drop_table)) step.drop_table = [];
- if (kind === 'table') {
- step.drop_table.push({table: '', weight: 10, quantity: 1, _kind: 'table'});
- } else {
- step.drop_table.push({item_id: '', weight: 10, quantity: 1, _kind: 'item'});
- }
- renderCurrent();
-}
-
-function trigRemoveDropRow(si, ri) {
- if (!triggerData || !Array.isArray(triggerData.steps) || !triggerData.steps[si]) return;
- syncAllStepEffects();
- var step = triggerData.steps[si];
- if (!Array.isArray(step.drop_table)) return;
- step.drop_table.splice(ri, 1);
- renderCurrent();
-}
-
-function addStep() {
- if (!triggerData) return;
- if (!Array.isArray(triggerData.steps)) triggerData.steps = [];
- triggerData.steps.push({wait: 0});
- renderCurrent();
-}
-
-function removeStep(si) {
- if (!triggerData || !Array.isArray(triggerData.steps)) return;
- triggerData.steps.splice(si, 1);
- renderCurrent();
-}
-
-function moveStep(from, to) {
- if (!triggerData || !Array.isArray(triggerData.steps)) return;
- var s = triggerData.steps[from];
- triggerData.steps.splice(from, 1);
- triggerData.steps.splice(to, 0, s);
- renderCurrent();
-}
-
-function addStepEffect(si, kind) {
- if (!triggerData) return;
- syncCondDOM(triggerData);
- syncAllStepEffects();
- if (!Array.isArray(triggerData.steps)) triggerData.steps = [];
- if (!triggerData.steps[si]) triggerData.steps[si] = {};
- var step = triggerData.steps[si];
-
- if (kind === 'messages') {
- if (!Array.isArray(step.messages)) step.messages = [];
- step.messages.push('');
- } else if (kind === 'wait') {
- step.wait = (step.wait || 0) + 1;
- } else {
- var at = IE_ACT_TYPES.find(function(a) { return a.key === kind; });
- if (!at) return;
- if (at.kind === 'kv') step[kind] = {};
- else if (at.kind === 'checkbox') step[kind] = true;
- else if (at.kind === 'droptable') step[kind] = [];
- else if (at.kind === 'number') step[kind] = 0;
- else if (at.kind === 'search') step[kind] = '';
- else step[kind] = '';
- }
- renderCurrent();
-}
-
-function syncAllStepEffects() {
- 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);
- });
-}
-
function saveTrigger() {
- syncCondDOM(triggerData);
- syncAllStepEffects();
- if (!triggerData || !triggerID) return;
var flagTypeEl = document.querySelector('input[name="trigFlagType"]:checked');
if (flagTypeEl) {
delete triggerData.on_player_flag;
@@ -445,14 +186,8 @@ function saveTrigger() {
if (flagTypeEl.value === 'player') triggerData.on_player_flag = n ? n.value.trim() : '';
else 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; }
+ window._ieSyncAll(window._editorData);
+ mergeTriggerFromEditor();
var out = JSON.parse(JSON.stringify(triggerData));
delete out.id;
diff --git a/internal/behavior/behavior.go b/internal/behavior/behavior.go
index 9152f8c..7dab514 100644
--- a/internal/behavior/behavior.go
+++ b/internal/behavior/behavior.go
@@ -89,9 +89,10 @@ func (s Step) HasEffects() bool {
// its Steps run as a scripted sequence.
//
// For verb blocks only ItemID/Condition/Steps/Lock are meaningful. For
-// on_flag_change/on_global_flag_change blocks, OnPlayerFlag/OnGlobalFlag (and
-// optional Value) declare the flag subscription; Condition provides an
-// additional gate (use the Room condition to scope a flag trigger to a room).
+// on_flag_change/on_global_flag_change blocks, OnPlayerFlag/OnGlobalFlag
+// declare the flag subscription; Condition provides an additional gate
+// (use a player_flag/global_flag + value condition to match a specific
+// flag value, or Room to scope a flag trigger to a room).
//
// Lock, when true, makes the sequence atomic: the player is blocked from any
// verb (except quit) until it completes, and the sequence is saved and resumed
@@ -104,7 +105,6 @@ type Trigger struct {
Steps []Step `yaml:"steps"`
OnPlayerFlag string `yaml:"on_player_flag,omitempty"`
OnGlobalFlag string `yaml:"on_global_flag,omitempty"`
- Value any `yaml:"value,omitempty"`
DedupKey string `yaml:"-"` // runtime only — disambiguates flag-trigger dedup keys
}
diff --git a/internal/game/sys_triggers.go b/internal/game/sys_triggers.go
index 683b3e0..cae774e 100644
--- a/internal/game/sys_triggers.go
+++ b/internal/game/sys_triggers.go
@@ -575,8 +575,8 @@ func (g *Game) loadAllFlagTriggers() {
}
// firePlayerFlagTriggers starts sequences for every on_flag_change trigger
-// subscribed to flagName whose Value (if any) matches and whose Condition
-// passes for the player. Called from setPlayerFlag after an actual change.
+// subscribed to flagName whose Condition passes for the player.
+// Called from setPlayerFlag after an actual change.
func (g *Game) firePlayerFlagTriggers(p *player.Player, flagName string, flagValue any) {
g.charsMu.Lock()
sess := g.loggedInChars[p.Name]
@@ -589,9 +589,6 @@ func (g *Game) firePlayerFlagTriggers(p *player.Player, flagName string, flagVal
g.flagIndex.mu.Unlock()
for i := range triggers {
t := triggers[i]
- if t.Value != nil && !engine.ValuesEqual(t.Value, flagValue) {
- continue
- }
if t.Condition != nil && !g.checkCondition(sess, t.Condition) {
continue
}
@@ -600,17 +597,14 @@ func (g *Game) firePlayerFlagTriggers(p *player.Player, flagName string, flagVal
}
// fireGlobalFlagTriggers starts sequences for every on_global_flag_change
-// trigger subscribed to flagName whose Value (if any) matches. Global-flag
-// triggers have no originating player and run at scopeGlobal.
+// trigger subscribed to flagName. Global-flag triggers have no originating
+// player and run at scopeGlobal.
func (g *Game) fireGlobalFlagTriggers(flagName string, flagValue any) {
g.flagIndex.mu.Lock()
triggers := append([]*behavior.Trigger(nil), g.flagIndex.globalFlag[flagName]...)
g.flagIndex.mu.Unlock()
for i := range triggers {
t := triggers[i]
- if t.Value != nil && !engine.ValuesEqual(t.Value, flagValue) {
- continue
- }
if t.Condition != nil && !g.checkConditionGlobal(t.Condition) {
continue
}
--
cgit v1.2.3