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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

169
Scripts/Spells/Second/Harm.cs
View file

@ -2,111 +2,108 @@ using Server.Targeting;
namespace Server.Spells.Second
{
public class HarmSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Harm", "An Mani",
212,
Core.AOS ? 9001 : 9041,
Reagent.Nightshade,
Reagent.SpidersSilk
);
public class HarmSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Harm", "An Mani",
212,
Core.AOS ? 9001 : 9041,
Reagent.Nightshade,
Reagent.SpidersSilk
);
public override SpellCircle Circle => SpellCircle.Second;
public HarmSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public HarmSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public override SpellCircle Circle => SpellCircle.Second;
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
}
public override bool DelayedDamage => false;
public override bool DelayedDamage => false;
public override void OnCast()
{
Caster.Target = new InternalTarget(this);
}
public override double GetSlayerDamageScalar( Mobile target )
{
return 1.0; //This spell isn't affected by slayer spellbooks
}
public override double GetSlayerDamageScalar(Mobile target)
{
return 1.0; //This spell isn't affected by slayer spellbooks
}
public void Target( Mobile m )
{
if ( !Caster.CanSee( m ) )
{
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
}
else if ( CheckHSequence( m ) )
{
SpellHelper.Turn( Caster, m );
public void Target(Mobile m)
{
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckHSequence(m))
{
SpellHelper.Turn(Caster, m);
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
SpellHelper.CheckReflect((int)Circle, Caster, ref m);
double damage;
double damage;
if ( Core.AOS )
{
damage = GetNewAosDamage( 17, 1, 5, m );
}
else
{
damage = Utility.Random( 1, 15 );
if (Core.AOS)
{
damage = GetNewAosDamage(17, 1, 5, m);
}
else
{
damage = Utility.Random(1, 15);
if ( CheckResisted( m ) )
{
damage *= 0.75;
if (CheckResisted(m))
{
damage *= 0.75;
m.SendLocalizedMessage( 501783 ); // You feel yourself resisting magical energy.
}
m.SendLocalizedMessage(501783); // You feel yourself resisting magical energy.
}
damage *= GetDamageScalar( m );
}
damage *= GetDamageScalar(m);
}
if ( !m.InRange( Caster, 2 ) )
damage *= 0.25; // 1/4 damage at > 2 tile range
else if ( !m.InRange( Caster, 1 ) )
damage *= 0.50; // 1/2 damage at 2 tile range
if (!m.InRange(Caster, 2))
damage *= 0.25; // 1/4 damage at > 2 tile range
else if (!m.InRange(Caster, 1))
damage *= 0.50; // 1/2 damage at 2 tile range
if ( Core.AOS )
{
m.FixedParticles( 0x374A, 10, 30, 5013, 1153, 2, EffectLayer.Waist );
m.PlaySound( 0x0FC );
}
else
{
m.FixedParticles( 0x374A, 10, 15, 5013, EffectLayer.Waist );
m.PlaySound( 0x1F1 );
}
if (Core.AOS)
{
m.FixedParticles(0x374A, 10, 30, 5013, 1153, 2, EffectLayer.Waist);
m.PlaySound(0x0FC);
}
else
{
m.FixedParticles(0x374A, 10, 15, 5013, EffectLayer.Waist);
m.PlaySound(0x1F1);
}
SpellHelper.Damage( this, m, damage, 0, 0, 100, 0, 0 );
}
SpellHelper.Damage(this, m, damage, 0, 0, 100, 0, 0);
}
FinishSequence();
}
FinishSequence();
}
private class InternalTarget : Target
{
private HarmSpell m_Owner;
private class InternalTarget : Target
{
private HarmSpell m_Owner;
public InternalTarget( HarmSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Harmful )
{
m_Owner = owner;
}
public InternalTarget(HarmSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.Harmful)
{
m_Owner = owner;
}
protected override void OnTarget( Mobile from, object o )
{
if ( o is Mobile )
{
m_Owner.Target( (Mobile)o );
}
}
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile) m_Owner.Target((Mobile)o);
}
protected override void OnTargetFinish( Mobile from )
{
m_Owner.FinishSequence();
}
}
}
}
protected override void OnTargetFinish(Mobile from)
{
m_Owner.FinishSequence();
}
}
}
}