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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,10 +19,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 40.0; } }
public override int RequiredMana{ get{ return 23; } }
public override double RequiredSkill => 40.0;
public override int RequiredMana => 23;
public AnimateDeadSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -239,8 +239,7 @@ namespace Server.Spells.Necromancy
if ( master == null )
return;
List<Mobile> list = null;
m_Table.TryGetValue( master, out list );
m_Table.TryGetValue( master, out List<Mobile> list );
if ( list == null )
return;
@ -256,8 +255,7 @@ namespace Server.Spells.Necromancy
if ( master == null )
return;
List<Mobile> list = null;
m_Table.TryGetValue( master, out list );
m_Table.TryGetValue( master, out List<Mobile> list );
if ( list == null )
m_Table[master] = list = new List<Mobile>();
@ -418,4 +416,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

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

@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 13; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 13;
public BloodOathSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -53,7 +53,7 @@ namespace Server.Spells.Necromancy
/* Temporarily creates a dark pact between the caster and the target.
* Any damage dealt by the target to the caster is increased, but the target receives the same amount of damage.
* The effect lasts for ((Spirit Speak skill level - target's Resist Magic skill level) / 80 ) + 8 seconds.
*
*
* NOTE: The above algorithm must be fixed point, it should be:
* ((ss-rm)/8)+8
*/
@ -67,7 +67,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
Caster.PlaySound( 0x175 );
Caster.FixedParticles( 0x375A, 1, 17, 9919, 33, 7, EffectLayer.Waist );
@ -187,4 +187,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

16
Scripts/Spells/Necromancy/CorpseSkin.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.GraveDust
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 11; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 11;
public CorpseSkinSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -39,12 +39,12 @@ namespace Server.Spells.Necromancy
/* Transmogrifies the flesh of the target creature or player to resemble rotted corpse flesh,
* making them more vulnerable to Fire and Poison damage,
* but increasing their resistance to Physical and Cold damage.
*
*
* The effect lasts for ((Spirit Speak skill level - target's Resist Magic skill level) / 25 ) + 40 seconds.
*
*
* NOTE: Algorithm above is fixed point, should be:
* ((ss-mr)/2.5) + 40
*
*
* NOTE: Resistance is not checked if targeting yourself
*/
@ -57,7 +57,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
m.FixedParticles( 0x373A, 1, 15, 9913, 67, 7, EffectLayer.Head );
m.PlaySound( 0x1BB );
@ -154,4 +154,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

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

@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.75 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.75 );
public override double RequiredSkill{ get{ return 0.0; } }
public override int RequiredMana{ get{ return 7; } }
public override double RequiredSkill => 0.0;
public override int RequiredMana => 7;
public CurseWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -37,10 +37,10 @@ namespace Server.Spells.Necromancy
/* Temporarily imbues a weapon with a life draining effect.
* Half the damage that the weapon inflicts is added to the necromancer's health.
* The effects lasts for (Spirit Speak skill level / 34) + 1 seconds.
*
*
* NOTE: Above algorithm is fixed point, should be :
* (Spirit Speak skill level / 3.4) + 1
*
*
* TODO: What happens if you curse a weapon then give it to someone else? Should they get the drain effect?
*/
@ -103,4 +103,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

8
Scripts/Spells/Necromancy/EvilOmen.cs
View file

@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds(0.75); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(0.75);
public override double RequiredSkill { get { return 20.0; } }
public override int RequiredMana { get { return 11; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 11;
public EvilOmenSpell(Mobile caster, Item scroll)
: base(caster, scroll, m_Info)
@ -130,4 +130,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

6
Scripts/Spells/Necromancy/Exorcism.cs
View file

@ -20,10 +20,10 @@ namespace Server.Spells.Necromancy
Reagent.GraveDust
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill { get { return 80.0; } }
public override int RequiredMana { get { return 40; } }
public override double RequiredSkill => 80.0;
public override int RequiredMana => 40;
public ExorcismSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

10
Scripts/Spells/Necromancy/HorrificBeast.cs
View file

@ -16,12 +16,12 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 40.0; } }
public override int RequiredMana{ get{ return 11; } }
public override double RequiredSkill => 40.0;
public override int RequiredMana => 11;
public override int Body{ get{ return 746; } }
public override int Body => 746;
public HorrificBeastSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -41,4 +41,4 @@ namespace Server.Spells.Necromancy
m.Delta( MobileDelta.WeaponDamage );
}
}
}
}

18
Scripts/Spells/Necromancy/LichForm.cs
View file

@ -17,18 +17,18 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 70.0; } }
public override int RequiredMana{ get{ return 23; } }
public override double RequiredSkill => 70.0;
public override int RequiredMana => 23;
public override int Body{ get{ return 749; } }
public override int Body => 749;
public override int FireResistOffset{ get{ return -10; } }
public override int ColdResistOffset{ get{ return +10; } }
public override int PoisResistOffset{ get{ return +10; } }
public override int FireResistOffset => -10;
public override int ColdResistOffset => +10;
public override int PoisResistOffset => +10;
public override double TickRate{ get{ return 2.5; } }
public override double TickRate => 2.5;
public LichFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -45,4 +45,4 @@ namespace Server.Spells.Necromancy
--m.Hits;
}
}
}
}

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

@ -17,10 +17,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 30.0; } }
public override int RequiredMana{ get{ return 17; } }
public override double RequiredSkill => 30.0;
public override int RequiredMana => 17;
public MindRotSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -48,7 +48,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
m.PlaySound( 0x1FB );
m.PlaySound( 0x258 );
m.FixedParticles( 0x373A, 1, 17, 9903, 15, 4, EffectLayer.Head );
@ -147,7 +147,7 @@ namespace Server.Spells.Necromancy
m_End = DateTime.UtcNow + delay;
Priority = TimerPriority.TwoFiftyMS;
}
public void RenewDelay(TimeSpan delay)
{
m_End = DateTime.UtcNow + delay;
@ -179,4 +179,4 @@ namespace Server.Spells.Necromancy
public double m_Scalar;
public MRExpireTimer m_MRExpireTimer;
}
}
}

8
Scripts/Spells/Necromancy/NecromancerSpell.cs
View file

@ -9,14 +9,14 @@ namespace Server.Spells.Necromancy
public abstract double RequiredSkill{ get; }
public abstract int RequiredMana{ get; }
public override SkillName CastSkill{ get{ return SkillName.Necromancy; } }
public override SkillName DamageSkill{ get{ return SkillName.SpiritSpeak; } }
public override SkillName CastSkill => SkillName.Necromancy;
public override SkillName DamageSkill => SkillName.SpiritSpeak;
//public override int CastDelayBase{ get{ return base.CastDelayBase; } } // Reference, 3
//public override int CastDelayBase => base.CastDelayBase; // Reference, 3
public override bool ClearHandsOnCast => false;
public override double CastDelayFastScalar{ get{ return (Core.SE? base.CastDelayFastScalar : 0); } } // Necromancer spells are not affected by fast cast items, though they are by fast cast recovery
public override double CastDelayFastScalar => (Core.SE? base.CastDelayFastScalar : 0); // Necromancer spells are not affected by fast cast items, though they are by fast cast recovery
public NecromancerSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info )
{

6
Scripts/Spells/Necromancy/PainSpike.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 5; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 5;
public PainSpikeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

6
Scripts/Spells/Necromancy/PoisonStrike.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( (Core.ML ? 1.75 : 1.5) ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( (Core.ML ? 1.75 : 1.5) );
public override double RequiredSkill { get { return 50.0; } }
public override int RequiredMana { get { return 17; } }
public override double RequiredSkill => 50.0;
public override int RequiredMana => 17;
public PoisonStrikeSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

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

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 65.0; } }
public override int RequiredMana{ get{ return 29; } }
public override double RequiredSkill => 65.0;
public override int RequiredMana => 29;
public StrangleSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -54,7 +54,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
m.PlaySound( 0x22F );
m.FixedParticles( 0x36CB, 1, 9, 9911, 67, 5, EffectLayer.Head );
m.FixedParticles( 0x374A, 1, 17, 9502, 1108, 4, (EffectLayer)255 );
@ -210,7 +210,7 @@ namespace Server.Spells.Necromancy
damage *= 1.75;
AOS.Damage( m_Target, m_From, (int)damage, 0, 0, 0, 100, 0 );
if ( 0.60 <= Utility.RandomDouble() ) // OSI: randomly revealed between first and third damage tick, guessing 60% chance
m_Target.RevealingAction();
}
@ -238,4 +238,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

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

@ -19,10 +19,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 30.0; } }
public override int RequiredMana{ get{ return 17; } }
public override double RequiredSkill => 30.0;
public override int RequiredMana => 17;
public SummonFamiliarSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -207,4 +207,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

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

@ -17,15 +17,15 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 99.0; } }
public override int RequiredMana{ get{ return 23; } }
public override double RequiredSkill => 99.0;
public override int RequiredMana => 23;
public override int Body{ get{ return Caster.Female ? 745 : 744; } }
public override int Hue{ get{ return 0x847E; } }
public override int Body => Caster.Female ? 745 : 744;
public override int Hue => 0x847E;
public override int FireResistOffset{ get{ return -25; } }
public override int FireResistOffset => -25;
public VampiricEmbraceSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -51,4 +51,4 @@ namespace Server.Spells.Necromancy
Effects.PlaySound( m.Location, m.Map, 0x4B1 );
}
}
}
}

8
Scripts/Spells/Necromancy/VengefulSpirit.cs
View file

@ -18,10 +18,10 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 80.0; } }
public override int RequiredMana{ get{ return 41; } }
public override double RequiredSkill => 80.0;
public override int RequiredMana => 41;
public VengefulSpiritSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -94,4 +94,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

6
Scripts/Spells/Necromancy/Wither.cs
View file

@ -16,11 +16,11 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill { get { return 60.0; } }
public override double RequiredSkill => 60.0;
public override int RequiredMana { get { return 23; } }
public override int RequiredMana => 23;
public WitherSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

26
Scripts/Spells/Necromancy/WraithForm.cs
View file

@ -17,19 +17,19 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 17; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 17;
public override int Body{ get{ return Caster.Female ? 747 : 748; } }
public override int Hue{ get{ return Caster.Female ? 0 : 0x4001; } }
public override int Body => Caster.Female ? 747 : 748;
public override int Hue => Caster.Female ? 0 : 0x4001;
public override int PhysResistOffset{ get{ return +15; } }
public override int FireResistOffset{ get{ return -5; } }
public override int ColdResistOffset{ get{ return 0; } }
public override int PoisResistOffset{ get{ return 0; } }
public override int NrgyResistOffset{ get{ return -5; } }
public override int PhysResistOffset => +15;
public override int FireResistOffset => -5;
public override int ColdResistOffset => 0;
public override int PoisResistOffset => 0;
public override int NrgyResistOffset => -5;
public WraithFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -39,15 +39,15 @@ namespace Server.Spells.Necromancy
{
if ( m is PlayerMobile )
((PlayerMobile)m).IgnoreMobiles = true;
m.PlaySound( 0x17F );
m.FixedParticles( 0x374A, 1, 15, 9902, 1108, 4, EffectLayer.Waist );
}
public override void RemoveEffect( Mobile m )
{
if ( m is PlayerMobile && m.AccessLevel == AccessLevel.Player )
((PlayerMobile)m).IgnoreMobiles = false;
}
}
}
}