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

fix: Cleans up some comments and spell code (#1120)

Browse source
This commit is contained in:
Kamron Batman 2022-07-16 19:45:41 -07:00 • committed by GitHub
parent 56c97ca84a
commit fa3515f930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 338 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Projects/UOContent/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs
View file

@ -46,11 +46,8 @@ namespace Server.Items
{
if (from.Poisoned || MortalStrike.IsWounded(from))
{
from.LocalOverheadMessage(
MessageType.Regular,
0x22,
1005000
); // You can not heal yourself in your current state.
// You can not heal yourself in your current state.
from.LocalOverheadMessage(MessageType.Regular, 0x22, 1005000);
}
else
{
@ -69,19 +66,15 @@ namespace Server.Items
}
else
{
from.LocalOverheadMessage(
MessageType.Regular,
0x22,
500235
); // You must wait 10 seconds before using another healing potion.
// You must wait 10 seconds before using another healing potion.
from.LocalOverheadMessage(MessageType.Regular, 0x22, 500235);
}
}
}
else
{
from.SendLocalizedMessage(
1049547
); // You decide against drinking this potion, as you are already at full health.
// You decide against drinking this potion, as you are already at full health.
from.SendLocalizedMessage(1049547);
}
}
}

2
Projects/UOContent/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
View file

@ -292,7 +292,7 @@ namespace Server.Items
if (weapon.Poison != null && weapon.PoisonCharges > 0)
{
if (EvilOmenSpell.TryEndEffect(target))
if (EvilOmenSpell.EndEffect(target))
{
target.ApplyPoison(from, Poison.GetPoison(weapon.Poison.Level + 1));
}

2
Projects/UOContent/Items/Talismans/BaseTalisman.cs
View file

@ -1258,7 +1258,7 @@ namespace Server.Items
target.Paralyzed = false;
EvilOmenSpell.TryEndEffect(target);
EvilOmenSpell.EndEffect(target);
StrangleSpell.RemoveCurse(target);
CorpseSkinSpell.RemoveCurse(target);
CurseSpell.RemoveEffect(target);

3
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -1900,7 +1900,6 @@ namespace Server.Items
var lifeLeech = 0;
var stamLeech = 0;
var manaLeech = 0;
int wraithLeech;
if ((int)(AosWeaponAttributes.GetValue(attacker, AosWeaponAttribute.HitLeechHits) * propertyBonus) >
Utility.Random(100))
@ -1935,7 +1934,7 @@ namespace Server.Items
if (context?.Type == typeof(WraithFormSpell))
{
// Wraith form gives an additional 5-20% mana leech
wraithLeech = 5 + (int)(15 * attacker.Skills.SpiritSpeak.Value / 100);
var wraithLeech = 5 + (int)(15 * attacker.Skills.SpiritSpeak.Value / 100);
// Mana leeched by the Wraith Form spell is actually stolen, not just leeched.
defender.Mana -= AOS.Scale(damageGiven, wraithLeech);