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

181
Scripts/Spells/Sixth/Reveal.cs
View file

@ -1,119 +1,122 @@
using System.Collections.Generic;
using Server.Mobiles;
using Server.Targeting;
namespace Server.Spells.Sixth
{
public class RevealSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Reveal", "Wis Quas",
206,
9002,
Reagent.Bloodmoss,
Reagent.SulfurousAsh
);
public class RevealSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Reveal", "Wis Quas",
206,
9002,
Reagent.Bloodmoss,
Reagent.SulfurousAsh
);
public override SpellCircle Circle => SpellCircle.Sixth;
public RevealSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public RevealSpell( 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 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;
Map map = Caster.Map;
if ( map != null )
{
IPooledEnumerable<Mobile> eable = map.GetMobilesInRange( new Point3D( p ), 1 + (int)(Caster.Skills[SkillName.Magery].Value / 20.0) );
if (map != null)
{
IPooledEnumerable<Mobile> eable = map.GetMobilesInRange(new Point3D(p),
1 + (int)(Caster.Skills[SkillName.Magery].Value / 20.0));
foreach ( Mobile m in eable )
{
if ( m is Mobiles.ShadowKnight && (m.X != p.X || m.Y != p.Y) )
continue;
foreach (Mobile m in eable)
{
if (m is ShadowKnight && (m.X != p.X || m.Y != p.Y))
continue;
if ( m.Hidden && (m.AccessLevel == AccessLevel.Player || Caster.AccessLevel > m.AccessLevel) && CheckDifficulty( Caster, m ) )
targets.Add( m );
}
if (m.Hidden && (m.AccessLevel == AccessLevel.Player || Caster.AccessLevel > m.AccessLevel) &&
CheckDifficulty(Caster, m))
targets.Add(m);
}
eable.Free();
}
eable.Free();
}
for ( int i = 0; i < targets.Count; ++i )
{
Mobile m = targets[i];
for (int i = 0; i < targets.Count; ++i)
{
Mobile m = targets[i];
m.RevealingAction();
m.RevealingAction();
m.FixedParticles( 0x375A, 9, 20, 5049, EffectLayer.Head );
m.PlaySound( 0x1FD );
}
}
m.FixedParticles(0x375A, 9, 20, 5049, EffectLayer.Head);
m.PlaySound(0x1FD);
}
}
FinishSequence();
}
FinishSequence();
}
// Reveal uses magery and detect hidden vs. hide and stealth
private static bool CheckDifficulty( Mobile from, Mobile m )
{
// Reveal always reveals vs. invisibility spell
if ( !Core.AOS || InvisibilitySpell.HasTimer( m ) )
return true;
// Reveal uses magery and detect hidden vs. hide and stealth
private static bool CheckDifficulty(Mobile from, Mobile m)
{
// Reveal always reveals vs. invisibility spell
if (!Core.AOS || InvisibilitySpell.HasTimer(m))
return true;
int magery = from.Skills[SkillName.Magery].Fixed;
int detectHidden = from.Skills[SkillName.DetectHidden].Fixed;
int magery = from.Skills[SkillName.Magery].Fixed;
int detectHidden = from.Skills[SkillName.DetectHidden].Fixed;
int hiding = m.Skills[SkillName.Hiding].Fixed;
int stealth = m.Skills[SkillName.Stealth].Fixed;
int divisor = hiding + stealth;
int hiding = m.Skills[SkillName.Hiding].Fixed;
int stealth = m.Skills[SkillName.Stealth].Fixed;
int divisor = hiding + stealth;
int chance;
if ( divisor > 0 )
chance = 50 * (magery + detectHidden) / divisor;
else
chance = 100;
int chance;
if (divisor > 0)
chance = 50 * (magery + detectHidden) / divisor;
else
chance = 100;
return chance > Utility.Random( 100 );
}
return chance > Utility.Random(100);
}
public class InternalTarget : Target
{
private RevealSpell m_Owner;
public class InternalTarget : Target
{
private RevealSpell m_Owner;
public InternalTarget( RevealSpell owner ) : base( Core.ML ? 10 : 12, true, TargetFlags.None )
{
m_Owner = owner;
}
public InternalTarget(RevealSpell 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();
}
}
}
}