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

3
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -251,8 +251,7 @@ namespace Server.Items
if ( ItemID == m_NorthID )
return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // North wall
else
return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // West wall
return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // West wall
}
public override void Serialize( GenericWriter writer )

3
Scripts/Items/Skill Items/Harvest Tools/ProspectorsTool.cs
View file

@ -95,7 +95,8 @@ namespace Server.Items
from.SendLocalizedMessage( 1049048 ); // You cannot use your prospector tool on that.
return;
}
else if ( vein != defaultVein )
if ( vein != defaultVein )
{
from.SendLocalizedMessage( 1049049 ); // That ore looks to be prospected already.
return;

12
Scripts/Items/Skill Items/Lumberjack/Log.cs
View file

@ -90,10 +90,10 @@ namespace Server.Items
public virtual bool TryCreateBoards( Mobile from, double skill, Item item )
{
if ( Deleted || !from.CanSee( this ) )
if ( Deleted || !from.CanSee( this ) )
return false;
else if ( from.Skills.Carpentry.Value < skill &&
from.Skills.Lumberjacking.Value < skill )
if ( from.Skills.Carpentry.Value < skill &&
from.Skills.Lumberjacking.Value < skill )
{
item.Delete();
from.SendLocalizedMessage( 1072652 ); // You cannot work this strange and unusual wood.
@ -107,7 +107,7 @@ namespace Server.Items
{
if ( !TryCreateBoards( from , 0, new Board() ) )
return false;
return true;
}
}
@ -118,7 +118,7 @@ namespace Server.Items
{
}
[Constructible]
public HeartwoodLog( int amount )
public HeartwoodLog( int amount )
: base( CraftResource.Heartwood, amount )
{
}
@ -352,4 +352,4 @@ namespace Server.Items
return true;
}
}
}
}

2
Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -98,7 +98,7 @@ namespace Server.Items
public virtual void UseGate( Mobile m )
{
ClientFlags flags = m.NetState == null ? ClientFlags.None : m.NetState.Flags;
ClientFlags flags = m.NetState?.Flags ?? ClientFlags.None;
if ( Factions.Sigil.ExistsOn( m ) )
{

4
Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -191,10 +191,6 @@ namespace Server.Items
pot.Delete();
}
}
else
{
// TODO: Target a bottle
}
}
else
{

2
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -315,7 +315,7 @@ namespace Server.Items
if ( (m.Z + 16) > m_Item.Z && (m_Item.Z + 12) > m.Z && (!Core.AOS || m != from) && SpellHelper.ValidIndirectTarget( from, m ) && from.CanBeHarmful( m, false ) )
{
@from?.DoHarmful( m );
from?.DoHarmful( m );
AOS.Damage( m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0 );
m.PlaySound( 0x208 );

17
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -104,7 +104,7 @@ namespace Server.Items
Spellbook book = Find( from, -1, type );
book?.DisplayTo( @from );
book?.DisplayTo( from );
}
private static void EventSink_CastSpellRequest( CastSpellRequestEventArgs e )
@ -150,17 +150,17 @@ namespace Server.Items
{
if ( spellID >= 0 && spellID < 64 )
return SpellbookType.Regular;
else if ( spellID >= 100 && spellID < 117 )
if ( spellID >= 100 && spellID < 117 )
return SpellbookType.Necromancer;
else if ( spellID >= 200 && spellID < 210 )
if ( spellID >= 200 && spellID < 210 )
return SpellbookType.Paladin;
else if ( spellID >= 400 && spellID < 406 )
if ( spellID >= 400 && spellID < 406 )
return SpellbookType.Samurai;
else if ( spellID >= 500 && spellID < 508 )
if ( spellID >= 500 && spellID < 508 )
return SpellbookType.Ninja;
else if ( spellID >= 600 && spellID < 617 )
if ( spellID >= 600 && spellID < 617 )
return SpellbookType.Arcanist;
else if ( spellID >= 677 && spellID < 693 )
if ( spellID >= 677 && spellID < 693 )
return SpellbookType.Mystic;
return SpellbookType.Invalid;
@ -333,7 +333,8 @@ namespace Server.Items
{
return false;
}
else if ( !from.CanBeginAction( typeof( BaseWeapon ) ) )
if ( !from.CanBeginAction( typeof( BaseWeapon ) ) )
{
return false;
}

6
Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -205,16 +205,14 @@ namespace Server.Items
{
if ( !m.Player && (m.Body.IsMonster || m.Body.IsAnimal) )
return SkillName.Veterinary;
else
return SkillName.Healing;
return SkillName.Healing;
}
public static SkillName GetSecondarySkill( Mobile m )
{
if ( !m.Player && (m.Body.IsMonster || m.Body.IsAnimal) )
return SkillName.AnimalLore;
else
return SkillName.Anatomy;
return SkillName.Anatomy;
}
public void EndHeal()

2
Scripts/Items/Skill Items/Misc/RepairDeed.cs
View file

@ -158,7 +158,7 @@ namespace Server.Items
if ( skill >= 11 )
return (1062008 + skill-11);
else if ( skill >=5 )
if ( skill >=5 )
return (1061123 + skill-5);
switch( skill )

4
Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -153,7 +153,7 @@ namespace Server.Items
}
else
{
@from?.SendLocalizedMessage( 502079 ); // The instrument played its last tune.
from?.SendLocalizedMessage( 502079 ); // The instrument played its last tune.
Delete();
}
@ -186,7 +186,7 @@ namespace Server.Items
if ( instrument != null )
{
callback?.Invoke( @from, instrument );
callback?.Invoke( from, instrument );
}
else
{

6
Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
View file

@ -179,10 +179,8 @@ namespace Server.Items
{
return true;
}
else
{
from.SendLocalizedMessage(weapon.NoFreeHandMessage);
}
from.SendLocalizedMessage(weapon.NoFreeHandMessage);
}
else
{