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;

6
Scripts/Spells/Bushido/SamuraiSpell.cs
View file

@ -55,7 +55,8 @@ namespace Server.Spells.Bushido
Caster.SendLocalizedMessage( 1063013, args ); // You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
return false;
}
else if ( Caster.Mana < mana )
if ( Caster.Mana < mana )
{
Caster.SendLocalizedMessage( 1060174, mana.ToString() ); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
return false;
@ -73,7 +74,8 @@ namespace Server.Spells.Bushido
Caster.SendLocalizedMessage( 1070768, RequiredSkill.ToString( "F1" ) ); // You need ~1_SKILL_REQUIREMENT~ Bushido skill to perform that attack!
return false;
}
else if ( Caster.Mana < mana )
if ( Caster.Mana < mana )
{
Caster.SendLocalizedMessage( 1060174, mana.ToString() ); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
return false;

6
Scripts/Spells/Chivalry/PaladinSpell.cs
View file

@ -35,7 +35,8 @@ namespace Server.Spells.Chivalry
Caster.SendLocalizedMessage( 1060173, RequiredTithing.ToString() ); // You must have at least ~1_TITHE_REQUIREMENT~ Tithing Points to use this ability,
return false;
}
else if ( Caster.Mana < mana )
if ( Caster.Mana < mana )
{
Caster.SendLocalizedMessage( 1060174, mana.ToString() ); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
return false;
@ -58,7 +59,8 @@ namespace Server.Spells.Chivalry
Caster.SendLocalizedMessage( 1060173, RequiredTithing.ToString() ); // You must have at least ~1_TITHE_REQUIREMENT~ Tithing Points to use this ability,
return false;
}
else if ( Caster.Mana < mana )
if ( Caster.Mana < mana )
{
Caster.SendLocalizedMessage( 1060174, mana.ToString() ); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
return false;

7
Scripts/Spells/Chivalry/SacredJourney.cs
View file

@ -54,17 +54,18 @@ namespace Server.Spells.Chivalry
Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
return false;
}
else if ( Caster.Criminal )
if ( Caster.Criminal )
{
Caster.SendLocalizedMessage( 1005561, "", 0x22 ); // Thou'rt a criminal and cannot escape so easily.
return false;
}
else if ( SpellHelper.CheckCombat( Caster ) )
if ( SpellHelper.CheckCombat( Caster ) )
{
Caster.SendLocalizedMessage( 1061282 ); // You cannot use the Sacred Journey ability to flee from combat.
return false;
}
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
return false;

5
Scripts/Spells/Fifth/Incognito.cs
View file

@ -30,12 +30,13 @@ namespace Server.Spells.Fifth
Caster.SendLocalizedMessage( 1010445 ); // You cannot incognito if you have a sigil
return false;
}
else if ( !Caster.CanBeginAction( typeof( IncognitoSpell ) ) )
if ( !Caster.CanBeginAction( typeof( IncognitoSpell ) ) )
{
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
return false;
}
else if ( Caster.BodyMod == 183 || Caster.BodyMod == 184 )
if ( Caster.BodyMod == 183 || Caster.BodyMod == 184 )
{
Caster.SendLocalizedMessage( 1042402 ); // You cannot use incognito while wearing body paint
return false;

3
Scripts/Spells/Fifth/MagicReflect.cs
View file

@ -30,7 +30,8 @@ namespace Server.Spells.Fifth
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
return false;
}
else if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
{
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
return false;

3
Scripts/Spells/First/ReactiveArmor.cs
View file

@ -30,7 +30,8 @@ namespace Server.Spells.First
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
return false;
}
else if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
{
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
return false;

7
Scripts/Spells/Fourth/Recall.cs
View file

@ -58,17 +58,18 @@ namespace Server.Spells.Fourth
Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
return false;
}
else if ( Caster.Criminal )
if ( Caster.Criminal )
{
Caster.SendLocalizedMessage( 1005561, "", 0x22 ); // Thou'rt a criminal and cannot escape so easily.
return false;
}
else if ( SpellHelper.CheckCombat( Caster ) )
if ( SpellHelper.CheckCombat( Caster ) )
{
Caster.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
return false;
}
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
return false;

7
Scripts/Spells/Mysticism/StoneFormSpell.cs
View file

@ -46,17 +46,18 @@ namespace Server.Spells.Mysticism
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 ( Ninjitsu.AnimalForm.UnderTransformation( Caster ) )
if ( Ninjitsu.AnimalForm.UnderTransformation( Caster ) )
{
Caster.SendLocalizedMessage( 1063218 ); // You cannot use that ability in this form.
return false;
}
else if ( Caster.Flying )
if ( Caster.Flying )
{
Caster.SendLocalizedMessage( 1113415 ); // You cannot use this ability while flying.
return false;

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

@ -50,12 +50,13 @@ namespace Server.Spells.Ninjitsu
Caster.SendLocalizedMessage(1061628); // You can't do that while polymorphed.
return false;
}
else if (TransformationSpellHelper.UnderTransformation(Caster))
if (TransformationSpellHelper.UnderTransformation(Caster))
{
Caster.SendLocalizedMessage(1063219); // You cannot mimic an animal while in that form.
return false;
}
else if (DisguiseTimers.IsDisguised(Caster))
if (DisguiseTimers.IsDisguised(Caster))
{
Caster.SendLocalizedMessage(1061631); // You can't do that while disguised.
return false;

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

@ -66,12 +66,13 @@ namespace Server.Spells.Ninjitsu
Caster.SendLocalizedMessage( 1063132 ); // You cannot use this ability while mounted.
return false;
}
else if ( (Caster.Followers + 1) > Caster.FollowersMax )
if ( (Caster.Followers + 1) > Caster.FollowersMax )
{
Caster.SendLocalizedMessage( 1063133 ); // You cannot summon a mirror image because you have too many followers.
return false;
}
else if ( TransformationSpellHelper.UnderTransformation( Caster, typeof( HorrificBeastSpell ) ) )
if ( TransformationSpellHelper.UnderTransformation( Caster, typeof( HorrificBeastSpell ) ) )
{
Caster.SendLocalizedMessage( 1061091 ); // You cannot cast that spell in this form.
return false;

6
Scripts/Spells/Ninjitsu/NinjaSpell.cs
View file

@ -55,7 +55,8 @@ namespace Server.Spells.Ninjitsu
Caster.SendLocalizedMessage( 1063013, args ); // You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
return false;
}
else if ( Caster.Mana < mana )
if ( Caster.Mana < mana )
{
Caster.SendLocalizedMessage( 1060174, mana.ToString() ); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
return false;
@ -73,7 +74,8 @@ namespace Server.Spells.Ninjitsu
Caster.SendLocalizedMessage( 1063352, RequiredSkill.ToString( "F1" ) ); // You need ~1_SKILL_REQUIREMENT~ Ninjitsu skill to perform that attack!
return false;
}
else if ( Caster.Mana < mana )
if ( Caster.Mana < mana )
{
Caster.SendLocalizedMessage( 1060174, mana.ToString() ); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
return false;

3
Scripts/Spells/Second/Protection.cs
View file

@ -33,7 +33,8 @@ namespace Server.Spells.Second
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
return false;
}
else if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
{
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
return false;

5
Scripts/Spells/Seventh/GateTravel.cs
View file

@ -46,12 +46,13 @@ namespace Server.Spells.Seventh
Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
return false;
}
else if ( Caster.Criminal )
if ( Caster.Criminal )
{
Caster.SendLocalizedMessage( 1005561, "", 0x22 ); // Thou'rt a criminal and cannot escape so easily.
return false;
}
else if ( SpellHelper.CheckCombat( Caster ) )
if ( SpellHelper.CheckCombat( Caster ) )
{
Caster.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
return false;

11
Scripts/Spells/Seventh/Polymorph.cs
View file

@ -43,22 +43,23 @@ namespace Server.Spells.Seventh
Caster.SendLocalizedMessage( 1010521 ); // You cannot polymorph while you have a Town Sigil
return false;
}
else if ( TransformationSpellHelper.UnderTransformation( Caster ) )
if ( TransformationSpellHelper.UnderTransformation( Caster ) )
{
Caster.SendLocalizedMessage( 1061633 ); // You cannot polymorph while in that form.
return false;
}
else if ( DisguiseTimers.IsDisguised( Caster ) )
if ( DisguiseTimers.IsDisguised( Caster ) )
{
Caster.SendLocalizedMessage( 502167 ); // You cannot polymorph while disguised.
return false;
}
else if ( Caster.BodyMod == 183 || Caster.BodyMod == 184 )
if ( Caster.BodyMod == 183 || Caster.BodyMod == 184 )
{
Caster.SendLocalizedMessage( 1042512 ); // You cannot polymorph while wearing body paint
return false;
}
else if ( !Caster.CanBeginAction( typeof( PolymorphSpell ) ) )
if ( !Caster.CanBeginAction( typeof( PolymorphSpell ) ) )
{
if ( Core.ML )
EndPolymorph( Caster );
@ -66,7 +67,7 @@ namespace Server.Spells.Seventh
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
return false;
}
else if ( m_NewBody == 0 )
if ( m_NewBody == 0 )
{
Gump gump;
if ( Core.SE )

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

@ -82,7 +82,7 @@ namespace Server.Spells.Spellweaving
if ( t.Z + id.CalcHeight != location.Z )
continue;
else if ( IsValidTile( tand ) )
if ( IsValidTile( tand ) )
return true;
}
@ -94,7 +94,7 @@ namespace Server.Spells.Spellweaving
if ( item == null || item.Z + id.CalcHeight != location.Z )
continue;
else if ( IsValidTile( item.ItemID ) )
if ( IsValidTile( item.ItemID ) )
{
eable.Free();
return true;

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

@ -36,7 +36,7 @@ namespace Server.Spells.Spellweaving
public static ArcaneFocus FindArcaneFocus( Mobile from )
{
if ( @from?.Backpack == null )
if ( from?.Backpack == null )
return null;
if ( from.Holding is ArcaneFocus )
@ -87,7 +87,8 @@ namespace Server.Spells.Spellweaving
caster.SendLocalizedMessage( 1060174, mana.ToString() ); // You must have at least ~1_MANA_REQUIREMENT~ Mana to use this ability.
return false;
}
else if ( caster.Skills[CastSkill].Value < RequiredSkill )
if ( caster.Skills[CastSkill].Value < RequiredSkill )
{
caster.SendLocalizedMessage( 1063013, $"{RequiredSkill.ToString("F1")}\t{"#1044114"}"); // You need at least ~1_SKILL_REQUIREMENT~ ~2_SKILL_NAME~ skill to use that ability.
return false;

3
Scripts/Spells/Spellweaving/AttuneWeapon.cs
View file

@ -27,7 +27,8 @@ namespace Server.Spells.Spellweaving
Caster.SendLocalizedMessage( 501775 ); // This spell is already in effect.
return false;
}
else if ( !Caster.CanBeginAction( typeof( AttuneWeaponSpell ) ) )
if ( !Caster.CanBeginAction( typeof( AttuneWeaponSpell ) ) )
{
Caster.SendLocalizedMessage( 1075124 ); // You must wait before casting that spell again.
return false;

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

@ -38,7 +38,7 @@ namespace Server.Items
public virtual void Expire( Mobile parent )
{
parent?.SendLocalizedMessage( 1072515, (Name == null ? $"#{LabelNumber}" : Name) ); // The ~1_name~ expired...
parent?.SendLocalizedMessage( 1072515, Name ?? $"#{LabelNumber}" ); // The ~1_name~ expired...
Effects.PlaySound( GetWorldLocation(), Map, 0x201 );
@ -48,7 +48,7 @@ namespace Server.Items
public virtual void SendTimeRemainingMessage( Mobile to )
{
to.SendLocalizedMessage( 1072516,
$"{(Name == null ? $"#{LabelNumber}" : Name)}\t{(int) m_LifeSpan.TotalSeconds}"); // ~1_name~ will expire in ~2_val~ seconds!
$"{Name ?? $"#{LabelNumber}"}\t{(int) m_LifeSpan.TotalSeconds}"); // ~1_name~ will expire in ~2_val~ seconds!
}
public override void OnDelete()

3
Scripts/Spells/Third/Teleport.cs
View file

@ -27,7 +27,8 @@ namespace Server.Spells.Third
Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
return false;
}
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
return false;