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

fix: Removes duplicate stat offsets (#1293)

Browse source
This commit is contained in:
Kamron Batman 2022-12-04 14:23:02 -08:00 • committed by GitHub
parent bd1db66858
commit b1cfb10ef8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Projects/UOContent/Spells/Base/SpellHelper.cs
View file

@ -305,13 +305,18 @@ namespace Server.Spells
var mod = target.GetStatMod(name); var mod = target.GetStatMod(name);
if (mod == null || mod.Offset < bonus) if (mod != null)
{ {
target.AddStatMod(new StatMod(type, name, bonus - (mod?.Offset ?? 0), duration)); if (mod.Offset >= bonus)
return true; {
return false;
}
target.RemoveStatMod(mod);
} }
return false; target.AddStatMod(new StatMod(type, name, bonus, duration));
return true;
} }
public static bool AddStatCurse(Mobile caster, Mobile target, StatType type, TimeSpan duration, bool skillCheck = true) => public static bool AddStatCurse(Mobile caster, Mobile target, StatType type, TimeSpan duration, bool skillCheck = true) =>
@ -325,18 +330,23 @@ namespace Server.Spells
public static bool AddStatCurse(Mobile caster, Mobile target, StatType type, int curse, TimeSpan duration) public static bool AddStatCurse(Mobile caster, Mobile target, StatType type, int curse, TimeSpan duration)
{ {
var offset = -curse; var malus = -curse;
var name = $"[Magic] {type} Curse"; var name = $"[Magic] {type} Curse";
var mod = target.GetStatMod(name); var mod = target.GetStatMod(name);
if (mod == null || mod.Offset < offset) if (mod != null)
{ {
target.AddStatMod(new StatMod(type, name, offset - (mod?.Offset ?? 0), duration)); if (mod.Offset <= malus)
return true; {
return false;
}
target.RemoveStatMod(mod);
} }
return false; target.AddStatMod(new StatMod(type, name, malus, duration));
return true;
} }
public static TimeSpan GetDuration(Mobile caster, Mobile target) => public static TimeSpan GetDuration(Mobile caster, Mobile target) =>