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

fix: Fixes skill cooldown for some target skills (#2231)

Browse source 
### Summary

Stealing, Detect Hidden, and Begging will now give credit for the time it took the player to use the targeter against the total skill cooldown. So if the player takes longer than 10s to target, then they can use a skill again immediately.

> [!NOTE]
> This does not change the requirement that players can no longer stack target these skills.
This commit is contained in:
Kamron Batman 2025-07-06 22:50:40 -07:00 • committed by GitHub
parent c0948fd0e2
commit 55d653d752
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 74 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

121
Projects/UOContent/Skills/Begging.cs
View file

@ -37,88 +37,81 @@ namespace Server.SkillHandlers
protected override void OnTarget(Mobile from, object targeted)
{
from.RevealingAction();
var number = -1;
if (targeted is Mobile targ)
if (targeted is not Mobile targ)
{
if (targ.Player) // We can't beg from players
from.SendLocalizedMessage(500399); // There is little chance of getting money from that!
}
else if (targ.Player) // We can't beg from players
{
from.SendLocalizedMessage(500398); // Perhaps just asking would work better.
}
else if (!targ.Body.IsHuman) // Make sure the NPC is human
{
from.SendLocalizedMessage(500399); // There is little chance of getting money from that!
}
else if (!from.InRange(targ, 2))
{
if (!targ.Female)
{
number = 500398; // Perhaps just asking would work better.
}
else if (!targ.Body.IsHuman) // Make sure the NPC is human
{
number = 500399; // There is little chance of getting money from that!
}
else if (!from.InRange(targ, 2))
{
if (!targ.Female)
{
number = 500401; // You are too far away to beg from him.
}
else
{
number = 500402; // You are too far away to beg from her.
}
}
// If we're on a mount, who would give us money? TODO: guessed it's removed since ML
else if (!Core.ML && from.Mounted)
{
number = 500404; // They seem unwilling to give you any money.
from.SendLocalizedMessage(500401); // You are too far away to beg from him.
}
else
{
// Face each other
from.Direction = from.GetDirectionTo(targ);
targ.Direction = targ.GetDirectionTo(from);
from.Animate(32, 5, 1, true, false, 0); // Bow
new InternalTimer(from, targ).Start();
from.SendLocalizedMessage(500402); // You are too far away to beg from her.
}
}
else // Not a Mobile
// If we're on a mount, who would give us money? TODO: guessed it's removed since ML
else if (!Core.ML && from.Mounted)
{
number = 500399; // There is little chance of getting money from that!
from.SendLocalizedMessage(500404); // They seem unwilling to give you any money.
}
else
{
from.RevealingAction();
// Face each other
from.Direction = from.GetDirectionTo(targ);
targ.Direction = targ.GetDirectionTo(from);
from.Animate(32, 5, 1, true, false, 0); // Bow
new InternalTimer(from, targ).Start();
return;
}
if (number != -1)
{
from.SendLocalizedMessage(number);
}
from.NextSkillTime = Core.TickCount;
}
private class InternalTimer : Timer
{
private readonly Mobile m_From;
private readonly Mobile m_Target;
private readonly Mobile _from;
private readonly Mobile _target;
public InternalTimer(Mobile from, Mobile target) : base(TimeSpan.FromSeconds(2.0))
{
m_From = from;
m_Target = target;
_from = from;
_target = target;
}
protected override void OnTick()
{
var theirPack = m_Target.Backpack;
var theirPack = _target.Backpack;
var badKarmaChance = 0.5 - (double)m_From.Karma / 8570;
var badKarmaChance = 0.5 - (double)_from.Karma / 8570;
if (theirPack == null)
{
m_From.SendLocalizedMessage(500404); // They seem unwilling to give you any money.
_from.SendLocalizedMessage(500404); // They seem unwilling to give you any money.
}
else if (m_From.Karma < 0 && badKarmaChance > Utility.RandomDouble())
else if (_from.Karma < 0 && badKarmaChance > Utility.RandomDouble())
{
// Thou dost not look trustworthy... no gold for thee today!
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue, 500406);
_target.PublicOverheadMessage(MessageType.Regular, _target.SpeechHue, 500406);
}
else if (m_From.CheckTargetSkill(SkillName.Begging, m_Target, 0.0, 100.0))
else if (_from.CheckTargetSkill(SkillName.Begging, _target, 0.0, 100.0))
{
var toConsume = theirPack.GetAmount(typeof(Gold)) / 10;
var max = Math.Clamp(10 + m_From.Fame / 2500, 10, 14);
var max = Math.Clamp(10 + _from.Fame / 2500, 10, 14);
if (toConsume > max)
{
@ -132,43 +125,49 @@ namespace Server.SkillHandlers
if (consumed > 0)
{
// I feel sorry for thee...
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue, 500405);
_target.PublicOverheadMessage(MessageType.Regular, _target.SpeechHue, 500405);
var gold = new Gold(consumed);
m_From.AddToBackpack(gold);
m_From.PlaySound(gold.GetDropSound());
_from.AddToBackpack(gold);
_from.PlaySound(gold.GetDropSound());
if (m_From.Karma > -3000)
if (_from.Karma > -3000)
{
var toLose = m_From.Karma + 3000;
var toLose = _from.Karma + 3000;
if (toLose > 40)
{
toLose = 40;
}
Titles.AwardKarma(m_From, -toLose, true);
Titles.AwardKarma(_from, -toLose, true);
}
}
else
{
// I have not enough money to give thee any!
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue, 500407);
_target.PublicOverheadMessage(MessageType.Regular, _target.SpeechHue, 500407);
}
}
else
{
// I have not enough money to give thee any!
m_Target.PublicOverheadMessage(MessageType.Regular, m_Target.SpeechHue, 500407);
_target.PublicOverheadMessage(MessageType.Regular, _target.SpeechHue, 500407);
}
}
else
{
m_Target.SendLocalizedMessage(500404); // They seem unwilling to give you any money.
_target.SendLocalizedMessage(500404); // They seem unwilling to give you any money.
}
m_From.NextSkillTime = Core.TickCount + 10000;
const int TargeterCooldown = 30000; // 30s
const int SkillCooldown = 10000; // 10s
// Calculate how much time has passed since the targeter was opened
int ticksSinceTargeter = (int)(Core.TickCount - (_from.NextSkillTime - TargeterCooldown));
int remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter);
_from.NextSkillTime = Core.TickCount + remainingCooldown;
}
}
}

8
Projects/UOContent/Skills/DetectHidden.cs
View file

@ -114,7 +114,13 @@ namespace Server.SkillHandlers
src.SendLocalizedMessage(500817); // You can see nothing hidden there.
}
src.NextSkillTime = Core.TickCount + 6000; // 6 seconds cooldown
const int TargeterCooldown = 30000; // 30s
const int SkillCooldown = 10000; // 10s
// Calculate how much time has passed since the targeter was opened
int ticksSinceTargeter = (int)(Core.TickCount - (src.NextSkillTime - TargeterCooldown));
int remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter);
src.NextSkillTime = Core.TickCount + remainingCooldown;
}
}
}

8
Projects/UOContent/Skills/Stealing.cs
View file

@ -410,7 +410,13 @@ public static class Stealing
pm.Delta(MobileDelta.Noto);
}
from.NextSkillTime = Core.TickCount + 10000; // 10 seconds cooldown
const int TargeterCooldown = 30000; // 30s
const int SkillCooldown = 10000; // 10s
// Calculate how much time has passed since the targeter was opened
int ticksSinceTargeter = (int)(Core.TickCount - (from.NextSkillTime - TargeterCooldown));
int remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter);
from.NextSkillTime = Core.TickCount + remainingCooldown;
}
}
}