From 09d325dcf5e779eab5550d3fd3377bde50101428 Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Wed, 8 Jul 2026 19:59:14 -0400 Subject: feat: unify on use, on look, and on kill. all support same conditions/actions now. --- internal/world/trigger_store.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'internal/world/trigger_store.go') diff --git a/internal/world/trigger_store.go b/internal/world/trigger_store.go index e18ae80..04d77f4 100644 --- a/internal/world/trigger_store.go +++ b/internal/world/trigger_store.go @@ -8,6 +8,7 @@ import ( "sync" "gopkg.in/yaml.v3" + "thehouseoficarus/internal/behavior" ) type TriggerStore struct { @@ -26,7 +27,7 @@ type PlayerTriggerSeq struct { PlayerName string TriggerID string RoomID int - Steps []TriggerStep + Steps []behavior.StepAction Wait int Started bool FlagValue any @@ -35,7 +36,7 @@ type PlayerTriggerSeq struct { type GlobalTriggerSeq struct { TriggerID string RoomID int - Steps []TriggerStep + Steps []behavior.StepAction Wait int FlagValue any } @@ -227,7 +228,7 @@ func (ts *TriggerStore) startPlayerSeqLocked(playerName string, t *TriggerDef, r PlayerName: playerName, TriggerID: t.ID, RoomID: roomID, - Steps: make([]TriggerStep, len(t.Steps)), + Steps: make([]behavior.StepAction, len(t.Steps)), FlagValue: flagValue, } copy(seq.Steps, t.Steps) @@ -246,7 +247,7 @@ func (ts *TriggerStore) startGlobalSeqLocked(t *TriggerDef, flagValue any) *Glob seq := &GlobalTriggerSeq{ TriggerID: t.ID, RoomID: t.Room, - Steps: make([]TriggerStep, len(t.Steps)), + Steps: make([]behavior.StepAction, len(t.Steps)), FlagValue: flagValue, } copy(seq.Steps, t.Steps) -- cgit v1.2.3