Fixes body expression style.
This commit is contained in:
Kamron Batman
parent
3f0a72a62f
commit
33f5e77a24
957 changed files with 7424 additions and 15973 deletions
|
|
@ -25,7 +25,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string EngravedText
|
||||
{
|
||||
get{ return m_EngravedText; }
|
||||
get => m_EngravedText;
|
||||
set{ m_EngravedText = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ namespace Server.Items
|
|||
|
||||
public FactionItem FactionItemState
|
||||
{
|
||||
get{ return m_FactionState; }
|
||||
get => m_FactionState;
|
||||
set
|
||||
{
|
||||
m_FactionState = value;
|
||||
|
|
@ -102,47 +102,47 @@ namespace Server.Items
|
|||
#endregion
|
||||
|
||||
#region Virtual Properties
|
||||
public virtual WeaponAbility PrimaryAbility{ get{ return null; } }
|
||||
public virtual WeaponAbility SecondaryAbility{ get{ return null; } }
|
||||
public virtual WeaponAbility PrimaryAbility => null;
|
||||
public virtual WeaponAbility SecondaryAbility => null;
|
||||
|
||||
public virtual int DefMaxRange{ get{ return 1; } }
|
||||
public virtual int DefHitSound{ get{ return 0; } }
|
||||
public virtual int DefMissSound{ get{ return 0; } }
|
||||
public virtual SkillName DefSkill{ get{ return SkillName.Swords; } }
|
||||
public virtual WeaponType DefType{ get{ return WeaponType.Slashing; } }
|
||||
public virtual WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } }
|
||||
public virtual int DefMaxRange => 1;
|
||||
public virtual int DefHitSound => 0;
|
||||
public virtual int DefMissSound => 0;
|
||||
public virtual SkillName DefSkill => SkillName.Swords;
|
||||
public virtual WeaponType DefType => WeaponType.Slashing;
|
||||
public virtual WeaponAnimation DefAnimation => WeaponAnimation.Slash1H;
|
||||
|
||||
public virtual int AosStrengthReq{ get{ return 0; } }
|
||||
public virtual int AosDexterityReq{ get{ return 0; } }
|
||||
public virtual int AosIntelligenceReq{ get{ return 0; } }
|
||||
public virtual int AosMinDamage{ get{ return 0; } }
|
||||
public virtual int AosMaxDamage{ get{ return 0; } }
|
||||
public virtual int AosSpeed{ get{ return 0; } }
|
||||
public virtual float MlSpeed{ get{ return 0.0f; } }
|
||||
public virtual int AosMaxRange{ get{ return DefMaxRange; } }
|
||||
public virtual int AosHitSound{ get{ return DefHitSound; } }
|
||||
public virtual int AosMissSound{ get{ return DefMissSound; } }
|
||||
public virtual SkillName AosSkill{ get{ return DefSkill; } }
|
||||
public virtual WeaponType AosType{ get{ return DefType; } }
|
||||
public virtual WeaponAnimation AosAnimation{ get{ return DefAnimation; } }
|
||||
public virtual int AosStrengthReq => 0;
|
||||
public virtual int AosDexterityReq => 0;
|
||||
public virtual int AosIntelligenceReq => 0;
|
||||
public virtual int AosMinDamage => 0;
|
||||
public virtual int AosMaxDamage => 0;
|
||||
public virtual int AosSpeed => 0;
|
||||
public virtual float MlSpeed => 0.0f;
|
||||
public virtual int AosMaxRange => DefMaxRange;
|
||||
public virtual int AosHitSound => DefHitSound;
|
||||
public virtual int AosMissSound => DefMissSound;
|
||||
public virtual SkillName AosSkill => DefSkill;
|
||||
public virtual WeaponType AosType => DefType;
|
||||
public virtual WeaponAnimation AosAnimation => DefAnimation;
|
||||
|
||||
public virtual int OldStrengthReq{ get{ return 0; } }
|
||||
public virtual int OldDexterityReq{ get{ return 0; } }
|
||||
public virtual int OldIntelligenceReq{ get{ return 0; } }
|
||||
public virtual int OldMinDamage{ get{ return 0; } }
|
||||
public virtual int OldMaxDamage{ get{ return 0; } }
|
||||
public virtual int OldSpeed{ get{ return 0; } }
|
||||
public virtual int OldMaxRange{ get{ return DefMaxRange; } }
|
||||
public virtual int OldHitSound{ get{ return DefHitSound; } }
|
||||
public virtual int OldMissSound{ get{ return DefMissSound; } }
|
||||
public virtual SkillName OldSkill{ get{ return DefSkill; } }
|
||||
public virtual WeaponType OldType{ get{ return DefType; } }
|
||||
public virtual WeaponAnimation OldAnimation{ get{ return DefAnimation; } }
|
||||
public virtual int OldStrengthReq => 0;
|
||||
public virtual int OldDexterityReq => 0;
|
||||
public virtual int OldIntelligenceReq => 0;
|
||||
public virtual int OldMinDamage => 0;
|
||||
public virtual int OldMaxDamage => 0;
|
||||
public virtual int OldSpeed => 0;
|
||||
public virtual int OldMaxRange => DefMaxRange;
|
||||
public virtual int OldHitSound => DefHitSound;
|
||||
public virtual int OldMissSound => DefMissSound;
|
||||
public virtual SkillName OldSkill => DefSkill;
|
||||
public virtual WeaponType OldType => DefType;
|
||||
public virtual WeaponAnimation OldAnimation => DefAnimation;
|
||||
|
||||
public virtual int InitMinHits{ get{ return 0; } }
|
||||
public virtual int InitMaxHits{ get{ return 0; } }
|
||||
public virtual int InitMinHits => 0;
|
||||
public virtual int InitMaxHits => 0;
|
||||
|
||||
public virtual bool CanFortify{ get{ return true; } }
|
||||
public virtual bool CanFortify => true;
|
||||
|
||||
public override int PhysicalResistance => m_AosWeaponAttributes.ResistPhysicalBonus;
|
||||
public override int FireResistance => m_AosWeaponAttributes.ResistFireBonus;
|
||||
|
|
@ -157,56 +157,56 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosAttributes Attributes
|
||||
{
|
||||
get{ return m_AosAttributes; }
|
||||
get => m_AosAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosWeaponAttributes WeaponAttributes
|
||||
{
|
||||
get{ return m_AosWeaponAttributes; }
|
||||
get => m_AosWeaponAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosSkillBonuses SkillBonuses
|
||||
{
|
||||
get{ return m_AosSkillBonuses; }
|
||||
get => m_AosSkillBonuses;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosElementAttributes AosElementDamages
|
||||
{
|
||||
get { return m_AosElementDamages; }
|
||||
get => m_AosElementDamages;
|
||||
set { }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Cursed
|
||||
{
|
||||
get{ return m_Cursed; }
|
||||
set{ m_Cursed = value; }
|
||||
get => m_Cursed;
|
||||
set => m_Cursed = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Consecrated
|
||||
{
|
||||
get{ return m_Consecrated; }
|
||||
set{ m_Consecrated = value; }
|
||||
get => m_Consecrated;
|
||||
set => m_Consecrated = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Identified
|
||||
{
|
||||
get{ return m_Identified; }
|
||||
get => m_Identified;
|
||||
set{ m_Identified = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int HitPoints
|
||||
{
|
||||
get{ return m_Hits; }
|
||||
get => m_Hits;
|
||||
set
|
||||
{
|
||||
if ( m_Hits == value )
|
||||
|
|
@ -224,133 +224,133 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxHitPoints
|
||||
{
|
||||
get{ return m_MaxHits; }
|
||||
get => m_MaxHits;
|
||||
set{ m_MaxHits = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int PoisonCharges
|
||||
{
|
||||
get{ return m_PoisonCharges; }
|
||||
get => m_PoisonCharges;
|
||||
set{ m_PoisonCharges = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Poison Poison
|
||||
{
|
||||
get{ return m_Poison; }
|
||||
get => m_Poison;
|
||||
set{ m_Poison = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public WeaponQuality Quality
|
||||
{
|
||||
get{ return m_Quality; }
|
||||
get => m_Quality;
|
||||
set{ UnscaleDurability(); m_Quality = value; ScaleDurability(); InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Crafter
|
||||
{
|
||||
get{ return m_Crafter; }
|
||||
get => m_Crafter;
|
||||
set{ m_Crafter = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SlayerName Slayer
|
||||
{
|
||||
get{ return m_Slayer; }
|
||||
get => m_Slayer;
|
||||
set{ m_Slayer = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SlayerName Slayer2
|
||||
{
|
||||
get { return m_Slayer2; }
|
||||
get => m_Slayer2;
|
||||
set { m_Slayer2 = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get{ return m_Resource; }
|
||||
get => m_Resource;
|
||||
set{ UnscaleDurability(); m_Resource = value; Hue = CraftResources.GetHue( m_Resource ); InvalidateProperties(); ScaleDurability(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public WeaponDamageLevel DamageLevel
|
||||
{
|
||||
get{ return m_DamageLevel; }
|
||||
get => m_DamageLevel;
|
||||
set{ m_DamageLevel = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public WeaponDurabilityLevel DurabilityLevel
|
||||
{
|
||||
get{ return m_DurabilityLevel; }
|
||||
get => m_DurabilityLevel;
|
||||
set{ UnscaleDurability(); m_DurabilityLevel = value; InvalidateProperties(); ScaleDurability(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool PlayerConstructed
|
||||
{
|
||||
get{ return m_PlayerConstructed; }
|
||||
set{ m_PlayerConstructed = value; }
|
||||
get => m_PlayerConstructed;
|
||||
set => m_PlayerConstructed = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxRange
|
||||
{
|
||||
get{ return ( m_MaxRange == -1 ? Core.AOS ? AosMaxRange : OldMaxRange : m_MaxRange ); }
|
||||
get => ( m_MaxRange == -1 ? Core.AOS ? AosMaxRange : OldMaxRange : m_MaxRange );
|
||||
set{ m_MaxRange = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public WeaponAnimation Animation
|
||||
{
|
||||
get{ return ( m_Animation == (WeaponAnimation)(-1) ? Core.AOS ? AosAnimation : OldAnimation : m_Animation ); }
|
||||
set{ m_Animation = value; }
|
||||
get => ( m_Animation == (WeaponAnimation)(-1) ? Core.AOS ? AosAnimation : OldAnimation : m_Animation );
|
||||
set => m_Animation = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public WeaponType Type
|
||||
{
|
||||
get{ return ( m_Type == (WeaponType)(-1) ? Core.AOS ? AosType : OldType : m_Type ); }
|
||||
set{ m_Type = value; }
|
||||
get => ( m_Type == (WeaponType)(-1) ? Core.AOS ? AosType : OldType : m_Type );
|
||||
set => m_Type = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SkillName Skill
|
||||
{
|
||||
get{ return ( m_Skill == (SkillName)(-1) ? Core.AOS ? AosSkill : OldSkill : m_Skill ); }
|
||||
get => ( m_Skill == (SkillName)(-1) ? Core.AOS ? AosSkill : OldSkill : m_Skill );
|
||||
set{ m_Skill = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int HitSound
|
||||
{
|
||||
get{ return ( m_HitSound == -1 ? Core.AOS ? AosHitSound : OldHitSound : m_HitSound ); }
|
||||
set{ m_HitSound = value; }
|
||||
get => ( m_HitSound == -1 ? Core.AOS ? AosHitSound : OldHitSound : m_HitSound );
|
||||
set => m_HitSound = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MissSound
|
||||
{
|
||||
get{ return ( m_MissSound == -1 ? Core.AOS ? AosMissSound : OldMissSound : m_MissSound ); }
|
||||
set{ m_MissSound = value; }
|
||||
get => ( m_MissSound == -1 ? Core.AOS ? AosMissSound : OldMissSound : m_MissSound );
|
||||
set => m_MissSound = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MinDamage
|
||||
{
|
||||
get{ return ( m_MinDamage == -1 ? Core.AOS ? AosMinDamage : OldMinDamage : m_MinDamage ); }
|
||||
get => ( m_MinDamage == -1 ? Core.AOS ? AosMinDamage : OldMinDamage : m_MinDamage );
|
||||
set{ m_MinDamage = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxDamage
|
||||
{
|
||||
get{ return ( m_MaxDamage == -1 ? Core.AOS ? AosMaxDamage : OldMaxDamage : m_MaxDamage ); }
|
||||
get => ( m_MaxDamage == -1 ? Core.AOS ? AosMaxDamage : OldMaxDamage : m_MaxDamage );
|
||||
set{ m_MaxDamage = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -375,31 +375,28 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int StrRequirement
|
||||
{
|
||||
get{ return ( m_StrReq == -1 ? Core.AOS ? AosStrengthReq : OldStrengthReq : m_StrReq ); }
|
||||
get => ( m_StrReq == -1 ? Core.AOS ? AosStrengthReq : OldStrengthReq : m_StrReq );
|
||||
set{ m_StrReq = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int DexRequirement
|
||||
{
|
||||
get{ return ( m_DexReq == -1 ? Core.AOS ? AosDexterityReq : OldDexterityReq : m_DexReq ); }
|
||||
set{ m_DexReq = value; }
|
||||
get => ( m_DexReq == -1 ? Core.AOS ? AosDexterityReq : OldDexterityReq : m_DexReq );
|
||||
set => m_DexReq = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int IntRequirement
|
||||
{
|
||||
get{ return ( m_IntReq == -1 ? Core.AOS ? AosIntelligenceReq : OldIntelligenceReq : m_IntReq ); }
|
||||
set{ m_IntReq = value; }
|
||||
get => ( m_IntReq == -1 ? Core.AOS ? AosIntelligenceReq : OldIntelligenceReq : m_IntReq );
|
||||
set => m_IntReq = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public WeaponAccuracyLevel AccuracyLevel
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_AccuracyLevel;
|
||||
}
|
||||
get => m_AccuracyLevel;
|
||||
set
|
||||
{
|
||||
if ( m_AccuracyLevel != value )
|
||||
|
|
@ -599,7 +596,7 @@ namespace Server.Items
|
|||
return base.CanEquip( from );
|
||||
}
|
||||
|
||||
public virtual bool UseSkillMod{ get{ return !Core.AOS; } }
|
||||
public virtual bool UseSkillMod => !Core.AOS;
|
||||
|
||||
public override bool OnEquip( Mobile from )
|
||||
{
|
||||
|
|
@ -1310,8 +1307,8 @@ namespace Server.Items
|
|||
|
||||
public static bool InDoubleStrike
|
||||
{
|
||||
get{ return m_InDoubleStrike; }
|
||||
set{ m_InDoubleStrike = value; }
|
||||
get => m_InDoubleStrike;
|
||||
set => m_InDoubleStrike = value;
|
||||
}
|
||||
|
||||
public virtual void OnHit( Mobile attacker, Mobile defender, double damageBonus = 1.0)
|
||||
|
|
@ -2189,7 +2186,7 @@ namespace Server.Items
|
|||
return damage + (int)(damage * totalBonus);
|
||||
}
|
||||
|
||||
public virtual int VirtualDamageBonus{ get{ return 0; } }
|
||||
public virtual int VirtualDamageBonus => 0;
|
||||
|
||||
public virtual int ComputeDamageAOS( Mobile attacker, Mobile defender )
|
||||
{
|
||||
|
|
@ -2926,7 +2923,7 @@ namespace Server.Items
|
|||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get{ return base.Hue; }
|
||||
get => base.Hue;
|
||||
set{ base.Hue = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -3024,10 +3021,7 @@ namespace Server.Items
|
|||
return ( m_AosAttributes.SpellChanneling != 0 );
|
||||
}
|
||||
|
||||
public virtual int ArtifactRarity
|
||||
{
|
||||
get{ return 0; }
|
||||
}
|
||||
public virtual int ArtifactRarity => 0;
|
||||
|
||||
public virtual int GetLuckBonus()
|
||||
{
|
||||
|
|
@ -3362,8 +3356,8 @@ namespace Server.Items
|
|||
|
||||
public static BaseWeapon Fists
|
||||
{
|
||||
get{ return m_Fists; }
|
||||
set{ m_Fists = value; }
|
||||
get => m_Fists;
|
||||
set => m_Fists = value;
|
||||
}
|
||||
|
||||
#region ICraftable Members
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue