warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes casting checks

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 01:38:55 +08:00
parent 7ea00fbf4f
commit 03dd5f1926
431 changed files with 5616 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
{
get
{
if( ItemID == 0x2336 )
if ( ItemID == 0x2336 )
return true;
return false;
@ -54,11 +54,11 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if( from.InRange( Location, 3 ) )
if ( from.InRange( Location, 3 ) )
{
BaseHouse house = BaseHouse.FindHouseAt( this );
if( house != null && house.IsOwner( from ) )
if ( house != null && house.IsOwner( from ) )
{
from.CloseGump( typeof( RewardDemolitionGump ) );
from.SendGump( new RewardDemolitionGump( this, 1049783 ) ); // Do you wish to re-deed this decoration?
@ -86,10 +86,10 @@ namespace Server.Items
public bool CouldFit( IPoint3D p, Map map )
{
if( map == null || !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) )
if ( map == null || !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) )
return false;
if( FacingSouth )
if ( FacingSouth )
return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // north wall
else
return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // west wall
@ -115,15 +115,15 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if( IsChildOf( from.Backpack ) )
if ( IsChildOf( from.Backpack ) )
{
BaseHouse house = BaseHouse.FindHouseAt( from );
if( house != null && house.IsOwner( from ) )
if ( house != null && house.IsOwner( from ) )
{
from.CloseGump( typeof( FacingGump ) );
if( !from.SendGump( new FacingGump( this, from ) ) )
if ( !from.SendGump( new FacingGump( this, from ) ) )
{
from.SendLocalizedMessage( 1150062 ); // You fail to re-deed the holiday fireflies.
}
@ -213,29 +213,29 @@ namespace Server.Items
protected override void OnTarget( Mobile from, object targeted )
{
if( m_FirefliesDeed == null || m_FirefliesDeed.Deleted )
if ( m_FirefliesDeed == null || m_FirefliesDeed.Deleted )
return;
if( m_FirefliesDeed.IsChildOf( from.Backpack ) )
if ( m_FirefliesDeed.IsChildOf( from.Backpack ) )
{
BaseHouse house = BaseHouse.FindHouseAt( from );
if( house != null && house.IsOwner( from ) )
if ( house != null && house.IsOwner( from ) )
{
IPoint3D p = targeted as IPoint3D;
Map map = from.Map;
if( p == null || map == null || map == Map.Internal )
if ( p == null || map == null || map == Map.Internal )
return;
Point3D p3d = new Point3D( p );
ItemData id = TileData.ItemTable[ m_ItemID & TileData.MaxItemValue ];
if( map.CanFit( p3d, id.Height ) )
if ( map.CanFit( p3d, id.Height ) )
{
house = BaseHouse.FindHouseAt( p3d, map, id.Height );
if( house != null && house.IsOwner( from ) )
if ( house != null && house.IsOwner( from ) )
{
bool north = BaseAddon.IsWall( p3d.X, p3d.Y - 1, p3d.Z, map );
bool west = BaseAddon.IsWall( p3d.X - 1, p3d.Y, p3d.Z, map );
@ -244,13 +244,13 @@ namespace Server.Items
foreach( Item item in Map.Malas.GetItemsInRange( p3d, 0 ) )
{
if( item is Fireflies )
if ( item is Fireflies )
{
isclear = false;
}
}
if( ( ( m_ItemID == 0x2336 && north ) || ( m_ItemID == 0x2332 && west ) ) && isclear )
if ( ( ( m_ItemID == 0x2336 && north ) || ( m_ItemID == 0x2332 && west ) ) && isclear )
{
Fireflies flies = new Fireflies( m_ItemID );

2
Scripts/Holiday Stuff/Easter/2011/Items/DragonEasterEgg.cs
View file

@ -33,7 +33,7 @@ namespace Server.Items
public bool Dye( Mobile from, DyeTub sender )
{
if( Deleted || !sender.AllowDyables )
if ( Deleted || !sender.AllowDyables )
return false;
Hue = sender.DyedHue;

60
Scripts/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs
View file

@ -15,7 +15,7 @@ namespace Server.Engines.Events
{
DateTime now = DateTime.UtcNow;
if( DateTime.UtcNow >= HolidaySettings.StartHalloween && DateTime.UtcNow <= HolidaySettings.FinishHalloween )
if ( DateTime.UtcNow >= HolidaySettings.StartHalloween && DateTime.UtcNow <= HolidaySettings.FinishHalloween )
{
EventSink.Speech += new SpeechEventHandler( EventSink_Speech );
}
@ -24,7 +24,7 @@ namespace Server.Engines.Events
private static void EventSink_Speech( SpeechEventArgs e )
{
if( Insensitive.Contains( e.Speech, "trick or treat" ) )
if ( Insensitive.Contains( e.Speech, "trick or treat" ) )
{
e.Mobile.Target = new TrickOrTreatTarget();
@ -41,14 +41,14 @@ namespace Server.Engines.Events
protected override void OnTarget( Mobile from, object targ )
{
if( targ != null && CheckMobile( from ) )
if ( targ != null && CheckMobile( from ) )
{
if( !( targ is Mobile ) )
if ( !( targ is Mobile ) )
{
from.SendLocalizedMessage( 1076781 ); /* There is little chance of getting candy from that! */
return;
}
if( !( targ is BaseVendor ) || ( ( BaseVendor )targ ).Deleted )
if ( !( targ is BaseVendor ) || ( ( BaseVendor )targ ).Deleted )
{
from.SendLocalizedMessage( 1076765 ); /* That doesn't look friendly. */
return;
@ -58,9 +58,9 @@ namespace Server.Engines.Events
BaseVendor m_Begged = targ as BaseVendor;
if( CheckMobile( m_Begged ) )
if ( CheckMobile( m_Begged ) )
{
if( m_Begged.NextTrickOrTreat > now )
if ( m_Begged.NextTrickOrTreat > now )
{
from.SendLocalizedMessage( 1076767 ); /* That doesn't appear to have any more candy. */
return;
@ -68,9 +68,9 @@ namespace Server.Engines.Events
m_Begged.NextTrickOrTreat = now + TimeSpan.FromMinutes( Utility.RandomMinMax( 5, 10 ) );
if( from.Backpack != null && !from.Backpack.Deleted )
if ( from.Backpack != null && !from.Backpack.Deleted )
{
if( Utility.RandomDouble() > .10 )
if ( Utility.RandomDouble() > .10 )
{
switch( Utility.Random( 3 ) )
{
@ -80,7 +80,7 @@ namespace Server.Engines.Events
default: break;
}
if( Utility.RandomDouble() <= .01 && from.Skills.Begging.Value >= 100 )
if ( Utility.RandomDouble() <= .01 && from.Skills.Begging.Value >= 100 )
{
from.AddToBackpack( HolidaySettings.RandomGMBeggerItem );
@ -99,11 +99,11 @@ namespace Server.Engines.Events
int m_Action = Utility.Random( 4 );
if( m_Action == 0 )
if ( m_Action == 0 )
{
Timer.DelayCall<Mobile>( OneSecond, OneSecond, 10, new TimerStateCallback<Mobile>( Bleeding ), from );
}
else if( m_Action == 1 )
else if ( m_Action == 1 )
{
Timer.DelayCall<Mobile>( TimeSpan.FromSeconds( 2 ), new TimerStateCallback<Mobile>( SolidHueMobile ), from );
}
@ -120,9 +120,9 @@ namespace Server.Engines.Events
public static void Bleeding( Mobile m_From )
{
if( TrickOrTreat.CheckMobile( m_From ) )
if ( TrickOrTreat.CheckMobile( m_From ) )
{
if( m_From.Location != Point3D.Zero )
if ( m_From.Location != Point3D.Zero )
{
int amount = Utility.RandomMinMax( 3, 7 );
@ -136,7 +136,7 @@ namespace Server.Engines.Events
public static void RemoveHueMod( Mobile target )
{
if( target != null && !target.Deleted )
if ( target != null && !target.Deleted )
{
target.SolidHueOverride = -1;
}
@ -144,7 +144,7 @@ namespace Server.Engines.Events
public static void SolidHueMobile( Mobile target )
{
if( CheckMobile( target ) )
if ( CheckMobile( target ) )
{
target.SolidHueOverride = Utility.RandomMinMax( 2501, 2644 );
@ -156,21 +156,21 @@ namespace Server.Engines.Events
{
List<Item> m_Items = new List<Item>();
if( CheckMobile( m_From ) )
if ( CheckMobile( m_From ) )
{
Mobile twin = new NaughtyTwin( m_From );
if( twin != null && !twin.Deleted )
if ( twin != null && !twin.Deleted )
{
foreach( Item item in m_From.Items )
{
if( item.Layer != Layer.Backpack && item.Layer != Layer.Mount && item.Layer != Layer.Bank )
if ( item.Layer != Layer.Backpack && item.Layer != Layer.Mount && item.Layer != Layer.Bank )
{
m_Items.Add( item );
}
}
if( m_Items.Count > 0 )
if ( m_Items.Count > 0 )
{
for( int i = 0; i < m_Items.Count; i++ ) /* dupe exploits start out like this ... */
{
@ -179,7 +179,7 @@ namespace Server.Engines.Events
foreach( Item item in twin.Items ) /* ... and end like this */
{
if( item.Layer != Layer.Backpack && item.Layer != Layer.Mount && item.Layer != Layer.Bank )
if ( item.Layer != Layer.Backpack && item.Layer != Layer.Mount && item.Layer != Layer.Bank )
{
item.Movable = false;
}
@ -201,7 +201,7 @@ namespace Server.Engines.Events
public static void DeleteTwin( Mobile m_Twin )
{
if( TrickOrTreat.CheckMobile( m_Twin ) )
if ( TrickOrTreat.CheckMobile( m_Twin ) )
{
m_Twin.Delete();
}
@ -267,7 +267,7 @@ namespace Server.Engines.Events
public NaughtyTwin( Mobile from )
: base( AIType.AI_Melee, FightMode.None, 10, 1, 0.2, 0.4 )
{
if( TrickOrTreat.CheckMobile( from ) )
if ( TrickOrTreat.CheckMobile( from ) )
{
Body = from.Body;
@ -280,7 +280,7 @@ namespace Server.Engines.Events
public override void OnThink()
{
if( m_From == null || m_From.Deleted )
if ( m_From == null || m_From.Deleted )
{
Delete();
}
@ -290,13 +290,13 @@ namespace Server.Engines.Events
{
Type[] types = { typeof( WrappedCandy ), typeof( Lollipops ), typeof( NougatSwirl ), typeof( Taffy ), typeof( JellyBeans ) };
if( TrickOrTreat.CheckMobile( target ) )
if ( TrickOrTreat.CheckMobile( target ) )
{
for( int i = 0; i < types.Length; i++ )
{
Item item = target.Backpack.FindItemByType( types[ i ] );
if( item != null )
if ( item != null )
{
return item;
}
@ -307,13 +307,13 @@ namespace Server.Engines.Events
public static void StealCandy( Mobile target )
{
if( TrickOrTreat.CheckMobile( target ) )
if ( TrickOrTreat.CheckMobile( target ) )
{
Item item = FindCandyTypes( target );
target.SendLocalizedMessage( 1113967 ); /* Your naughty twin steals some of your candy. */
if( item != null && !item.Deleted )
if ( item != null && !item.Deleted )
{
item.Delete();
}
@ -322,7 +322,7 @@ namespace Server.Engines.Events
public static void ToGate( Mobile target )
{
if( TrickOrTreat.CheckMobile( target ) )
if ( TrickOrTreat.CheckMobile( target ) )
{
target.SendLocalizedMessage( 1113972 ); /* Your naughty twin teleports you away with a naughty laugh! */
@ -360,4 +360,4 @@ namespace Server.Engines.Events
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Holiday Stuff/Halloween/2009/Engines/PumpkinPatch.cs
View file

@ -24,7 +24,7 @@ namespace Server.Engines.Events
{
DateTime now = DateTime.UtcNow;
if( DateTime.UtcNow >= HolidaySettings.StartHalloween && DateTime.UtcNow <= HolidaySettings.FinishHalloween )
if ( DateTime.UtcNow >= HolidaySettings.StartHalloween && DateTime.UtcNow <= HolidaySettings.FinishHalloween )
{
m_Timer = Timer.DelayCall( TimeSpan.Zero, TimeSpan.FromMinutes( .50 ), 0, new TimerCallback( PumpkinPatchSpawnerCallback ));
}
@ -47,13 +47,13 @@ namespace Server.Engines.Events
foreach( Item item in map.GetItemsInBounds( rect ) )
{
if( item is HalloweenPumpkin )
if ( item is HalloweenPumpkin )
{
pumpkins++;
}
}
if( spawncount > pumpkins )
if ( spawncount > pumpkins )
{
Item item = new HalloweenPumpkin();
@ -71,4 +71,4 @@ namespace Server.Engines.Events
return new Point3D( x, y, z );
}
}
}
}

6
Scripts/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items.Holiday
{
get
{
if( m_Staffer != null )
if ( m_Staffer != null )
{
return String.Format( "{0} hand painted by {1}", MaskName, m_Staffer );
}
@ -24,7 +24,7 @@ namespace Server.Items.Holiday
private string m_Staffer;
private static string[] m_Staffers =
private static string[] m_Staffers =
{
"Ryan",
"Mark",
@ -68,7 +68,7 @@ namespace Server.Items.Holiday
int version = reader.ReadInt();
if( version == 1 )
if ( version == 1 )
{
m_Staffer = Utility.Intern( reader.ReadString() );
}

8
Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs
View file

@ -58,7 +58,7 @@ namespace Server.Mobiles
public override void GenerateLoot()
{
if( Utility.RandomDouble() < .05 )
if ( Utility.RandomDouble() < .05 )
{
//PackItem( new TwilightLantern() ); OLD Halloween
@ -79,7 +79,7 @@ namespace Server.Mobiles
public virtual void Lifted_Callback( Mobile from )
{
if( from != null && !from.Deleted && from is PlayerMobile )
if ( from != null && !from.Deleted && from is PlayerMobile )
{
Combatant = from;
@ -100,9 +100,9 @@ namespace Server.Mobiles
public override void OnDamage( int amount, Mobile from, bool willKill )
{
if( Utility.RandomBool() )
if ( Utility.RandomBool() )
{
if( from != null && from.Map != null && Map != Map.Internal && Map == from.Map && from.InRange( this, 12 ) )
if ( from != null && from.Map != null && Map != Map.Internal && Map == from.Map && from.InRange( this, 12 ) )
{
SpillAcid( ( willKill ) ? this : from, ( willKill ) ? 3 : 1 );
}

26
Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs
View file

@ -57,7 +57,7 @@ namespace Server.Engines.Events
m_ReAnimated = new Dictionary<PlayerMobile, ZombieSkeleton>();
m_DeathQueue = new List<PlayerMobile>();
if( today >= HolidaySettings.StartHalloween && today <= HolidaySettings.FinishHalloween )
if ( today >= HolidaySettings.StartHalloween && today <= HolidaySettings.FinishHalloween )
{
m_Timer = Timer.DelayCall( tick, tick, new TimerCallback( Timer_Callback ) );
@ -69,13 +69,13 @@ namespace Server.Engines.Events
public static void EventSink_PlayerDeath( PlayerDeathEventArgs e )
{
if( e.Mobile != null && !e.Mobile.Deleted ) /* not sure .. better safe than sorry? */
if ( e.Mobile != null && !e.Mobile.Deleted ) /* not sure .. better safe than sorry? */
{
if( e.Mobile is PlayerMobile )
if ( e.Mobile is PlayerMobile )
{
PlayerMobile player = e.Mobile as PlayerMobile;
if( m_Timer.Running && !m_DeathQueue.Contains( player ) && m_DeathQueue.Count < m_DeathQueueLimit )
if ( m_Timer.Running && !m_DeathQueue.Contains( player ) && m_DeathQueue.Count < m_DeathQueueLimit )
{
m_DeathQueue.Add( player );
}
@ -89,7 +89,7 @@ namespace Server.Engines.Events
m_DeathQueue.Clear();
if( DateTime.UtcNow <= HolidaySettings.FinishHalloween )
if ( DateTime.UtcNow <= HolidaySettings.FinishHalloween )
{
m_ClearTimer.Stop();
}
@ -99,11 +99,11 @@ namespace Server.Engines.Events
{
PlayerMobile player = null;
if( DateTime.UtcNow <= HolidaySettings.FinishHalloween )
if ( DateTime.UtcNow <= HolidaySettings.FinishHalloween )
{
for( int index = 0; m_DeathQueue.Count > 0 && index < m_DeathQueue.Count; index++ )
{
if( !m_ReAnimated.ContainsKey( m_DeathQueue[ index ] ) )
if ( !m_ReAnimated.ContainsKey( m_DeathQueue[ index ] ) )
{
player = m_DeathQueue[ index ];
@ -111,13 +111,13 @@ namespace Server.Engines.Events
}
}
if( player != null && !player.Deleted && m_ReAnimated.Count < m_TotalZombieLimit )
if ( player != null && !player.Deleted && m_ReAnimated.Count < m_TotalZombieLimit )
{
Map map = Utility.RandomBool() ? Map.Trammel : Map.Felucca;
Point3D home = ( GetRandomPointInRect( m_Cemetaries[ Utility.Random( m_Cemetaries.Length ) ], map ));
if( map.CanSpawnMobile( home ) )
if ( map.CanSpawnMobile( home ) )
{
ZombieSkeleton zombieskel = new ZombieSkeleton( player );
@ -241,7 +241,7 @@ namespace Server.Engines.Events
case 2: PackItem( new Torso() ); break;
case 3: PackItem( new Bone() ); break;
case 4: PackItem( new RibCage() ); break;
case 5: if( m_DeadPlayer != null && !m_DeadPlayer.Deleted ) { PackItem( new PlayerBones( m_DeadPlayer.Name ) ); } break;
case 5: if ( m_DeadPlayer != null && !m_DeadPlayer.Deleted ) { PackItem( new PlayerBones( m_DeadPlayer.Name ) ); } break;
default: break;
}
@ -259,11 +259,11 @@ namespace Server.Engines.Events
public override void OnDelete()
{
if( HalloweenHauntings.ReAnimated != null )
if ( HalloweenHauntings.ReAnimated != null )
{
if( m_DeadPlayer != null && !m_DeadPlayer.Deleted )
if ( m_DeadPlayer != null && !m_DeadPlayer.Deleted )
{
if( HalloweenHauntings.ReAnimated.Count > 0 && HalloweenHauntings.ReAnimated.ContainsKey( m_DeadPlayer ) )
if ( HalloweenHauntings.ReAnimated.Count > 0 && HalloweenHauntings.ReAnimated.ContainsKey( m_DeadPlayer ) )
{
HalloweenHauntings.ReAnimated.Remove( m_DeadPlayer );
}