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

158
Scripts/Skills/DetectHidden.cs
View file

@ -6,105 +6,101 @@ using Server.Targeting;
namespace Server.SkillHandlers
{
public class DetectHidden
{
public static void Initialize()
{
SkillInfo.Table[(int)SkillName.DetectHidden].Callback = OnUse;
}
public class DetectHidden
{
public static void Initialize()
{
SkillInfo.Table[(int)SkillName.DetectHidden].Callback = OnUse;
}
public static TimeSpan OnUse( Mobile src )
{
src.SendLocalizedMessage( 500819 );//Where will you search?
src.Target = new InternalTarget();
public static TimeSpan OnUse(Mobile src)
{
src.SendLocalizedMessage(500819); //Where will you search?
src.Target = new InternalTarget();
return TimeSpan.FromSeconds( 6.0 );
}
return TimeSpan.FromSeconds(6.0);
}
private class InternalTarget : Target
{
public InternalTarget() : base( 12, true, TargetFlags.None )
{
}
private class InternalTarget : Target
{
public InternalTarget() : base(12, true, TargetFlags.None)
{
}
protected override void OnTarget( Mobile src, object targ )
{
bool foundAnyone = false;
protected override void OnTarget(Mobile src, object targ)
{
bool foundAnyone = false;
Point3D p;
if ( targ is Mobile )
p = ((Mobile)targ).Location;
else if ( targ is Item )
p = ((Item)targ).Location;
else if ( targ is IPoint3D )
p = new Point3D( (IPoint3D)targ );
else
p = src.Location;
Point3D p;
if (targ is Mobile)
p = ((Mobile)targ).Location;
else if (targ is Item)
p = ((Item)targ).Location;
else if (targ is IPoint3D)
p = new Point3D((IPoint3D)targ);
else
p = src.Location;
double srcSkill = src.Skills[SkillName.DetectHidden].Value;
int range = (int)(srcSkill / 10.0);
double srcSkill = src.Skills[SkillName.DetectHidden].Value;
int range = (int)(srcSkill / 10.0);
if ( !src.CheckSkill( SkillName.DetectHidden, 0.0, 100.0 ) )
range /= 2;
if (!src.CheckSkill(SkillName.DetectHidden, 0.0, 100.0))
range /= 2;
BaseHouse house = BaseHouse.FindHouseAt( p, src.Map, 16 );
BaseHouse house = BaseHouse.FindHouseAt(p, src.Map, 16);
bool inHouse = ( house != null && house.IsFriend( src ) );
bool inHouse = house != null && house.IsFriend(src);
if ( inHouse )
range = 22;
if (inHouse)
range = 22;
if ( range > 0 )
{
IPooledEnumerable<Mobile> inRange = src.Map.GetMobilesInRange( p, range );
if (range > 0)
{
IPooledEnumerable<Mobile> inRange = src.Map.GetMobilesInRange(p, range);
foreach ( Mobile trg in inRange )
{
if ( trg.Hidden && src != trg )
{
double ss = srcSkill + Utility.Random( 21 ) - 10;
double ts = trg.Skills[SkillName.Hiding].Value + Utility.Random( 21 ) - 10;
foreach (Mobile trg in inRange)
if (trg.Hidden && src != trg)
{
double ss = srcSkill + Utility.Random(21) - 10;
double ts = trg.Skills[SkillName.Hiding].Value + Utility.Random(21) - 10;
if ( src.AccessLevel >= trg.AccessLevel && ( ss >= ts || ( inHouse && house.IsInside( trg ) ) ) )
{
if ( trg is ShadowKnight && (trg.X != p.X || trg.Y != p.Y) )
continue;
if (src.AccessLevel >= trg.AccessLevel && (ss >= ts || inHouse && house.IsInside(trg)))
{
if (trg is ShadowKnight && (trg.X != p.X || trg.Y != p.Y))
continue;
trg.RevealingAction();
trg.SendLocalizedMessage( 500814 ); // You have been revealed!
foundAnyone = true;
}
}
}
trg.RevealingAction();
trg.SendLocalizedMessage(500814); // You have been revealed!
foundAnyone = true;
}
}
inRange.Free();
inRange.Free();
if ( Faction.Find( src ) != null )
{
IPooledEnumerable<BaseFactionTrap> itemsInRange = src.Map.GetItemsInRange<BaseFactionTrap>( p, range );
if (Faction.Find(src) != null)
{
IPooledEnumerable<BaseFactionTrap> itemsInRange = src.Map.GetItemsInRange<BaseFactionTrap>(p, range);
foreach ( BaseFactionTrap trap in itemsInRange )
{
if ( src.CheckTargetSkill( SkillName.DetectHidden, trap, 80.0, 100.0 ) )
{
src.SendLocalizedMessage( 1042712, true, " " + (trap.Faction == null ? "" : trap.Faction.Definition.FriendlyName) ); // You reveal a trap placed by a faction:
foreach (BaseFactionTrap trap in itemsInRange)
if (src.CheckTargetSkill(SkillName.DetectHidden, trap, 80.0, 100.0))
{
src.SendLocalizedMessage(1042712, true,
" " + (trap.Faction == null
? ""
: trap.Faction.Definition.FriendlyName)); // You reveal a trap placed by a faction:
trap.Visible = true;
trap.BeginConceal();
trap.Visible = true;
trap.BeginConceal();
foundAnyone = true;
}
}
foundAnyone = true;
}
itemsInRange.Free();
}
}
itemsInRange.Free();
}
}
if ( !foundAnyone )
{
src.SendLocalizedMessage( 500817 ); // You can see nothing hidden there.
}
}
}
}
}
if (!foundAnyone) src.SendLocalizedMessage(500817); // You can see nothing hidden there.
}
}
}
}