From ab2597b22ccdb71116992aec78080d9858358d04 Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Tue, 7 Jul 2026 16:24:27 -0400 Subject: rename flags to global_flags (differentiate from player_flags) --- internal/world/trigger.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/world/trigger.go') diff --git a/internal/world/trigger.go b/internal/world/trigger.go index 8e74ff7..e31a5f9 100644 --- a/internal/world/trigger.go +++ b/internal/world/trigger.go @@ -7,7 +7,7 @@ import ( type TriggerDef struct { ID string `yaml:"id"` OnPlayerFlag string `yaml:"on_player_flag"` - OnFlag string `yaml:"on_flag"` + OnGlobalFlag string `yaml:"on_global_flag"` Value any `yaml:"value"` Room int `yaml:"room"` Steps []TriggerStep `yaml:"steps"` @@ -15,14 +15,14 @@ type TriggerDef struct { func (t *TriggerDef) IsPlayerFlagTrigger() bool { return t.OnPlayerFlag != "" } -func (t *TriggerDef) IsWorldFlagTrigger() bool { return t.OnFlag != "" } +func (t *TriggerDef) IsGlobalFlagTrigger() bool { return t.OnGlobalFlag != "" } type TriggerStep struct { Delay int `yaml:"delay"` Message string `yaml:"message"` Broadcast string `yaml:"broadcast"` BroadcastGlobal string `yaml:"broadcast_global"` - SetFlags map[string]any `yaml:"set_flags"` + SetGlobalFlags map[string]any `yaml:"set_global_flags"` SetPlayerFlags map[string]any `yaml:"set_player_flags"` SpawnMob *SpawnMobConfig `yaml:"spawn_mob"` GiveItem string `yaml:"give_item"` @@ -54,7 +54,7 @@ func (s *SpawnMobConfig) UnmarshalYAML(value *yaml.Node) error { } func (t TriggerStep) IsTimed() bool { - return t.Delay > 0 || len(t.SetFlags) > 0 || len(t.SetPlayerFlags) > 0 || + return t.Delay > 0 || len(t.SetGlobalFlags) > 0 || len(t.SetPlayerFlags) > 0 || t.Message != "" || t.Broadcast != "" || t.BroadcastGlobal != "" || t.SpawnMob != nil || t.GiveItem != "" || t.TakeItem != "" || t.Teleport != 0 || t.Heal != 0 || t.DespawnMob != "" -- cgit v1.2.3