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

fix: Fixes mana insufficient message for newer clients. (#957)

Browse source 
Publish 100 introduced the cliloc change for insufficient mana. This was rolled out starting with v7.0.65.4 on 6/22/2018.
This commit is contained in:
Kamron Batman 2022-03-10 12:18:22 -08:00 • committed by GitHub
parent 60991b7ab0
commit 44bd129734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 91 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

166
Projects/UOContent/Spells/Base/Spell.cs
View file

@ -459,6 +459,8 @@ namespace Server.Spells
}
}
private static ClientVersion _insufficientManaClientChange = new ClientVersion("7.0.65.4");
public bool Cast()
{
StartCastTime = Core.TickCount;
@ -473,13 +475,19 @@ namespace Server.Spells
return false;
}
if (Scroll is BaseWand && Caster.Spell?.IsCasting == true)
var isCasting = Caster.Spell?.IsCasting == true;
var isWand = Scroll is BaseWand;
if (isCasting)
{
Caster.SendLocalizedMessage(502643); // You can not cast a spell while frozen.
}
else if (Caster.Spell?.IsCasting == true)
{
Caster.SendLocalizedMessage(502642); // You are already casting a spell.
if (isWand)
{
Caster.SendLocalizedMessage(502643); // You can not cast a spell while frozen.
}
else
{
Caster.SendLocalizedMessage(502642); // You are already casting a spell.
}
}
else if (BlockedByHorrificBeast &&
TransformationSpellHelper.UnderTransformation(Caster, typeof(HorrificBeastSpell)) ||
@ -487,7 +495,7 @@ namespace Server.Spells
{
Caster.SendLocalizedMessage(1061091); // You cannot cast that spell in this form.
}
else if (Scroll is not BaseWand && (Caster.Paralyzed || Caster.Frozen))
else if (!isWand && (Caster.Paralyzed || Caster.Frozen))
{
Caster.SendLocalizedMessage(502643); // You can not cast a spell while frozen.
}
@ -502,76 +510,84 @@ namespace Server.Spells
else if ((Caster as PlayerMobile)?.DuelContext?.AllowSpellCast(Caster, this) == false)
{
}
else if (Caster.Mana >= ScaleMana(GetMana()))
{
if (Caster.Spell == null && Caster.CheckSpellCast(this) && CheckCast() &&
Caster.Region.OnBeginSpellCast(Caster, this))
{
State = SpellState.Casting;
Caster.Spell = this;
if (Scroll is not BaseWand && RevealOnCast)
{
Caster.RevealingAction();
}
SayMantra();
var castDelay = GetCastDelay();
if (ShowHandMovement && (Caster.Body.IsHuman || Caster.Player && Caster.Body.IsMonster))
{
var count = (int)Math.Ceiling(castDelay.TotalSeconds / AnimateDelay.TotalSeconds);
if (count != 0)
{
_animTimer = new AnimTimer(this, count);
_animTimer.Start();
}
if (Info.LeftHandEffect > 0)
{
Caster.FixedParticles(0, 10, 5, Info.LeftHandEffect, EffectLayer.LeftHand);
}
if (Info.RightHandEffect > 0)
{
Caster.FixedParticles(0, 10, 5, Info.RightHandEffect, EffectLayer.RightHand);
}
}
if (ClearHandsOnCast)
{
Caster.ClearHands();
}
if (Core.ML)
{
WeaponAbility.ClearCurrentAbility(Caster);
}
_castTimer = new CastTimer(this, castDelay);
// m_CastTimer.Start();
OnBeginCast();
if (castDelay > TimeSpan.Zero)
{
_castTimer.Start();
}
else
{
_castTimer.Tick();
}
return true;
}
return false;
}
else
{
Caster.LocalOverheadMessage(MessageType.Regular, 0x22, 502625); // Insufficient mana
var requiredMana = ScaleMana(GetMana());
if (Caster.Mana >= requiredMana)
{
if (Caster.Spell == null && Caster.CheckSpellCast(this) && CheckCast() &&
Caster.Region.OnBeginSpellCast(Caster, this))
{
State = SpellState.Casting;
Caster.Spell = this;
if (!isWand && RevealOnCast)
{
Caster.RevealingAction();
}
SayMantra();
var castDelay = GetCastDelay();
if (ShowHandMovement && (Caster.Body.IsHuman || Caster.Player && Caster.Body.IsMonster))
{
var count = (int)Math.Ceiling(castDelay.TotalSeconds / AnimateDelay.TotalSeconds);
if (count != 0)
{
_animTimer = new AnimTimer(this, count);
_animTimer.Start();
}
if (Info.LeftHandEffect > 0)
{
Caster.FixedParticles(0, 10, 5, Info.LeftHandEffect, EffectLayer.LeftHand);
}
if (Info.RightHandEffect > 0)
{
Caster.FixedParticles(0, 10, 5, Info.RightHandEffect, EffectLayer.RightHand);
}
}
if (ClearHandsOnCast)
{
Caster.ClearHands();
}
if (Core.ML)
{
WeaponAbility.ClearCurrentAbility(Caster);
}
_castTimer = new CastTimer(this, castDelay);
// m_CastTimer.Start();
OnBeginCast();
if (castDelay > TimeSpan.Zero)
{
_castTimer.Start();
}
else
{
_castTimer.Tick();
}
return true;
}
}
else if (Caster.NetState?.Version >= _insufficientManaClientChange)
{
// Insufficient mana. You must have at least ~1_MANA_REQUIREMENT~ Mana to use this spell.
Caster.LocalOverheadMessage(MessageType.Regular, 0x22, 502625, requiredMana.ToString());
}
else
{
Caster.LocalOverheadMessage(MessageType.Regular, 0x22, 502625); // Insufficient mana
}
}
return false;