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

fix: Fixes cast spell speeds for various expansions (#1178)

Browse source 
* Adds 0.25s for all spells for SA+ Era
* Fixes Summon Creature & Blade Spirits cast delay
* Fixes minimum cast delay for chivalry spells
* Fixes poison strike and wither spells
This commit is contained in:
Kamron Batman 2022-10-01 12:25:40 -07:00 • committed by GitHub
parent aa270ac868
commit 8a2c0ead3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 62 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Projects/UOContent/Spells/Fifth/BladeSpirits.cs
View file

@ -34,17 +34,7 @@ namespace Server.Spells.Fifth
}
else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
{
TimeSpan duration;
if (Core.AOS)
{
duration = TimeSpan.FromSeconds(120);
}
else
{
duration = TimeSpan.FromSeconds(Utility.Random(80, 40));
}
var duration = TimeSpan.FromSeconds(Core.AOS ? 120 : Utility.Random(80, 40));
BaseCreature.Summon(new BladeSpirits(), false, Caster, new Point3D(p), 0x212, duration);
}
@ -53,12 +43,23 @@ namespace Server.Spells.Fifth
public override TimeSpan GetCastDelay()
{
if (Core.AOS)
var scalar = Core.Expansion switch
{
return TimeSpan.FromTicks(base.GetCastDelay().Ticks * (Core.SE ? 3 : 5));
>= Expansion.SE => 3,
>= Expansion.AOS => 5,
_ => 4
};
var delay = base.GetCastDelay() * scalar;
// SA made everything 0.25s slower, but that is applied after the scalar
// So remove 0.25 * scalar to compensate
if (Core.SA)
{
delay -= TimeSpan.FromSeconds(0.25 * scalar);
}
return base.GetCastDelay() + TimeSpan.FromSeconds(6.0);
return delay;
}
public override bool CheckCast()

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

@ -91,12 +91,16 @@ namespace Server.Spells.Fifth
public override TimeSpan GetCastDelay()
{
if (Core.AOS)
var delay = base.GetCastDelay() * (Core.AOS ? 5 : 4);
// SA made everything 0.25 slower, but that is applied after the scalar
// So remove 0.25 * 5 to compensate
if (Core.SA)
{
return TimeSpan.FromTicks(base.GetCastDelay().Ticks * 5);
delay -= TimeSpan.FromSeconds(1.25);
}
return base.GetCastDelay() + TimeSpan.FromSeconds(6.0);
return delay;
}
}
}