warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: pets will now fallback to follow/stay/guard after combat (#2325)

Browse source
This commit is contained in:
Bohica 2026-02-05 15:38:39 -08:00 • committed by GitHub
parent 15557aa216
commit e4178bb495
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Projects/UOContent/Mobiles/AI/BaseAI/PetOrders.cs
View file

@ -17,6 +17,8 @@ namespace Server.Mobiles;
public abstract partial class BaseAI
{
private OrderType _lastPetOrder = OrderType.None;
public virtual bool Obey() =>
!Mobile.Deleted && Mobile.ControlOrder switch
{
@ -41,6 +43,32 @@ public abstract partial class BaseAI
Mobile.Warmode = IsValidCombatant(Mobile.Combatant);
if (_lastPetOrder == OrderType.Guard)
{
DebugSay("Target lost, resuming guard duty.");
Mobile.ControlOrder = OrderType.Guard;
_lastPetOrder = OrderType.None;
return true;
}
else if (_lastPetOrder == OrderType.Stay)
{
DebugSay("Target lost, resuming stay position.");
Mobile.ControlOrder = OrderType.Stay;
_lastPetOrder = OrderType.None;
return true;
}
else if (_lastPetOrder == OrderType.Follow)
{
DebugSay("Target lost, resuming follow command.");
Mobile.ControlTarget = Mobile.ControlMaster;
Mobile.ControlOrder = OrderType.Follow;
_lastPetOrder = OrderType.None;
return true;
}
WalkRandom(3, 2, 1);
return true;
}
@ -78,6 +106,8 @@ public abstract partial class BaseAI
if (Mobile.ControlTarget?.Deleted == false && Mobile.ControlTarget != Mobile)
{
_lastPetOrder = OrderType.Follow;
FollowTarget();
}
else
@ -266,7 +296,7 @@ public abstract partial class BaseAI
return true;
}
Action = ActionType.Guard;
_lastPetOrder = OrderType.Guard;
FindCombatant();
@ -442,6 +472,8 @@ public abstract partial class BaseAI
this.DebugSayFormatted($"I have been ordered to stay by {Mobile.ControlMaster?.Name ?? "Unknown"}.");
}
_lastPetOrder = OrderType.Stay;
WalkRandomInHome(3, 2, 1);
return true;
}