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,188 +1,185 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Server.Targeting;
|
||||
using Server.Mobiles;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Fourth
|
||||
{
|
||||
public class ArchCureSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Arch Cure", "Vas An Nox",
|
||||
215,
|
||||
9061,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng,
|
||||
Reagent.MandrakeRoot
|
||||
);
|
||||
public class ArchCureSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Arch Cure", "Vas An Nox",
|
||||
215,
|
||||
9061,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng,
|
||||
Reagent.MandrakeRoot
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Fourth;
|
||||
public ArchCureSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public ArchCureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override SpellCircle Circle => SpellCircle.Fourth;
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget( this );
|
||||
}
|
||||
// Arch cure is now 1/4th of a second faster
|
||||
public override TimeSpan CastDelayBase => base.CastDelayBase - TimeSpan.FromSeconds(0.25);
|
||||
|
||||
// Arch cure is now 1/4th of a second faster
|
||||
public override TimeSpan CastDelayBase => base.CastDelayBase - TimeSpan.FromSeconds( 0.25 );
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public void Target( IPoint3D p )
|
||||
{
|
||||
if ( !Caster.CanSee( p ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( CheckSequence() )
|
||||
{
|
||||
SpellHelper.Turn( Caster, p );
|
||||
public void Target(IPoint3D p)
|
||||
{
|
||||
if (!Caster.CanSee(p))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (CheckSequence())
|
||||
{
|
||||
SpellHelper.Turn(Caster, p);
|
||||
|
||||
SpellHelper.GetSurfaceTop( ref p );
|
||||
SpellHelper.GetSurfaceTop(ref p);
|
||||
|
||||
List<Mobile> targets = new List<Mobile>();
|
||||
List<Mobile> targets = new List<Mobile>();
|
||||
|
||||
Map map = Caster.Map;
|
||||
Mobile directTarget = p as Mobile;
|
||||
Map map = Caster.Map;
|
||||
Mobile directTarget = p as Mobile;
|
||||
|
||||
if ( map != null )
|
||||
{
|
||||
bool feluccaRules = ( map.Rules == MapRules.FeluccaRules );
|
||||
if (map != null)
|
||||
{
|
||||
bool feluccaRules = map.Rules == MapRules.FeluccaRules;
|
||||
|
||||
// You can target any living mobile directly, beneficial checks apply
|
||||
if ( directTarget != null && Caster.CanBeBeneficial( directTarget, false ) )
|
||||
targets.Add( directTarget );
|
||||
// You can target any living mobile directly, beneficial checks apply
|
||||
if (directTarget != null && Caster.CanBeBeneficial(directTarget, false))
|
||||
targets.Add(directTarget);
|
||||
|
||||
IPooledEnumerable<Mobile> eable = map.GetMobilesInRange( new Point3D( p ), 2 );
|
||||
IPooledEnumerable<Mobile> eable = map.GetMobilesInRange(new Point3D(p), 2);
|
||||
|
||||
foreach ( Mobile m in eable )
|
||||
{
|
||||
if ( m == directTarget )
|
||||
continue;
|
||||
foreach (Mobile m in eable)
|
||||
{
|
||||
if (m == directTarget)
|
||||
continue;
|
||||
|
||||
if ( AreaCanTarget( m, feluccaRules ) )
|
||||
targets.Add( m );
|
||||
}
|
||||
if (AreaCanTarget(m, feluccaRules))
|
||||
targets.Add(m);
|
||||
}
|
||||
|
||||
eable.Free();
|
||||
}
|
||||
eable.Free();
|
||||
}
|
||||
|
||||
Effects.PlaySound( p, Caster.Map, 0x299 );
|
||||
Effects.PlaySound(p, Caster.Map, 0x299);
|
||||
|
||||
if ( targets.Count > 0 )
|
||||
{
|
||||
int cured = 0;
|
||||
if (targets.Count > 0)
|
||||
{
|
||||
int cured = 0;
|
||||
|
||||
for ( int i = 0; i < targets.Count; ++i )
|
||||
{
|
||||
Mobile m = targets[i];
|
||||
for (int i = 0; i < targets.Count; ++i)
|
||||
{
|
||||
Mobile m = targets[i];
|
||||
|
||||
Caster.DoBeneficial( m );
|
||||
Caster.DoBeneficial(m);
|
||||
|
||||
Poison poison = m.Poison;
|
||||
Poison poison = m.Poison;
|
||||
|
||||
if ( poison != null )
|
||||
{
|
||||
int chanceToCure = 10000 + (int)(Caster.Skills[SkillName.Magery].Value * 75) - ((poison.Level + 1) * 1750);
|
||||
chanceToCure /= 100;
|
||||
chanceToCure -= 1;
|
||||
if (poison != null)
|
||||
{
|
||||
int chanceToCure = 10000 + (int)(Caster.Skills[SkillName.Magery].Value * 75) -
|
||||
(poison.Level + 1) * 1750;
|
||||
chanceToCure /= 100;
|
||||
chanceToCure -= 1;
|
||||
|
||||
if ( chanceToCure > Utility.Random( 100 ) && m.CurePoison( Caster ) )
|
||||
++cured;
|
||||
}
|
||||
if (chanceToCure > Utility.Random(100) && m.CurePoison(Caster))
|
||||
++cured;
|
||||
}
|
||||
|
||||
m.FixedParticles( 0x373A, 10, 15, 5012, EffectLayer.Waist );
|
||||
m.PlaySound( 0x1E0 );
|
||||
}
|
||||
m.FixedParticles(0x373A, 10, 15, 5012, EffectLayer.Waist);
|
||||
m.PlaySound(0x1E0);
|
||||
}
|
||||
|
||||
if ( cured > 0 )
|
||||
Caster.SendLocalizedMessage( 1010058 ); // You have cured the target of all poisons!
|
||||
}
|
||||
}
|
||||
if (cured > 0)
|
||||
Caster.SendLocalizedMessage(1010058); // You have cured the target of all poisons!
|
||||
}
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private bool AreaCanTarget( Mobile target, bool feluccaRules )
|
||||
{
|
||||
/* Arch cure area effect won't cure aggressors, victims, murderers, criminals or monsters.
|
||||
* In Felucca, it will also not cure summons and pets.
|
||||
* For red players it will only cure themselves and guild members.
|
||||
*/
|
||||
private bool AreaCanTarget(Mobile target, bool feluccaRules)
|
||||
{
|
||||
/* Arch cure area effect won't cure aggressors, victims, murderers, criminals or monsters.
|
||||
* In Felucca, it will also not cure summons and pets.
|
||||
* For red players it will only cure themselves and guild members.
|
||||
*/
|
||||
|
||||
if ( !Caster.CanBeBeneficial( target, false ) )
|
||||
return false;
|
||||
if (!Caster.CanBeBeneficial(target, false))
|
||||
return false;
|
||||
|
||||
if ( Core.AOS && target != Caster )
|
||||
{
|
||||
if ( IsAggressor( target ) || IsAggressed( target ) )
|
||||
return false;
|
||||
if (Core.AOS && target != Caster)
|
||||
{
|
||||
if (IsAggressor(target) || IsAggressed(target))
|
||||
return false;
|
||||
|
||||
if ( ( !IsInnocentTo( Caster, target ) || !IsInnocentTo( target, Caster ) ) && !IsAllyTo( Caster, target ) )
|
||||
return false;
|
||||
if ((!IsInnocentTo(Caster, target) || !IsInnocentTo(target, Caster)) && !IsAllyTo(Caster, target))
|
||||
return false;
|
||||
|
||||
if ( feluccaRules && !( target is PlayerMobile ) )
|
||||
return false;
|
||||
}
|
||||
if (feluccaRules && !(target is PlayerMobile))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool IsAggressor( Mobile m )
|
||||
{
|
||||
foreach ( AggressorInfo info in Caster.Aggressors )
|
||||
{
|
||||
if ( m == info.Attacker && !info.Expired )
|
||||
return true;
|
||||
}
|
||||
private bool IsAggressor(Mobile m)
|
||||
{
|
||||
foreach (AggressorInfo info in Caster.Aggressors)
|
||||
if (m == info.Attacker && !info.Expired)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool IsAggressed( Mobile m )
|
||||
{
|
||||
foreach ( AggressorInfo info in Caster.Aggressed )
|
||||
{
|
||||
if ( m == info.Defender && !info.Expired )
|
||||
return true;
|
||||
}
|
||||
private bool IsAggressed(Mobile m)
|
||||
{
|
||||
foreach (AggressorInfo info in Caster.Aggressed)
|
||||
if (m == info.Defender && !info.Expired)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static bool IsInnocentTo( Mobile from, Mobile to )
|
||||
{
|
||||
return ( Notoriety.Compute( from, (Mobile)to ) == Notoriety.Innocent );
|
||||
}
|
||||
private static bool IsInnocentTo(Mobile from, Mobile to)
|
||||
{
|
||||
return Notoriety.Compute(from, to) == Notoriety.Innocent;
|
||||
}
|
||||
|
||||
private static bool IsAllyTo( Mobile from, Mobile to )
|
||||
{
|
||||
return ( Notoriety.Compute( from, (Mobile)to ) == Notoriety.Ally );
|
||||
}
|
||||
private static bool IsAllyTo(Mobile from, Mobile to)
|
||||
{
|
||||
return Notoriety.Compute(from, to) == Notoriety.Ally;
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private ArchCureSpell m_Owner;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private ArchCureSpell m_Owner;
|
||||
|
||||
public InternalTarget( ArchCureSpell owner ) : base( Core.ML ? 10 : 12, true, TargetFlags.None )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(ArchCureSpell owner) : base(Core.ML ? 10 : 12, true, TargetFlags.None)
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object o )
|
||||
{
|
||||
IPoint3D p = o as IPoint3D;
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
IPoint3D p = o as IPoint3D;
|
||||
|
||||
if ( p != null )
|
||||
m_Owner.Target( p );
|
||||
}
|
||||
if (p != null)
|
||||
m_Owner.Target(p);
|
||||
}
|
||||
|
||||
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