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

chore(content): Cleans up abilities and some spell timers (#427)

Browse source 
- [X] Exposes Index/Count on the timer.
- [X] Cleans up abilities
- [X] Combines some spell context/info objects with their timers to reduce allocations
- [X] Fixes a bug where immolating weapon both finishes effect or stops in the wrong order due to a race condition.
This commit is contained in:
Kamron Batman 2021-01-23 16:40:53 -08:00 • committed by GitHub
parent 9ef7752beb
commit 178f71c6dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 469 additions and 677 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs
View file

@ -185,10 +185,8 @@ namespace Server.Items
if (Core.ML && reqTactics && from.Skills.Tactics.Base < reqSkill)
{
from.SendLocalizedMessage(
1079308,
reqSkill.ToString()
); // You need ~1_SKILL_REQUIREMENT~ weapon and tactics skill to perform that attack
// You need ~1_SKILL_REQUIREMENT~ weapon and tactics skill to perform that attack
from.SendLocalizedMessage(1079308, reqSkill.ToString());
return false;
}
@ -208,17 +206,13 @@ namespace Server.Items
if (reqTactics)
{
from.SendLocalizedMessage(
1079308,
reqSkill.ToString()
); // You need ~1_SKILL_REQUIREMENT~ weapon and tactics skill to perform that attack
// You need ~1_SKILL_REQUIREMENT~ weapon and tactics skill to perform that attack
from.SendLocalizedMessage(1079308, reqSkill.ToString());
}
else
{
from.SendLocalizedMessage(
1060182,
reqSkill.ToString()
); // You need ~1_SKILL_REQUIREMENT~ weapon skill to perform that attack
// You need ~1_SKILL_REQUIREMENT~ weapon skill to perform that attack
from.SendLocalizedMessage(1060182, reqSkill.ToString());
}
return false;
@ -239,10 +233,8 @@ namespace Server.Items
return true;
}
from.SendLocalizedMessage(
1060181,
mana.ToString()
); // You need ~1_MANA_REQUIREMENT~ mana to perform that attack
// You need ~1_MANA_REQUIREMENT~ mana to perform that attack
from.SendLocalizedMessage(1060181, mana.ToString());
return false;
}