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

6
Scripts/Engines/Factions/Core/Election.cs
View file

@ -24,7 +24,7 @@ namespace Server.Factions
public Faction Faction{ get{ return m_Faction; } }
public List<Candidate> Candidates { get { return m_Candidates; } }
public List<Candidate> Candidates => m_Candidates;
public ElectionState State{ get{ return m_State; } set{ m_State = value; m_LastStateTime = DateTime.UtcNow; } }
public DateTime LastStateTime{ get{ return m_LastStateTime; } }
@ -483,7 +483,7 @@ namespace Server.Factions
private List<Voter> m_Voters;
public Mobile Mobile{ get{ return m_Mobile; } }
public List<Voter> Voters { get { return m_Voters; } }
public List<Voter> Voters => m_Voters;
public int Votes{ get{ return m_Voters.Count; } }
@ -561,4 +561,4 @@ namespace Server.Factions
Campaign,
Election
}
}
}

8
Scripts/Engines/Factions/Core/Faction.cs
View file

@ -927,9 +927,7 @@ namespace Server.Factions
public static bool ClearSkillLoss( Mobile mob )
{
SkillLossContext context;
if ( !m_SkillLoss.TryGetValue( mob, out context ) )
if (!m_SkillLoss.TryGetValue( mob, out SkillLossContext context ))
return false;
m_SkillLoss.Remove( mob );
@ -1111,7 +1109,7 @@ namespace Server.Factions
{
if ( victimState.KillPoints <= -6 )
{
killer.SendLocalizedMessage( 501693 ); // This victim is not worth enough to get kill points from.
killer.SendLocalizedMessage( 501693 ); // This victim is not worth enough to get kill points from.
#region Ethics
Ethics.Player killerEPL = Ethics.Player.Find( killer );
@ -1153,7 +1151,7 @@ namespace Server.Factions
if ( 1 > Utility.Random( 3 ) )
killerState.IsActive = true;
int silver = 0;
silver = killerState.Faction.AwardSilver( killer, award * 40 );

20
Scripts/Engines/Factions/Core/PlayerState.cs
View file

@ -24,15 +24,15 @@ namespace Server.Factions
public Mobile Mobile{ get{ return m_Mobile; } }
public Faction Faction{ get{ return m_Faction; } }
public List<PlayerState> Owner { get { return m_Owner; } }
public List<PlayerState> Owner => m_Owner;
public MerchantTitle MerchantTitle{ get{ return m_MerchantTitle; } set{ m_MerchantTitle = value; Invalidate(); } }
public Town Sheriff{ get{ return m_Sheriff; } set{ m_Sheriff = value; Invalidate(); } }
public Town Finance{ get{ return m_Finance; } set{ m_Finance = value; Invalidate(); } }
public List<SilverGivenEntry> SilverGiven { get { return m_SilverGiven; } }
public List<SilverGivenEntry> SilverGiven => m_SilverGiven;
public int KillPoints {
get { return m_KillPoints; }
set {
public int KillPoints {
get { return m_KillPoints; }
set {
if ( m_KillPoints != value ) {
if ( value > m_KillPoints ) {
if ( m_KillPoints <= 0 ) {
@ -41,7 +41,7 @@ namespace Server.Factions
Invalidate();
return;
}
m_Owner.Remove( this );
m_Owner.Insert( m_Faction.ZeroRankOffset, this );
@ -104,9 +104,9 @@ namespace Server.Factions
private int m_RankIndex = -1;
public int RankIndex { get { return m_RankIndex; } set { if ( m_RankIndex != value ) { m_RankIndex = value; m_InvalidateRank = true; } } }
public RankDefinition Rank {
get {
public RankDefinition Rank {
get {
if ( m_InvalidateRank ) {
RankDefinition[] ranks = m_Faction.Definition.Ranks;
int percent;
@ -252,4 +252,4 @@ namespace Server.Factions
return ((PlayerState)obj).m_KillPoints - m_KillPoints;
}
}
}
}

4
Scripts/Engines/Factions/Core/Town.cs
View file

@ -436,7 +436,7 @@ namespace Server.Factions
return ( mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance );
}
public static List<Town> Towns { get { return Reflector.Towns; } }
public static List<Town> Towns => Reflector.Towns;
public const int SilverCaptureBonus = 10000;
@ -551,4 +551,4 @@ namespace Server.Factions
}
}
}
}
}

4
Scripts/Engines/Factions/Core/VendorList.cs
View file

@ -10,7 +10,7 @@ namespace Server.Factions
private List<BaseFactionVendor> m_Vendors;
public VendorDefinition Definition{ get{ return m_Definition; } }
public List<BaseFactionVendor> Vendors { get { return m_Vendors; } }
public List<BaseFactionVendor> Vendors => m_Vendors;
public BaseFactionVendor Construct( Town town, Faction faction )
{
@ -24,4 +24,4 @@ namespace Server.Factions
m_Vendors = new List<BaseFactionVendor>();
}
}
}
}

4
Scripts/Engines/Factions/Definitions/FactionDefinition.cs
View file

@ -47,7 +47,7 @@ namespace Server.Factions
public string FriendlyName{ get{ return m_FriendlyName; } }
public string Keyword{ get{ return m_Keyword; } }
public string Abbreviation{ get { return m_Abbreviation; } }
public string Abbreviation => m_Abbreviation;
public TextDefinition Name{ get{ return m_Name; } }
public TextDefinition PropName{ get{ return m_PropName; } }
@ -97,4 +97,4 @@ namespace Server.Factions
m_Guards = guards;
}
}
}
}

20
Scripts/Engines/Factions/Gumps/FactionStoneGump.cs
View file

@ -12,7 +12,7 @@ namespace Server.Factions
private PlayerMobile m_From;
private Faction m_Faction;
public override int ButtonTypes{ get{ return 4; } }
public override int ButtonTypes => 4;
public FactionStoneGump( PlayerMobile from, Faction faction ) : base( 20, 30 )
{
@ -29,16 +29,16 @@ namespace Server.Factions
AddHtmlText( 20, 30, 510, 20, faction.Definition.Header, false, false );
AddHtmlLocalized( 20, 60, 100, 20, 1011429, false, false ); // Led By :
AddHtmlLocalized( 20, 60, 100, 20, 1011429, false, false ); // Led By :
AddHtml( 125, 60, 200, 20, faction.Commander != null ? faction.Commander.Name : "Nobody", false, false );
AddHtmlLocalized( 20, 80, 100, 20, 1011457, false, false ); // Tithe rate :
AddHtmlLocalized( 20, 80, 100, 20, 1011457, false, false ); // Tithe rate :
if ( faction.Tithe >= 0 && faction.Tithe <= 100 && (faction.Tithe % 10) == 0 )
AddHtmlLocalized( 125, 80, 350, 20, 1011480 + (faction.Tithe / 10), false, false );
else
AddHtml( 125, 80, 350, 20, faction.Tithe + "%", false, false );
AddHtmlLocalized( 20, 100, 100, 20, 1011458, false, false ); // Traps placed :
AddHtmlLocalized( 20, 100, 100, 20, 1011458, false, false ); // Traps placed :
AddHtml( 125, 100, 50, 20, faction.Traps.Count.ToString(), false, false );
AddHtmlLocalized( 55, 225, 200, 20, 1011428, false, false ); // VOTE FOR LEADERSHIP
@ -126,13 +126,13 @@ namespace Server.Factions
AddHtmlLocalized( 20, 30, 150, 20, 1011444, false, false ); // STATISTICS
AddHtmlLocalized( 20, 100, 100, 20, 1011445, false, false ); // Name :
AddHtmlLocalized( 20, 100, 100, 20, 1011445, false, false ); // Name :
AddHtml( 120, 100, 150, 20, from.Name, false, false );
AddHtmlLocalized( 20, 130, 100, 20, 1018064, false, false ); // score :
AddHtmlLocalized( 20, 130, 100, 20, 1018064, false, false ); // score :
AddHtml( 120, 130, 100, 20, (pl != null ? pl.KillPoints : 0).ToString(), false, false );
AddHtmlLocalized( 20, 160, 100, 20, 1011446, false, false ); // Rank :
AddHtmlLocalized( 20, 160, 100, 20, 1011446, false, false ); // Rank :
AddHtml( 120, 160, 100, 20, (pl != null ? pl.Rank.Rank : 0).ToString(), false, false );
AddHtmlLocalized( 55, 250, 100, 20, 1011447, false, false ); // BACK
@ -175,13 +175,13 @@ namespace Server.Factions
AddHtmlLocalized( 20, 30, 200, 20, 1011461, false, false ); // COMMANDER OPTIONS
AddHtmlLocalized( 20, 70, 120, 20, 1011457, false, false ); // Tithe rate :
AddHtmlLocalized( 20, 70, 120, 20, 1011457, false, false ); // Tithe rate :
if ( faction.Tithe >= 0 && faction.Tithe <= 100 && (faction.Tithe % 10) == 0 )
AddHtmlLocalized( 140, 70, 250, 20, 1011480 + (faction.Tithe / 10), false, false );
else
AddHtml( 140, 70, 250, 20, faction.Tithe + "%", false, false );
AddHtmlLocalized( 20, 100, 120, 20, 1011474, false, false ); // Silver available :
AddHtmlLocalized( 20, 100, 120, 20, 1011474, false, false ); // Silver available :
AddHtml( 140, 100, 50, 20, faction.Silver.ToString( "N0" ), false, false ); // NOTE: Added 'N0' formatting
AddHtmlLocalized( 55, 130, 200, 20, 1011478, false, false ); // CHANGE TITHE RATE
@ -344,4 +344,4 @@ namespace Server.Factions
}
}
}
}
}

24
Scripts/Engines/Factions/Gumps/FinanceGump.cs
View file

@ -21,7 +21,7 @@ namespace Server.Factions
+50, +100, +150, +200, +250, +300
};
public override int ButtonTypes{ get{ return 2; } }
public override int ButtonTypes => 2;
public FinanceGump( PlayerMobile from, Faction faction, Town town ) : base( 50, 50 )
{
@ -44,7 +44,7 @@ namespace Server.Factions
AddHtmlLocalized( 55, 90, 200, 25, 1011539, false, false ); // CHANGE PRICES
AddButton( 20, 90, 4005, 4007, 0, GumpButtonType.Page, 2 );
AddHtmlLocalized( 55, 120, 200, 25, 1011540, false, false ); // BUY SHOPKEEPERS
AddHtmlLocalized( 55, 120, 200, 25, 1011540, false, false ); // BUY SHOPKEEPERS
AddButton( 20, 120, 4005, 4007, 0, GumpButtonType.Page, 3 );
AddHtmlLocalized( 55, 150, 200, 25, 1011495, false, false ); // VIEW FINANCES
@ -114,20 +114,20 @@ namespace Server.Factions
AddHtmlLocalized( 20, 30, 300, 25, 1011524, false, false ); // FINANCE STATEMENT
AddHtmlLocalized( 20, 80, 300, 25, 1011538, false, false ); // Current total money for town :
AddHtmlLocalized( 20, 80, 300, 25, 1011538, false, false ); // Current total money for town :
AddLabel( 20, 100, 0x44, town.Silver.ToString() );
AddHtmlLocalized( 20, 130, 300, 25, 1011520, false, false ); // Finance Minister Upkeep :
AddHtmlLocalized( 20, 130, 300, 25, 1011520, false, false ); // Finance Minister Upkeep :
AddLabel( 20, 150, 0x44, financeUpkeep.ToString( "N0" ) ); // NOTE: Added 'N0'
AddHtmlLocalized( 20, 180, 300, 25, 1011521, false, false ); // Sheriff Upkeep :
AddHtmlLocalized( 20, 180, 300, 25, 1011521, false, false ); // Sheriff Upkeep :
AddLabel( 20, 200, 0x44, sheriffUpkeep.ToString( "N0" ) ); // NOTE: Added 'N0'
AddHtmlLocalized( 20, 230, 300, 25, 1011522, false, false ); // Town Income :
AddHtmlLocalized( 20, 230, 300, 25, 1011522, false, false ); // Town Income :
AddLabel( 20, 250, 0x44, dailyIncome.ToString( "N0" ) ); // NOTE: Added 'N0'
AddHtmlLocalized( 20, 280, 300, 25, 1011523, false, false ); // Net Cash flow per day :
AddHtmlLocalized( 20, 280, 300, 25, 1011523, false, false ); // Net Cash flow per day :
AddLabel( 20, 300, 0x44, netCashFlow.ToString( "N0" ) ); // NOTE: Added 'N0'
AddHtmlLocalized( 55, 360, 200, 25, 1011067, false, false ); // Previous page
@ -144,10 +144,10 @@ namespace Server.Factions
AddHtmlText( 60, 30, 300, 25, vendorList.Definition.Header, false, false );
AddItem( 20, 30, vendorList.Definition.ItemID );
AddHtmlLocalized( 20, 90, 200, 25, 1011514, false, false ); // You have :
AddHtmlLocalized( 20, 90, 200, 25, 1011514, false, false ); // You have :
AddLabel( 230, 90, 0x26, vendorList.Vendors.Count.ToString() );
AddHtmlLocalized( 20, 120, 200, 25, 1011515, false, false ); // Maximum :
AddHtmlLocalized( 20, 120, 200, 25, 1011515, false, false ); // Maximum :
AddLabel( 230, 120, 0x256, vendorList.Definition.Maximum.ToString() );
AddHtmlLocalized( 20, 150, 200, 25, 1011516, false, false ); // Cost :
@ -221,7 +221,7 @@ namespace Server.Factions
m_From.SendLocalizedMessage( 1042167 ); // You must wait up to an hour before changing prices again.
else if ( remaining.TotalHours < 4 )
m_From.SendLocalizedMessage( 1042168 ); // You must wait a few hours before changing prices again.
else
else
m_From.SendLocalizedMessage( 1042169 ); // You must wait several hours before changing prices again.
}
else
@ -278,4 +278,4 @@ namespace Server.Factions
}
}
}
}
}

4
Scripts/Engines/Factions/Items/FactionStone.cs
View file

@ -21,7 +21,7 @@ namespace Server.Factions
}
}
public override string DefaultName { get { return "faction stone"; } }
public override string DefaultName => "faction stone";
[Constructible]
public FactionStone() : this( null )
@ -102,4 +102,4 @@ namespace Server.Factions
}
}
}
}
}

4
Scripts/Engines/Factions/Items/JoinStone.cs
View file

@ -22,7 +22,7 @@ namespace Server.Factions
}
}
public override string DefaultName { get { return "faction signup stone"; } }
public override string DefaultName => "faction signup stone";
[Constructible]
public JoinStone() : this( null )
@ -78,4 +78,4 @@ namespace Server.Factions
}
}
}
}
}

4
Scripts/Engines/Factions/Items/StrongholdMonolith.cs
View file

@ -4,7 +4,7 @@ namespace Server.Factions
{
public class StrongholdMonolith : BaseMonolith
{
public override int DefaultLabelNumber{ get{ return 1041042; } } // A Faction Sigil Monolith
public override int DefaultLabelNumber => 1041042; // A Faction Sigil Monolith
public override void OnTownChanged()
{
@ -37,4 +37,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Items/TownMonolith.cs
View file

@ -4,7 +4,7 @@ namespace Server.Factions
{
public class TownMonolith : BaseMonolith
{
public override int DefaultLabelNumber{ get{ return 1041403; } } // A Faction Town Sigil Monolith
public override int DefaultLabelNumber => 1041403; // A Faction Town Sigil Monolith
public override void OnTownChanged()
{
@ -37,4 +37,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Items/TownStone.cs
View file

@ -21,7 +21,7 @@ namespace Server.Factions
}
}
public override string DefaultName { get { return "faction town stone"; } }
public override string DefaultName => "faction town stone";
[Constructible]
public TownStone() : this( null )
@ -84,4 +84,4 @@ namespace Server.Factions
}
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs
View file

@ -5,14 +5,14 @@ namespace Server.Factions
{
public class FactionExplosionTrap : BaseFactionTrap
{
public override int LabelNumber{ get{ return 1044599; } } // faction explosion trap
public override int LabelNumber => 1044599; // faction explosion trap
public override int AttackMessage{ get{ return 1010543; } } // You are enveloped in an explosion of fire!
public override int DisarmMessage{ get{ return 1010539; } } // You carefully remove the pressure trigger and disable the trap.
public override int EffectSound{ get{ return 0x307; } }
public override int MessageHue{ get{ return 0x78; } }
public override int AttackMessage => 1010543; // You are enveloped in an explosion of fire!
public override int DisarmMessage => 1010539; // You carefully remove the pressure trigger and disable the trap.
public override int EffectSound => 0x307;
public override int MessageHue => 0x78;
public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.AnyFactionTown; } }
public override AllowedPlacing AllowedPlacing => AllowedPlacing.AnyFactionTown;
public override void DoVisibleEffect()
{
@ -58,13 +58,13 @@ namespace Server.Factions
public class FactionExplosionTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType{ get{ return typeof( FactionExplosionTrap ); } }
public override int LabelNumber{ get{ return 1044603; } } // faction explosion trap deed
public override Type TrapType => typeof( FactionExplosionTrap );
public override int LabelNumber => 1044603; // faction explosion trap deed
public FactionExplosionTrapDeed() : base( 0x36D2 )
{
}
public FactionExplosionTrapDeed( Serial serial ) : base( serial )
{
}
@ -82,4 +82,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs
View file

@ -5,14 +5,14 @@ namespace Server.Factions
{
public class FactionGasTrap : BaseFactionTrap
{
public override int LabelNumber{ get{ return 1044598; } } // faction gas trap
public override int LabelNumber => 1044598; // faction gas trap
public override int AttackMessage{ get{ return 1010542; } } // A noxious green cloud of poison gas envelops you!
public override int DisarmMessage{ get{ return 502376; } } // The poison leaks harmlessly away due to your deft touch.
public override int EffectSound{ get{ return 0x230; } }
public override int MessageHue{ get{ return 0x44; } }
public override int AttackMessage => 1010542; // A noxious green cloud of poison gas envelops you!
public override int DisarmMessage => 502376; // The poison leaks harmlessly away due to your deft touch.
public override int EffectSound => 0x230;
public override int MessageHue => 0x44;
public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.FactionStronghold; } }
public override AllowedPlacing AllowedPlacing => AllowedPlacing.FactionStronghold;
public override void DoVisibleEffect()
{
@ -58,13 +58,13 @@ namespace Server.Factions
public class FactionGasTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType{ get{ return typeof( FactionGasTrap ); } }
public override int LabelNumber{ get{ return 1044602; } } // faction gas trap deed
public override Type TrapType => typeof( FactionGasTrap );
public override int LabelNumber => 1044602; // faction gas trap deed
public FactionGasTrapDeed() : base( 0x11AB )
{
}
public FactionGasTrapDeed( Serial serial ) : base( serial )
{
}
@ -82,4 +82,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs
View file

@ -5,14 +5,14 @@ namespace Server.Factions
{
public class FactionSawTrap : BaseFactionTrap
{
public override int LabelNumber{ get{ return 1041047; } } // faction saw trap
public override int LabelNumber => 1041047; // faction saw trap
public override int AttackMessage{ get{ return 1010544; } } // The blade cuts deep into your skin!
public override int DisarmMessage{ get{ return 1010540; } } // You carefully dismantle the saw mechanism and disable the trap.
public override int EffectSound{ get{ return 0x218; } }
public override int MessageHue{ get{ return 0x5A; } }
public override int AttackMessage => 1010544; // The blade cuts deep into your skin!
public override int DisarmMessage => 1010540; // You carefully dismantle the saw mechanism and disable the trap.
public override int EffectSound => 0x218;
public override int MessageHue => 0x5A;
public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.ControlledFactionTown; } }
public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown;
public override void DoVisibleEffect()
{
@ -58,13 +58,13 @@ namespace Server.Factions
public class FactionSawTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType{ get{ return typeof( FactionSawTrap ); } }
public override int LabelNumber{ get{ return 1044604; } } // faction saw trap deed
public override Type TrapType => typeof( FactionSawTrap );
public override int LabelNumber => 1044604; // faction saw trap deed
public FactionSawTrapDeed() : base( 0x1107 )
{
}
public FactionSawTrapDeed( Serial serial ) : base( serial )
{
}
@ -82,4 +82,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs
View file

@ -5,14 +5,14 @@ namespace Server.Factions
{
public class FactionSpikeTrap : BaseFactionTrap
{
public override int LabelNumber{ get{ return 1044601; } } // faction spike trap
public override int LabelNumber => 1044601; // faction spike trap
public override int AttackMessage{ get{ return 1010545; } } // Large spikes in the ground spring up piercing your skin!
public override int DisarmMessage{ get{ return 1010541; } } // You carefully dismantle the trigger on the spikes and disable the trap.
public override int EffectSound{ get{ return 0x22E; } }
public override int MessageHue{ get{ return 0x5A; } }
public override int AttackMessage => 1010545; // Large spikes in the ground spring up piercing your skin!
public override int DisarmMessage => 1010541; // You carefully dismantle the trigger on the spikes and disable the trap.
public override int EffectSound => 0x22E;
public override int MessageHue => 0x5A;
public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.ControlledFactionTown; } }
public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown;
public override void DoVisibleEffect()
{
@ -58,13 +58,13 @@ namespace Server.Factions
public class FactionSpikeTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType{ get{ return typeof( FactionSpikeTrap ); } }
public override int LabelNumber{ get{ return 1044605; } } // faction spike trap deed
public override Type TrapType => typeof( FactionSpikeTrap );
public override int LabelNumber => 1044605; // faction spike trap deed
public FactionSpikeTrapDeed() : base( 0x11A5 )
{
}
public FactionSpikeTrapDeed( Serial serial ) : base( serial )
{
}
@ -82,4 +82,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs
View file

@ -15,7 +15,7 @@ namespace Server.Factions
set{ m_Charges = value; }
}
public override int LabelNumber{ get{ return 1041508; } } // a faction trap removal kit
public override int LabelNumber => 1041508; // a faction trap removal kit
[Constructible]
public FactionTrapRemovalKit() : base( 7867 )
@ -79,4 +79,4 @@ namespace Server.Factions
}
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs
View file

@ -64,7 +64,7 @@ namespace Server.Factions
Faction = faction;
}
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public FactionWarHorse( Serial serial ) : base( serial )
{
@ -109,4 +109,4 @@ namespace Server.Factions
}
}
}
}
}

2
Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -55,7 +55,7 @@ namespace Server.Factions
get { return new FactionGuardAI( this ); }
}
public override TimeSpan ReacquireDelay{ get{ return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan ReacquireDelay => TimeSpan.FromSeconds( 2.0 );
public override bool IsEnemy( Mobile m )
{

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionBerserker.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionBerserker : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Melee | GuardAI.Curse | GuardAI.Bless; } }
public override GuardAI GuardAI => GuardAI.Melee | GuardAI.Curse | GuardAI.Bless;
[Constructible]
public FactionBerserker() : base( "the berserker" )
@ -71,4 +71,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDeathKnight.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionDeathKnight : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Melee | GuardAI.Curse | GuardAI.Bless; } }
public override GuardAI GuardAI => GuardAI.Melee | GuardAI.Curse | GuardAI.Bless;
[Constructible]
public FactionDeathKnight() : base( "the death knight" )
@ -67,4 +67,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDragoon.cs
View file

@ -7,7 +7,7 @@ namespace Server.Factions
{
public class FactionDragoon : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; } }
public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse;
[Constructible]
public FactionDragoon() : base( "the dragoon" )
@ -72,4 +72,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionHenchman.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionHenchman : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Melee; } }
public override GuardAI GuardAI => GuardAI.Melee;
[Constructible]
public FactionHenchman() : base( "the henchman" )
@ -64,4 +64,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionKnight.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionKnight : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless; } }
public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless;
[Constructible]
public FactionKnight() : base( "the knight" )
@ -72,4 +72,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionMercenary.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionMercenary : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Melee | GuardAI.Smart; } }
public override GuardAI GuardAI => GuardAI.Melee | GuardAI.Smart;
[Constructible]
public FactionMercenary() : base( "the mercenary" )
@ -62,4 +62,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionNecromancer.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionNecromancer : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; } }
public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse;
[Constructible]
public FactionNecromancer() : base( "the necromancer" )
@ -65,4 +65,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionPaladin.cs
View file

@ -7,7 +7,7 @@ namespace Server.Factions
{
public class FactionPaladin : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless; } }
public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless;
[Constructible]
public FactionPaladin() : base( "the paladin" )
@ -73,4 +73,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionSorceress.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionSorceress : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Bless | GuardAI.Curse; } }
public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Bless | GuardAI.Curse;
[Constructible]
public FactionSorceress() : base( "the sorceress" )
@ -69,4 +69,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionWizard.cs
View file

@ -6,7 +6,7 @@ namespace Server.Factions
{
public class FactionWizard : BaseFactionGuard
{
public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; } }
public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse;
[Constructible]
public FactionWizard() : base( "the wizard" )
@ -66,4 +66,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionBoardVendor.cs
View file

@ -54,8 +54,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -73,4 +73,4 @@ namespace Server.Factions
}
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionBottleVendor.cs
View file

@ -59,8 +59,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -78,4 +78,4 @@ namespace Server.Factions
}
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionOreVendor.cs
View file

@ -57,8 +57,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -76,4 +76,4 @@ namespace Server.Factions
}
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionReagentVendor.cs
View file

@ -64,8 +64,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -92,4 +92,4 @@ namespace Server.Factions
}
}
}
}
}