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

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

20
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
public abstract int MinDamage{ get; }
public abstract int MaxDamage{ get; }
public override bool RequireFreeHand{ get{ return false; } }
public override bool RequireFreeHand => false;
public BaseConflagrationPotion( PotionEffect effect ) : base( 0xF06, effect )
{
@ -82,7 +82,7 @@ namespace Server.Items
return;
Consume();
// Check if any other players are using this potion
for ( int i = 0; i < m_Users.Count; i ++ )
{
@ -117,7 +117,7 @@ namespace Server.Items
if ( timer != null )
timer.Stop();
m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 30 ), new TimerStateCallback( EndDelay_Callback ), m );
m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 30 ), new TimerStateCallback( EndDelay_Callback ), m );
}
public static int GetDelay( Mobile m )
@ -166,7 +166,7 @@ namespace Server.Items
{
if ( m_Potion.Deleted || m_Potion.Map == Map.Internal )
return;
IPoint3D p = targeted as IPoint3D;
if ( p == null || from.Map == null )
@ -201,7 +201,7 @@ namespace Server.Items
public Mobile From{ get{ return m_From; } }
public override bool BlocksFit{ get{ return true; } }
public override bool BlocksFit => true;
public InternalItem( Mobile from, Point3D loc, Map map, int min, int max ) : base( 0x398C )
{
@ -269,7 +269,7 @@ namespace Server.Items
base.Deserialize( reader );
int version = reader.ReadInt();
m_From = reader.ReadMobile();
m_End = reader.ReadDateTime();
m_MinDamage = reader.ReadInt();
@ -321,7 +321,7 @@ namespace Server.Items
if ( m_Item.Map == null || from == null )
return;
List<Mobile> mobiles = new List<Mobile>();
foreach( Mobile mobile in m_Item.GetMobilesInRange( 0 ) )
@ -330,15 +330,15 @@ namespace Server.Items
for( int i = 0; i < mobiles.Count; i++ )
{
Mobile m = mobiles[i];
if ( (m.Z + 16) > m_Item.Z && (m_Item.Z + 12) > m.Z && (!Core.AOS || m != from) && SpellHelper.ValidIndirectTarget( from, m ) && from.CanBeHarmful( m, false ) )
{
if ( from != null )
from.DoHarmful( m );
AOS.Damage( m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0 );
m.PlaySound( 0x208 );
}
}
}
}
}

10
Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs
View file

@ -14,7 +14,7 @@ namespace Server.Items
{
public abstract int Radius{ get; }
public override bool RequireFreeHand{ get{ return false; } }
public override bool RequireFreeHand => false;
public BaseConfusionBlastPotion( PotionEffect effect ) : base( 0xF06, effect )
{
@ -120,11 +120,11 @@ namespace Server.Items
if ( map.CanFit( p, 12, true, false ) )
Effects.SendLocationEffect( p, map, 0x376A, 4, 9 );
}
public void CircleEffect2( object state )
{
object[] states = (object[]) state;
Geometry.Circle2D( (Point3D)states[0], (Map)states[1], Radius, new DoEffect_Callback( BlastEffect ), 90, 270 );
}
#endregion
@ -139,7 +139,7 @@ namespace Server.Items
if ( timer != null )
timer.Stop();
m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 60 ), new TimerStateCallback( EndDelay_Callback ), m );
m_Delay[ m ] = Timer.DelayCall( TimeSpan.FromSeconds( 60 ), new TimerStateCallback( EndDelay_Callback ), m );
}
public static int GetDelay( Mobile m )
@ -168,7 +168,7 @@ namespace Server.Items
m_Delay.Remove( m );
}
}
#endregion
#endregion
private class ThrowTarget : Target
{

6
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
public abstract int MinDamage { get; }
public abstract int MaxDamage { get; }
public override bool RequireFreeHand{ get{ return false; } }
public override bool RequireFreeHand => false;
private static bool LeveledExplosion = false; // Should explosion potions explode other nearby potions?
private static bool InstantExplosion = false; // Should explosion potions explode on impact?
@ -207,7 +207,7 @@ namespace Server.Items
if( p is Mobile )
{
if( !RelativeLocation ) // explosion location = current mob location.
if( !RelativeLocation ) // explosion location = current mob location.
p = ((Mobile)p).Location;
else
to = (Mobile)p;
@ -287,7 +287,7 @@ namespace Server.Items
from.DoHarmful( m );
int damage = Utility.RandomMinMax( min, max );
damage += alchemyBonus;
if ( !Core.AOS && damage > 40 )

28
Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -16,8 +16,8 @@ namespace Server.Items
public static readonly TimeSpan UseDelay = TimeSpan.FromSeconds( 7.0 );
private BookQuality m_Quality;
[CommandProperty( AccessLevel.GameMaster )]
[CommandProperty( AccessLevel.GameMaster )]
public BookQuality Quality
{
get{ return m_Quality; }
@ -30,9 +30,9 @@ namespace Server.Items
private int m_DefaultIndex;
private SecureLevel m_Level;
private Mobile m_Crafter;
private DateTime m_NextUse;
private List<Mobile> m_Openers = new List<Mobile>();
[CommandProperty( AccessLevel.GameMaster )]
@ -95,7 +95,7 @@ namespace Server.Items
m_MaxCharges = value;
}
}
public List<Mobile> Openers
{
get
@ -180,7 +180,7 @@ namespace Server.Items
writer.Write( (int) 3 );
writer.Write( (byte) m_Quality );
writer.Write( (byte) m_Quality );
writer.Write( m_Crafter );
@ -212,7 +212,7 @@ namespace Server.Items
{
case 3:
{
m_Quality = (BookQuality) reader.ReadByte();
m_Quality = (BookQuality) reader.ReadByte();
goto case 2;
}
case 2:
@ -283,7 +283,7 @@ namespace Server.Items
return false;
}
public override bool DisplayLootType{ get{ return Core.AOS; } }
public override bool DisplayLootType => Core.AOS;
public override void GetProperties( ObjectPropertyList list )
{
@ -298,7 +298,7 @@ namespace Server.Items
if ( m_Description != null && m_Description.Length > 0 )
list.Add( m_Description );
}
public override bool OnDragLift( Mobile from )
{
if ( from.HasGump( typeof( RunebookGump ) ) )
@ -306,13 +306,13 @@ namespace Server.Items
from.SendLocalizedMessage( 500169 ); // You cannot pick that up.
return false;
}
foreach ( Mobile m in m_Openers )
if ( IsOpen( m ) )
m.CloseGump( typeof( RunebookGump ) );
m_Openers.Clear();
return true;
}
@ -345,7 +345,7 @@ namespace Server.Items
from.CloseGump( typeof( RunebookGump ) );
from.SendGump( new RunebookGump( from, this ) );
m_Openers.Add( from );
}
}
@ -555,4 +555,4 @@ namespace Server.Items
writer.Write( m_Description );
}
}
}
}

32
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -31,15 +31,15 @@ namespace Server.Items
{
private string m_EngravedText;
private BookQuality m_Quality;
[CommandProperty( AccessLevel.GameMaster )]
[CommandProperty( AccessLevel.GameMaster )]
public string EngravedText
{
get{ return m_EngravedText; }
set{ m_EngravedText = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
[CommandProperty( AccessLevel.GameMaster )]
public BookQuality Quality
{
get{ return m_Quality; }
@ -135,7 +135,7 @@ namespace Server.Items
else
{
Spell spell = SpellRegistry.NewSpell( spellID, from, null );
if ( spell != null )
spell.Cast();
else
@ -299,7 +299,7 @@ namespace Server.Items
return ( book.SpellbookType == type && ( spellID == -1 || book.HasSpell( spellID ) ) );
}
public override bool DisplayWeight { get { return false; } }
public override bool DisplayWeight => false;
private AosAttributes m_AosAttributes;
private AosSkillBonuses m_AosSkillBonuses;
@ -582,21 +582,21 @@ namespace Server.Items
set{ m_Crafter = value; InvalidateProperties(); }
}
public override bool DisplayLootType{ get{ return Core.AOS; } }
public override bool DisplayLootType => Core.AOS;
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
if ( m_Quality == BookQuality.Exceptional )
list.Add( 1063341 ); // exceptional
if ( m_EngravedText != null )
list.Add( 1072305, m_EngravedText ); // Engraved: ~1_INSCRIPTION~
if ( m_Crafter != null )
list.Add( 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
m_AosSkillBonuses.GetProperties( list );
if( m_Slayer != SlayerName.None )
@ -735,9 +735,9 @@ namespace Server.Items
writer.Write( (int) 5 ); // version
writer.Write( (byte) m_Quality );
writer.Write( (string) m_EngravedText );
writer.Write( (byte) m_Quality );
writer.Write( (string) m_EngravedText );
writer.Write( m_Crafter );
@ -761,13 +761,13 @@ namespace Server.Items
{
case 5:
{
m_Quality = (BookQuality) reader.ReadByte();
m_Quality = (BookQuality) reader.ReadByte();
goto case 4;
}
case 4:
{
m_EngravedText = reader.ReadString();
m_EngravedText = reader.ReadString();
goto case 3;
}
@ -917,4 +917,4 @@ namespace Server.Items
return quality;
}
}
}
}

4
Scripts/Items/Skill Items/Misc/RepairDeed.cs
View file

@ -64,9 +64,9 @@ namespace Server.Items
Fletching
}
public override bool DisplayLootType { get { return false; } }
public override bool DisplayLootType => false;
private RepairSkillType m_Skill;
private RepairSkillType m_Skill;
private double m_SkillLevel;
private Mobile m_Crafter;

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs
View file

@ -4,8 +4,8 @@ namespace Server.Items
{
public class FurnitureDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem
{
public override bool AllowDyables{ get{ return false; } }
public override bool AllowFurniture{ get{ return true; } }
public override bool AllowDyables => false;
public override bool AllowFurniture => true;
public override int TargetMessage{ get{ return 501019; } } // Select the furniture to dye.
public override int FailMessage{ get{ return 501021; } } // That is not a piece of furniture.
public override int LabelNumber{ get{ return 1041246; } } // Furniture Dye Tub
@ -73,4 +73,4 @@ namespace Server.Items
LootType = LootType.Blessed;
}
}
}
}

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs
View file

@ -4,8 +4,8 @@ namespace Server.Items
{
public class LeatherDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem
{
public override bool AllowDyables{ get{ return false; } }
public override bool AllowLeather{ get{ return true; } }
public override bool AllowDyables => false;
public override bool AllowLeather => true;
public override int TargetMessage{ get{ return 1042416; } } // Select the leather item to dye.
public override int FailMessage{ get{ return 1042418; } } // You can only dye leather with this tub.
public override int LabelNumber{ get{ return 1041284; } } // Leather Dye Tub
@ -71,4 +71,4 @@ namespace Server.Items
}
}
}
}
}

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs
View file

@ -4,9 +4,9 @@ namespace Server.Items
{
public class MetallicClothDyetub : DyeTub
{
public override int LabelNumber { get { return 1152920; } } // Metallic Cloth ...
public override int LabelNumber { get { return 1152920; } } // Metallic Cloth ...
public override bool MetallicHues { get { return true; } }
public override bool MetallicHues => true;
[Constructible]
public MetallicClothDyetub()
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public override CustomHuePicker CustomHuePicker{ get{ return null; } }
public override int LabelNumber { get { return 1153495; } } // Metallic Leather ...
public override int LabelNumber { get { return 1153495; } } // Metallic Leather ...
public override bool MetallicHues { get { return true; } }
public override bool MetallicHues => true;
[Constructible]
public MetallicLeatherDyeTub()
@ -43,4 +43,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs
View file

@ -4,8 +4,8 @@ namespace Server.Items
{
public class RunebookDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem
{
public override bool AllowDyables{ get{ return false; } }
public override bool AllowRunebooks{ get{ return true; } }
public override bool AllowDyables => false;
public override bool AllowRunebooks => true;
public override int TargetMessage{ get{ return 1049774; } } // Target the runebook or runestone to dye
public override int FailMessage{ get{ return 1049775; } } // You can only dye runestones or runebooks with this tub.
public override int LabelNumber{ get{ return 1049740; } } // Runebook Dye Tub
@ -71,4 +71,4 @@ namespace Server.Items
}
}
}
}
}

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs
View file

@ -4,8 +4,8 @@ namespace Server.Items
{
public class StatuetteDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem
{
public override bool AllowDyables{ get{ return false; } }
public override bool AllowStatuettes{ get{ return true; } }
public override bool AllowDyables => false;
public override bool AllowStatuettes => true;
public override int TargetMessage{ get{ return 1049777; } } // Target the statuette to dye
public override int FailMessage{ get{ return 1049778; } } // You can only dye veteran reward statuettes with this tub.
public override int LabelNumber{ get{ return 1049741; } } // Reward Statuette Dye Tub
@ -71,4 +71,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "unc
{
public override int LabelNumber { get { return 1149984; } } // White Cloth Dye Tub
public override bool Redyable { get { return false; } }
public override bool Redyable => false;
[Constructible]
public WhiteClothDyeTub()
@ -34,4 +34,4 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "unc
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public override int LabelNumber { get { return 1149900; } } // White Leather Dye Tub
public override bool Redyable { get { return false; } }
public override bool Redyable => false;
[Constructible]
public WhiteLeatherDyeTub()
@ -36,4 +36,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}