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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Mobiles/AI/AIControlMobileTarget.cs
View file

@ -9,11 +9,7 @@ namespace Server.Targets
private List<BaseAI> m_List;
private OrderType m_Order;
public OrderType Order {
get {
return m_Order;
}
}
public OrderType Order => m_Order;
public AIControlMobileTarget( BaseAI ai, OrderType order ) : base( -1, false, ( order == OrderType.Attack ? TargetFlags.Harmful : TargetFlags.None ) )
{

11
Scripts/Mobiles/AI/BaseAI.cs
View file

@ -71,10 +71,7 @@ namespace Server.Mobiles
public ActionType Action
{
get
{
return m_Action;
}
get => m_Action;
set
{
m_Action = value;
@ -1992,8 +1989,8 @@ namespace Server.Mobiles
public long NextMove
{
get { return m_NextMove; }
set { m_NextMove = value; }
get => m_NextMove;
set => m_NextMove = value;
}
public virtual bool CheckMove()
@ -2697,7 +2694,7 @@ namespace Server.Mobiles
private long m_NextDetectHidden;
public virtual bool CanDetectHidden { get { return m_Mobile.Skills[SkillName.DetectHidden].Value > 0; } }
public virtual bool CanDetectHidden => m_Mobile.Skills[SkillName.DetectHidden].Value > 0;
/*
* The Timer object

10
Scripts/Mobiles/AI/MageAI.cs
View file

@ -34,15 +34,9 @@ namespace Server.Mobiles
return base.Think();
}
public virtual bool SmartAI
{
get { return ( m_Mobile is BaseVendor || m_Mobile is BaseEscortable || m_Mobile is Changeling ); }
}
public virtual bool SmartAI => ( m_Mobile is BaseVendor || m_Mobile is BaseEscortable || m_Mobile is Changeling );
public virtual bool IsNecromancer
{
get { return ( Core.AOS && m_Mobile.Skills[ SkillName.Necromancy ].Value > 50 ); }
}
public virtual bool IsNecromancer => ( Core.AOS && m_Mobile.Skills[ SkillName.Necromancy ].Value > 50 );
private const double HealChance = 0.10; // 10% chance to heal at gm magery
private const double TeleportChance = 0.05; // 5% chance to teleport at gm magery

17
Scripts/Mobiles/AI/OppositionGroup.cs
View file

@ -62,10 +62,7 @@ namespace Server
}
} );
public static OppositionGroup TerathansAndOphidians
{
get{ return m_TerathansAndOphidians; }
}
public static OppositionGroup TerathansAndOphidians => m_TerathansAndOphidians;
private static OppositionGroup m_SavagesAndOrcs = new OppositionGroup( new Type[][]
{
@ -88,11 +85,8 @@ namespace Server
}
} );
public static OppositionGroup SavagesAndOrcs
{
get{ return m_SavagesAndOrcs; }
}
public static OppositionGroup SavagesAndOrcs => m_SavagesAndOrcs;
private static OppositionGroup m_FeyAndUndead = new OppositionGroup( new Type[][]
{
new Type[]
@ -133,9 +127,6 @@ namespace Server
}
} );
public static OppositionGroup FeyAndUndead
{
get{ return m_FeyAndUndead; }
}
public static OppositionGroup FeyAndUndead => m_FeyAndUndead;
}
}

12
Scripts/Mobiles/AI/SpeedInfo.cs
View file

@ -16,20 +16,20 @@ namespace Server
public double ActiveSpeed
{
get{ return m_ActiveSpeed; }
set{ m_ActiveSpeed = value; }
get => m_ActiveSpeed;
set => m_ActiveSpeed = value;
}
public double PassiveSpeed
{
get{ return m_PassiveSpeed; }
set{ m_PassiveSpeed = value; }
get => m_PassiveSpeed;
set => m_PassiveSpeed = value;
}
public Type[] Types
{
get{ return m_Types; }
set{ m_Types = value; }
get => m_Types;
set => m_Types = value;
}
public SpeedInfo( double activeSpeed, double passiveSpeed, Type[] types )

8
Scripts/Mobiles/Animals/Cows/Cow.cs
View file

@ -10,8 +10,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime MilkedOn
{
get { return m_MilkedOn; }
set { m_MilkedOn = value; }
get => m_MilkedOn;
set => m_MilkedOn = value;
}
private int m_Milk;
@ -19,8 +19,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int Milk
{
get { return m_Milk; }
set { m_Milk = value; }
get => m_Milk;
set => m_Milk = value;
}
public override string DefaultName => "a cow";

2
Scripts/Mobiles/Animals/Misc/Sheep.cs
View file

@ -12,7 +12,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextWoolTime
{
get{ return m_NextWoolTime; }
get => m_NextWoolTime;
set{ m_NextWoolTime = value; Body = ( DateTime.UtcNow >= m_NextWoolTime ) ? 0xCF : 0xDF; }
}

33
Scripts/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -15,14 +15,14 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextMountAbility
{
get { return m_NextMountAbility; }
set { m_NextMountAbility = value; }
get => m_NextMountAbility;
set => m_NextMountAbility = value;
}
protected Item InternalItem { get { return m_InternalItem; } }
protected Item InternalItem => m_InternalItem;
public virtual bool AllowMaleRider{ get{ return true; } }
public virtual bool AllowFemaleRider{ get{ return true; } }
public virtual bool AllowMaleRider => true;
public virtual bool AllowFemaleRider => true;
public BaseMount( string name, int bodyID, int itemID, AIType aiType, FightMode fightMode, int rangePerception, int rangeFight, double activeSpeed, double passiveSpeed ) : base ( aiType, fightMode, rangePerception, rangeFight, activeSpeed, passiveSpeed )
{
@ -35,10 +35,7 @@ namespace Server.Mobiles
[Hue, CommandProperty( AccessLevel.GameMaster )]
public override int Hue
{
get
{
return base.Hue;
}
get => base.Hue;
set
{
base.Hue = value;
@ -190,10 +187,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int ItemID
{
get
{
return m_InternalItem?.ItemID ?? 0;
}
get => m_InternalItem?.ItemID ?? 0;
set
{
if ( m_InternalItem != null )
@ -212,10 +206,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Rider
{
get
{
return m_Rider;
}
get => m_Rider;
set
{
if ( m_Rider != value )
@ -367,13 +358,7 @@ namespace Server.Mobiles
}
}
public IMount Mount
{
get
{
return m_Mount;
}
}
public IMount Mount => m_Mount;
}
}

2
Scripts/Mobiles/Animals/Mounts/Beetle.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class Beetle : BaseMount
{
public override string CorpseName => "a giant beetle corpse";
public virtual double BoostedSpeed{ get{ return 0.1; } }
public virtual double BoostedSpeed => 0.1;
[Constructible]
public Beetle() : this( "a giant beetle" )

42
Scripts/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -16,19 +16,16 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get { return m_IsRewardItem; }
set { m_IsRewardItem = value; }
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public override double DefaultWeight
{
get { return 1.0; }
}
public override double DefaultWeight => 1.0;
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public bool IsDonationItem
{
get { return m_IsDonationItem; }
get => m_IsDonationItem;
set { m_IsDonationItem = value; InvalidateProperties(); }
}
@ -61,10 +58,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int MountedID
{
get
{
return m_MountedID;
}
get => m_MountedID;
set
{
if ( m_MountedID != value )
@ -80,10 +74,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int RegularID
{
get
{
return m_RegularID;
}
get => m_RegularID;
set
{
if ( m_RegularID != value )
@ -253,10 +244,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Rider
{
get
{
return m_Rider;
}
get => m_Rider;
set
{
if ( value != m_Rider )
@ -334,13 +322,7 @@ namespace Server.Mobiles
ProcessDelta();
}
public IMount Mount
{
get
{
return this;
}
}
public IMount Mount => this;
public static void StopMounting( Mobile mob )
{
@ -375,13 +357,7 @@ namespace Server.Mobiles
public override double CastDelayFastScalar => 0;
public override TimeSpan CastDelayBase
{
get
{
return TimeSpan.FromSeconds( ( ( m_Mount.IsDonationItem && RewardSystem.GetRewardLevel( m_Rider ) < 3 ) ? ( 7.5 + ( Core.AOS ? 3.0 : 2.0 ) ) : ( Core.AOS ? 3.0 : 2.0 ) ) );
}
}
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( ( ( m_Mount.IsDonationItem && RewardSystem.GetRewardLevel( m_Rider ) < 3 ) ? ( 7.5 + ( Core.AOS ? 3.0 : 2.0 ) ) : ( Core.AOS ? 3.0 : 2.0 ) ) );
public override int GetMana()
{

5
Scripts/Mobiles/Animals/Mounts/Kirin.cs
View file

@ -98,10 +98,7 @@ namespace Server.Mobiles
c.DropItem( new KirinBrains() );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int Meat => 3;
public override int Hides => 10;

15
Scripts/Mobiles/Animals/Mounts/SwampDragon.cs
View file

@ -14,28 +14,28 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile BardingCrafter
{
get{ return m_BardingCrafter; }
get => m_BardingCrafter;
set{ m_BardingCrafter = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool BardingExceptional
{
get{ return m_BardingExceptional; }
get => m_BardingExceptional;
set{ m_BardingExceptional = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int BardingHP
{
get{ return m_BardingHP; }
get => m_BardingHP;
set{ m_BardingHP = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool HasBarding
{
get{ return m_HasBarding; }
get => m_HasBarding;
set
{
m_HasBarding = value;
@ -60,7 +60,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource BardingResource
{
get{ return m_BardingResource; }
get => m_BardingResource;
set
{
m_BardingResource = value;
@ -73,10 +73,7 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public int BardingMaxHP
{
get{ return m_BardingExceptional ? 2500 : 1000; }
}
public int BardingMaxHP => m_BardingExceptional ? 2500 : 1000;
[Constructible]
public SwampDragon() : this( "a swamp dragon" )

5
Scripts/Mobiles/Animals/Mounts/Unicorn.cs
View file

@ -107,10 +107,7 @@ namespace Server.Mobiles
c.DropItem( new UnicornRibs() );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Lethal;
public override int Meat => 3;

671
Scripts/Mobiles/BaseCreature.cs
View file

File diff suppressed because it is too large Load diff

5
Scripts/Mobiles/Guards/ArcherGuard.cs
View file

@ -90,10 +90,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public override Mobile Focus
{
get
{
return m_Focus;
}
get => m_Focus;
set
{
if ( Deleted )

5
Scripts/Mobiles/Guards/WarriorGuard.cs
View file

@ -105,10 +105,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public override Mobile Focus
{
get
{
return m_Focus;
}
get => m_Focus;
set
{
if ( Deleted )

4
Scripts/Mobiles/Healers/BaseHealer.cs
View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
public abstract class BaseHealer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override bool IsActiveVendor => false;
public override bool IsInvulnerable => false;
@ -73,7 +73,7 @@ namespace Server.Mobiles
AddItem( new Robe( GetRobeColor() ) );
}
public virtual bool HealsYoungPlayers{ get{ return true; } }
public virtual bool HealsYoungPlayers => true;
public virtual bool CheckResurrect( Mobile m )
{

4
Scripts/Mobiles/Healers/PricedHealer.cs
View file

@ -9,8 +9,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int Price
{
get{ return m_Price; }
set{ m_Price = value; }
get => m_Price;
set => m_Price = value;
}
[Constructible]

5
Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs
View file

@ -54,10 +54,7 @@ namespace Server.Mobiles
AddLoot( LootPack.UltraRich, 2 );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void OnDeath( Container c )
{

5
Scripts/Mobiles/Monsters/AOS/Treefellow.cs
View file

@ -40,10 +40,7 @@ namespace Server.Mobiles
PackItem( new Log( Utility.RandomMinMax( 23, 34 ) ) );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int GetIdleSound()
{

2
Scripts/Mobiles/Monsters/Ants/BlackSolenQueen.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
{
public override string CorpseName => "a solen queen corpse";
private bool m_BurstSac;
public bool BurstSac{ get{ return m_BurstSac; } }
public bool BurstSac => m_BurstSac;
public override string DefaultName => "a black solen queen";

2
Scripts/Mobiles/Monsters/Ants/BlackSolenWarrior.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
{
public override string CorpseName => "a solen warrior corpse";
private bool m_BurstSac;
public bool BurstSac{ get{ return m_BurstSac; } }
public bool BurstSac => m_BurstSac;
public override string DefaultName => "a black solen warrior";

2
Scripts/Mobiles/Monsters/Ants/RedSolenQueen.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
{
public override string CorpseName => "a solen queen corpse";
private bool m_BurstSac;
public bool BurstSac{ get{ return m_BurstSac; } }
public bool BurstSac => m_BurstSac;
public override string DefaultName => "a red solen queen";

2
Scripts/Mobiles/Monsters/Ants/RedSolenWarrior.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
{
public override string CorpseName => "a solen warrior corpse";
private bool m_BurstSac;
public bool BurstSac{ get{ return m_BurstSac; } }
public bool BurstSac => m_BurstSac;
public override string DefaultName => "a red solen warrior";

5
Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs
View file

@ -52,10 +52,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 3;
public override int Meat => 2;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public TerathanAvenger( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs
View file

@ -52,10 +52,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 4;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public TerathanMatriarch( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs
View file

@ -51,10 +51,7 @@ namespace Server.Mobiles
public override int Meat => 4;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public TerathanDrone( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs
View file

@ -50,10 +50,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override int Meat => 4;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public TerathanWarrior( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs
View file

@ -46,10 +46,7 @@ namespace Server.Mobiles
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int GetIdleSound()
{

5
Scripts/Mobiles/Monsters/Humanoid/Magic/Bogle.cs
View file

@ -47,10 +47,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs
View file

@ -57,10 +57,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Regular;

5
Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs
View file

@ -55,10 +55,7 @@ namespace Server.Mobiles
AddLoot( LootPack.MedScrolls, 2 );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override bool CanRummageCorpses => true;
public override bool BleedImmune => true;

5
Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs
View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
PackNecroReg( 12, 40 );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void GenerateLoot()
{

5
Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs
View file

@ -60,10 +60,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override int Meat => 1;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs
View file

@ -66,10 +66,7 @@ namespace Server.Mobiles
public override bool AlwaysMurderer => true;
public override bool ShowFameTitle => false;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Magic/Shade.cs
View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Lethal;

5
Scripts/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs
View file

@ -55,10 +55,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Regular;

5
Scripts/Mobiles/Monsters/Humanoid/Magic/Spectre.cs
View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Lethal;

5
Scripts/Mobiles/Monsters/Humanoid/Magic/Wraith.cs
View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Lethal;

5
Scripts/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs
View file

@ -66,10 +66,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs
View file

@ -51,10 +51,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/Mummy.cs
View file

@ -60,10 +60,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs
View file

@ -72,10 +72,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override int Meat => 1;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs
View file

@ -62,10 +62,7 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs
View file

@ -61,10 +61,7 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Lethal;
public override int Meat => 2;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs
View file

@ -73,10 +73,7 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override int Meat => 1;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs
View file

@ -69,10 +69,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override int Meat => 1;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs
View file

@ -56,10 +56,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs
View file

@ -60,10 +60,7 @@ namespace Server.Mobiles
public override bool AlwaysMurderer => true;
public override bool ShowFameTitle => false;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool IsEnemy( Mobile m )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs
View file

@ -57,10 +57,7 @@ namespace Server.Mobiles
public override bool AlwaysMurderer => true;
public override bool ShowFameTitle => false;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.SavagesAndOrcs; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.SavagesAndOrcs;
public override bool OnBeforeDeath()
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs
View file

@ -65,10 +65,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs
View file

@ -60,10 +60,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Humanoid/Melee/Zombie.cs
View file

@ -63,10 +63,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs
View file

@ -6,8 +6,9 @@ namespace Server.Mobiles
{
public override string CorpseName => "a minion's corpse";
private bool m_FieldActive;
public bool FieldActive{ get{ return m_FieldActive; } }
public bool CanUseField{ get{ return Hits >= HitsMax * 9 / 10; } } // TODO: an OSI bug prevents to verify this
public bool FieldActive => m_FieldActive;
public bool CanUseField // TODO: an OSI bug prevents to verify this
=> Hits >= HitsMax * 9 / 10;
public override bool IsScaredOfScaryThings => false;
public override bool IsScaryToPets => true;

5
Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs
View file

@ -6,8 +6,9 @@ namespace Server.Mobiles
{
public override string CorpseName => "an overseer's corpse";
private bool m_FieldActive;
public bool FieldActive{ get{ return m_FieldActive; } }
public bool CanUseField{ get{ return Hits >= HitsMax * 9 / 10; } } // TODO: an OSI bug prevents to verify this
public bool FieldActive => m_FieldActive;
public bool CanUseField // TODO: an OSI bug prevents to verify this
=> Hits >= HitsMax * 9 / 10;
public override bool IsScaredOfScaryThings => false;
public override bool IsScaryToPets => true;

5
Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs
View file

@ -8,10 +8,7 @@ namespace Server.Mobiles
public override string CorpseName => "a dryad's corpse";
public override bool InitialInnocent => true;
public override OppositionGroup OppositionGroup
{
get { return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override string DefaultName => "a dryad";

5
Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs
View file

@ -42,10 +42,7 @@ namespace Server.Mobiles
PackArcanceScroll( 0.05 );
}
public override OppositionGroup OppositionGroup
{
get { return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void GenerateLoot()
{

5
Scripts/Mobiles/Monsters/ML/Humanoid/Melee/FerelTreefellow.cs
View file

@ -41,10 +41,7 @@ namespace Server.Mobiles
PackItem( new Log( Utility.RandomMinMax( 23, 34 ) ) );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int GetIdleSound()
{

4
Scripts/Mobiles/Monsters/ML/Special/Ilhenir.cs
View file

@ -323,8 +323,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public bool Corrosive
{
get { return m_Corrosive; }
set { m_Corrosive = value; }
get => m_Corrosive;
set => m_Corrosive = value;
}
[Constructible]

5
Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs
View file

@ -67,10 +67,7 @@ namespace Server.Mobiles
AddLoot(LootPack.Gems);
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override bool Unprovokable => true;
public override Poison PoisonImmune => Poison.Regular;

2
Scripts/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs
View file

@ -74,7 +74,7 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile MorphedInto
{
get { return m_MorphedInto; }
get => m_MorphedInto;
set
{
if ( value == this )

5
Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs
View file

@ -58,10 +58,7 @@ namespace Server.Mobiles
AddLoot( LootPack.Average );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public DarkWisp( Serial serial )
: base( serial )

5
Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs
View file

@ -77,10 +77,7 @@ namespace Server.Mobiles
}
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int Feathers => 100;

5
Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs
View file

@ -67,10 +67,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs
View file

@ -60,10 +60,7 @@ namespace Server.Mobiles
{
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs
View file

@ -63,10 +63,7 @@ namespace Server.Mobiles
AddLoot( LootPack.Average );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public Wisp( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Misc/Melee/Centaur.cs
View file

@ -49,10 +49,7 @@ namespace Server.Mobiles
AddLoot( LootPack.Gems );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int Meat => 1;
public override int Hides => 8;

13
Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs
View file

@ -14,22 +14,19 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int TotalDevoured
{
get { return m_DevourTotal; }
set { m_DevourTotal = value; }
get => m_DevourTotal;
set => m_DevourTotal = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DevourGoal
{
get { return ( IsParagon ? m_DevourGoal + 25 : m_DevourGoal ); }
set { m_DevourGoal = value; }
get => ( IsParagon ? m_DevourGoal + 25 : m_DevourGoal );
set => m_DevourGoal = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool HasMetalChest
{
get { return m_HasMetalChest; }
}
public bool HasMetalChest => m_HasMetalChest;
public override string DefaultName => "a plague beast";

14
Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs
View file

@ -14,8 +14,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile OpenedBy
{
get { return m_OpenedBy; }
set { m_OpenedBy = value; }
get => m_OpenedBy;
set => m_OpenedBy = value;
}
[CommandProperty( AccessLevel.GameMaster )]
@ -296,15 +296,9 @@ namespace Server.Mobiles
private int m_Count;
private int m_Deadline;
public int Count
{
get { return m_Count; }
}
public int Count => m_Count;
public int Deadline
{
get { return m_Deadline; }
}
public int Deadline => m_Deadline;
public DecayTimer( PlagueBeastLord lord ) : this( lord, 0, 120 )
{

8
Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs
View file

@ -13,15 +13,15 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner
{
get{ return m_Owner; }
set{ m_Owner = value; }
get => m_Owner;
set => m_Owner = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime ExpireTime
{
get{ return m_ExpireTime; }
set{ m_ExpireTime = value; }
get => m_ExpireTime;
set => m_ExpireTime = value;
}
[Constructible]

2
Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class AgapiteElemental : BaseCreature
{
public override string CorpseName => "an ore elemental corpse";
public override string DefaultName{ get { return "an agapite elemental"; } }
public override string DefaultName => "an agapite elemental";
[Constructible]
public AgapiteElemental() : this( 2 )

4
Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs
View file

@ -10,8 +10,8 @@ namespace Server.Mobiles
public Mobile Fisher
{
get{ return m_Fisher; }
set{ m_Fisher = value; }
get => m_Fisher;
set => m_Fisher = value;
}
public override string DefaultName => "a leviathan";

5
Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs
View file

@ -57,10 +57,7 @@ namespace Server.Mobiles
public override int Meat => 1;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public OphidianArchmage( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs
View file

@ -58,10 +58,7 @@ namespace Server.Mobiles
public override int Meat => 1;
public override int TreasureMapLevel => 2;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public OphidianMage( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs
View file

@ -50,10 +50,7 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Greater;
public override int TreasureMapLevel => 4;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public OphidianMatriarch( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs
View file

@ -60,10 +60,7 @@ namespace Server.Mobiles
public override Poison HitPoison => Poison.Lethal;
public override int TreasureMapLevel => 3;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public OphidianKnight( Serial serial ) : base( serial )
{

5
Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs
View file

@ -53,10 +53,7 @@ namespace Server.Mobiles
public override int Meat => 1;
public override int TreasureMapLevel => 1;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.TerathansAndOphidians; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.TerathansAndOphidians;
public OphidianWarrior( Serial serial ) : base( serial )
{

2
Scripts/Mobiles/Monsters/SE/BakeKitsune.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class BakeKitsune : BaseCreature
{
public override string CorpseName => "a bake kitsune corpse";
public override string DefaultName{ get { return "a bake kitsune"; } }
public override string DefaultName => "a bake kitsune";
[Constructible]
public BakeKitsune() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 )

2
Scripts/Mobiles/Monsters/SE/FireBeetle.cs
View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
public override string CorpseName => "a fire beetle corpse";
public override bool SubdueBeforeTame => true; // Must be beaten into submission
public override bool StatLossAfterTame => true;
public virtual double BoostedSpeed{ get{ return 0.1; } }
public virtual double BoostedSpeed => 0.1;
public override bool ReduceSpeedWithDamage => false;
[Constructible]

414
Scripts/Mobiles/PlayerMobile.cs
View file

@ -163,10 +163,11 @@ namespace Server.Mobiles
{
}
public DateTime TimeStamp { get{ return m_Stamp; } }
public DateTime TimeStamp => m_Stamp;
public int Count
{
get { return m_Count; }
get => m_Count;
set { m_Count = value; m_Stamp = DateTime.UtcNow; }
}
}
@ -203,28 +204,16 @@ namespace Server.Mobiles
public List<Mobile> RecentlyReported
{
get
{
return m_RecentlyReported;
}
set
{
m_RecentlyReported = value;
}
get => m_RecentlyReported;
set => m_RecentlyReported = value;
}
public List<Mobile> AutoStabled => m_AutoStabled;
public bool NinjaWepCooldown
{
get
{
return m_NinjaWepCooldown;
}
set
{
m_NinjaWepCooldown = value;
}
get => m_NinjaWepCooldown;
set => m_NinjaWepCooldown = value;
}
public List<Mobile> AllFollowers
@ -246,50 +235,47 @@ namespace Server.Mobiles
else
return m_GuildRank;
}
set{ m_GuildRank = value; }
set => m_GuildRank = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int GuildMessageHue
{
get{ return m_GuildMessageHue; }
set{ m_GuildMessageHue = value; }
get => m_GuildMessageHue;
set => m_GuildMessageHue = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int AllianceMessageHue
{
get { return m_AllianceMessageHue; }
set { m_AllianceMessageHue = value; }
get => m_AllianceMessageHue;
set => m_AllianceMessageHue = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Profession
{
get{ return m_Profession; }
set{ m_Profession = value; }
get => m_Profession;
set => m_Profession = value;
}
public int StepsTaken
{
get{ return m_StepsTaken; }
set{ m_StepsTaken = value; }
get => m_StepsTaken;
set => m_StepsTaken = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsStealthing // IsStealthing should be moved to Server.Mobiles
{
get { return m_IsStealthing; }
set { m_IsStealthing = value; }
get => m_IsStealthing;
set => m_IsStealthing = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IgnoreMobiles // IgnoreMobiles should be moved to Server.Mobiles
{
get
{
return m_IgnoreMobiles;
}
get => m_IgnoreMobiles;
set
{
if ( m_IgnoreMobiles != value )
@ -303,42 +289,39 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public NpcGuild NpcGuild
{
get{ return m_NpcGuild; }
set{ m_NpcGuild = value; }
get => m_NpcGuild;
set => m_NpcGuild = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NpcGuildJoinTime
{
get{ return m_NpcGuildJoinTime; }
set{ m_NpcGuildJoinTime = value; }
get => m_NpcGuildJoinTime;
set => m_NpcGuildJoinTime = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextBODTurnInTime
{
get{ return m_NextBODTurnInTime; }
set{ m_NextBODTurnInTime = value; }
get => m_NextBODTurnInTime;
set => m_NextBODTurnInTime = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime LastOnline
{
get{ return m_LastOnline; }
set{ m_LastOnline = value; }
get => m_LastOnline;
set => m_LastOnline = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public long LastMoved
{
get{ return LastMoveTime; }
}
public long LastMoved => LastMoveTime;
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan NpcGuildGameTime
{
get{ return m_NpcGuildGameTime; }
set{ m_NpcGuildGameTime = value; }
get => m_NpcGuildGameTime;
set => m_NpcGuildGameTime = value;
}
private int m_ToTItemsTurnedIn;
@ -346,8 +329,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int ToTItemsTurnedIn
{
get { return m_ToTItemsTurnedIn; }
set { m_ToTItemsTurnedIn = value; }
get => m_ToTItemsTurnedIn;
set => m_ToTItemsTurnedIn = value;
}
private int m_ToTTotalMonsterFame;
@ -355,21 +338,21 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public int ToTTotalMonsterFame
{
get { return m_ToTTotalMonsterFame; }
set { m_ToTTotalMonsterFame = value; }
get => m_ToTTotalMonsterFame;
set => m_ToTTotalMonsterFame = value;
}
public int ExecutesLightningStrike
{
get { return m_ExecutesLightningStrike; }
set { m_ExecutesLightningStrike = value; }
get => m_ExecutesLightningStrike;
set => m_ExecutesLightningStrike = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ToothAche
{
get { return CandyCane.GetToothAche( this ); }
set { CandyCane.SetToothAche( this, value ); }
get => CandyCane.GetToothAche( this );
set => CandyCane.SetToothAche( this, value );
}
#endregion
@ -377,109 +360,106 @@ namespace Server.Mobiles
#region PlayerFlags
public PlayerFlag Flags
{
get{ return m_Flags; }
set{ m_Flags = value; }
get => m_Flags;
set => m_Flags = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool PagingSquelched
{
get{ return GetFlag( PlayerFlag.PagingSquelched ); }
set{ SetFlag( PlayerFlag.PagingSquelched, value ); }
get => GetFlag( PlayerFlag.PagingSquelched );
set => SetFlag( PlayerFlag.PagingSquelched, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Glassblowing
{
get{ return GetFlag( PlayerFlag.Glassblowing ); }
set{ SetFlag( PlayerFlag.Glassblowing, value ); }
get => GetFlag( PlayerFlag.Glassblowing );
set => SetFlag( PlayerFlag.Glassblowing, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Masonry
{
get{ return GetFlag( PlayerFlag.Masonry ); }
set{ SetFlag( PlayerFlag.Masonry, value ); }
get => GetFlag( PlayerFlag.Masonry );
set => SetFlag( PlayerFlag.Masonry, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool SandMining
{
get{ return GetFlag( PlayerFlag.SandMining ); }
set{ SetFlag( PlayerFlag.SandMining, value ); }
get => GetFlag( PlayerFlag.SandMining );
set => SetFlag( PlayerFlag.SandMining, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool StoneMining
{
get{ return GetFlag( PlayerFlag.StoneMining ); }
set{ SetFlag( PlayerFlag.StoneMining, value ); }
get => GetFlag( PlayerFlag.StoneMining );
set => SetFlag( PlayerFlag.StoneMining, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool ToggleMiningStone
{
get{ return GetFlag( PlayerFlag.ToggleMiningStone ); }
set{ SetFlag( PlayerFlag.ToggleMiningStone, value ); }
get => GetFlag( PlayerFlag.ToggleMiningStone );
set => SetFlag( PlayerFlag.ToggleMiningStone, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool KarmaLocked
{
get{ return GetFlag( PlayerFlag.KarmaLocked ); }
set{ SetFlag( PlayerFlag.KarmaLocked, value ); }
get => GetFlag( PlayerFlag.KarmaLocked );
set => SetFlag( PlayerFlag.KarmaLocked, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool AutoRenewInsurance
{
get{ return GetFlag( PlayerFlag.AutoRenewInsurance ); }
set{ SetFlag( PlayerFlag.AutoRenewInsurance, value ); }
get => GetFlag( PlayerFlag.AutoRenewInsurance );
set => SetFlag( PlayerFlag.AutoRenewInsurance, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool UseOwnFilter
{
get{ return GetFlag( PlayerFlag.UseOwnFilter ); }
set{ SetFlag( PlayerFlag.UseOwnFilter, value ); }
get => GetFlag( PlayerFlag.UseOwnFilter );
set => SetFlag( PlayerFlag.UseOwnFilter, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool PublicMyRunUO
{
get{ return GetFlag( PlayerFlag.PublicMyRunUO ); }
get => GetFlag( PlayerFlag.PublicMyRunUO );
set{ SetFlag( PlayerFlag.PublicMyRunUO, value ); InvalidateMyRunUO(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool AcceptGuildInvites
{
get{ return GetFlag( PlayerFlag.AcceptGuildInvites ); }
set{ SetFlag( PlayerFlag.AcceptGuildInvites, value ); }
get => GetFlag( PlayerFlag.AcceptGuildInvites );
set => SetFlag( PlayerFlag.AcceptGuildInvites, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool HasStatReward
{
get{ return GetFlag( PlayerFlag.HasStatReward ); }
set{ SetFlag( PlayerFlag.HasStatReward, value ); }
get => GetFlag( PlayerFlag.HasStatReward );
set => SetFlag( PlayerFlag.HasStatReward, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public bool RefuseTrades
{
get{ return GetFlag( PlayerFlag.RefuseTrades ); }
set{ SetFlag( PlayerFlag.RefuseTrades, value ); }
get => GetFlag( PlayerFlag.RefuseTrades );
set => SetFlag( PlayerFlag.RefuseTrades, value );
}
#endregion
#region Auto Arrow Recovery
private Dictionary<Type, int> m_RecoverableAmmo = new Dictionary<Type,int>();
public Dictionary<Type, int> RecoverableAmmo
{
get { return m_RecoverableAmmo; }
}
public Dictionary<Type, int> RecoverableAmmo => m_RecoverableAmmo;
public void RecoverAmmo()
{
@ -535,23 +515,20 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime AnkhNextUse
{
get{ return m_AnkhNextUse; }
set{ m_AnkhNextUse = value; }
get => m_AnkhNextUse;
set => m_AnkhNextUse = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan DisguiseTimeLeft
{
get{ return DisguiseTimers.TimeRemaining( this ); }
}
public TimeSpan DisguiseTimeLeft => DisguiseTimers.TimeRemaining( this );
private DateTime m_PeacedUntil;
[CommandProperty( AccessLevel.GameMaster )]
public DateTime PeacedUntil
{
get { return m_PeacedUntil; }
set { m_PeacedUntil = value; }
get => m_PeacedUntil;
set => m_PeacedUntil = value;
}
#region Scroll of Alacrity
@ -560,8 +537,8 @@ namespace Server.Mobiles
[CommandProperty(AccessLevel.GameMaster)]
public DateTime AcceleratedStart
{
get { return m_AcceleratedStart; }
set { m_AcceleratedStart = value; }
get => m_AcceleratedStart;
set => m_AcceleratedStart = value;
}
private SkillName m_AcceleratedSkill;
@ -569,8 +546,8 @@ namespace Server.Mobiles
[CommandProperty(AccessLevel.GameMaster)]
public SkillName AcceleratedSkill
{
get { return m_AcceleratedSkill; }
set { m_AcceleratedSkill = value; }
get => m_AcceleratedSkill;
set => m_AcceleratedSkill = value;
}
#endregion
@ -704,8 +681,8 @@ namespace Server.Mobiles
public DesignContext DesignContext
{
get{ return m_DesignContext; }
set{ m_DesignContext = value; }
get => m_DesignContext;
set => m_DesignContext = value;
}
public static void Initialize()
@ -741,13 +718,7 @@ namespace Server.Mobiles
private MountBlock m_MountBlock;
public BlockMountType MountBlockReason
{
get
{
return ( CheckBlock( m_MountBlock ) ) ? m_MountBlock.m_Type : BlockMountType.None;
}
}
public BlockMountType MountBlockReason => ( CheckBlock( m_MountBlock ) ) ? m_MountBlock.m_Type : BlockMountType.None;
private static bool CheckBlock( MountBlock block )
{
@ -1411,16 +1382,11 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public override int StamMax
{
get{ return base.StamMax + AosAttributes.GetValue( this, AosAttribute.BonusStam ); }
}
public override int StamMax => base.StamMax + AosAttributes.GetValue( this, AosAttribute.BonusStam );
[CommandProperty( AccessLevel.GameMaster )]
public override int ManaMax
{
get{ return base.ManaMax + AosAttributes.GetValue( this, AosAttribute.BonusMana ) + ((Core.ML && Race == Race.Elf) ? 20 : 0); }
}
public override int ManaMax => base.ManaMax + AosAttributes.GetValue( this, AosAttribute.BonusMana ) + ((Core.ML && Race == Race.Elf) ? 20 : 0);
#endregion
#region Stat Getters/Setters
@ -1435,10 +1401,7 @@ namespace Server.Mobiles
return base.Str;
}
set
{
base.Str = value;
}
set => base.Str = value;
}
[CommandProperty( AccessLevel.GameMaster )]
@ -1451,10 +1414,7 @@ namespace Server.Mobiles
return base.Int;
}
set
{
base.Int = value;
}
set => base.Int = value;
}
[CommandProperty( AccessLevel.GameMaster )]
@ -1467,10 +1427,7 @@ namespace Server.Mobiles
return base.Dex;
}
set
{
base.Dex = value;
}
set => base.Dex = value;
}
#endregion
@ -1542,7 +1499,7 @@ namespace Server.Mobiles
return DesignContext.Check( this );
}
public SkillName[] AnimalFormRestrictedSkills{ get{ return m_AnimalFormRestrictedSkills; } }
public SkillName[] AnimalFormRestrictedSkills => m_AnimalFormRestrictedSkills;
private SkillName[] m_AnimalFormRestrictedSkills = new SkillName[]
{
@ -2618,10 +2575,7 @@ namespace Server.Mobiles
private List<Item> m_EquipSnapshot;
public List<Item> EquipSnapshot
{
get { return m_EquipSnapshot; }
}
public List<Item> EquipSnapshot => m_EquipSnapshot;
private bool FindItems_Callback(Item item)
{
@ -2953,8 +2907,8 @@ namespace Server.Mobiles
public SkillName Learning
{
get{ return m_Learning; }
set{ m_Learning = value; }
get => m_Learning;
set => m_Learning = value;
}
[CommandProperty( AccessLevel.GameMaster )]
@ -2969,10 +2923,7 @@ namespace Server.Mobiles
return ts;
}
set
{
m_SavagePaintExpiration = DateTime.UtcNow + value;
}
set => m_SavagePaintExpiration = DateTime.UtcNow + value;
}
[CommandProperty( AccessLevel.GameMaster )]
@ -3016,15 +2967,15 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public DateTime LastEscortTime
{
get{ return m_LastEscortTime; }
set{ m_LastEscortTime = value; }
get => m_LastEscortTime;
set => m_LastEscortTime = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime LastPetBallTime
{
get{ return m_LastPetBallTime; }
set{ m_LastPetBallTime = value; }
get => m_LastPetBallTime;
set => m_LastPetBallTime = value;
}
public PlayerMobile()
@ -3221,15 +3172,9 @@ namespace Server.Mobiles
InvalidateMyRunUO();
}
public List<Mobile> VisibilityList
{
get{ return m_VisList; }
}
public List<Mobile> VisibilityList => m_VisList;
public List<Mobile> PermaFlags
{
get{ return m_PermaFlags; }
}
public List<Mobile> PermaFlags => m_PermaFlags;
public override int Luck => AosAttributes.GetValue( this, AosAttribute.Luck );
@ -3292,10 +3237,7 @@ namespace Server.Mobiles
private Engines.BulkOrders.BOBFilter m_BOBFilter;
public Engines.BulkOrders.BOBFilter BOBFilter
{
get{ return m_BOBFilter; }
}
public Engines.BulkOrders.BOBFilter BOBFilter => m_BOBFilter;
public override void Deserialize( GenericReader reader )
{
@ -3767,10 +3709,7 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime SessionStart
{
get{ return m_SessionStart; }
}
public DateTime SessionStart => m_SessionStart;
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan GameTime
@ -3962,17 +3901,14 @@ namespace Server.Mobiles
public bool BedrollLogout
{
get{ return m_BedrollLogout; }
set{ m_BedrollLogout = value; }
get => m_BedrollLogout;
set => m_BedrollLogout = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public override bool Paralyzed
{
get
{
return base.Paralyzed;
}
get => base.Paralyzed;
set
{
base.Paralyzed = value;
@ -3990,8 +3926,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Ethics.Player EthicPlayer
{
get { return m_EthicPlayer; }
set { m_EthicPlayer = value; }
get => m_EthicPlayer;
set => m_EthicPlayer = value;
}
#endregion
@ -4000,8 +3936,8 @@ namespace Server.Mobiles
public PlayerState FactionPlayerState
{
get{ return m_FactionPlayerState; }
set{ m_FactionPlayerState = value; }
get => m_FactionPlayerState;
set => m_FactionPlayerState = value;
}
#endregion
@ -4009,14 +3945,11 @@ namespace Server.Mobiles
private Engines.ConPVP.DuelContext m_DuelContext;
private Engines.ConPVP.DuelPlayer m_DuelPlayer;
public Engines.ConPVP.DuelContext DuelContext
{
get{ return m_DuelContext; }
}
public Engines.ConPVP.DuelContext DuelContext => m_DuelContext;
public Engines.ConPVP.DuelPlayer DuelPlayer
{
get{ return m_DuelPlayer; }
get => m_DuelPlayer;
set
{
bool wasInTourny = ( m_DuelContext != null && !m_DuelContext.Finished && m_DuelContext.m_Tournament != null );
@ -4043,21 +3976,21 @@ namespace Server.Mobiles
public QuestSystem Quest
{
get{ return m_Quest; }
set{ m_Quest = value; }
get => m_Quest;
set => m_Quest = value;
}
public List<QuestRestartInfo> DoneQuests
{
get{ return m_DoneQuests; }
set{ m_DoneQuests = value; }
get => m_DoneQuests;
set => m_DoneQuests = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public SolenFriendship SolenFriendship
{
get{ return m_SolenFriendship; }
set{ m_SolenFriendship = value; }
get => m_SolenFriendship;
set => m_SolenFriendship = value;
}
#endregion
@ -4066,8 +3999,8 @@ namespace Server.Mobiles
public bool ChangedMyRunUO
{
get{ return m_ChangedMyRunUO; }
set{ m_ChangedMyRunUO = value; }
get => m_ChangedMyRunUO;
set => m_ChangedMyRunUO = value;
}
public void InvalidateMyRunUO()
@ -4159,7 +4092,7 @@ namespace Server.Mobiles
private long m_NextMovementTime;
private bool m_HasMoved;
public virtual bool UsesFastwalkPrevention{ get{ return ( AccessLevel < AccessLevel.Counselor ); } }
public virtual bool UsesFastwalkPrevention => ( AccessLevel < AccessLevel.Counselor );
public override int ComputeMovementSpeed( Direction dir, bool checkTurning )
{
@ -4216,7 +4149,7 @@ namespace Server.Mobiles
public Type EnemyOfOneType
{
get{ return m_EnemyOfOneType; }
get => m_EnemyOfOneType;
set
{
Type oldType = m_EnemyOfOneType;
@ -4233,8 +4166,8 @@ namespace Server.Mobiles
public bool WaitingForEnemy
{
get{ return m_WaitingForEnemy; }
set{ m_WaitingForEnemy = value; }
get => m_WaitingForEnemy;
set => m_WaitingForEnemy = value;
}
private void DeltaEnemies( Type oldType, Type newType )
@ -4325,32 +4258,50 @@ namespace Server.Mobiles
private DateTime m_LastSacrificeLoss;
private int m_AvailableResurrects;
public DateTime LastSacrificeGain{ get{ return m_LastSacrificeGain; } set{ m_LastSacrificeGain = value; } }
public DateTime LastSacrificeLoss{ get{ return m_LastSacrificeLoss; } set{ m_LastSacrificeLoss = value; } }
public DateTime LastSacrificeGain{ get => m_LastSacrificeGain;
set => m_LastSacrificeGain = value;
}
public DateTime LastSacrificeLoss{ get => m_LastSacrificeLoss;
set => m_LastSacrificeLoss = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int AvailableResurrects{ get{ return m_AvailableResurrects; } set{ m_AvailableResurrects = value; } }
public int AvailableResurrects{ get => m_AvailableResurrects;
set => m_AvailableResurrects = value;
}
private DateTime m_NextJustAward;
private DateTime m_LastJusticeLoss;
private List<Mobile> m_JusticeProtectors;
public DateTime LastJusticeLoss{ get{ return m_LastJusticeLoss; } set{ m_LastJusticeLoss = value; } }
public List<Mobile> JusticeProtectors { get { return m_JusticeProtectors; } set { m_JusticeProtectors = value; } }
public DateTime LastJusticeLoss{ get => m_LastJusticeLoss;
set => m_LastJusticeLoss = value;
}
public List<Mobile> JusticeProtectors { get => m_JusticeProtectors;
set => m_JusticeProtectors = value;
}
private DateTime m_LastCompassionLoss;
private DateTime m_NextCompassionDay;
private int m_CompassionGains;
public DateTime LastCompassionLoss{ get{ return m_LastCompassionLoss; } set{ m_LastCompassionLoss = value; } }
public DateTime LastCompassionLoss{ get => m_LastCompassionLoss;
set => m_LastCompassionLoss = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextCompassionDay{ get{ return m_NextCompassionDay; } set{ m_NextCompassionDay = value; } }
public DateTime NextCompassionDay{ get => m_NextCompassionDay;
set => m_NextCompassionDay = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int CompassionGains{ get{ return m_CompassionGains; } set{ m_CompassionGains = value; } }
public int CompassionGains{ get => m_CompassionGains;
set => m_CompassionGains = value;
}
private DateTime m_LastValorLoss;
public DateTime LastValorLoss { get { return m_LastValorLoss; } set { m_LastValorLoss = value; } }
public DateTime LastValorLoss { get => m_LastValorLoss;
set => m_LastValorLoss = value;
}
private DateTime m_LastHonorLoss;
private DateTime m_LastHonorUse;
@ -4359,18 +4310,28 @@ namespace Server.Mobiles
private HonorContext m_SentHonorContext;
public DateTime m_hontime;
public DateTime LastHonorLoss{ get{ return m_LastHonorLoss; } set{ m_LastHonorLoss = value; } }
public DateTime LastHonorUse{ get{ return m_LastHonorUse; } set{ m_LastHonorUse = value; } }
public bool HonorActive{ get{ return m_HonorActive; } set{ m_HonorActive = value; } }
public HonorContext ReceivedHonorContext{ get{ return m_ReceivedHonorContext; } set{ m_ReceivedHonorContext = value; } }
public HonorContext SentHonorContext{ get{ return m_SentHonorContext; } set{ m_SentHonorContext = value; } }
public DateTime LastHonorLoss{ get => m_LastHonorLoss;
set => m_LastHonorLoss = value;
}
public DateTime LastHonorUse{ get => m_LastHonorUse;
set => m_LastHonorUse = value;
}
public bool HonorActive{ get => m_HonorActive;
set => m_HonorActive = value;
}
public HonorContext ReceivedHonorContext{ get => m_ReceivedHonorContext;
set => m_ReceivedHonorContext = value;
}
public HonorContext SentHonorContext{ get => m_SentHonorContext;
set => m_SentHonorContext = value;
}
#endregion
#region Young system
[CommandProperty( AccessLevel.GameMaster )]
public bool Young
{
get{ return GetFlag( PlayerFlag.Young ); }
get => GetFlag( PlayerFlag.Young );
set{ SetFlag( PlayerFlag.Young, value ); InvalidateProperties(); }
}
@ -4570,7 +4531,7 @@ namespace Server.Mobiles
#region Speech log
private SpeechLog m_SpeechLog;
public SpeechLog SpeechLog{ get{ return m_SpeechLog; } }
public SpeechLog SpeechLog => m_SpeechLog;
public override void OnSpeech( SpeechEventArgs e )
{
@ -4589,14 +4550,15 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public bool DisplayChampionTitle
{
get { return GetFlag( PlayerFlag.DisplayChampionTitle ); }
set { SetFlag( PlayerFlag.DisplayChampionTitle, value ); }
get => GetFlag( PlayerFlag.DisplayChampionTitle );
set => SetFlag( PlayerFlag.DisplayChampionTitle, value );
}
private ChampionTitleInfo m_ChampionTitles;
[CommandProperty( AccessLevel.GameMaster )]
public ChampionTitleInfo ChampionTitles { get { return m_ChampionTitles; } set { } }
public ChampionTitleInfo ChampionTitles { get => m_ChampionTitles;
set { } }
private void ToggleChampionTitleDisplay()
{
@ -4622,8 +4584,12 @@ namespace Server.Mobiles
private int m_Value;
private DateTime m_LastDecay;
public int Value { get { return m_Value; } set { m_Value = value; } }
public DateTime LastDecay { get { return m_LastDecay; } set { m_LastDecay = value; } }
public int Value { get => m_Value;
set => m_Value = value;
}
public DateTime LastDecay { get => m_LastDecay;
set => m_LastDecay = value;
}
public TitleInfo()
{
@ -4753,31 +4719,49 @@ namespace Server.Mobiles
}
[CommandProperty(AccessLevel.GameMaster)]
public int Pestilence { get { return GetValue(ChampionSpawnType.Pestilence); } set { SetValue(ChampionSpawnType.Pestilence, value); } }
public int Pestilence { get => GetValue(ChampionSpawnType.Pestilence);
set => SetValue(ChampionSpawnType.Pestilence, value);
}
[CommandProperty( AccessLevel.GameMaster )]
public int Abyss { get { return GetValue( ChampionSpawnType.Abyss ); } set { SetValue( ChampionSpawnType.Abyss, value ); } }
public int Abyss { get => GetValue( ChampionSpawnType.Abyss );
set => SetValue( ChampionSpawnType.Abyss, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public int Arachnid { get { return GetValue( ChampionSpawnType.Arachnid ); } set { SetValue( ChampionSpawnType.Arachnid, value ); } }
public int Arachnid { get => GetValue( ChampionSpawnType.Arachnid );
set => SetValue( ChampionSpawnType.Arachnid, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public int ColdBlood { get { return GetValue( ChampionSpawnType.ColdBlood ); } set { SetValue( ChampionSpawnType.ColdBlood, value ); } }
public int ColdBlood { get => GetValue( ChampionSpawnType.ColdBlood );
set => SetValue( ChampionSpawnType.ColdBlood, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public int ForestLord { get { return GetValue( ChampionSpawnType.ForestLord ); } set { SetValue( ChampionSpawnType.ForestLord, value ); } }
public int ForestLord { get => GetValue( ChampionSpawnType.ForestLord );
set => SetValue( ChampionSpawnType.ForestLord, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public int SleepingDragon { get { return GetValue( ChampionSpawnType.SleepingDragon ); } set { SetValue( ChampionSpawnType.SleepingDragon, value ); } }
public int SleepingDragon { get => GetValue( ChampionSpawnType.SleepingDragon );
set => SetValue( ChampionSpawnType.SleepingDragon, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public int UnholyTerror { get { return GetValue( ChampionSpawnType.UnholyTerror ); } set { SetValue( ChampionSpawnType.UnholyTerror, value ); } }
public int UnholyTerror { get => GetValue( ChampionSpawnType.UnholyTerror );
set => SetValue( ChampionSpawnType.UnholyTerror, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public int VerminHorde { get { return GetValue( ChampionSpawnType.VerminHorde ); } set { SetValue( ChampionSpawnType.VerminHorde, value ); } }
public int VerminHorde { get => GetValue( ChampionSpawnType.VerminHorde );
set => SetValue( ChampionSpawnType.VerminHorde, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public int Harrower { get { return m_Harrower; } set { m_Harrower = value; } }
public int Harrower { get => m_Harrower;
set => m_Harrower = value;
}
public ChampionTitleInfo()
{

9
Scripts/Mobiles/Special/Barracoon.cs
View file

@ -11,10 +11,11 @@ namespace Server.Mobiles
public override ChampionSkullType SkullType => ChampionSkullType.Greed;
public override Type[] UniqueList => new Type[] { typeof( FangOfRactus ) };
public override Type[] SharedList{ get{ return new Type[] { typeof( EmbroideredOakLeafCloak ),
typeof( DjinnisRing ),
typeof( DetectiveBoots ),
typeof( GuantletsOfAnger ) }; } }
public override Type[] SharedList => new Type[] { typeof( EmbroideredOakLeafCloak ),
typeof( DjinnisRing ),
typeof( DetectiveBoots ),
typeof( GuantletsOfAnger ) };
public override Type[] DecorativeList => new Type[] { typeof( SwampTile ), typeof( MonsterStatuette ) };
public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.Slime };

2
Scripts/Mobiles/Special/BaseChampion.cs
View file

@ -29,7 +29,7 @@ namespace Server.Mobiles
public abstract Type[] DecorativeList{ get; }
public abstract MonsterStatuetteType[] StatueTypes{ get; }
public virtual bool NoGoodies{ get{ return false; } }
public virtual bool NoGoodies => false;
public override void Serialize( GenericWriter writer )
{

5
Scripts/Mobiles/Special/DarkGuardian.cs
View file

@ -55,10 +55,7 @@ namespace Server.Mobiles
AddLoot( LootPack.MedScrolls, 2 );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override int TreasureMapLevel => 2;
public override bool BleedImmune => true;

16
Scripts/Mobiles/Special/Harrower.cs
View file

@ -7,9 +7,9 @@ namespace Server.Mobiles
{
public class Harrower : BaseCreature
{
public Type[] UniqueList{ get{ return new Type[] { typeof( AcidProofRobe ) }; } }
public Type[] SharedList{ get{ return new Type[] { typeof( TheRobeOfBritanniaAri ) }; } }
public Type[] DecorativeList{ get{ return new Type[] { typeof( EvilIdolSkull ), typeof( SkullPole ) }; } }
public Type[] UniqueList => new Type[] { typeof( AcidProofRobe ) };
public Type[] SharedList => new Type[] { typeof( TheRobeOfBritanniaAri ) };
public Type[] DecorativeList => new Type[] { typeof( EvilIdolSkull ), typeof( SkullPole ) };
private bool m_TrueForm;
private Item m_GateItem;
@ -49,7 +49,7 @@ namespace Server.Mobiles
private static ArrayList m_Instances = new ArrayList();
public static ArrayList Instances{ get{ return m_Instances; } }
public static ArrayList Instances => m_Instances;
public static Harrower Spawn( Point3D platLoc, Map platMap )
{
@ -67,13 +67,7 @@ namespace Server.Mobiles
return harrower;
}
public static bool CanSpawn
{
get
{
return ( m_Instances.Count == 0 );
}
}
public static bool CanSpawn => ( m_Instances.Count == 0 );
public override string DefaultName => "the harrower";

10
Scripts/Mobiles/Special/HarrowerTentacles.cs
View file

@ -13,14 +13,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Harrower
{
get
{
return m_Harrower;
}
set
{
m_Harrower = value;
}
get => m_Harrower;
set => m_Harrower = value;
}
public override string DefaultName => "tentacles of the harrower";

26
Scripts/Mobiles/Special/LordOaks.cs
View file

@ -12,16 +12,17 @@ namespace Server.Mobiles
public override ChampionSkullType SkullType => ChampionSkullType.Enlightenment;
public override Type[] UniqueList => new Type[] { typeof( OrcChieftainHelm ) };
public override Type[] SharedList{ get{ return new Type[] { typeof( RoyalGuardSurvivalKnife ),
typeof( DjinnisRing ),
typeof( LieutenantOfTheBritannianRoyalGuard ),
typeof( SamaritanRobe ),
typeof( DetectiveBoots ),
typeof( TheMostKnowledgePerson ) }; } }
public override Type[] DecorativeList{ get{ return new Type[] { typeof( WaterTile ),
typeof( WindSpirit ),
typeof( Pier ),
typeof( DirtPatch )}; } }
public override Type[] SharedList => new Type[] { typeof( RoyalGuardSurvivalKnife ),
typeof( DjinnisRing ),
typeof( LieutenantOfTheBritannianRoyalGuard ),
typeof( SamaritanRobe ),
typeof( DetectiveBoots ),
typeof( TheMostKnowledgePerson ) };
public override Type[] DecorativeList => new Type[] { typeof( WaterTile ),
typeof( WindSpirit ),
typeof( Pier ),
typeof( DirtPatch )};
public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { };
@ -73,10 +74,7 @@ namespace Server.Mobiles
public override bool BardImmune => !Core.SE;
public override bool Unprovokable => Core.SE;
public override bool Uncalmable => Core.SE;
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override Poison PoisonImmune => Poison.Deadly;

12
Scripts/Mobiles/Special/Neira.cs
View file

@ -9,9 +9,10 @@ namespace Server.Mobiles
public override ChampionSkullType SkullType => ChampionSkullType.Death;
public override Type[] UniqueList => new Type[] { typeof( ShroudOfDeciet ) };
public override Type[] SharedList{ get{ return new Type[] { typeof( ANecromancerShroud ),
public override Type[] SharedList => new Type[] { typeof( ANecromancerShroud ),
typeof( CaptainJohnsHat ) };
typeof( CaptainJohnsHat ) }; } }
public override Type[] DecorativeList => new Type[] { typeof( WallBlood ), typeof( TatteredAncientMummyWrapping ) };
public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { };
@ -127,7 +128,7 @@ namespace Server.Mobiles
public Mobile Rider
{
get { return m_Item.Rider; }
get => m_Item.Rider;
set { }
}
@ -159,10 +160,7 @@ namespace Server.Mobiles
m_Mount = new VirtualMount( this );
}
public IMount Mount
{
get { return m_Mount; }
}
public IMount Mount => m_Mount;
public VirtualMountItem( Serial serial )
: base( serial )

17
Scripts/Mobiles/Special/Rikktor.cs
View file

@ -10,15 +10,16 @@ namespace Server.Mobiles
public override ChampionSkullType SkullType => ChampionSkullType.Power;
public override Type[] UniqueList => new Type[] { typeof( CrownOfTalKeesh ) };
public override Type[] SharedList{ get{ return new Type[] { typeof( TheMostKnowledgePerson ),
typeof( BraveKnightOfTheBritannia ),
typeof( LieutenantOfTheBritannianRoyalGuard ) }; } }
public override Type[] DecorativeList{ get{ return new Type[] { typeof( LavaTile ),
typeof( MonsterStatuette ),
typeof( MonsterStatuette ) }; } }
public override Type[] SharedList => new Type[] { typeof( TheMostKnowledgePerson ),
typeof( BraveKnightOfTheBritannia ),
typeof( LieutenantOfTheBritannianRoyalGuard ) };
public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.OphidianArchMage,
MonsterStatuetteType.OphidianWarrior }; } }
public override Type[] DecorativeList => new Type[] { typeof( LavaTile ),
typeof( MonsterStatuette ),
typeof( MonsterStatuette ) };
public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.OphidianArchMage,
MonsterStatuetteType.OphidianWarrior };
public override string DefaultName => "Rikktor";

11
Scripts/Mobiles/Special/Serado.cs
View file

@ -10,10 +10,11 @@ namespace Server.Mobiles
public override ChampionSkullType SkullType => ChampionSkullType.Power;
public override Type[] UniqueList => new Type[] { typeof( Pacify ) };
public override Type[] SharedList{ get{ return new Type[] { typeof( BraveKnightOfTheBritannia ),
typeof( DetectiveBoots ),
typeof( EmbroideredOakLeafCloak ),
typeof( LieutenantOfTheBritannianRoyalGuard ) }; } }
public override Type[] SharedList => new Type[] { typeof( BraveKnightOfTheBritannia ),
typeof( DetectiveBoots ),
typeof( EmbroideredOakLeafCloak ),
typeof( LieutenantOfTheBritannianRoyalGuard ) };
public override Type[] DecorativeList => new Type[] { typeof( Futon ), typeof( SwampTile ) };
public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { };
@ -71,7 +72,7 @@ namespace Server.Mobiles
public override Poison HitPoison => Poison.Lethal;
public override Poison PoisonImmune => Poison.Lethal;
public override double HitPoisonChance{ get{ return 0.8; } }
public override double HitPoisonChance => 0.8;
public override int Feathers => 30;

5
Scripts/Mobiles/Special/Silvani.cs
View file

@ -45,10 +45,7 @@ namespace Server.Mobiles
AddLoot( LootPack.UltraRich, 2 );
}
public override OppositionGroup OppositionGroup
{
get{ return OppositionGroup.FeyAndUndead; }
}
public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead;
public override bool CanFly => true;
public override bool Unprovokable => true;

2
Scripts/Mobiles/Townfolk/Banker.cs
View file

@ -12,7 +12,7 @@ namespace Server.Mobiles
public class Banker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.MerchantsGuild;

22
Scripts/Mobiles/Townfolk/BaseEscortable.cs
View file

@ -97,10 +97,7 @@ namespace Server.Mobiles
private bool m_DeleteCorpse = false;
public bool IsBeingDeleted
{
get { return ( m_DeleteTimer != null ); }
}
public bool IsBeingDeleted => ( m_DeleteTimer != null );
public override bool Commandable => false; // Our master cannot boss us around!
public override bool DeleteCorpseOnDeath => m_DeleteCorpse;
@ -108,7 +105,7 @@ namespace Server.Mobiles
[CommandProperty(AccessLevel.GameMaster)]
public string Destination
{
get { return m_Destination == null ? null : m_Destination.Name; }
get => m_Destination == null ? null : m_Destination.Name;
set { m_DestinationString = value; m_Destination = EDI.Find(value); }
}
@ -236,10 +233,7 @@ namespace Server.Mobiles
private static Hashtable m_EscortTable = new Hashtable();
public static Hashtable EscortTable
{
get { return m_EscortTable; }
}
public static Hashtable EscortTable => m_EscortTable;
public virtual bool AcceptEscorter(Mobile m)
{
@ -661,15 +655,9 @@ namespace Server.Mobiles
private Region m_Region;
//private Rectangle2D[] m_Bounds;
public string Name
{
get { return m_Name; }
}
public string Name => m_Name;
public Region Region
{
get { return m_Region; }
}
public Region Region => m_Region;
/*public Rectangle2D[] Bounds
{

23
Scripts/Mobiles/Townfolk/TownCrier.cs
View file

@ -44,7 +44,7 @@ namespace Server.Mobiles
}
}
public bool IsEmpty{ get{ return ( m_Entries == null || m_Entries.Count == 0 ); } }
public bool IsEmpty => ( m_Entries == null || m_Entries.Count == 0 );
public GlobalTownCrierEntryList()
{
@ -52,10 +52,7 @@ namespace Server.Mobiles
private List<TownCrierEntry> m_Entries;
public List<TownCrierEntry> Entries
{
get{ return m_Entries; }
}
public List<TownCrierEntry> Entries => m_Entries;
public TownCrierEntry GetRandomEntry()
{
@ -113,9 +110,9 @@ namespace Server.Mobiles
private string[] m_Lines;
private DateTime m_ExpireTime;
public string[] Lines{ get{ return m_Lines; } }
public DateTime ExpireTime{ get{ return m_ExpireTime; } }
public bool Expired{ get{ return ( DateTime.UtcNow >= m_ExpireTime ); } }
public string[] Lines => m_Lines;
public DateTime ExpireTime => m_ExpireTime;
public bool Expired => ( DateTime.UtcNow >= m_ExpireTime );
public TownCrierEntry( string[] lines, TimeSpan duration )
{
@ -325,10 +322,7 @@ namespace Server.Mobiles
private Timer m_NewsTimer;
private Timer m_AutoShoutTimer;
public List<TownCrierEntry> Entries
{
get{ return m_Entries; }
}
public List<TownCrierEntry> Entries => m_Entries;
public TownCrierEntry GetRandomEntry()
{
@ -472,10 +466,7 @@ namespace Server.Mobiles
private static List<TownCrier> m_Instances = new List<TownCrier>();
public static List<TownCrier> Instances
{
get{ return m_Instances; }
}
public static List<TownCrier> Instances => m_Instances;
[Constructible]
public TownCrier()

8
Scripts/Mobiles/Vendors/AnimalBuy.cs
View file

@ -15,12 +15,6 @@ namespace Server.Mobiles
m_ControlSlots = controlSlots;
}
public override int ControlSlots
{
get
{
return m_ControlSlots;
}
}
public override int ControlSlots => m_ControlSlots;
}
}

29
Scripts/Mobiles/Vendors/BaseVendor.cs
View file

@ -48,7 +48,9 @@ namespace Server.Mobiles
public override bool IsInvulnerable => true;
public virtual DateTime NextTrickOrTreat { get { return m_NextTrickOrTreat; } set { m_NextTrickOrTreat = value; } }
public virtual DateTime NextTrickOrTreat { get => m_NextTrickOrTreat;
set => m_NextTrickOrTreat = value;
}
public override bool ShowFameTitle => false;
@ -186,23 +188,11 @@ namespace Server.Mobiles
public DateTime LastRestock
{
get
{
return m_LastRestock;
}
set
{
m_LastRestock = value;
}
get => m_LastRestock;
set => m_LastRestock = value;
}
public virtual TimeSpan RestockDelay
{
get
{
return TimeSpan.FromHours( 1 );
}
}
public virtual TimeSpan RestockDelay => TimeSpan.FromHours( 1 );
public Container BuyPack
{
@ -220,7 +210,7 @@ namespace Server.Mobiles
public abstract void InitSBInfo();
public virtual bool IsTokunoVendor { get { return ( Map == Map.Tokuno ); } }
public virtual bool IsTokunoVendor => ( Map == Map.Tokuno );
protected void LoadSBInfo()
{
@ -292,10 +282,7 @@ namespace Server.Mobiles
return Utility.RandomNeutralHue();
}
public virtual VendorShoeType ShoeType
{
get { return VendorShoeType.Shoes; }
}
public virtual VendorShoeType ShoeType => VendorShoeType.Shoes;
public virtual void CheckMorph()
{

39
Scripts/Mobiles/Vendors/GenericBuy.cs
View file

@ -110,9 +110,10 @@ namespace Server.Mobiles
private object[] m_Args;
private IEntity m_DisplayEntity;
public virtual int ControlSlots{ get{ return 0; } }
public virtual int ControlSlots => 0;
public virtual bool CanCacheDisplay{ get{ return false; } } //return ( m_Args == null || m_Args.Length == 0 ); }
public virtual bool CanCacheDisplay //return ( m_Args == null || m_Args.Length == 0 ); }
=> false;
private bool IsDeleted( IEntity obj )
{
@ -148,24 +149,24 @@ namespace Server.Mobiles
public Type Type
{
get{ return m_Type; }
set{ m_Type = value; }
get => m_Type;
set => m_Type = value;
}
public string Name
{
get{ return m_Name; }
set{ m_Name = value; }
get => m_Name;
set => m_Name = value;
}
public int DefaultPrice{ get{ return m_PriceScalar; } }
public int DefaultPrice => m_PriceScalar;
private int m_PriceScalar;
public int PriceScalar
{
get{ return m_PriceScalar; }
set{ m_PriceScalar = value; }
get => m_PriceScalar;
set => m_PriceScalar = value;
}
public int Price
@ -193,37 +194,37 @@ namespace Server.Mobiles
return m_Price;
}
set{ m_Price = value; }
set => m_Price = value;
}
public int ItemID
{
get{ return m_ItemID; }
set{ m_ItemID = value; }
get => m_ItemID;
set => m_ItemID = value;
}
public int Hue
{
get{ return m_Hue; }
set{ m_Hue = value; }
get => m_Hue;
set => m_Hue = value;
}
public int Amount
{
get{ return m_Amount; }
get => m_Amount;
set{ if ( value < 0 ) value = 0; m_Amount = value; }
}
public int MaxAmount
{
get{ return m_MaxAmount; }
set{ m_MaxAmount = value; }
get => m_MaxAmount;
set => m_MaxAmount = value;
}
public object[] Args
{
get{ return m_Args; }
set{ m_Args = value; }
get => m_Args;
set => m_Args = value;
}
public GenericBuyInfo( Type type, int price, int amount, int itemID, int hue ) : this( null, type, price, amount, itemID, hue, null )

7
Scripts/Mobiles/Vendors/NPC/Alchemist.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Alchemist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
@ -21,10 +21,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBAlchemist() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{

7
Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -11,7 +11,7 @@ namespace Server.Mobiles
public class AnimalTrainer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public AnimalTrainer() : base( "the animal trainer" )
@ -26,10 +26,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBAnimalTrainer() );
}
public override VendorShoeType ShoeType
{
get{ return Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots; }
}
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override int GetShoeHue()
{

2
Scripts/Mobiles/Vendors/NPC/Architect.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Architect : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;

7
Scripts/Mobiles/Vendors/NPC/Armorer.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Armorer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Armorer() : base( "the armorer" )
@ -60,10 +60,7 @@ namespace Server.Mobiles
}
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.Boots; }
}
public override VendorShoeType ShoeType => VendorShoeType.Boots;
public override void InitOutfit()
{

Some files were not shown because too many files have changed in this diff Show more