lots of random changes

BossMod/BossModule/BossComponent.cs

@@ -58,6 +58,7 @@ public virtual void OnActorEState(BossModule module, Actor actor, ushort state)
         public virtual void OnActorEAnim(BossModule module, Actor actor, uint state) { }
         public virtual void OnActorPlayActionTimelineEvent(BossModule module, Actor actor, ushort id) { }
         public virtual void OnActorNpcYell(BossModule module, Actor actor, ushort id) { }
+        public virtual void OnActorModelStateChange(BossModule module, Actor actor, byte modelstate, byte animstate1, byte animstate2) { }
         public virtual void OnEventEnvControl(BossModule module, byte index, uint state) { }
     }
 }

BossMod/BossModule/BossModule.cs

@@ -135,6 +135,7 @@ public BossModule(WorldState ws, Actor primary, ArenaBounds bounds)
             WorldState.Actors.EventObjectAnimation += OnActorEAnim;
             WorldState.Actors.PlayActionTimelineEvent += OnActorPlayActionTimelineEvent;
             WorldState.Actors.EventNpcYell += OnActorNpcYell;
+            WorldState.Actors.ModelStateChanged += OnActorModelStateChange;
             WorldState.EnvControl += OnEnvControl;
             foreach (var v in WorldState.Actors)
                 OnActorCreated(null, v);
@@ -170,6 +171,7 @@ protected virtual void Dispose(bool disposing)
                 WorldState.Actors.EventObjectAnimation -= OnActorEAnim;
                 WorldState.Actors.PlayActionTimelineEvent -= OnActorPlayActionTimelineEvent;
                 WorldState.Actors.EventNpcYell -= OnActorNpcYell;
+                WorldState.Actors.ModelStateChanged += OnActorModelStateChange;
                 WorldState.EnvControl -= OnEnvControl;
             }
         }
@@ -481,6 +483,12 @@ private void OnActorNpcYell(object? sender, (Actor actor, ushort id) arg)
                 comp.OnActorNpcYell(this, arg.actor, arg.id);
         }
 
+        private void OnActorModelStateChange(object? sender, (Actor actor, byte modelstate, byte animstate1, byte animstate2) arg)
+        {
+            foreach (var comp in _components)
+                comp.OnActorModelStateChange(this, arg.actor, arg.modelstate, arg.animstate1, arg.animstate2);
+        }
+
         private void OnEnvControl(object? sender, WorldState.OpEnvControl op)
         {
             foreach (var comp in _components)

BossMod/BossModule/BossModuleConfig.cs

@@ -28,6 +28,10 @@ public class BossModuleConfig : ConfigNode
         [PropertyDisplay("Show cardinal direction names")]
         public bool ShowCardinals = false;
 
+        [PropertyDisplay("Cardinal direction font size")]
+        [PropertySlider(0.1f, 100, Speed = 1)]
+        public float CadrdinalsFontSize = 17;
+
         [PropertyDisplay("Show waymarks on radar")]
         public bool ShowWaymarks = false;
 

BossMod/BossModule/MiniArena.cs

@@ -211,13 +211,14 @@ public void Border(uint color)
 
         public void CardinalNames()
         {
+            var fontsize = Service.Config.Get<BossModuleConfig>().CadrdinalsFontSize;
             var offCenter = ScreenHalfSize + ScreenMarginSize / 2;
             var offS = RotatedCoords(new(0, offCenter));
             var offE = RotatedCoords(new(offCenter, 0));
-            TextScreen(ScreenCenter - offS, "N", ArenaColor.Border);
-            TextScreen(ScreenCenter + offS, "S", ArenaColor.Border);
-            TextScreen(ScreenCenter + offE, "E", ArenaColor.Border);
-            TextScreen(ScreenCenter - offE, "W", ArenaColor.Border);
+            TextScreen(ScreenCenter - offS, "N", ArenaColor.Border, fontsize);
+            TextScreen(ScreenCenter + offS, "S", ArenaColor.Border, fontsize);
+            TextScreen(ScreenCenter + offE, "E", ArenaColor.Border, fontsize);
+            TextScreen(ScreenCenter - offE, "W", ArenaColor.Border, fontsize);
         }
 
         // draw actor representation

BossMod/Components/BaitAway.cs

@@ -31,6 +31,7 @@ public Bait(Actor source, Actor target, AOEShape shape, DateTime activation = de
         public bool CenterAtTarget; // if true, aoe source is at target
         public bool AllowDeadTargets = true; // if false, baits with dead targets are ignored
         public bool EnableHints = true;
+        public bool EndsOnCastEvent;
         public bool IgnoreOtherBaits = false; // if true, don't show hints/aoes for baits by others
         public PlayerPriority BaiterPriority = PlayerPriority.Interesting;
         public BitMask ForbiddenPlayers; // these players should avoid baiting
@@ -202,7 +203,13 @@ public override void OnCastStarted(BossModule module, Actor caster, ActorCastInf
 
         public override void OnCastFinished(BossModule module, Actor caster, ActorCastInfo spell)
         {
-            if (spell.Action == WatchedAction)
+            if (spell.Action == WatchedAction && !EndsOnCastEvent)
+                CurrentBaits.RemoveAll(b => b.Source == caster);
+        }
+
+        public override void OnEventCast(BossModule module, Actor caster, ActorCastEvent spell)
+        {
+            if (spell.Action == WatchedAction && EndsOnCastEvent)
                 CurrentBaits.RemoveAll(b => b.Source == caster);
         }
     }

BossMod/Components/CastHint.cs

@@ -7,6 +7,7 @@ namespace BossMod.Components
     public class CastHint : CastCounter
     {
         public string Hint;
+        public bool EndsOnCastEvent;
         public bool ShowCastTimeLeft; // if true, show cast time left until next instance
         private List<Actor> _casters = new();
         public IReadOnlyList<Actor> Casters => _casters;
@@ -32,28 +33,67 @@ public override void OnCastStarted(BossModule module, Actor caster, ActorCastInf
 
         public override void OnCastFinished(BossModule module, Actor caster, ActorCastInfo spell)
         {
-            if (spell.Action == WatchedAction)
+            if (spell.Action == WatchedAction && !EndsOnCastEvent)
+                _casters.Remove(caster);
+        }
+
+        public override void OnEventCast(BossModule module, Actor caster, ActorCastEvent spell)
+        {
+            if (spell.Action == WatchedAction && EndsOnCastEvent)
                 _casters.Remove(caster);
         }
     }
 
     public class CastInterruptHint : CastHint
     {
-        public bool CanBeInterrupted { get; init; }
-        public bool CanBeStunned { get; init; }
+        public bool CanBeInterrupted;
+        public bool CanBeStunned;
+        public bool ShowNameInHint;
+        public string HintExtra;
+        private List<Actor> _casters = new();
+        public new IReadOnlyList<Actor> Casters => _casters;
+        public new bool Active => _casters.Count > 0;
 
-        public CastInterruptHint(ActionID aid, bool canBeInterrupted = true, bool canBeStunned = false, string hint = "") : base(aid, "")
+        public CastInterruptHint(ActionID aid, bool canBeInterrupted = true, bool canBeStunned = false, string hintExtra = "", bool showNameInHint = false) : base(aid, hintExtra)
         {
             CanBeInterrupted = canBeInterrupted;
             CanBeStunned = canBeStunned;
-            if (canBeInterrupted || canBeStunned)
-            {
-                Hint = !canBeStunned ? "Interrupt" : !canBeInterrupted ? "Stun" : "Interrupt/stun";
-                if (hint.Length > 0)
-                    Hint += $" {hint}";
-            }
+            ShowNameInHint = showNameInHint;
+            HintExtra = hintExtra;
+        }
+
+        public override void AddGlobalHints(BossModule module, GlobalHints hints)
+        {
+            if (!Active) return;
+            string action = "";
+            if (CanBeInterrupted && !CanBeStunned)
+                action = "Interrupt";
+            else if (CanBeInterrupted && CanBeStunned)
+                action = "Interrupt/Stun";
+            else if (!CanBeInterrupted && CanBeStunned)
+                action = "Stun";
+            string hint = $"{action}!";
+            if (ShowNameInHint && Casters.Count > 0)
+                hint = $"{action} {Casters[0].Name}!";
+            if (HintExtra.Length > 0)
+                hint += $" {HintExtra}";
+            hints.Add(hint);
+        }
+
+        public override void OnCastStarted(BossModule module, Actor caster, ActorCastInfo spell)
+        {
+            if (spell.Action == WatchedAction)
+                _casters.Add(caster);
         }
 
+        public override void OnCastFinished(BossModule module, Actor caster, ActorCastInfo spell)
+        {
+            if (spell.Action == WatchedAction)
+                _casters.Remove(caster);
+        }
+
+
+
         public override void AddAIHints(BossModule module, int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
         {
             foreach (var c in Casters)

BossMod/Components/ChasingAOEs.cs

@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BossMod.Components
+{
+    // generic 'chasing AOE' component - these are AOEs that follow the target for a set amount of casts
+    public class ChasingAOEs : GenericAOEs
+    {
+        public class Chaser
+        {
+            public Actor Player;
+            public WPos? Pos;
+            public int NumCasts;
+            public DateTime Activation;
+
+            public Chaser(Actor player)
+            {
+                Player = player;
+            }
+
+            public WPos PredictedPosition()
+            {
+                if (Pos == null)
+                    return default;
+                if (NumCasts == 0)
+                    return Pos.Value;
+                var toPlayer = Player.Position - Pos.Value;
+                var dist = toPlayer.Length();
+                if (dist < MoveDist)
+                    return Player.Position;
+                return Pos.Value + toPlayer * MoveDist / dist;
+            }
+        }
+
+        private List<Chaser> _chasers = new();
+
+        public bool Active => _chasers.Count > 0;
+
+        public AOEShape Shape;
+        public static int MaxCasts;
+        public static float MoveDist;
+        public bool LocationTargeted; //if true chaser is location targeted instead of self targeted
+        public Angle Rotation;
+        public uint Icon;
+        public ActionID ChasingAOEFirst;
+        public ActionID ChasingAOERest;
+        public float TimeBetweenCasts;
+
+        public ChasingAOEs(uint icon, AOEShape shape, ActionID chasingAOEFirst, ActionID chasingAOERest, float movedist, int maxCasts, float timeBetweenCasts, bool locationtargeted = false, Angle rotation = default) : base(chasingAOEFirst, "GTFO from chasing AOE!")
+        {
+            Shape = shape;
+            Icon = icon;
+            ChasingAOEFirst = chasingAOEFirst;
+            ChasingAOERest = chasingAOERest;
+            MoveDist = movedist;
+            MaxCasts = maxCasts;
+            TimeBetweenCasts = timeBetweenCasts;
+            LocationTargeted = locationtargeted;
+            Rotation = rotation;
+        }
+
+        public override IEnumerable<AOEInstance> ActiveAOEs(BossModule module, int slot, Actor actor) => _chasers.Select(c => new AOEInstance(Shape, c.PredictedPosition(), Rotation, c.Activation));
+
+        public override void Update(BossModule module)
+        {
+            _chasers.RemoveAll(c => (c.Player.IsDestroyed || c.Player.IsDead) && (c.Pos == null || c.NumCasts > 0));
+        }
+
+        public override void DrawArenaForeground(BossModule module, int pcSlot, Actor pc, MiniArena arena)
+        {
+            foreach (var c in _chasers)
+                if (c.Pos != null)
+                {                
+                    if (arena.Config.ShowOutlinesAndShadows)
+                        arena.AddLine(c.Pos.Value, c.Player.Position, 0xFF000000, 2);
+                    arena.AddLine(c.Pos.Value, c.Player.Position, ArenaColor.Danger);
+                }
+        }
+
+        public override void OnEventIcon(BossModule module, Actor actor, uint iconID)
+        {
+            if (iconID == Icon)
+                _chasers.Add(new(actor));
+        }
+
+        public override void OnCastStarted(BossModule module, Actor caster, ActorCastInfo spell)
+        {
+            if (spell.Action == ChasingAOEFirst && _chasers.Where(c => c.Pos == null).MinBy(c => (c.Player.Position - caster.Position).LengthSq()) is var chaser && chaser != null)
+            {
+                if (LocationTargeted)
+                    chaser.Pos = spell.LocXZ;
+                else
+                    chaser.Pos = caster.Position;
+                chaser.Activation = spell.NPCFinishAt;
+            }
+        }
+
+        public override void OnCastFinished(BossModule module, Actor caster, ActorCastInfo spell)
+        {
+            if (spell.Action == ChasingAOEFirst)
+            {
+                if (LocationTargeted)
+                    Advance(module, spell.LocXZ);
+                else
+                    Advance(module, caster.Position);
+            }
+        }
+
+        public override void OnEventCast(BossModule module, Actor caster, ActorCastEvent spell)
+        {
+            if (spell.Action == ChasingAOERest)
+            {
+                if (LocationTargeted)
+                    Advance(module, spell.TargetXZ);
+                else
+                    Advance(module, caster.Position);
+            }
+        }
+
+        private void Advance(BossModule module, WPos pos)
+        {
+            ++NumCasts;
+            var chaser = _chasers.MinBy(c => c.Pos != null ? (c.PredictedPosition() - pos).LengthSq() : float.MaxValue);
+            if (chaser == null)
+                return;
+
+            if (++chaser.NumCasts < MaxCasts)
+            {
+                chaser.Pos = pos;
+                chaser.Activation = module.WorldState.CurrentTime.AddSeconds(TimeBetweenCasts);
+            }
+            else
+            {
+                _chasers.Remove(chaser);
+            }
+        }
+    }
+}

BossMod/Components/PersistentVoidzone.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace BossMod.Components
 {
@@ -77,4 +78,72 @@ public override void OnEventCast(BossModule module, Actor caster, ActorCastEvent
                 _predictedByEvent.Add((module.WorldState.Actors.Find(spell.MainTargetID)?.Position ?? spell.TargetXZ, module.WorldState.CurrentTime.AddSeconds(CastEventToSpawn)));
         }
     }
+
+    // voidzone (circle aoe that stays active for some time) centered at each existing object with specified OID, assumed to be persistent voidzone center
+    // inverts from dangerous to safe when a specific AID is being casted
+    public class PersistentInvertibleVoidzone : GenericAOEs
+    {
+        public AOEShapeCircle Shape { get; private init; }
+        public Func<BossModule, IEnumerable<Actor>> Sources { get; private init; }
+        private bool inverting;
+        private DateTime _activation;
+        private float Radius;
+
+        public PersistentInvertibleVoidzone(float radius, ActionID aid, Func<BossModule, IEnumerable<Actor>> sources) : base(aid, "GTFO from voidzone!")
+        {
+            Shape = new(radius);
+            Sources = sources;
+            Radius = radius;
+        }
+
+        public override IEnumerable<AOEInstance> ActiveAOEs(BossModule module, int slot, Actor actor)
+        {
+            if (!inverting)
+                foreach (var s in Sources(module))
+                    yield return new(Shape, s.Position);
+            if (inverting)
+                foreach (var s in Sources(module))
+                    yield return new(Shape, s.Position, activation: _activation, color: ArenaColor.SafeFromAOE, risky: false);
+        }
+
+        public override void OnCastStarted(BossModule module, Actor caster, ActorCastInfo spell)
+        {
+            if (spell.Action == WatchedAction)
+            {
+                inverting = true;
+                _activation = spell.NPCFinishAt;
+            }
+        }
+
+        public override void OnCastFinished(BossModule module, Actor caster, ActorCastInfo spell)
+        {
+            if (spell.Action == WatchedAction)
+                inverting = false;
+        }
+
+        public override void AddAIHints(BossModule module, int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
+        {
+            var shapes = new List<Func<WPos, float>>();
+            foreach (var c in ActiveAOEs(module, slot, actor))
+            {
+                if (c.Risky)
+                    hints.AddForbiddenZone(c.Shape, c.Origin, c.Rotation, c.Activation);
+                if (inverting)
+                    shapes.Add(ShapeDistance.InvertedCircle(c.Origin, Radius));
+            }
+            if (shapes.Count > 0)
+                hints.AddForbiddenZone(p => shapes.Select(f => f(p)).Max(), _activation);
+            if (shapes.Count > 0 && !inverting)
+                shapes.Clear();
+        }
+
+        public override void AddHints(BossModule module, int slot, Actor actor, TextHints hints, MovementHints? movementHints)
+        {
+            base.AddHints(module, slot, actor, hints, movementHints);
+            if (ActiveAOEs(module, slot, actor).Any(c => c.Check(actor.Position)) && inverting)
+                hints.Add("Wait in puddle until mechanic resolves!", false);
+            if (!ActiveAOEs(module, slot, actor).Any(c => c.Check(actor.Position)) && inverting)
+                hints.Add("Go into puddle until mechanic resolves!");
+        }
+    }
 }