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

fix: Fixes spell durations for older expansions (#1119)

Browse source
This commit is contained in:
Kamron Batman 2022-07-15 12:49:14 -07:00 • committed by GitHub
parent d6d02de296
commit 56c97ca84a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 68 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/UOContent/Spells/Fifth/Incognito.cs
View file

@ -108,13 +108,12 @@ namespace Server.Spells.Fifth
StopTimer(Caster);
var timeVal = Math.Min(6 * Caster.Skills.Magery.Fixed / 50 + 1, 144);
var duration = TimeSpan.FromSeconds(Math.Min(6 * Caster.Skills.Magery.Value / 5.0, 144));
var length = TimeSpan.FromSeconds(timeVal);
Timer.StartTimer(length, () => EndIncognito(Caster), out var timerToken);
Timer.StartTimer(duration, () => EndIncognito(Caster), out var timerToken);
_table[Caster] = timerToken;
BuffInfo.AddBuff(Caster, new BuffInfo(BuffIcon.Incognito, 1075819, length, Caster));
BuffInfo.AddBuff(Caster, new BuffInfo(BuffIcon.Incognito, 1075819, duration, Caster));
}
else
{

7
Projects/UOContent/Spells/Fifth/PoisonField.cs
View file

@ -38,7 +38,12 @@ namespace Server.Spells.Fifth
Effects.PlaySound(loc, Caster.Map, 0x20B);
var itemID = eastToWest ? 0x3915 : 0x3922;
var duration = TimeSpan.FromSeconds(3 + Caster.Skills.Magery.Fixed / 25);
var duration = Core.Expansion switch
{
Expansion.None => TimeSpan.FromSeconds(20),
< Expansion.LBR => TimeSpan.FromSeconds(15 + Caster.Skills.Magery.Value * 0.4),
_ => TimeSpan.FromSeconds(3 + Caster.Skills.Magery.Fixed * 0.4)
};
for (var i = -2; i <= 2; ++i)
{

13
Projects/UOContent/Spells/Fifth/SummonCreature.cs
View file

@ -72,16 +72,11 @@ namespace Server.Spells.Fifth
// creature.ControlSlots = 2;
TimeSpan duration;
if (Core.AOS)
var duration = Core.Expansion switch
{
duration = TimeSpan.FromSeconds(2 * Caster.Skills.Magery.Fixed / 5.0);
}
else
{
duration = TimeSpan.FromSeconds(4.0 * Caster.Skills.Magery.Value);
}
Expansion.None => TimeSpan.FromSeconds(Caster.Skills.Magery.Value),
_ => TimeSpan.FromSeconds(2 * Caster.Skills.Magery.Fixed / 5.0)
};
SpellHelper.Summon(creature, Caster, 0x215, duration, false, false);
}