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

8
Scripts/Spells/Base/MagerySpell.cs
View file

@ -104,12 +104,6 @@ namespace Server.Spells
return base.GetCastDelay();
}
public override TimeSpan CastDelayBase
{
get
{
return TimeSpan.FromSeconds( (3 + (int)Circle) * CastDelaySecondsPerTick );
}
}
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( (3 + (int)Circle) * CastDelaySecondsPerTick );
}
}

18
Scripts/Spells/Base/SpecialMove.cs
View file

@ -9,15 +9,15 @@ namespace Server.Spells
{
public abstract class SpecialMove
{
public virtual int BaseMana{ get{ return 0; } }
public virtual int BaseMana => 0;
public virtual SkillName MoveSkill{ get{ return SkillName.Bushido; } }
public virtual double RequiredSkill{ get{ return 0.0; } }
public virtual SkillName MoveSkill => SkillName.Bushido;
public virtual double RequiredSkill => 0.0;
public virtual TextDefinition AbilityMessage{ get{ return 0; } }
public virtual TextDefinition AbilityMessage => 0;
public virtual bool BlockedByAnimalForm{ get{ return true; } }
public virtual bool DelayedContext{ get{ return false; } }
public virtual bool BlockedByAnimalForm => true;
public virtual bool DelayedContext => false;
public virtual int GetAccuracyBonus( Mobile attacker )
{
@ -189,7 +189,7 @@ namespace Server.Spells
private static Dictionary<Mobile, SpecialMove> m_Table = new Dictionary<Mobile, SpecialMove>();
public static Dictionary<Mobile, SpecialMove> Table{ get{ return m_Table; } }
public static Dictionary<Mobile, SpecialMove> Table => m_Table;
public static void ClearAllMoves( Mobile m )
{
@ -344,8 +344,8 @@ namespace Server.Spells
private Timer m_Timer;
private Type m_Type;
public Timer Timer{ get{ return m_Timer; } }
public Type Type{ get{ return m_Type; } }
public Timer Timer => m_Timer;
public Type Type => m_Type;
public SpecialMoveContext( Timer timer, Type type )
{

50
Scripts/Spells/Base/Spell.cs
View file

@ -20,28 +20,30 @@ namespace Server.Spells
private SpellState m_State;
private long m_StartCastTime;
public SpellState State{ get{ return m_State; } set{ m_State = value; } }
public Mobile Caster{ get{ return m_Caster; } }
public SpellInfo Info{ get{ return m_Info; } }
public string Name{ get{ return m_Info.Name; } }
public string Mantra{ get{ return m_Info.Mantra; } }
public Type[] Reagents{ get{ return m_Info.Reagents; } }
public Item Scroll{ get{ return m_Scroll; } }
public SpellState State{ get => m_State;
set => m_State = value;
}
public Mobile Caster => m_Caster;
public SpellInfo Info => m_Info;
public string Name => m_Info.Name;
public string Mantra => m_Info.Mantra;
public Type[] Reagents => m_Info.Reagents;
public Item Scroll => m_Scroll;
public long StartCastTime => m_StartCastTime;
private static TimeSpan NextSpellDelay = TimeSpan.FromSeconds( 0.75 );
private static TimeSpan AnimateDelay = TimeSpan.FromSeconds( 1.5 );
public virtual SkillName CastSkill{ get{ return SkillName.Magery; } }
public virtual SkillName DamageSkill{ get{ return SkillName.EvalInt; } }
public virtual SkillName CastSkill => SkillName.Magery;
public virtual SkillName DamageSkill => SkillName.EvalInt;
public virtual bool RevealOnCast{ get{ return true; } }
public virtual bool ClearHandsOnCast{ get{ return true; } }
public virtual bool ShowHandMovement{ get{ return true; } }
public virtual bool RevealOnCast => true;
public virtual bool ClearHandsOnCast => true;
public virtual bool ShowHandMovement => true;
public virtual bool DelayedDamage{ get{ return false; } }
public virtual bool DelayedDamage => false;
public virtual bool DelayedDamageStacking => true;
public virtual bool DelayedDamageStacking => true;
//In reality, it's ANY delayed Damage spell Post-AoS that can't stack, but, only
//Expo & Magic Arrow have enough delay and a short enough cast time to bring up
//the possibility of stacking 'em. Note that a MA & an Explosion will stack, but
@ -158,7 +160,7 @@ namespace Server.Spells
return damage / 100;
}
public virtual bool IsCasting{ get{ return m_State == SpellState.Casting; } }
public virtual bool IsCasting => m_State == SpellState.Casting;
public virtual void OnCasterHurt()
{
@ -469,11 +471,11 @@ namespace Server.Spells
m_Caster.PublicOverheadMessage( MessageType.Spell, m_Caster.SpeechHue, true, m_Info.Mantra, false );
}
public virtual bool BlockedByHorrificBeast{ get{ return true; } }
public virtual bool BlockedByAnimalForm{ get{ return true; } }
public virtual bool BlocksMovement{ get{ return true; } }
public virtual bool BlockedByHorrificBeast => true;
public virtual bool BlockedByAnimalForm => true;
public virtual bool BlocksMovement => true;
public virtual bool CheckNextSpellTime{ get{ return !(m_Scroll is BaseWand); } }
public virtual bool CheckNextSpellTime => !(m_Scroll is BaseWand);
public bool Cast()
{
@ -636,10 +638,10 @@ namespace Server.Spells
return TimeSpan.FromSeconds( delay );
}
public virtual int CastRecoveryBase{ get{ return 6; } }
public virtual int CastRecoveryFastScalar{ get{ return 1; } }
public virtual int CastRecoveryPerSecond{ get{ return 4; } }
public virtual int CastRecoveryMinimum{ get{ return 0; } }
public virtual int CastRecoveryBase => 6;
public virtual int CastRecoveryFastScalar => 1;
public virtual int CastRecoveryPerSecond => 4;
public virtual int CastRecoveryMinimum => 0;
public virtual TimeSpan GetCastRecovery()
{
@ -664,7 +666,7 @@ namespace Server.Spells
public virtual double CastDelayFastScalar => 1;
public virtual double CastDelaySecondsPerTick => 0.25;
public virtual TimeSpan CastDelayMinimum { get { return TimeSpan.FromSeconds( 0.25 ); } }
public virtual TimeSpan CastDelayMinimum => TimeSpan.FromSeconds( 0.25 );
//public virtual int CastDelayBase{ get{ return 3; } }
//public virtual int CastDelayFastScalar{ get{ return 1; } }

4
Scripts/Spells/Base/SpellHelper.cs
View file

@ -280,8 +280,8 @@ namespace Server.Spells
public static bool DisableSkillCheck
{
get { return m_DisableSkillCheck; }
set { m_DisableSkillCheck = value; }
get => m_DisableSkillCheck;
set => m_DisableSkillCheck = value;
}
public static double GetOffsetScalar( Mobile caster, Mobile target, bool curse )

32
Scripts/Spells/Base/SpellInfo.cs
View file

@ -53,13 +53,29 @@ namespace Server.Spells
m_Amounts[i] = 1;
}
public int Action{ get{ return m_Action; } set{ m_Action = value; } }
public bool AllowTown{ get{ return m_AllowTown; } set{ m_AllowTown = value; } }
public int[] Amounts{ get{ return m_Amounts; } set{ m_Amounts = value; } }
public string Mantra{ get{ return m_Mantra; } set{ m_Mantra = value; } }
public string Name{ get{ return m_Name; } set{ m_Name = value; } }
public Type[] Reagents{ get{ return m_Reagents; } set{ m_Reagents = value; } }
public int LeftHandEffect{ get{ return m_LeftHandEffect; } set{ m_LeftHandEffect = value; } }
public int RightHandEffect{ get{ return m_RightHandEffect; } set{ m_RightHandEffect = value; } }
public int Action{ get => m_Action;
set => m_Action = value;
}
public bool AllowTown{ get => m_AllowTown;
set => m_AllowTown = value;
}
public int[] Amounts{ get => m_Amounts;
set => m_Amounts = value;
}
public string Mantra{ get => m_Mantra;
set => m_Mantra = value;
}
public string Name{ get => m_Name;
set => m_Name = value;
}
public Type[] Reagents{ get => m_Reagents;
set => m_Reagents = value;
}
public int LeftHandEffect{ get => m_LeftHandEffect;
set => m_LeftHandEffect = value;
}
public int RightHandEffect{ get => m_RightHandEffect;
set => m_RightHandEffect = value;
}
}
}

8
Scripts/Spells/First/CreateFood.cs
View file

@ -62,8 +62,12 @@ namespace Server.Spells.First
private Type m_Type;
private string m_Name;
public Type Type{ get{ return m_Type; } set{ m_Type = value; } }
public string Name{ get{ return m_Name; } set{ m_Name = value; } }
public Type Type{ get => m_Type;
set => m_Type = value;
}
public string Name{ get => m_Name;
set => m_Name = value;
}
public FoodInfo( Type type, string name )
{

38
Scripts/Spells/Gargoyle/SpellDefinitions/FlySpell.cs
View file

@ -11,35 +11,15 @@ namespace Server.Spells
{
}
public override bool ClearHandsOnCast
{
get
{
return false;
}
}
public override bool RevealOnCast
{
get
{
return false;
}
}
public override double CastDelayFastScalar
{
get
{
return 0;
}
}
public override TimeSpan CastDelayBase
{
get
{
return TimeSpan.FromSeconds(.25);
}
}
public override TimeSpan GetCastRecovery()
public override bool ClearHandsOnCast => false;
public override bool RevealOnCast => false;
public override double CastDelayFastScalar => 0;
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(.25);
public override TimeSpan GetCastRecovery()
{
return TimeSpan.Zero;
}

12
Scripts/Spells/Necromancy/SummonFamiliar.cs
View file

@ -28,7 +28,7 @@ namespace Server.Spells.Necromancy
private static Hashtable m_Table = new Hashtable();
public static Hashtable Table{ get{ return m_Table; } }
public static Hashtable Table => m_Table;
public override bool CheckCast()
{
@ -63,7 +63,7 @@ namespace Server.Spells.Necromancy
new SummonFamiliarEntry( typeof( VampireBatFamiliar ), 1060144, 100.0, 100.0 ) // Vampire Bat
};
public static SummonFamiliarEntry[] Entries{ get{ return m_Entries; } }
public static SummonFamiliarEntry[] Entries => m_Entries;
}
public class SummonFamiliarEntry
@ -73,10 +73,10 @@ namespace Server.Spells.Necromancy
private double m_ReqNecromancy;
private double m_ReqSpiritSpeak;
public Type Type{ get{ return m_Type; } }
public object Name{ get{ return m_Name; } }
public double ReqNecromancy{ get{ return m_ReqNecromancy; } }
public double ReqSpiritSpeak{ get{ return m_ReqSpiritSpeak; } }
public Type Type => m_Type;
public object Name => m_Name;
public double ReqNecromancy => m_ReqNecromancy;
public double ReqSpiritSpeak => m_ReqSpiritSpeak;
public SummonFamiliarEntry( Type type, object name, double reqNecromancy, double reqSpiritSpeak )
{

14
Scripts/Spells/Necromancy/TransformationSpell.cs
View file

@ -3,13 +3,13 @@ namespace Server.Spells.Necromancy
public abstract class TransformationSpell : NecromancerSpell, ITransformationSpell
{
public abstract int Body{ get; }
public virtual int Hue{ get{ return 0; } }
public virtual int Hue => 0;
public virtual int PhysResistOffset{ get{ return 0; } }
public virtual int FireResistOffset{ get{ return 0; } }
public virtual int ColdResistOffset{ get{ return 0; } }
public virtual int PoisResistOffset{ get{ return 0; } }
public virtual int NrgyResistOffset{ get{ return 0; } }
public virtual int PhysResistOffset => 0;
public virtual int FireResistOffset => 0;
public virtual int ColdResistOffset => 0;
public virtual int PoisResistOffset => 0;
public virtual int NrgyResistOffset => 0;
public TransformationSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info )
{
@ -32,7 +32,7 @@ namespace Server.Spells.Necromancy
FinishSequence();
}
public virtual double TickRate{ get{ return 1.0; } }
public virtual double TickRate => 1.0;
public virtual void OnTick( Mobile m )
{

2
Scripts/Spells/Ninjitsu/AnimalForm.cs
View file

@ -339,7 +339,7 @@ namespace Server.Spells.Ninjitsu
public int Tooltip => m_Tooltip;
public double ReqSkill => m_ReqSkill;
public int BodyMod => m_BodyMod;
public int HueMod { get { return Utility.RandomMinMax( m_HueModMin, m_HueModMax ); } }
public int HueMod => Utility.RandomMinMax( m_HueModMin, m_HueModMax );
public bool StealthBonus => m_StealthBonus;
public bool SpeedBoost => m_SpeedBoost;
public bool StealingBonus => m_StealingBonus;

2
Scripts/Spells/Ninjitsu/MirrorImage.cs
View file

@ -173,7 +173,7 @@ namespace Server.Mobiles
MirrorImage.AddClone( m_Caster );
}
protected override BaseAI ForcedAI { get { return new CloneAI( this ); } }
protected override BaseAI ForcedAI => new CloneAI( this );
public override bool IsHumanInTown() { return false; }

73
Scripts/Spells/Reagent.cs
View file

@ -25,111 +25,108 @@ namespace Server.Spells
typeof( DaemonBone )
};
public Type[] Types
{
get{ return m_Types; }
}
public Type[] Types => m_Types;
public static Type BlackPearl
{
get{ return m_Types[0]; }
set{ m_Types[0] = value; }
get => m_Types[0];
set => m_Types[0] = value;
}
public static Type Bloodmoss
{
get{ return m_Types[1]; }
set{ m_Types[1] = value; }
get => m_Types[1];
set => m_Types[1] = value;
}
public static Type Garlic
{
get{ return m_Types[2]; }
set{ m_Types[2] = value; }
get => m_Types[2];
set => m_Types[2] = value;
}
public static Type Ginseng
{
get{ return m_Types[3]; }
set{ m_Types[3] = value; }
get => m_Types[3];
set => m_Types[3] = value;
}
public static Type MandrakeRoot
{
get{ return m_Types[4]; }
set{ m_Types[4] = value; }
get => m_Types[4];
set => m_Types[4] = value;
}
public static Type Nightshade
{
get{ return m_Types[5]; }
set{ m_Types[5] = value; }
get => m_Types[5];
set => m_Types[5] = value;
}
public static Type SulfurousAsh
{
get{ return m_Types[6]; }
set{ m_Types[6] = value; }
get => m_Types[6];
set => m_Types[6] = value;
}
public static Type SpidersSilk
{
get{ return m_Types[7]; }
set{ m_Types[7] = value; }
get => m_Types[7];
set => m_Types[7] = value;
}
public static Type BatWing
{
get{ return m_Types[8]; }
set{ m_Types[8] = value; }
get => m_Types[8];
set => m_Types[8] = value;
}
public static Type GraveDust
{
get{ return m_Types[9]; }
set{ m_Types[9] = value; }
get => m_Types[9];
set => m_Types[9] = value;
}
public static Type DaemonBlood
{
get{ return m_Types[10]; }
set{ m_Types[10] = value; }
get => m_Types[10];
set => m_Types[10] = value;
}
public static Type NoxCrystal
{
get{ return m_Types[11]; }
set{ m_Types[11] = value; }
get => m_Types[11];
set => m_Types[11] = value;
}
public static Type PigIron
{
get{ return m_Types[12]; }
set{ m_Types[12] = value; }
get => m_Types[12];
set => m_Types[12] = value;
}
public static Type Bone
{
get{ return m_Types[13]; }
set{ m_Types[13] = value; }
get => m_Types[13];
set => m_Types[13] = value;
}
public static Type FertileDirt
{
get{ return m_Types[14]; }
set{ m_Types[14] = value; }
get => m_Types[14];
set => m_Types[14] = value;
}
public static Type DragonsBlood
{
get{ return m_Types[15]; }
set{ m_Types[15] = value; }
get => m_Types[15];
set => m_Types[15] = value;
}
public static Type DaemonBone
{
get{ return m_Types[16]; }
set{ m_Types[16] = value; }
get => m_Types[16];
set => m_Types[16] = value;
}
}
}

5
Scripts/Spells/Spellweaving/ArcaneForm.cs
View file

@ -30,10 +30,7 @@ namespace Server.Spells.Spellweaving
FinishSequence();
}
public virtual double TickRate
{
get { return 1.0; }
}
public virtual double TickRate => 1.0;
public virtual void OnTick( Mobile m )
{

5
Scripts/Spells/Spellweaving/ArcanistSpell.cs
View file

@ -22,10 +22,7 @@ namespace Server.Spells.Spellweaving
{
}
public virtual int FocusLevel
{
get { return m_CastTimeFocusLevel; }
}
public virtual int FocusLevel => m_CastTimeFocusLevel;
public static int GetFocusLevel( Mobile from )
{

2
Scripts/Spells/Spellweaving/GiftOfLife.cs
View file

@ -141,7 +141,7 @@ namespace Server.Spells.Spellweaving
}
public double HitsScalar { get { return ((Caster.Skills.Spellweaving.Value/2.4) + FocusLevel)/100; } }
public double HitsScalar => ((Caster.Skills.Spellweaving.Value/2.4) + FocusLevel)/100;
public static void OnLogin( LoginEventArgs e )
{

4
Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs
View file

@ -11,8 +11,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int StrengthBonus
{
get { return m_StrengthBonus; }
set { m_StrengthBonus = value; }
get => m_StrengthBonus;
set => m_StrengthBonus = value;
}
[Constructible]

8
Scripts/Spells/Spellweaving/Items/TransientItem.cs
View file

@ -9,8 +9,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan LifeSpan
{
get { return m_LifeSpan; }
set { m_LifeSpan = value; }
get => m_LifeSpan;
set => m_LifeSpan = value;
}
private DateTime m_CreationTime;
@ -18,8 +18,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public DateTime CreationTime
{
get { return m_CreationTime; }
set { m_CreationTime = value; }
get => m_CreationTime;
set => m_CreationTime = value;
}
private Timer m_Timer;

4
Scripts/Spells/Spellweaving/ReaperForm.cs
View file

@ -33,8 +33,8 @@ namespace Server.Spells.Spellweaving
public override int PoisResistOffset => 5 + FocusLevel;
public override int NrgyResistOffset => 5 + FocusLevel;
public virtual int SwingSpeedBonus { get { return 10 + FocusLevel; } }
public virtual int SpellDamageBonus { get { return 10 + FocusLevel; } }
public virtual int SwingSpeedBonus => 10 + FocusLevel;
public virtual int SpellDamageBonus => 10 + FocusLevel;
public ReaperFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{