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

Add DefaultName property to Mobiles & Items (#18)

Browse source
This commit is contained in:
Kamron Batman 2018-08-09 17:18:41 -07:00 • committed by GitHub
parent b06f5bf60d
commit 8ee42c8ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
713 changed files with 5112 additions and 4987 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Misc/BankCheck.cs
View file

@ -62,7 +62,7 @@ namespace Server.Items
m_Worth = worth;
}
public override bool DisplayLootType{ get{ return Core.AOS; } }
public override bool DisplayLootType => Core.AOS;
public override int LabelNumber{ get{ return 1041361; } } // A bank check

8
Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -265,7 +265,7 @@ namespace Server.Items
set{ m_TimeOfDeath = value; }
}
public override bool DisplayWeight { get { return false; } }
public override bool DisplayWeight => false;
public HairInfo Hair { get { return m_Hair; } }
public FacialHairInfo FacialHair { get { return m_FacialHair; } }
@ -528,7 +528,7 @@ namespace Server.Items
}
// Why was this public?
// public override bool IsPublicContainer{ get{ return true; } }
// public override bool IsPublicContainer => true;
public Corpse( Mobile owner, List<Item> equipItems ) : this( owner, null, null, equipItems )
{
@ -1209,7 +1209,7 @@ namespace Server.Items
return false;
}
public override bool DisplaysContent{ get{ return false; } }
public override bool DisplaysContent => false;
public override void AddNameProperty( ObjectPropertyList list )
{
@ -1302,4 +1302,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/Corpses/DecayedCorpse.cs
View file

@ -60,7 +60,7 @@ namespace Server.Items
}
// Do not display (x items, y stones)
public override bool DisplaysContent{ get{ return false; } }
public override bool DisplaysContent => false;
public override void AddNameProperty( ObjectPropertyList list )
{
@ -112,4 +112,4 @@ namespace Server.Items
}
}
}
}
}

8
Scripts/Items/Misc/DeceitBrazier.cs
View file

@ -63,7 +63,7 @@ namespace Server.Items
#endregion
#region Random Critters
typeof( Sewerrat ), typeof( GiantRat ), typeof( DireWolf ), typeof( TimberWolf ),
typeof( SewerRat ), typeof( GiantRat ), typeof( DireWolf ), typeof( TimberWolf ),
typeof( Cougar ), typeof( Alligator )
#endregion
};
@ -89,7 +89,7 @@ namespace Server.Items
[Constructible]
public DeceitBrazier() : base( 0xE31 )
{
Movable = false;
Movable = false;
Light = LightType.Circle225;
m_NextSpawn = DateTime.UtcNow;
m_NextSpawnDelay = TimeSpan.FromMinutes( 15.0 );
@ -130,7 +130,7 @@ namespace Server.Items
PublicOverheadMessage( MessageType.Regular, 0x3B2, 500761 );// Heed this warning well, and use this brazier at your own peril.
}
public override bool HandlesOnMovement { get { return true; } }
public override bool HandlesOnMovement => true;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -223,4 +223,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/EffectController.cs
View file

@ -161,7 +161,7 @@ namespace Server.Items
DoEffect( from );
}
public override bool HandlesOnMovement{ get{ return ( m_TriggerType == EffectTriggerType.InRange ); } }
public override bool HandlesOnMovement => ( m_TriggerType == EffectTriggerType.InRange );
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -336,4 +336,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/MorphItem.cs
View file

@ -60,7 +60,7 @@ namespace Server.Items
{
}
public override bool HandlesOnMovement{ get{ return true; } }
public override bool HandlesOnMovement => true;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -143,4 +143,4 @@ namespace Server.Items
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Refresh ) );
}
}
}
}

4
Scripts/Items/Misc/PowerGenerator.cs
View file

@ -24,7 +24,7 @@ namespace Server.Items
AddComponent( new ControlPanel( sideLength ), 1, 0, -2 );
}
public override bool ShareHue{ get{ return false; } }
public override bool ShareHue => false;
private void AddGeneratorComponent( int itemID, int x, int y, int z )
{
@ -568,4 +568,4 @@ namespace Server.Items
}
}
}
}
}

2
Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
public class ShimmeringCrystals : Item
{
public override int LabelNumber{ get{ return 1075095; } } // Shimmering Crystals
public override bool ForceShowProperties{ get{ return true; } }
public override bool ForceShowProperties => true;
private static readonly int[] m_ItemIDs = new int[]
{

6
Scripts/Items/Misc/PublicMoongate.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
{
public class PublicMoongate : Item
{
public override bool ForceShowProperties{ get{ return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[Constructible]
public PublicMoongate() : base( 0xF6C )
@ -44,7 +44,7 @@ namespace Server.Items
return true;
}
public override bool HandlesOnMovement{ get{ return true; } }
public override bool HandlesOnMovement => true;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -467,4 +467,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/SerpentPillar.cs
View file

@ -49,7 +49,7 @@ namespace Server.Items
m_Destination = destination;
}
public override bool HandlesOnSpeech{ get{ return true; } }
public override bool HandlesOnSpeech => true;
public override void OnSpeech( SpeechEventArgs e )
{
@ -123,4 +123,4 @@ namespace Server.Items
m_Destination = reader.ReadRect2D();
}
}
}
}

2
Scripts/Items/Misc/Teleporter.cs
View file

@ -448,7 +448,7 @@ namespace Server.Items
set { m_Range = value; InvalidateProperties(); }
}
public override bool HandlesOnSpeech { get { return true; } }
public override bool HandlesOnSpeech => true;
public override void OnSpeech(SpeechEventArgs e)
{

2
Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
public class TaintedMushroom : Item
{
public override int LabelNumber{ get{ return 1075088; } } // Dread Horn Tainted Mushroom
public override bool ForceShowProperties{ get{ return true; } }
public override bool ForceShowProperties => true;
[Constructible]
public TaintedMushroom() : base( Utility.RandomMinMax( 0x222E, 0x2231 ) )

6
Scripts/Items/Misc/WarningItem.cs
View file

@ -127,7 +127,7 @@ namespace Server.Items
m_Broadcasting = false;
}
public override bool HandlesOnMovement{ get{ return true; } }
public override bool HandlesOnMovement => true;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -188,7 +188,7 @@ namespace Server.Items
set{ m_HintNumber = value; }
}
public override bool OnlyToTriggerer{ get{ return true; } }
public override bool OnlyToTriggerer => true;
[Constructible]
public HintItem( int itemID, int range, int warning, int hint ) : base( itemID, range, warning )
@ -239,4 +239,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/WindChimes.cs
View file

@ -29,7 +29,7 @@ namespace Server.Items
get{ return m_Sounds; }
}
public override bool HandlesOnMovement{ get{ return m_TurnedOn && IsLockedDown; } }
public override bool HandlesOnMovement => m_TurnedOn && IsLockedDown;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -186,4 +186,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}