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

132
Scripts/Spells/Sixth/Dispel.cs
View file

@ -1,81 +1,83 @@
using Server.Items;
using Server.Targeting;
using Server.Mobiles;
using Server.Targeting;
namespace Server.Spells.Sixth
{
public class DispelSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Dispel", "An Ort",
218,
9002,
Reagent.Garlic,
Reagent.MandrakeRoot,
Reagent.SulfurousAsh
);
public class DispelSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Dispel", "An Ort",
218,
9002,
Reagent.Garlic,
Reagent.MandrakeRoot,
Reagent.SulfurousAsh
);
public override SpellCircle Circle => SpellCircle.Sixth;
public DispelSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public DispelSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public override SpellCircle Circle => SpellCircle.Sixth;
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
}
public override void OnCast()
{
Caster.Target = new InternalTarget(this);
}
public class InternalTarget : Target
{
private DispelSpell m_Owner;
public class InternalTarget : Target
{
private DispelSpell m_Owner;
public InternalTarget( DispelSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Harmful )
{
m_Owner = owner;
}
public InternalTarget(DispelSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.Harmful)
{
m_Owner = owner;
}
protected override void OnTarget( Mobile from, object o )
{
if ( o is Mobile )
{
Mobile m = (Mobile)o;
BaseCreature bc = m as BaseCreature;
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile)
{
Mobile m = (Mobile)o;
BaseCreature bc = m as BaseCreature;
if ( !from.CanSee( m ) )
{
from.SendLocalizedMessage( 500237 ); // Target can not be seen.
}
else if ( bc == null || !bc.IsDispellable )
{
from.SendLocalizedMessage( 1005049 ); // That cannot be dispelled.
}
else if ( m_Owner.CheckHSequence( m ) )
{
SpellHelper.Turn( from, m );
if (!from.CanSee(m))
{
from.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (bc == null || !bc.IsDispellable)
{
from.SendLocalizedMessage(1005049); // That cannot be dispelled.
}
else if (m_Owner.CheckHSequence(m))
{
SpellHelper.Turn(from, m);
double dispelChance = (50.0 + ((100 * (from.Skills.Magery.Value - bc.DispelDifficulty)) / (bc.DispelFocus*2))) / 100;
double dispelChance =
(50.0 + 100 * (from.Skills.Magery.Value - bc.DispelDifficulty) / (bc.DispelFocus * 2)) / 100;
if ( dispelChance > Utility.RandomDouble() )
{
Effects.SendLocationParticles( EffectItem.Create( m.Location, m.Map, EffectItem.DefaultDuration ), 0x3728, 8, 20, 5042 );
Effects.PlaySound( m, m.Map, 0x201 );
if (dispelChance > Utility.RandomDouble())
{
Effects.SendLocationParticles(EffectItem.Create(m.Location, m.Map, EffectItem.DefaultDuration),
0x3728, 8, 20, 5042);
Effects.PlaySound(m, m.Map, 0x201);
m.Delete();
}
else
{
m.FixedEffect( 0x3779, 10, 20 );
from.SendLocalizedMessage( 1010084 ); // The creature resisted the attempt to dispel it!
}
}
}
}
m.Delete();
}
else
{
m.FixedEffect(0x3779, 10, 20);
from.SendLocalizedMessage(1010084); // The creature resisted the attempt to dispel it!
}
}
}
}
protected override void OnTargetFinish( Mobile from )
{
m_Owner.FinishSequence();
}
}
}
}
protected override void OnTargetFinish(Mobile from)
{
m_Owner.FinishSequence();
}
}
}
}