diff --git a/Projects/UOContent.Tests/Tests/Mobiles/AI/MeerEnragedTests.cs b/Projects/UOContent.Tests/Tests/Mobiles/AI/MeerEnragedTests.cs new file mode 100644 index 000000000..3ced177b5 --- /dev/null +++ b/Projects/UOContent.Tests/Tests/Mobiles/AI/MeerEnragedTests.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using Server; +using Server.Mobiles; +using Xunit; + +namespace UOContent.Tests.Mobiles.AI; + +// A meer mage fights FightMode.Evil and its enraged creatures carry -1000 karma, so the karma rules alone +// make each an enemy of the other. +[Collection("Sequential UOContent Tests")] +public class MeerEnragedTests : IDisposable +{ + private readonly List _created = []; + + public void Dispose() + { + for (var i = 0; i < _created.Count; i++) + { + _created[i].Delete(); + } + } + + private T Track(T m) where T : Mobile + { + _created.Add(m); + return m; + } + + private static void Place(BaseCreature bc, int x) + { + var map = Map.Felucca; + bc.MoveToWorld(new Point3D(x, 1600, map.GetAverageZ(x, 1600)), map); // flat, clear line of sight both ways + bc.AIObject.AITimer.Stop(); + } + + private static bool Acquire(BaseCreature creature) + { + creature.NextReacquireTime = Core.TickCount - 1; + return creature.AIObject.AcquireFocusMob(creature.RangePerception, creature.FightMode, false, false, true); + } + + [Fact] + public void MeerAndItsEnragedCreature_AreNotEnemies() + { + var meer = Track(new MeerMage()); + var enraged = Track(new EnragedRabbit(meer)); + + Assert.False(enraged.IsEnemy(meer)); + Assert.False(meer.IsEnemy(enraged)); + } + + [Fact] + public void AnotherMeersEnragedCreature_StaysAnEnemy() + { + var meer = Track(new MeerMage()); + var other = Track(new MeerMage()); + var enraged = Track(new EnragedRabbit(other)); + + Assert.True(enraged.IsEnemy(meer)); + Assert.True(meer.IsEnemy(enraged)); + } + + [SkippableFact] + public void MeerAndItsEnragedCreature_NeverAcquireEachOther() + { + Skip.If(!Server.Tests.TestServerInitializer.TileDataLoaded, "Requires UO client map data."); + + var meer = Track(new MeerMage()); + var enraged = Track(new EnragedBlackBear(meer)); + Place(meer, 1600); + Place(enraged, 1601); + + Assert.False(Acquire(enraged)); + Assert.False(Acquire(meer)); + } +} diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs index ce4f3526d..a7afa1b9e 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs @@ -95,6 +95,9 @@ namespace Server.Mobiles SummonMaster = summoner; } + // The meer's FightMode.Evil against our negative karma would otherwise make us enemies. + public override bool IsEnemy(Mobile m) => m != SummonMaster && base.IsEnemy(m); + public override void OnThink() { if (SummonMaster?.Deleted != false) @@ -118,7 +121,7 @@ namespace Server.Mobiles */ else if (!Combat(SummonMaster)) { - if (Combatant.Player || Combatant is BaseCreature bc && (bc.Controlled || bc.SummonMaster != null)) + if (Combatant.Player || Combatant is BaseCreature bc && bc.GetMaster() != null) { SummonMaster.Combatant = Combatant; } diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs index fca41ec25..e96e8cd1d 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -59,6 +59,9 @@ namespace Server.Mobiles public override bool InitialInnocent => true; + // FightMode.Evil would otherwise target our own enraged creatures for their negative karma. + public override bool IsEnemy(Mobile m) => (m as BaseEnraged)?.SummonMaster != this && base.IsEnemy(m); + public override void GenerateLoot() { AddLoot(LootPack.FilthyRich);