Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,85 +1,83 @@
|
|||
using System;
|
||||
using Server.Engines.ConPVP;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class AgilitySpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Agility", "Ex Uus",
|
||||
212,
|
||||
9061,
|
||||
Reagent.Bloodmoss,
|
||||
Reagent.MandrakeRoot
|
||||
);
|
||||
public class AgilitySpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Agility", "Ex Uus",
|
||||
212,
|
||||
9061,
|
||||
Reagent.Bloodmoss,
|
||||
Reagent.MandrakeRoot
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public AgilitySpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public AgilitySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if ( Engines.ConPVP.DuelContext.CheckSuddenDeath( Caster ) )
|
||||
{
|
||||
Caster.SendMessage( 0x22, "You cannot cast this spell when in sudden death." );
|
||||
return false;
|
||||
}
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (DuelContext.CheckSuddenDeath(Caster))
|
||||
{
|
||||
Caster.SendMessage(0x22, "You cannot cast this spell when in sudden death.");
|
||||
return false;
|
||||
}
|
||||
|
||||
return base.CheckCast();
|
||||
}
|
||||
return base.CheckCast();
|
||||
}
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget( this );
|
||||
}
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public void Target( Mobile m )
|
||||
{
|
||||
if ( !Caster.CanSee( m ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( CheckBSequence( m ) )
|
||||
{
|
||||
SpellHelper.Turn( Caster, m );
|
||||
public void Target(Mobile m)
|
||||
{
|
||||
if (!Caster.CanSee(m))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (CheckBSequence(m))
|
||||
{
|
||||
SpellHelper.Turn(Caster, m);
|
||||
|
||||
SpellHelper.AddStatBonus( Caster, m, StatType.Dex );
|
||||
SpellHelper.AddStatBonus(Caster, m, StatType.Dex);
|
||||
|
||||
m.FixedParticles( 0x375A, 10, 15, 5010, EffectLayer.Waist );
|
||||
m.PlaySound( 0x1e7 );
|
||||
m.FixedParticles(0x375A, 10, 15, 5010, EffectLayer.Waist);
|
||||
m.PlaySound(0x1e7);
|
||||
|
||||
int percentage = (int)(SpellHelper.GetOffsetScalar( Caster, m, false )*100);
|
||||
TimeSpan length = SpellHelper.GetDuration( Caster, m );
|
||||
int percentage = (int)(SpellHelper.GetOffsetScalar(Caster, m, false) * 100);
|
||||
TimeSpan length = SpellHelper.GetDuration(Caster, m);
|
||||
|
||||
BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Agility, 1075841, length, m, percentage.ToString() ) );
|
||||
}
|
||||
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Agility, 1075841, length, m, percentage.ToString()));
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private AgilitySpell m_Owner;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private AgilitySpell m_Owner;
|
||||
|
||||
public InternalTarget( AgilitySpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(AgilitySpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.Beneficial)
|
||||
{
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,85 +1,83 @@
|
|||
using System;
|
||||
using Server.Engines.ConPVP;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class CunningSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Cunning", "Uus Wis",
|
||||
212,
|
||||
9061,
|
||||
Reagent.MandrakeRoot,
|
||||
Reagent.Nightshade
|
||||
);
|
||||
public class CunningSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Cunning", "Uus Wis",
|
||||
212,
|
||||
9061,
|
||||
Reagent.MandrakeRoot,
|
||||
Reagent.Nightshade
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public CunningSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public CunningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if ( Engines.ConPVP.DuelContext.CheckSuddenDeath( Caster ) )
|
||||
{
|
||||
Caster.SendMessage( 0x22, "You cannot cast this spell when in sudden death." );
|
||||
return false;
|
||||
}
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (DuelContext.CheckSuddenDeath(Caster))
|
||||
{
|
||||
Caster.SendMessage(0x22, "You cannot cast this spell when in sudden death.");
|
||||
return false;
|
||||
}
|
||||
|
||||
return base.CheckCast();
|
||||
}
|
||||
return base.CheckCast();
|
||||
}
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget( this );
|
||||
}
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public void Target( Mobile m )
|
||||
{
|
||||
if ( !Caster.CanSee( m ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( CheckBSequence( m ) )
|
||||
{
|
||||
SpellHelper.Turn( Caster, m );
|
||||
public void Target(Mobile m)
|
||||
{
|
||||
if (!Caster.CanSee(m))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (CheckBSequence(m))
|
||||
{
|
||||
SpellHelper.Turn(Caster, m);
|
||||
|
||||
SpellHelper.AddStatBonus( Caster, m, StatType.Int );
|
||||
SpellHelper.AddStatBonus(Caster, m, StatType.Int);
|
||||
|
||||
m.FixedParticles( 0x375A, 10, 15, 5011, EffectLayer.Head );
|
||||
m.PlaySound( 0x1EB );
|
||||
m.FixedParticles(0x375A, 10, 15, 5011, EffectLayer.Head);
|
||||
m.PlaySound(0x1EB);
|
||||
|
||||
int percentage = (int)(SpellHelper.GetOffsetScalar( Caster, m, false )*100);
|
||||
TimeSpan length = SpellHelper.GetDuration( Caster, m );
|
||||
int percentage = (int)(SpellHelper.GetOffsetScalar(Caster, m, false) * 100);
|
||||
TimeSpan length = SpellHelper.GetDuration(Caster, m);
|
||||
|
||||
BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Cunning, 1075843, length, m, percentage.ToString() ) );
|
||||
}
|
||||
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Cunning, 1075843, length, m, percentage.ToString()));
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private CunningSpell m_Owner;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private CunningSpell m_Owner;
|
||||
|
||||
public InternalTarget( CunningSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(CunningSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.Beneficial)
|
||||
{
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,100 +1,99 @@
|
|||
using Server.Engines.ConPVP;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class CureSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Cure", "An Nox",
|
||||
212,
|
||||
9061,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng
|
||||
);
|
||||
public class CureSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Cure", "An Nox",
|
||||
212,
|
||||
9061,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public CureSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public CureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if ( Engines.ConPVP.DuelContext.CheckSuddenDeath( Caster ) )
|
||||
{
|
||||
Caster.SendMessage( 0x22, "You cannot cast this spell when in sudden death." );
|
||||
return false;
|
||||
}
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (DuelContext.CheckSuddenDeath(Caster))
|
||||
{
|
||||
Caster.SendMessage(0x22, "You cannot cast this spell when in sudden death.");
|
||||
return false;
|
||||
}
|
||||
|
||||
return base.CheckCast();
|
||||
}
|
||||
return base.CheckCast();
|
||||
}
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget( this );
|
||||
}
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public void Target( Mobile m )
|
||||
{
|
||||
if ( !Caster.CanSee( m ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( CheckBSequence( m ) )
|
||||
{
|
||||
SpellHelper.Turn( Caster, m );
|
||||
public void Target(Mobile m)
|
||||
{
|
||||
if (!Caster.CanSee(m))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (CheckBSequence(m))
|
||||
{
|
||||
SpellHelper.Turn(Caster, m);
|
||||
|
||||
Poison p = m.Poison;
|
||||
Poison p = m.Poison;
|
||||
|
||||
if ( p != null )
|
||||
{
|
||||
int chanceToCure = 10000 + (int)(Caster.Skills[SkillName.Magery].Value * 75) - ((p.Level + 1) * (Core.AOS ? (p.Level < 4 ? 3300 : 3100) : 1750));
|
||||
chanceToCure /= 100;
|
||||
if (p != null)
|
||||
{
|
||||
int chanceToCure = 10000 + (int)(Caster.Skills[SkillName.Magery].Value * 75) -
|
||||
(p.Level + 1) * (Core.AOS ? p.Level < 4 ? 3300 : 3100 : 1750);
|
||||
chanceToCure /= 100;
|
||||
|
||||
if ( chanceToCure > Utility.Random( 100 ) )
|
||||
{
|
||||
if ( m.CurePoison( Caster ) )
|
||||
{
|
||||
if ( Caster != m )
|
||||
Caster.SendLocalizedMessage( 1010058 ); // You have cured the target of all poisons!
|
||||
if (chanceToCure > Utility.Random(100))
|
||||
{
|
||||
if (m.CurePoison(Caster))
|
||||
{
|
||||
if (Caster != m)
|
||||
Caster.SendLocalizedMessage(1010058); // You have cured the target of all poisons!
|
||||
|
||||
m.SendLocalizedMessage( 1010059 ); // You have been cured of all poisons.
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m.SendLocalizedMessage( 1010060 ); // You have failed to cure your target!
|
||||
}
|
||||
}
|
||||
m.SendLocalizedMessage(1010059); // You have been cured of all poisons.
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m.SendLocalizedMessage(1010060); // You have failed to cure your target!
|
||||
}
|
||||
}
|
||||
|
||||
m.FixedParticles( 0x373A, 10, 15, 5012, EffectLayer.Waist );
|
||||
m.PlaySound( 0x1E0 );
|
||||
}
|
||||
m.FixedParticles(0x373A, 10, 15, 5012, EffectLayer.Waist);
|
||||
m.PlaySound(0x1E0);
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
public class InternalTarget : Target
|
||||
{
|
||||
private CureSpell m_Owner;
|
||||
public class InternalTarget : Target
|
||||
{
|
||||
private CureSpell m_Owner;
|
||||
|
||||
public InternalTarget( CureSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(CureSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.Beneficial)
|
||||
{
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,87 +1,93 @@
|
|||
using Server.Targeting;
|
||||
using Server.Items;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class MagicTrapSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Magic Trap", "In Jux",
|
||||
212,
|
||||
9001,
|
||||
Reagent.Garlic,
|
||||
Reagent.SpidersSilk,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
public class MagicTrapSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Magic Trap", "In Jux",
|
||||
212,
|
||||
9001,
|
||||
Reagent.Garlic,
|
||||
Reagent.SpidersSilk,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public MagicTrapSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public MagicTrapSpell( 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 void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public void Target( TrappableContainer item )
|
||||
{
|
||||
if ( !Caster.CanSee( item ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( item.TrapType != TrapType.None && item.TrapType != TrapType.MagicTrap )
|
||||
{
|
||||
base.DoFizzle();
|
||||
}
|
||||
else if ( CheckSequence() )
|
||||
{
|
||||
SpellHelper.Turn( Caster, item );
|
||||
public void Target(TrappableContainer item)
|
||||
{
|
||||
if (!Caster.CanSee(item))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (item.TrapType != TrapType.None && item.TrapType != TrapType.MagicTrap)
|
||||
{
|
||||
base.DoFizzle();
|
||||
}
|
||||
else if (CheckSequence())
|
||||
{
|
||||
SpellHelper.Turn(Caster, item);
|
||||
|
||||
item.TrapType = TrapType.MagicTrap;
|
||||
item.TrapPower = Core.AOS ? Utility.RandomMinMax( 10, 50 ) : 1;
|
||||
item.TrapLevel = 0;
|
||||
item.TrapType = TrapType.MagicTrap;
|
||||
item.TrapPower = Core.AOS ? Utility.RandomMinMax(10, 50) : 1;
|
||||
item.TrapLevel = 0;
|
||||
|
||||
Point3D loc = item.GetWorldLocation();
|
||||
Point3D loc = item.GetWorldLocation();
|
||||
|
||||
Effects.SendLocationParticles( EffectItem.Create( new Point3D( loc.X + 1, loc.Y, loc.Z ), item.Map, EffectItem.DefaultDuration ), 0x376A, 9, 10, 9502 );
|
||||
Effects.SendLocationParticles( EffectItem.Create( new Point3D( loc.X, loc.Y - 1, loc.Z ), item.Map, EffectItem.DefaultDuration ), 0x376A, 9, 10, 9502 );
|
||||
Effects.SendLocationParticles( EffectItem.Create( new Point3D( loc.X - 1, loc.Y, loc.Z ), item.Map, EffectItem.DefaultDuration ), 0x376A, 9, 10, 9502 );
|
||||
Effects.SendLocationParticles( EffectItem.Create( new Point3D( loc.X, loc.Y + 1, loc.Z ), item.Map, EffectItem.DefaultDuration ), 0x376A, 9, 10, 9502 );
|
||||
Effects.SendLocationParticles( EffectItem.Create( new Point3D( loc.X, loc.Y, loc.Z ), item.Map, EffectItem.DefaultDuration ), 0, 0, 0, 5014 );
|
||||
Effects.SendLocationParticles(
|
||||
EffectItem.Create(new Point3D(loc.X + 1, loc.Y, loc.Z), item.Map, EffectItem.DefaultDuration), 0x376A, 9,
|
||||
10, 9502);
|
||||
Effects.SendLocationParticles(
|
||||
EffectItem.Create(new Point3D(loc.X, loc.Y - 1, loc.Z), item.Map, EffectItem.DefaultDuration), 0x376A, 9,
|
||||
10, 9502);
|
||||
Effects.SendLocationParticles(
|
||||
EffectItem.Create(new Point3D(loc.X - 1, loc.Y, loc.Z), item.Map, EffectItem.DefaultDuration), 0x376A, 9,
|
||||
10, 9502);
|
||||
Effects.SendLocationParticles(
|
||||
EffectItem.Create(new Point3D(loc.X, loc.Y + 1, loc.Z), item.Map, EffectItem.DefaultDuration), 0x376A, 9,
|
||||
10, 9502);
|
||||
Effects.SendLocationParticles(
|
||||
EffectItem.Create(new Point3D(loc.X, loc.Y, loc.Z), item.Map, EffectItem.DefaultDuration), 0, 0, 0,
|
||||
5014);
|
||||
|
||||
Effects.PlaySound( loc, item.Map, 0x1EF );
|
||||
}
|
||||
Effects.PlaySound(loc, item.Map, 0x1EF);
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private MagicTrapSpell m_Owner;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private MagicTrapSpell m_Owner;
|
||||
|
||||
public InternalTarget( MagicTrapSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.None )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(MagicTrapSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.None)
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object o )
|
||||
{
|
||||
if ( o is TrappableContainer )
|
||||
{
|
||||
m_Owner.Target( (TrappableContainer)o );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage( "You can't trap that" );
|
||||
}
|
||||
}
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
if (o is TrappableContainer)
|
||||
m_Owner.Target((TrappableContainer)o);
|
||||
else
|
||||
from.SendMessage("You can't trap that");
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish( Mobile from )
|
||||
{
|
||||
m_Owner.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Owner.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,182 +3,186 @@ using System.Collections;
|
|||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class ProtectionSpell : MagerySpell
|
||||
{
|
||||
public static Hashtable Registry { get; } = new Hashtable();
|
||||
public class ProtectionSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Protection", "Uus Sanct",
|
||||
236,
|
||||
9011,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Protection", "Uus Sanct",
|
||||
236,
|
||||
9011,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
private static Hashtable m_Table = new Hashtable();
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public ProtectionSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public ProtectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public static Hashtable Registry{ get; } = new Hashtable();
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if ( Core.AOS )
|
||||
return true;
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
if ( Registry.ContainsKey( Caster ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
|
||||
return false;
|
||||
}
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (Core.AOS)
|
||||
return true;
|
||||
|
||||
if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
|
||||
return false;
|
||||
}
|
||||
if (Registry.ContainsKey(Caster))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005559); // This spell is already in effect.
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
if (!Caster.CanBeginAction(typeof(DefensiveSpell)))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005385); // The spell will not adhere to you at this time.
|
||||
return false;
|
||||
}
|
||||
|
||||
private static Hashtable m_Table = new Hashtable();
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void Toggle( Mobile caster, Mobile target )
|
||||
{
|
||||
/* Players under the protection spell effect can no longer have their spells "disrupted" when hit.
|
||||
* Players under the protection spell have decreased physical resistance stat value (-15 + (Inscription/20),
|
||||
* a decreased "resisting spells" skill value by -35 + (Inscription/20),
|
||||
* and a slower casting speed modifier (technically, a negative "faster cast speed") of 2 points.
|
||||
* The protection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
|
||||
* Reactive Armor, Protection, and Magic Reflection will stay on<EFBFBD>even after logging out,
|
||||
* even after dying<EFBFBD>until you <EFBFBD>turn them off<EFBFBD> by casting them again.
|
||||
*/
|
||||
public static void Toggle(Mobile caster, Mobile target)
|
||||
{
|
||||
/* Players under the protection spell effect can no longer have their spells "disrupted" when hit.
|
||||
* Players under the protection spell have decreased physical resistance stat value (-15 + (Inscription/20),
|
||||
* a decreased "resisting spells" skill value by -35 + (Inscription/20),
|
||||
* and a slower casting speed modifier (technically, a negative "faster cast speed") of 2 points.
|
||||
* The protection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
|
||||
* Reactive Armor, Protection, and Magic Reflection will stay on<EFBFBD>even after logging out,
|
||||
* even after dying<EFBFBD>until you <EFBFBD>turn them off<EFBFBD> by casting them again.
|
||||
*/
|
||||
|
||||
object[] mods = (object[])m_Table[target];
|
||||
object[] mods = (object[])m_Table[target];
|
||||
|
||||
if ( mods == null )
|
||||
{
|
||||
target.PlaySound( 0x1E9 );
|
||||
target.FixedParticles( 0x375A, 9, 20, 5016, EffectLayer.Waist );
|
||||
if (mods == null)
|
||||
{
|
||||
target.PlaySound(0x1E9);
|
||||
target.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
|
||||
mods = new object[2]
|
||||
{
|
||||
new ResistanceMod( ResistanceType.Physical, -15 + Math.Min( (int)(caster.Skills[SkillName.Inscribe].Value / 20), 15 ) ),
|
||||
new DefaultSkillMod( SkillName.MagicResist, true, -35 + Math.Min( (int)(caster.Skills[SkillName.Inscribe].Value / 20), 35 ) )
|
||||
};
|
||||
mods = new object[2]
|
||||
{
|
||||
new ResistanceMod(ResistanceType.Physical,
|
||||
-15 + Math.Min((int)(caster.Skills[SkillName.Inscribe].Value / 20), 15)),
|
||||
new DefaultSkillMod(SkillName.MagicResist, true,
|
||||
-35 + Math.Min((int)(caster.Skills[SkillName.Inscribe].Value / 20), 35))
|
||||
};
|
||||
|
||||
m_Table[target] = mods;
|
||||
Registry[target] = 100.0;
|
||||
m_Table[target] = mods;
|
||||
Registry[target] = 100.0;
|
||||
|
||||
target.AddResistanceMod( (ResistanceMod)mods[0] );
|
||||
target.AddSkillMod( (SkillMod)mods[1] );
|
||||
target.AddResistanceMod((ResistanceMod)mods[0]);
|
||||
target.AddSkillMod((SkillMod)mods[1]);
|
||||
|
||||
int physloss = -15 + (int) (caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
int resistloss = -35 + (int) (caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
string args = $"{physloss}\t{resistloss}";
|
||||
BuffInfo.AddBuff(target, new BuffInfo(BuffIcon.Protection, 1075814, 1075815, args.ToString()));
|
||||
}
|
||||
else
|
||||
{
|
||||
target.PlaySound( 0x1ED );
|
||||
target.FixedParticles( 0x375A, 9, 20, 5016, EffectLayer.Waist );
|
||||
int physloss = -15 + (int)(caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
int resistloss = -35 + (int)(caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
string args = $"{physloss}\t{resistloss}";
|
||||
BuffInfo.AddBuff(target, new BuffInfo(BuffIcon.Protection, 1075814, 1075815, args));
|
||||
}
|
||||
else
|
||||
{
|
||||
target.PlaySound(0x1ED);
|
||||
target.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
|
||||
m_Table.Remove( target );
|
||||
Registry.Remove( target );
|
||||
m_Table.Remove(target);
|
||||
Registry.Remove(target);
|
||||
|
||||
target.RemoveResistanceMod( (ResistanceMod)mods[0] );
|
||||
target.RemoveSkillMod( (SkillMod)mods[1] );
|
||||
target.RemoveResistanceMod((ResistanceMod)mods[0]);
|
||||
target.RemoveSkillMod((SkillMod)mods[1]);
|
||||
|
||||
BuffInfo.RemoveBuff(target, BuffIcon.Protection);
|
||||
}
|
||||
}
|
||||
BuffInfo.RemoveBuff(target, BuffIcon.Protection);
|
||||
}
|
||||
}
|
||||
|
||||
public static void EndProtection( Mobile m )
|
||||
{
|
||||
if ( m_Table.Contains( m ) )
|
||||
{
|
||||
object[] mods = (object[]) m_Table[ m ];
|
||||
public static void EndProtection(Mobile m)
|
||||
{
|
||||
if (m_Table.Contains(m))
|
||||
{
|
||||
object[] mods = (object[])m_Table[m];
|
||||
|
||||
m_Table.Remove( m );
|
||||
Registry.Remove( m );
|
||||
m_Table.Remove(m);
|
||||
Registry.Remove(m);
|
||||
|
||||
m.RemoveResistanceMod( (ResistanceMod) mods[ 0 ] );
|
||||
m.RemoveSkillMod( (SkillMod) mods[ 1 ] );
|
||||
m.RemoveResistanceMod((ResistanceMod)mods[0]);
|
||||
m.RemoveSkillMod((SkillMod)mods[1]);
|
||||
|
||||
BuffInfo.RemoveBuff( m, BuffIcon.Protection );
|
||||
}
|
||||
}
|
||||
BuffInfo.RemoveBuff(m, BuffIcon.Protection);
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
if ( Core.AOS )
|
||||
{
|
||||
if ( CheckSequence() )
|
||||
Toggle( Caster, Caster );
|
||||
public override void OnCast()
|
||||
{
|
||||
if (Core.AOS)
|
||||
{
|
||||
if (CheckSequence())
|
||||
Toggle(Caster, Caster);
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( Registry.ContainsKey( Caster ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
|
||||
}
|
||||
else if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
|
||||
}
|
||||
else if ( CheckSequence() )
|
||||
{
|
||||
if ( Caster.BeginAction( typeof( DefensiveSpell ) ) )
|
||||
{
|
||||
double value = (int)(Caster.Skills[SkillName.EvalInt].Value + Caster.Skills[SkillName.Meditation].Value + Caster.Skills[SkillName.Inscribe].Value);
|
||||
value /= 4;
|
||||
FinishSequence();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Registry.ContainsKey(Caster))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005559); // This spell is already in effect.
|
||||
}
|
||||
else if (!Caster.CanBeginAction(typeof(DefensiveSpell)))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005385); // The spell will not adhere to you at this time.
|
||||
}
|
||||
else if (CheckSequence())
|
||||
{
|
||||
if (Caster.BeginAction(typeof(DefensiveSpell)))
|
||||
{
|
||||
double value = (int)(Caster.Skills[SkillName.EvalInt].Value +
|
||||
Caster.Skills[SkillName.Meditation].Value +
|
||||
Caster.Skills[SkillName.Inscribe].Value);
|
||||
value /= 4;
|
||||
|
||||
if ( value < 0 )
|
||||
value = 0;
|
||||
else if ( value > 75 )
|
||||
value = 75.0;
|
||||
if (value < 0)
|
||||
value = 0;
|
||||
else if (value > 75)
|
||||
value = 75.0;
|
||||
|
||||
Registry.Add( Caster, value );
|
||||
new InternalTimer( Caster ).Start();
|
||||
Registry.Add(Caster, value);
|
||||
new InternalTimer(Caster).Start();
|
||||
|
||||
Caster.FixedParticles( 0x375A, 9, 20, 5016, EffectLayer.Waist );
|
||||
Caster.PlaySound( 0x1ED );
|
||||
}
|
||||
else
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
|
||||
}
|
||||
}
|
||||
Caster.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
Caster.PlaySound(0x1ED);
|
||||
}
|
||||
else
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005385); // The spell will not adhere to you at this time.
|
||||
}
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
}
|
||||
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private Mobile m_Caster;
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private Mobile m_Caster;
|
||||
|
||||
public InternalTimer( Mobile caster ) : base( TimeSpan.FromSeconds( 0 ) )
|
||||
{
|
||||
double val = caster.Skills[SkillName.Magery].Value * 2.0;
|
||||
if ( val < 15 )
|
||||
val = 15;
|
||||
else if ( val > 240 )
|
||||
val = 240;
|
||||
public InternalTimer(Mobile caster) : base(TimeSpan.FromSeconds(0))
|
||||
{
|
||||
double val = caster.Skills[SkillName.Magery].Value * 2.0;
|
||||
if (val < 15)
|
||||
val = 15;
|
||||
else if (val > 240)
|
||||
val = 240;
|
||||
|
||||
m_Caster = caster;
|
||||
Delay = TimeSpan.FromSeconds( val );
|
||||
Priority = TimerPriority.OneSecond;
|
||||
}
|
||||
m_Caster = caster;
|
||||
Delay = TimeSpan.FromSeconds(val);
|
||||
Priority = TimerPriority.OneSecond;
|
||||
}
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
Registry.Remove( m_Caster );
|
||||
DefensiveSpell.Nullify( m_Caster );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTick()
|
||||
{
|
||||
Registry.Remove(m_Caster);
|
||||
DefensiveSpell.Nullify(m_Caster);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,82 +1,79 @@
|
|||
using Server.Targeting;
|
||||
using Server.Items;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class RemoveTrapSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Remove Trap", "An Jux",
|
||||
212,
|
||||
9001,
|
||||
Reagent.Bloodmoss,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
public class RemoveTrapSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Remove Trap", "An Jux",
|
||||
212,
|
||||
9001,
|
||||
Reagent.Bloodmoss,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public RemoveTrapSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public RemoveTrapSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget( this );
|
||||
Caster.SendMessage( "What do you wish to untrap?" );
|
||||
}
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
Caster.SendMessage("What do you wish to untrap?");
|
||||
}
|
||||
|
||||
public void Target( TrappableContainer item )
|
||||
{
|
||||
if ( !Caster.CanSee( item ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( item.TrapType != TrapType.None && item.TrapType != TrapType.MagicTrap )
|
||||
{
|
||||
base.DoFizzle();
|
||||
}
|
||||
else if ( CheckSequence() )
|
||||
{
|
||||
SpellHelper.Turn( Caster, item );
|
||||
public void Target(TrappableContainer item)
|
||||
{
|
||||
if (!Caster.CanSee(item))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (item.TrapType != TrapType.None && item.TrapType != TrapType.MagicTrap)
|
||||
{
|
||||
base.DoFizzle();
|
||||
}
|
||||
else if (CheckSequence())
|
||||
{
|
||||
SpellHelper.Turn(Caster, item);
|
||||
|
||||
Point3D loc = item.GetWorldLocation();
|
||||
Point3D loc = item.GetWorldLocation();
|
||||
|
||||
Effects.SendLocationParticles( EffectItem.Create( loc, item.Map, EffectItem.DefaultDuration ), 0x376A, 9, 32, 5015 );
|
||||
Effects.PlaySound( loc, item.Map, 0x1F0 );
|
||||
Effects.SendLocationParticles(EffectItem.Create(loc, item.Map, EffectItem.DefaultDuration), 0x376A, 9, 32,
|
||||
5015);
|
||||
Effects.PlaySound(loc, item.Map, 0x1F0);
|
||||
|
||||
item.TrapType = TrapType.None;
|
||||
item.TrapPower = 0;
|
||||
item.TrapLevel = 0;
|
||||
}
|
||||
item.TrapType = TrapType.None;
|
||||
item.TrapPower = 0;
|
||||
item.TrapLevel = 0;
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private RemoveTrapSpell m_Owner;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private RemoveTrapSpell m_Owner;
|
||||
|
||||
public InternalTarget( RemoveTrapSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.None )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(RemoveTrapSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.None)
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object o )
|
||||
{
|
||||
if ( o is TrappableContainer )
|
||||
{
|
||||
m_Owner.Target( (TrappableContainer)o );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage( "You can't disarm that" );
|
||||
}
|
||||
}
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
if (o is TrappableContainer)
|
||||
m_Owner.Target((TrappableContainer)o);
|
||||
else
|
||||
from.SendMessage("You can't disarm that");
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish( Mobile from )
|
||||
{
|
||||
m_Owner.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Owner.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,85 +1,83 @@
|
|||
using System;
|
||||
using Server.Engines.ConPVP;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class StrengthSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Strength", "Uus Mani",
|
||||
212,
|
||||
9061,
|
||||
Reagent.MandrakeRoot,
|
||||
Reagent.Nightshade
|
||||
);
|
||||
public class StrengthSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Strength", "Uus Mani",
|
||||
212,
|
||||
9061,
|
||||
Reagent.MandrakeRoot,
|
||||
Reagent.Nightshade
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public StrengthSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public StrengthSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if ( Engines.ConPVP.DuelContext.CheckSuddenDeath( Caster ) )
|
||||
{
|
||||
Caster.SendMessage( 0x22, "You cannot cast this spell when in sudden death." );
|
||||
return false;
|
||||
}
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (DuelContext.CheckSuddenDeath(Caster))
|
||||
{
|
||||
Caster.SendMessage(0x22, "You cannot cast this spell when in sudden death.");
|
||||
return false;
|
||||
}
|
||||
|
||||
return base.CheckCast();
|
||||
}
|
||||
return base.CheckCast();
|
||||
}
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget( this );
|
||||
}
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public void Target( Mobile m )
|
||||
{
|
||||
if ( !Caster.CanSee( m ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( CheckBSequence( m ) )
|
||||
{
|
||||
SpellHelper.Turn( Caster, m );
|
||||
public void Target(Mobile m)
|
||||
{
|
||||
if (!Caster.CanSee(m))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (CheckBSequence(m))
|
||||
{
|
||||
SpellHelper.Turn(Caster, m);
|
||||
|
||||
SpellHelper.AddStatBonus( Caster, m, StatType.Str );
|
||||
SpellHelper.AddStatBonus(Caster, m, StatType.Str);
|
||||
|
||||
m.FixedParticles( 0x375A, 10, 15, 5017, EffectLayer.Waist );
|
||||
m.PlaySound( 0x1EE );
|
||||
m.FixedParticles(0x375A, 10, 15, 5017, EffectLayer.Waist);
|
||||
m.PlaySound(0x1EE);
|
||||
|
||||
int percentage = (int)(SpellHelper.GetOffsetScalar( Caster, m, false )*100);
|
||||
TimeSpan length = SpellHelper.GetDuration( Caster, m );
|
||||
int percentage = (int)(SpellHelper.GetOffsetScalar(Caster, m, false) * 100);
|
||||
TimeSpan length = SpellHelper.GetDuration(Caster, m);
|
||||
|
||||
BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Strength, 1075845, length, m, percentage.ToString() ) );
|
||||
}
|
||||
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Strength, 1075845, length, m, percentage.ToString()));
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private StrengthSpell m_Owner;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private StrengthSpell m_Owner;
|
||||
|
||||
public InternalTarget( StrengthSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(StrengthSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.Beneficial)
|
||||
{
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue