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

Removes implicit this.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 12:56:58 -07:00
parent 04b4cfe75b
commit 83dcf536d8
533 changed files with 2804 additions and 2806 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -592,7 +592,7 @@ namespace Server.Factions
sigils[i].ReturnHome();
}
List<Faction> factions = Faction.Factions;
List<Faction> factions = Factions;
for ( int i = 0; i < factions.Count; ++i )
{
@ -644,7 +644,7 @@ namespace Server.Factions
sigils[i].ReturnHome();
}
List<Faction> factions = Faction.Factions;
List<Faction> factions = Factions;
for ( int i = 0; i < factions.Count; ++i )
{
@ -997,7 +997,7 @@ namespace Server.Factions
if ( smallest == null )
return true; // sanity
if ( StabilityFactor > 0 && (((this.Members.Count + influx) * 100) / StabilityFactor) > smallest.Members.Count )
if ( StabilityFactor > 0 && (((Members.Count + influx) * 100) / StabilityFactor) > smallest.Members.Count )
return false;
return true;
@ -1052,7 +1052,7 @@ namespace Server.Factions
{
Faction victimFaction = bc.FactionAllegiance;
if ( bc.Map == Faction.Facet && victimFaction != null && killerState.Faction != victimFaction )
if ( bc.Map == Facet && victimFaction != null && killerState.Faction != victimFaction )
{
int silver = killerState.Faction.AwardSilver( killer, bc.FactionSilverWorth );
@ -1061,7 +1061,7 @@ namespace Server.Factions
}
#region Ethics
if ( bc.Map == Faction.Facet && bc.GetEthicAllegiance( killer ) == BaseCreature.Allegiance.Enemy )
if ( bc.Map == Facet && bc.GetEthicAllegiance( killer ) == BaseCreature.Allegiance.Enemy )
{
Ethics.Player killerEPL = Ethics.Player.Find( killer );

2
Scripts/Engines/Factions/Core/Reflector.cs
View file

@ -26,7 +26,7 @@ namespace Server.Factions
get
{
if ( m_Factions == null )
Reflector.ProcessTypes();
ProcessTypes();
return m_Factions;
}

2
Scripts/Engines/Factions/Core/StrongholdRegion.cs
View file

@ -13,7 +13,7 @@ namespace Server.Factions
set => m_Faction = value;
}
public StrongholdRegion( Faction faction ) : base( faction.Definition.FriendlyName, Faction.Facet, Region.DefaultPriority, faction.Definition.Stronghold.Area )
public StrongholdRegion( Faction faction ) : base( faction.Definition.FriendlyName, Faction.Facet, DefaultPriority, faction.Definition.Stronghold.Area )
{
m_Faction = faction;

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

@ -436,7 +436,7 @@ namespace Server.Factions
Sheriff = null;
Finance = null;
TownMonolith monolith = this.Monolith;
TownMonolith monolith = Monolith;
if ( monolith != null )
monolith.Faction = f;

2
Scripts/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs
View file

@ -15,7 +15,7 @@ namespace Server {
public override bool Use( Mobile from ) {
if ( Faction.ClearSkillLoss( from ) ) {
from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2219, false, "The gem shatters as you invoke its power." );
from.LocalOverheadMessage( Network.MessageType.Regular, 2219, false, "The gem shatters as you invoke its power." );
from.PlaySound( 909 );
from.FixedEffect( 0x373A, 10, 30 );

10
Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs
View file

@ -23,7 +23,7 @@ namespace Server {
_screamed = true;
_mobile.PlaySound( _mobile.Female ? 814 : 1088 );
_mobile.PublicOverheadMessage( Server.Network.MessageType.Regular, 2118, false, "Aaaaah!" );
_mobile.PublicOverheadMessage( Network.MessageType.Regular, 2118, false, "Aaaaah!" );
}
_mobile.Damage( Utility.Dice( 2, 6, 0 ) );
@ -82,7 +82,7 @@ namespace Server {
killer.SendSound( 1470 );
killer.LocalOverheadMessage(
Server.Network.MessageType.Regular, 2119, false,
Network.MessageType.Regular, 2119, false,
"You notice a strange item on the corpse, and decide to pick it up."
);
@ -110,14 +110,14 @@ namespace Server {
} else if ( from is PlayerMobile mobile && mobile.DuelContext != null ) {
mobile.SendMessage( "You can't use that." );
} else if ( Faction.Find( from ) == null ) {
from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2119, false, "The object vanishes from your hands as you touch it." );
from.LocalOverheadMessage( Network.MessageType.Regular, 2119, false, "The object vanishes from your hands as you touch it." );
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), delegate {
from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2118, false, "You feel a strange tingling sensation throughout your body." );
from.LocalOverheadMessage( Network.MessageType.Regular, 2118, false, "You feel a strange tingling sensation throughout your body." );
} );
Timer.DelayCall( TimeSpan.FromSeconds( 4.0 ), delegate {
from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2118, false, "Your skin begins to burn." );
from.LocalOverheadMessage( Network.MessageType.Regular, 2118, false, "Your skin begins to burn." );
} );
new DestructionTimer( from ).Start();

12
Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs
View file

@ -17,9 +17,9 @@ namespace Server {
}
public override bool Use( Mobile user ) {
if ( this.Movable ) {
user.BeginTarget( 12, true, Server.Targeting.TargetFlags.None, delegate( Mobile from, object obj ) {
if ( this.Movable && !this.Deleted ) {
if ( Movable ) {
user.BeginTarget( 12, true, Targeting.TargetFlags.None, delegate( Mobile from, object obj ) {
if ( Movable && !Deleted ) {
if ( obj is IPoint3D pt ) {
SpellHelper.GetSurfaceTop( ref pt );
@ -27,15 +27,15 @@ namespace Server {
Map facet = from.Map;
if ( facet != null && facet.CanFit( pt.X, pt.Y, pt.Z, 16, false, false, true ) ) {
this.Movable = false;
Movable = false;
Effects.SendMovingEffect(
from, new Entity( Serial.Zero, origin, facet ),
this.ItemID & 0x3FFF, 7, 0, false, false, this.Hue - 1, 0
ItemID & 0x3FFF, 7, 0, false, false, Hue - 1, 0
);
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), delegate {
this.Delete();
Delete();
Effects.PlaySound( origin, facet, 530 );
Effects.PlaySound( origin, facet, 263 );

2
Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
View file

@ -37,7 +37,7 @@ namespace Server {
}
if ( used ) {
from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2219, false, "The urn shatters as you invoke its power." );
from.LocalOverheadMessage( Network.MessageType.Regular, 2219, false, "The urn shatters as you invoke its power." );
from.PlaySound( 64 );
Effects.PlaySound( from.Location, from.Map, 1481 );

2
Scripts/Engines/Factions/Items/Sigil.cs
View file

@ -263,7 +263,7 @@ namespace Server.Factions
from.SendLocalizedMessage( 1005223 ); // You cannot give the sigil to someone not in a faction
else if ( fromFaction != toFaction )
from.SendLocalizedMessage( 1005222 ); // You cannot give the sigil to someone not in your faction
else if ( Sigil.ExistsOn( targ ) )
else if ( ExistsOn( targ ) )
from.SendLocalizedMessage( 1005220 ); // You cannot give this sigil to someone who already has a sigil
else if ( !targ.Alive )
from.SendLocalizedMessage( 1042248 ); // You cannot give a sigil to a dead person.

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

@ -74,7 +74,7 @@ namespace Server.Factions
Conceal();
DoVisibleEffect();
Effects.PlaySound( this.Location, this.Map, this.EffectSound );
Effects.PlaySound( Location, Map, EffectSound );
DoAttackEffect( from );
int silverToAward = ( from.Alive ? 20 : 40 );
@ -120,7 +120,7 @@ namespace Server.Factions
{
foreach( Item item in m.GetItemsInRange( p, 0 ) )
{
if ( item is BaseFactionTrap trap && trap.Faction == this.Faction )
if ( item is BaseFactionTrap trap && trap.Faction == Faction )
return 1075263; // There is already a trap belonging to your faction at this location.;
}
}

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

@ -15,7 +15,7 @@ namespace Server.Factions
public override void DoVisibleEffect()
{
Effects.SendLocationEffect( this.Location, this.Map, 0x3709, 28, 10, 0x1D3, 5 );
Effects.SendLocationEffect( Location, Map, 0x3709, 28, 10, 0x1D3, 5 );
}
public override void DoAttackEffect( Mobile m )

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

@ -15,7 +15,7 @@ namespace Server.Factions
public override void DoVisibleEffect()
{
Effects.SendLocationEffect( this.Location, this.Map, 0x11AD, 25, 10 );
Effects.SendLocationEffect( Location, Map, 0x11AD, 25, 10 );
}
public override void DoAttackEffect( Mobile m )

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

@ -15,7 +15,7 @@ namespace Server.Factions
public override void DoVisibleEffect()
{
Effects.SendLocationEffect( this.Location, this.Map, 0x11A4, 12, 6 );
Effects.SendLocationEffect( Location, Map, 0x11A4, 12, 6 );
}
public override void DoAttackEffect( Mobile m )

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

@ -74,7 +74,7 @@ namespace Server.Factions
if ( pl == null )
from.SendLocalizedMessage( 1010366 ); // You cannot mount a faction war horse!
else if ( pl.Faction != this.Faction )
else if ( pl.Faction != Faction )
from.SendLocalizedMessage( 1010367 ); // You cannot ride an opposing faction's war horse!
else if ( pl.Rank.Rank < 2 )
from.SendLocalizedMessage( 1010368 ); // You must achieve a faction rank of at least two before riding a war horse!

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

@ -147,7 +147,7 @@ namespace Server.Factions
private bool WasNamed( string speech )
{
string name = this.Name;
string name = Name;
return ( name != null && Insensitive.StartsWith( speech, name ) );
}
@ -164,17 +164,17 @@ namespace Server.Factions
{
if ( m_Town == null || !m_Town.IsSheriff( from ) )
{
this.Say( 1042189 ); // I don't work for you!
Say( 1042189 ); // I don't work for you!
}
else if ( Town.FromRegion( this.Region ) == m_Town )
else if ( Town.FromRegion( Region ) == m_Town )
{
this.Say( 1042180 ); // Your orders, sire?
Say( 1042180 ); // Your orders, sire?
m_OrdersEnd = DateTime.UtcNow + TimeSpan.FromSeconds( 10.0 );
}
}
else if ( DateTime.UtcNow < m_OrdersEnd )
{
if ( m_Town != null && m_Town.IsSheriff( from ) && Town.FromRegion( this.Region ) == m_Town )
if ( m_Town != null && m_Town.IsSheriff( from ) && Town.FromRegion( Region ) == m_Town )
{
m_OrdersEnd = DateTime.UtcNow + TimeSpan.FromSeconds( 10.0 );

4
Scripts/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs
View file

@ -38,12 +38,12 @@ namespace Server.Factions
public override void VendorBuy( Mobile from )
{
if ( this.Faction == null || Faction.Find( from, true ) != this.Faction )
if ( Faction == null || Faction.Find( from, true ) != Faction )
PrivateOverheadMessage( MessageType.Regular, 0x3B2, 1042201, from.NetState ); // You are not in my faction, I cannot sell you a horse!
else if ( FactionGump.Exists( from ) )
from.SendLocalizedMessage( 1042160 ); // You already have a faction menu open.
else if ( from is PlayerMobile mobile )
mobile.SendGump( new HorseBreederGump( mobile, this.Faction ) );
mobile.SendGump( new HorseBreederGump( mobile, Faction ) );
}
public override void VendorSell( Mobile from )