diff options
Diffstat (limited to 'internal/game/sys_triggers.go')
| -rw-r--r-- | internal/game/sys_triggers.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/internal/game/sys_triggers.go b/internal/game/sys_triggers.go index 7c77fc9..b542fdd 100644 --- a/internal/game/sys_triggers.go +++ b/internal/game/sys_triggers.go @@ -13,7 +13,7 @@ import ( func (g *Game) TriggerSeqTick() { g.processPlayerTriggerSequences() - g.processWorldTriggerSequences() + g.processGlobalTriggerSequences() } func (g *Game) TransientMobTick() { @@ -106,8 +106,8 @@ func (g *Game) processPlayerTriggerSequences() { } } -func (g *Game) processWorldTriggerSequences() { - seqs := g.TriggerStore.SnapshotWorldSeqs() +func (g *Game) processGlobalTriggerSequences() { + seqs := g.TriggerStore.SnapshotGlobalSeqs() for _, seq := range seqs { seq.Wait-- if seq.Wait > 0 { @@ -125,11 +125,11 @@ func (g *Game) processWorldTriggerSequences() { } for _, step := range jobs { - g.executeWorldTriggerStep(&step, seq.RoomID, seq.FlagValue) + g.executeGlobalTriggerStep(&step, seq.RoomID, seq.FlagValue) } if len(seq.Steps) == 0 { - g.TriggerStore.RemoveWorldSeq(seq.TriggerID) + g.TriggerStore.RemoveGlobalSeq(seq.TriggerID) } } } @@ -161,8 +161,8 @@ func (g *Game) executeTriggerStep(sess *net.Session, p *player.Player, step *wor } } } - if len(step.SetFlags) > 0 { - g.Flags.SetAll(step.SetFlags) + if len(step.SetGlobalFlags) > 0 { + g.GlobalFlags.SetAll(step.SetGlobalFlags) } if len(step.SetPlayerFlags) > 0 { for k, v := range step.SetPlayerFlags { @@ -204,7 +204,7 @@ func (g *Game) executeTriggerStep(sess *net.Session, p *player.Player, step *wor } } -func (g *Game) executeWorldTriggerStep(step *world.TriggerStep, roomID int, flagValue any) { +func (g *Game) executeGlobalTriggerStep(step *world.TriggerStep, roomID int, flagValue any) { if step.Broadcast != "" && g.Hub != nil { msg := expandTemplate(step.Broadcast, "", flagValue) broadcastSpec := g.resolveColor(nil, "broadcast") @@ -225,8 +225,8 @@ func (g *Game) executeWorldTriggerStep(step *world.TriggerStep, roomID int, flag } } } - if len(step.SetFlags) > 0 { - g.Flags.SetAll(step.SetFlags) + if len(step.SetGlobalFlags) > 0 { + g.GlobalFlags.SetAll(step.SetGlobalFlags) } if step.SpawnMob != nil { g.spawnWorldTriggerMob(step.SpawnMob, roomID) |