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

fix: Fixes PainSpike, ManaVampire, Evil Omen, and Curse (#1622)

Browse source 
Co-authored-by: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
This commit is contained in:
mark1145 2023-12-02 17:59:42 +00:00 • committed by GitHub
parent fec78040bc
commit 4ebdc75bdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 119 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

89
Projects/UOContent/Spells/Fourth/Curse.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using Server.Targeting;
@ -23,6 +24,66 @@ namespace Server.Spells.Fourth
public override SpellCircle Circle => SpellCircle.Fourth;
public static bool DoCurse(Mobile caster, Mobile m)
{
var duration = SpellHelper.GetDuration(caster, m);
if (duration == TimeSpan.Zero)
{
return false;
}
// Allow curse duration to refresh if the new curse is longer
if (_table.TryGetValue(m, out var existingTimer) && existingTimer.Next - Core.Now > duration && Core.AOS)
{
return false;
}
var newStrOffset = SpellHelper.GetOffset(caster, m, StatType.Str, true);
var newDexOffset = SpellHelper.GetOffset(caster, m, StatType.Dex, true);
var newIntOffset = SpellHelper.GetOffset(caster, m, StatType.Int, true);
if (newStrOffset == 0 && newDexOffset == 0 && newIntOffset == 0)
{
return false;
}
var oldStrOffset = SpellHelper.GetCurse(caster, m, StatType.Str);
var oldDexOffset = SpellHelper.GetCurse(caster, m, StatType.Dex);
var oldIntOffset = SpellHelper.GetCurse(caster, m, StatType.Int);
if (oldStrOffset <= newStrOffset && oldDexOffset <= newDexOffset && oldIntOffset <= newIntOffset)
{
return false;
}
var strCurse = SpellHelper.AddStatCurse(caster, m, StatType.Str, newStrOffset, duration);
var dexCurse = SpellHelper.AddStatCurse(caster, m, StatType.Dex, newDexOffset, duration);
var intCurse = SpellHelper.AddStatCurse(caster, m, StatType.Int, newIntOffset, duration, true);
if (!strCurse && !dexCurse && !intCurse)
{
return false;
}
existingTimer?.Stop();
m.UpdateResistances();
_table[m] = Timer.DelayCall(duration, mob => RemoveEffect(mob), m);
m.Spell?.OnCasterHurt();
m.Paralyzed = false;
m.FixedParticles(0x374A, 10, 15, 5028, EffectLayer.Waist);
m.PlaySound(0x1E1);
var percentage = (int)(SpellHelper.GetOffsetScalar(caster, m, true) * 100);
var args = $"{percentage}\t{percentage}\t{percentage}\t{10}\t{10}\t{10}\t{10}";
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Curse, 1075835, 1075836, duration, m, args));
return true;
}
public void Target(Mobile m)
{
if (CheckHSequence(m))
@ -30,31 +91,15 @@ namespace Server.Spells.Fourth
SpellHelper.Turn(Caster, m);
SpellHelper.CheckReflect((int)Circle, Caster, ref m);
var length = SpellHelper.GetDuration(Caster, m);
SpellHelper.AddStatCurse(Caster, m, StatType.Str, length, false);
SpellHelper.AddStatCurse(Caster, m, StatType.Dex, length);
SpellHelper.AddStatCurse(Caster, m, StatType.Int, length);
if (Caster.Player && m.Player)
if (DoCurse(Caster, m))
{
RemoveEffect(m);
_table[m] = Timer.DelayCall(length, () => RemoveEffect(m));
HarmfulSpell(m);
}
else
{
DoHurtFizzle();
}
m.Spell?.OnCasterHurt();
m.Paralyzed = false;
m.FixedParticles(0x374A, 10, 15, 5028, EffectLayer.Waist);
m.PlaySound(0x1E1);
var percentage = (int)(SpellHelper.GetOffsetScalar(Caster, m, true) * 100);
var args = $"{percentage}\t{percentage}\t{percentage}\t{10}\t{10}\t{10}\t{10}";
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Curse, 1075835, 1075836, length, m, args));
HarmfulSpell(m);
}
FinishSequence();