Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -4,73 +4,75 @@ using Server.Mobiles;
namespace Server
{
public static class MondainsLegacy
{
public static Type[] Artifacts { get; } =
{
typeof( AegisOfGrace ), typeof( BladeDance ), typeof( BloodwoodSpirit ), typeof( Bonesmasher ),
typeof( Boomstick ), typeof( BrightsightLenses ), typeof( FeyLeggings ), typeof( FleshRipper ),
typeof( HelmOfSwiftness ), typeof( PadsOfTheCuSidhe ), typeof( QuiverOfRage ), typeof( QuiverOfElements ),
typeof( RaedsGlory ), typeof( RighteousAnger ), typeof( RobeOfTheEclipse ), typeof( RobeOfTheEquinox ),
typeof( SoulSeeker ), typeof( TalonBite ), typeof( TotemOfVoid ), typeof( WildfireBow ),
typeof( Windsong )
};
public static class MondainsLegacy
{
public static Type[] Artifacts{ get; } =
{
typeof(AegisOfGrace), typeof(BladeDance), typeof(BloodwoodSpirit), typeof(Bonesmasher),
typeof(Boomstick), typeof(BrightsightLenses), typeof(FeyLeggings), typeof(FleshRipper),
typeof(HelmOfSwiftness), typeof(PadsOfTheCuSidhe), typeof(QuiverOfRage), typeof(QuiverOfElements),
typeof(RaedsGlory), typeof(RighteousAnger), typeof(RobeOfTheEclipse), typeof(RobeOfTheEquinox),
typeof(SoulSeeker), typeof(TalonBite), typeof(TotemOfVoid), typeof(WildfireBow),
typeof(Windsong)
};
public static bool CheckArtifactChance( Mobile m, BaseCreature bc )
{
if ( !Core.ML )
return false;
public static bool CheckArtifactChance(Mobile m, BaseCreature bc)
{
if (!Core.ML)
return false;
return Paragon.CheckArtifactChance( m, bc );
}
return Paragon.CheckArtifactChance(m, bc);
}
public static void GiveArtifactTo( Mobile m )
{
if ( !(Activator.CreateInstance( Artifacts[Utility.Random( Artifacts.Length )] ) is Item item) )
return;
public static void GiveArtifactTo(Mobile m)
{
if (!(Activator.CreateInstance(Artifacts[Utility.Random(Artifacts.Length)]) is Item item))
return;
if ( m.AddToBackpack( item ) )
{
m.SendLocalizedMessage( 1072223 ); // An item has been placed in your backpack.
m.SendLocalizedMessage( 1062317 ); // For your valor in combating the fallen beast, a special artifact has been bestowed on you.
}
else if ( m.BankBox.TryDropItem( m, item, false ) )
{
m.SendLocalizedMessage( 1072224 ); // An item has been placed in your bank box.
m.SendLocalizedMessage( 1062317 ); // For your valor in combating the fallen beast, a special artifact has been bestowed on you.
}
else
{
// Item was placed at feet by m.AddToBackpack
m.SendLocalizedMessage( 1072523 ); // You find an artifact, but your backpack and bank are too full to hold it.
}
}
if (m.AddToBackpack(item))
{
m.SendLocalizedMessage(1072223); // An item has been placed in your backpack.
m.SendLocalizedMessage(
1062317); // For your valor in combating the fallen beast, a special artifact has been bestowed on you.
}
else if (m.BankBox.TryDropItem(m, item, false))
{
m.SendLocalizedMessage(1072224); // An item has been placed in your bank box.
m.SendLocalizedMessage(
1062317); // For your valor in combating the fallen beast, a special artifact has been bestowed on you.
}
else
{
// Item was placed at feet by m.AddToBackpack
m.SendLocalizedMessage(1072523); // You find an artifact, but your backpack and bank are too full to hold it.
}
}
public static bool CheckML( Mobile from, bool message = true)
{
if ( from?.NetState == null )
return false;
public static bool CheckML(Mobile from, bool message = true)
{
if (from?.NetState == null)
return false;
if ( from.NetState.SupportsExpansion( Expansion.ML ) )
return true;
if (from.NetState.SupportsExpansion(Expansion.ML))
return true;
if ( message )
from.SendLocalizedMessage( 1072791 ); // You must upgrade to Mondain's Legacy in order to use that item.
if (message)
from.SendLocalizedMessage(1072791); // You must upgrade to Mondain's Legacy in order to use that item.
return false;
}
return false;
}
public static bool IsMLRegion( Region region )
{
return region.IsPartOf( "Twisted Weald" )
|| region.IsPartOf( "Sanctuary" )
|| region.IsPartOf( "The Prism of Light" )
|| region.IsPartOf( "The Citadel" )
|| region.IsPartOf( "Bedlam" )
|| region.IsPartOf( "Blighted Grove" )
|| region.IsPartOf( "The Painted Caves" )
|| region.IsPartOf( "The Palace of Paroxysmus" )
|| region.IsPartOf( "Labyrinth" );
}
}
}
public static bool IsMLRegion(Region region)
{
return region.IsPartOf("Twisted Weald")
|| region.IsPartOf("Sanctuary")
|| region.IsPartOf("The Prism of Light")
|| region.IsPartOf("The Citadel")
|| region.IsPartOf("Bedlam")
|| region.IsPartOf("Blighted Grove")
|| region.IsPartOf("The Painted Caves")
|| region.IsPartOf("The Palace of Paroxysmus")
|| region.IsPartOf("Labyrinth");
}
}
}