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

fix: Fixes curses and spell effects (#1112)

Browse source 
* * Fix statmod naming mismatch: everything in code searches for "[Magic] {type} Offset" but stat reductions are being added as "[Magic] {type} Curse"

* Clarifies and cleans up curses

* Fixes blood oath

* * NobleSacrifice remove all curses in one go

* Dont need a method

* Fix extra parentheses

Co-authored-by: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
This commit is contained in:
mark1145 2022-07-08 16:59:46 +10:00 • committed by GitHub
parent ad0e1702a3
commit bd4e6fc30e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 126 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Projects/UOContent/Spells/Necromancy/BloodOathSpell.cs
View file

@ -65,8 +65,7 @@ namespace Server.Spells.Necromancy
* ((ss-rm)/8)+8
*/
_table.TryGetValue(m, out var timer);
timer?.DoExpire();
RemoveCurse(m);
m_OathTable[Caster] = Caster;
m_OathTable[m] = Caster;
@ -84,7 +83,7 @@ namespace Server.Spells.Necromancy
var duration = TimeSpan.FromSeconds((GetDamageSkill(Caster) - GetResistSkill(m)) / 8 + 8);
m.CheckSkill(SkillName.MagicResist, 0.0, 120.0); // Skill check for gain
timer = new ExpireTimer(Caster, m, duration);
var timer = new ExpireTimer(Caster, m, duration);
timer.Start();
BuffInfo.AddBuff(Caster, new BuffInfo(BuffIcon.BloodOathCaster, 1075659, duration, Caster, m.Name));
@ -102,10 +101,30 @@ namespace Server.Spells.Necromancy
Caster.Target = new SpellTargetMobile(this, TargetFlags.Harmful, Core.ML ? 10 : 12);
}
public static void RemoveCurse(Mobile m)
public static bool RemoveCurse(Mobile target)
{
_table.TryGetValue(m, out var t);
t?.DoExpire();
if (_table.Remove(target, out var timer))
{
var caster = timer.Caster;
if (m_OathTable.Remove(caster))
{
caster.SendLocalizedMessage(1061620); // Your Blood Oath has been broken.
}
if (m_OathTable.Remove(target))
{
target.SendLocalizedMessage(1061620); // Your Blood Oath has been broken.
}
timer.Stop();
BuffInfo.RemoveBuff(caster, BuffIcon.BloodOathCaster);
BuffInfo.RemoveBuff(target, BuffIcon.BloodOathCurse);
return true;
}
return false;
}
public static Mobile GetBloodOath(Mobile m) =>
@ -113,48 +132,29 @@ namespace Server.Spells.Necromancy
private class ExpireTimer : Timer
{
private readonly Mobile m_Caster;
private readonly DateTime m_End;
private readonly Mobile m_Target;
private Mobile _target;
private DateTime _end;
public Mobile Caster { get; }
public ExpireTimer(Mobile caster, Mobile target, TimeSpan delay) : base(
TimeSpan.FromSeconds(1.0),
TimeSpan.FromSeconds(1.0)
)
{
m_Caster = caster;
m_Target = target;
m_End = Core.Now + delay;
Caster = caster;
_target = target;
_end = Core.Now + delay;
}
protected override void OnTick()
{
if (m_Caster.Deleted || m_Target.Deleted || !m_Caster.Alive || !m_Target.Alive ||
Core.Now >= m_End)
if (Caster.Deleted || _target.Deleted || !Caster.Alive || !_target.Alive ||
Core.Now >= _end)
{
DoExpire();
RemoveCurse(_target);
}
}
public void DoExpire()
{
if (m_OathTable.Remove(m_Caster))
{
m_Caster.SendLocalizedMessage(1061620); // Your Blood Oath has been broken.
}
if (m_OathTable.Remove(m_Target))
{
m_Target.SendLocalizedMessage(1061620); // Your Blood Oath has been broken.
}
Stop();
BuffInfo.RemoveBuff(m_Caster, BuffIcon.BloodOathCaster);
BuffInfo.RemoveBuff(m_Target, BuffIcon.BloodOathCurse);
_table.Remove(m_Caster);
}
}
}
}

7
Projects/UOContent/Spells/Necromancy/MindRot.cs
View file

@ -71,15 +71,17 @@ namespace Server.Spells.Necromancy
Caster.Target = new SpellTargetMobile(this, TargetFlags.Harmful, Core.ML ? 10 : 12);
}
public static void ClearMindRotScalar(Mobile m)
public static bool ClearMindRotScalar(Mobile m)
{
if (_table.Remove(m, out var tmpB))
{
tmpB.m_MRExpireTimer.Stop();
m.SendLocalizedMessage(1060872); // Your mind feels normal again.
BuffInfo.RemoveBuff(m, BuffIcon.Mindrot);
return true;
}
BuffInfo.RemoveBuff(m, BuffIcon.Mindrot);
return false;
}
public static bool HasMindRotScalar(Mobile m) => _table.ContainsKey(m);
@ -127,7 +129,6 @@ namespace Server.Spells.Necromancy
if (m_Target.Deleted || !m_Target.Alive || Core.Now >= m_End)
{
MindRotSpell.ClearMindRotScalar(m_Target);
Stop();
}
}
}