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

fix: Cleans up more spells (#1121)

Browse source
This commit is contained in:
Kamron Batman 2022-07-16 22:32:51 -07:00 • committed by GitHub
parent fa3515f930
commit 068bafd9b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 339 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs
View file

@ -30,8 +30,7 @@ namespace Server.Spells.Ninjitsu
private bool m_WasMoving;
public AnimalForm(Mobile caster, Item scroll)
: base(caster, scroll, _info)
public AnimalForm(Mobile caster, Item scroll) : base(caster, scroll, _info)
{
}
@ -477,10 +476,8 @@ namespace Server.Spells.Ninjitsu
if (mana > m_Caster.Mana)
{
m_Caster.SendLocalizedMessage(
1060174, // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
mana.ToString()
);
// You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
m_Caster.SendLocalizedMessage(1060174, mana.ToString());
}
else if (m_Caster is PlayerMobile mobile && mobile.MountBlockReason != BlockMountType.None)
{

9
Projects/UOContent/Spells/Ninjitsu/KiAttack.cs
View file

@ -64,6 +64,8 @@ namespace Server.Spells.Ninjitsu
return;
}
ClearCurrentMove(attacker);
if (GetBonus(attacker) == 0.0)
{
attacker.SendLocalizedMessage(1063101); // You were too close to your target to cause any additional damage.
@ -73,15 +75,12 @@ namespace Server.Spells.Ninjitsu
attacker.FixedParticles(0x37BE, 1, 5, 0x26BD, 0x0, 0x1, EffectLayer.Waist);
attacker.PlaySound(0x510);
attacker.SendLocalizedMessage(
1063100
); // Your quick flight to your target causes extra damage as you strike!
// Your quick flight to your target causes extra damage as you strike!
attacker.SendLocalizedMessage(1063100);
defender.FixedParticles(0x37BE, 1, 5, 0x26BD, 0, 0x1, EffectLayer.Waist);
CheckGain(attacker);
}
ClearCurrentMove(attacker);
}
public override void OnClearMove(Mobile from)

10
Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs
View file

@ -69,9 +69,8 @@ namespace Server.Spells.Ninjitsu
if (Caster.Followers + 1 > Caster.FollowersMax)
{
Caster.SendLocalizedMessage(
1063133
); // You cannot summon a mirror image because you have too many followers.
// You cannot summon a mirror image because you have too many followers.
Caster.SendLocalizedMessage(1063133);
return false;
}
@ -101,9 +100,8 @@ namespace Server.Spells.Ninjitsu
}
else if (Caster.Followers + 1 > Caster.FollowersMax)
{
Caster.SendLocalizedMessage(
1063133
); // You cannot summon a mirror image because you have too many followers.
// You cannot summon a mirror image because you have too many followers.
Caster.SendLocalizedMessage(1063133);
}
else if (TransformationSpellHelper.UnderTransformation(Caster, typeof(HorrificBeastSpell)))
{

25
Projects/UOContent/Spells/Ninjitsu/NinjaSpell.cs
View file

@ -44,20 +44,15 @@ namespace Server.Spells.Ninjitsu
if (Caster.Skills[CastSkill].Value < RequiredSkill)
{
var args = $"{RequiredSkill:F1}\t{CastSkill.ToString()}\t ";
Caster.SendLocalizedMessage(
1063013,
args
); // You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
// You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
Caster.SendLocalizedMessage(1063013, $"{RequiredSkill:F1}\t{CastSkill.ToString()}\t ");
return false;
}
if (Caster.Mana < mana)
{
Caster.SendLocalizedMessage(
1060174,
mana.ToString()
); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
// You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
Caster.SendLocalizedMessage(1060174, mana.ToString());
return false;
}
@ -70,19 +65,15 @@ namespace Server.Spells.Ninjitsu
if (Caster.Skills[CastSkill].Value < RequiredSkill)
{
Caster.SendLocalizedMessage(
1063352,
RequiredSkill.ToString("F1")
); // You need ~1_SKILL_REQUIREMENT~ Ninjitsu skill to perform that attack!
// You need ~1_SKILL_REQUIREMENT~ Ninjitsu skill to perform that attack!
Caster.SendLocalizedMessage(1063352, RequiredSkill.ToString("F1"));
return false;
}
if (Caster.Mana < mana)
{
Caster.SendLocalizedMessage(
1060174,
mana.ToString()
); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
// You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
Caster.SendLocalizedMessage(1060174, mana.ToString());
return false;
}