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

Fixes implicit ternary expressions

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 14:56:48 -07:00
parent c85b0a740c
commit ff26dfa375
345 changed files with 1905 additions and 2336 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,10 +112,8 @@ namespace Server.Spells
{
return GetNewAosDamage( bonus, dice, sides, (Caster.Player && singleTarget.Player), GetDamageScalar( singleTarget ) );
}
else
{
return GetNewAosDamage( bonus, dice, sides, false );
}
return GetNewAosDamage( bonus, dice, sides, false );
}
public virtual int GetNewAosDamage( int bonus, int dice, int sides, bool playerVsPlayer )
@ -483,7 +481,8 @@ namespace Server.Spells
{
return false;
}
else if ( m_Scroll is BaseWand && m_Caster.Spell != null && m_Caster.Spell.IsCasting )
if ( m_Scroll is BaseWand && m_Caster.Spell != null && m_Caster.Spell.IsCasting )
{
m_Caster.SendLocalizedMessage( 502643 ); // You can not cast a spell while frozen.
}
@ -562,10 +561,8 @@ namespace Server.Spells
return true;
}
else
{
return false;
}
return false;
}
else
{
@ -820,15 +817,13 @@ namespace Server.Spells
m_Caster.SendLocalizedMessage( 501857 ); // This spell won't work on that!
return false;
}
else if ( Caster.CanBeBeneficial( target, true, allowDead ) && CheckSequence() )
if ( Caster.CanBeBeneficial( target, true, allowDead ) && CheckSequence() )
{
Caster.DoBeneficial( target );
return true;
}
else
{
return false;
}
return false;
}
public bool CheckHSequence( Mobile target )
@ -838,15 +833,13 @@ namespace Server.Spells
m_Caster.SendLocalizedMessage( 501857 ); // This spell won't work on that!
return false;
}
else if ( Caster.CanBeHarmful( target ) && CheckSequence() )
if ( Caster.CanBeHarmful( target ) && CheckSequence() )
{
Caster.DoHarmful( target );
return true;
}
else
{
return false;
}
return false;
}
private class AnimTimer : Timer
@ -898,7 +891,8 @@ namespace Server.Spells
{
return;
}
else if ( m_Spell.m_State == SpellState.Casting && m_Spell.m_Caster.Spell == m_Spell )
if ( m_Spell.m_State == SpellState.Casting && m_Spell.m_Caster.Spell == m_Spell )
{
m_Spell.m_State = SpellState.Sequencing;
m_Spell.m_CastTimer = null;

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

@ -210,7 +210,7 @@ namespace Server.Spells
{
if ( offset > 0 )
return AddStatBonus( m, m, type, offset, duration );
else if ( offset < 0 )
if ( offset < 0 )
return AddStatCurse( m, m, type, -offset, duration );
return true;
@ -233,7 +233,8 @@ namespace Server.Spells
target.AddStatMod( new StatMod( type, name, mod.Offset + offset, duration ) );
return true;
}
else if ( mod == null || mod.Offset < offset )
if ( mod == null || mod.Offset < offset )
{
target.AddStatMod( new StatMod( type, name, offset, duration ) );
return true;
@ -259,7 +260,8 @@ namespace Server.Spells
target.AddStatMod( new StatMod( type, name, mod.Offset + offset, duration ) );
return true;
}
else if ( mod == null || mod.Offset > offset )
if ( mod == null || mod.Offset > offset )
{
target.AddStatMod( new StatMod( type, name, offset, duration ) );
return true;
@ -545,15 +547,13 @@ namespace Server.Spells
p = new Point3D( x, y, p.Z );
return true;
}
else
{
int z = map.GetAverageZ( x, y );
if ( map.CanSpawnMobile( x, y, z ) )
{
p = new Point3D( x, y, z );
return true;
}
int z = map.GetAverageZ( x, y );
if ( map.CanSpawnMobile( x, y, z ) )
{
p = new Point3D( x, y, z );
return true;
}
}
@ -981,9 +981,9 @@ namespace Server.Spells
if ( delay == TimeSpan.Zero )
{
(@from as BaseCreature)?.AlterSpellDamageTo( target, ref iDamage );
(from as BaseCreature)?.AlterSpellDamageTo( target, ref iDamage );
(target as BaseCreature)?.AlterSpellDamageFrom( @from, ref iDamage );
(target as BaseCreature)?.AlterSpellDamageFrom( from, ref iDamage );
target.Damage( iDamage, from );
}
@ -1036,9 +1036,9 @@ namespace Server.Spells
if ( delay == TimeSpan.Zero )
{
(@from as BaseCreature)?.AlterSpellDamageTo( target, ref iDamage );
(from as BaseCreature)?.AlterSpellDamageTo( target, ref iDamage );
(target as BaseCreature)?.AlterSpellDamageFrom( @from, ref iDamage );
(target as BaseCreature)?.AlterSpellDamageFrom( from, ref iDamage );
WeightOverloading.DFA = dfa;
@ -1257,12 +1257,13 @@ namespace Server.Spells
caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
return false;
}
else if ( !caster.CanBeginAction( typeof( PolymorphSpell ) ) )
if ( !caster.CanBeginAction( typeof( PolymorphSpell ) ) )
{
caster.SendLocalizedMessage( 1061628 ); // You can't do that while polymorphed.
return false;
}
else if ( AnimalForm.UnderTransformation( caster ) )
if ( AnimalForm.UnderTransformation( caster ) )
{
caster.SendLocalizedMessage( 1061091 ); // You cannot cast that spell in this form.
return false;