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

2
Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
{
public sealed class StopMusic : Packet
{
public static readonly Packet Instance = Packet.SetStatic( new StopMusic() );
public static readonly Packet Instance = SetStatic( new StopMusic() );
public StopMusic() : base( 0x6D, 3 )
{

2
Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs
View file

@ -9,7 +9,7 @@
public LuckyNecklace( )
: base( 0x1088, Layer.Neck )
{
base.Attributes.Luck = 200;
Attributes.Luck = 200;
LootType = LootType.Blessed;
}

2
Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs
View file

@ -196,7 +196,7 @@ namespace Server.Items
{
m_Bonus = bonus;
this.Hue = CraftResources.GetHue( (CraftResource)Utility.RandomMinMax( (int)CraftResource.DullCopper, (int)CraftResource.Valorite ) );
Hue = CraftResources.GetHue( (CraftResource)Utility.RandomMinMax( (int)CraftResource.DullCopper, (int)CraftResource.Valorite ) );
}
public override void GetProperties( ObjectPropertyList list )

2
Scripts/Items/Special/Heritage Items/IronMaiden.cs
View file

@ -19,7 +19,7 @@ namespace Server.Items
public override void OnComponentUsed( AddonComponent c, Mobile from )
{
if ( from.InRange( this.GetWorldLocation(), 2 ) && from.InLOS( this.GetWorldLocation() ) )
if ( from.InRange( GetWorldLocation(), 2 ) && from.InLOS( GetWorldLocation() ) )
{
if ( Utility.RandomBool() )
{

6
Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs
View file

@ -198,7 +198,7 @@ namespace Server.Items
private void AddItem( int x, int y, int z, Item item )
{
item.MoveToWorld( new Point3D( this.Location.X + x, this.Location.Y + y, this.Location.Z + z ), this.Map );
item.MoveToWorld( new Point3D( Location.X + x, Location.Y + y, Location.Z + z ), Map );
m_Components.Add( item );
}
@ -278,13 +278,13 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( this.GetWorldLocation(), 1 ) )
if ( from.InRange( GetWorldLocation(), 1 ) )
{
if ( m_Placer == null || from == m_Placer || from.AccessLevel >= AccessLevel.GameMaster )
{
from.AddToBackpack( new HolidayTreeDeed() );
this.Delete();
Delete();
BaseHouse house = BaseHouse.FindHouseAt( this );

22
Scripts/Items/Special/Holiday/Wreath.cs
View file

@ -26,10 +26,10 @@ namespace Server.Items
public bool CouldFit( IPoint3D p, Map map )
{
if ( !map.CanFit( p.X, p.Y, p.Z, this.ItemData.Height ) )
if ( !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) )
return false;
if ( this.ItemID == 0x232C )
if ( ItemID == 0x232C )
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
@ -53,28 +53,28 @@ namespace Server.Items
private void FixMovingCrate()
{
if ( this.Deleted )
if ( Deleted )
return;
if ( this.Movable || this.IsLockedDown )
if ( Movable || IsLockedDown )
{
Item deed = this.Deed;
Item deed = Deed;
if ( this.Parent is Item item )
if ( Parent is Item item )
{
item.AddItem( deed );
deed.Location = this.Location;
deed.Location = Location;
}
else
{
deed.MoveToWorld( this.Location, this.Map );
deed.MoveToWorld( Location, Map );
}
Delete();
}
}
public Item Deed => new WreathDeed( this.Hue );
public Item Deed => new WreathDeed( Hue );
public override void OnDoubleClick( Mobile from )
{
@ -82,7 +82,7 @@ namespace Server.Items
if ( house != null && house.IsCoOwner( from ) )
{
if ( from.InRange( this.GetWorldLocation(), 3 ) )
if ( from.InRange( GetWorldLocation(), 3 ) )
{
from.CloseGump( typeof( WreathAddonGump ) );
from.SendGump( new WreathAddonGump( from, this ) );
@ -269,7 +269,7 @@ namespace Server.Items
if ( itemID > 0 )
{
Item addon = new WreathAddon( this.Hue );
Item addon = new WreathAddon( Hue );
addon.ItemID = itemID;
addon.MoveToWorld( loc, from.Map );

2
Scripts/Items/Special/House Raffle/HouseRaffleRegion.cs
View file

@ -10,7 +10,7 @@ namespace Server.Regions
private HouseRaffleStone m_Stone;
public HouseRaffleRegion( HouseRaffleStone stone )
: base( null, stone.PlotFacet, Region.DefaultPriority, stone.PlotBounds )
: base( null, stone.PlotFacet, DefaultPriority, stone.PlotBounds )
{
m_Stone = stone;
}

2
Scripts/Items/Special/House Raffle/HouseRaffleStone.cs
View file

@ -673,7 +673,7 @@ namespace Server.Items
: base( from, stone, 5113 ) // Start
{
if ( !stone.ValidLocation() )
Flags |= Network.CMEFlags.Disabled;
Flags |= CMEFlags.Disabled;
}
public override void OnClick()

2
Scripts/Items/Special/ML/GrizzledMareStatuette.cs
View file

@ -50,7 +50,7 @@ namespace Server.Mobiles
public virtual void OnAfterDeserialize_Callback()
{
HellSteed.SetStats( this );
SetStats( this );
Name = m_Myname;
}

4
Scripts/Items/Special/MonsterStatuette.cs
View file

@ -198,12 +198,12 @@ namespace Server.Items
public override void OnMovement( Mobile m, Point3D oldLocation )
{
if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, this.Location, 2 ) && !Utility.InRange( oldLocation, this.Location, 2 ) )
if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, Location, 2 ) && !Utility.InRange( oldLocation, Location, 2 ) )
{
int[] sounds = MonsterStatuetteInfo.GetInfo( m_Type ).Sounds;
if ( sounds.Length > 0 )
Effects.PlaySound( this.Location, this.Map, sounds[Utility.Random( sounds.Length )] );
Effects.PlaySound( Location, Map, sounds[Utility.Random( sounds.Length )] );
}
base.OnMovement( m, oldLocation );

2
Scripts/Items/Special/Rares/Containers/Bucket.cs
View file

@ -17,7 +17,7 @@
[Constructible]
public Bucket( bool filled )
: base( ( filled ) ? Bucket.fItemID : Bucket.vItemID, filled )
: base( ( filled ) ? fItemID : vItemID, filled )
{
}

2
Scripts/Items/Special/Rares/Containers/WaterBarrel.cs
View file

@ -19,7 +19,7 @@
[Constructible]
public WaterBarrel( bool filled )
: base( ( filled ) ? WaterBarrel.fItemID : WaterBarrel.vItemID, filled )
: base( ( filled ) ? fItemID : vItemID, filled )
{
}

2
Scripts/Items/Special/Rares/Containers/WaterTub.cs
View file

@ -17,7 +17,7 @@
[Constructible]
public Tub( bool filled )
: base( ( filled ) ? Tub.fItemID : Tub.vItemID, filled )
: base( ( filled ) ? fItemID : vItemID, filled )
{
}

2
Scripts/Items/Special/RewardCake.cs
View file

@ -23,7 +23,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if (! from.InRange( this.GetWorldLocation(), 1 ))
if (! from.InRange( GetWorldLocation(), 1 ))
{
from.LocalOverheadMessage( MessageType.Regular, 906, 1019045 ); // I can't reach that.
}

22
Scripts/Items/Special/Solen Items/BagOfSending.cs
View file

@ -35,8 +35,8 @@ namespace Server.Items
get => m_Charges;
set
{
if ( value > this.MaxCharges )
m_Charges = this.MaxCharges;
if ( value > MaxCharges )
m_Charges = MaxCharges;
else if ( value < 0 )
m_Charges = 0;
else
@ -52,8 +52,8 @@ namespace Server.Items
get => m_Recharges;
set
{
if ( value > this.MaxRecharges )
m_Recharges = this.MaxRecharges;
if ( value > MaxRecharges )
m_Recharges = MaxRecharges;
else if ( value < 0 )
m_Recharges = 0;
else
@ -83,9 +83,9 @@ namespace Server.Items
switch ( value )
{
case BagOfSendingHue.Yellow: this.Hue = 0x8A5; break;
case BagOfSendingHue.Blue: this.Hue = 0x8AD; break;
case BagOfSendingHue.Red: this.Hue = 0x89B; break;
case BagOfSendingHue.Yellow: Hue = 0x8A5; break;
case BagOfSendingHue.Blue: Hue = 0x8AD; break;
case BagOfSendingHue.Red: Hue = 0x89B; break;
}
}
}
@ -100,7 +100,7 @@ namespace Server.Items
{
Weight = 2.0;
this.BagOfSendingHue = hue;
BagOfSendingHue = hue;
m_Charges = Utility.RandomMinMax( 3, 9 );
}
@ -157,11 +157,11 @@ namespace Server.Items
{
from.SendMessage( "You may not do that in jail." );
}
else if ( !this.IsChildOf( from.Backpack ) )
else if ( !IsChildOf( from.Backpack ) )
{
MessageHelper.SendLocalizedMessageTo(this, from, 1062334, 0x59); // The bag of sending must be in your backpack.
}
else if ( this.Charges == 0 )
else if ( Charges == 0 )
{
MessageHelper.SendLocalizedMessageTo( this, from, 1042544, 0x59 ); // This item is out of charges.
}
@ -213,7 +213,7 @@ namespace Server.Items
{
MessageHelper.SendLocalizedMessageTo( m_Bag, from, 1054108, 0x59 ); // The bag of sending rejects the cursed item.
}
else if ( !item.VerifyMove( from ) || item is Server.Engines.Quests.QuestItem || item.Nontransferable )
else if ( !item.VerifyMove( from ) || item is Engines.Quests.QuestItem || item.Nontransferable )
{
MessageHelper.SendLocalizedMessageTo( m_Bag, from, 1054109, 0x59 ); // The bag of sending rejects that item.
}

34
Scripts/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -23,8 +23,8 @@ namespace Server.Items
get => m_Charges;
set
{
if ( value > this.MaxCharges )
m_Charges = this.MaxCharges;
if ( value > MaxCharges )
m_Charges = MaxCharges;
else if ( value < 0 )
m_Charges = 0;
else
@ -40,8 +40,8 @@ namespace Server.Items
get => m_Recharges;
set
{
if ( value > this.MaxRecharges )
m_Recharges = this.MaxRecharges;
if ( value > MaxRecharges )
m_Recharges = MaxRecharges;
else if ( value < 0 )
m_Recharges = 0;
else
@ -109,7 +109,7 @@ namespace Server.Items
{
base.GetContextMenuEntries( from, list );
if ( from.Alive && this.RootParent == from )
if ( from.Alive && RootParent == from )
{
if ( Pet == null )
{
@ -144,7 +144,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( this.RootParent != from ) // TODO: Previous implementation allowed use on ground, without house protection checks. What is the correct behavior?
if ( RootParent != from ) // TODO: Previous implementation allowed use on ground, without house protection checks. What is the correct behavior?
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1042001 ); // That must be in your pack for you to use it.
return;
@ -170,9 +170,9 @@ namespace Server.Items
public void LinkPet( Mobile from )
{
BaseCreature pet = this.Pet;
BaseCreature pet = Pet;
if ( Deleted || pet != null || this.RootParent != from )
if ( Deleted || pet != null || RootParent != from )
return;
from.SendLocalizedMessage( 1054114 ); // Target your pet that you wish to link to this Crystal Ball of Pet Summoning.
@ -227,9 +227,9 @@ namespace Server.Items
public void CastSummonPet( Mobile from )
{
BaseCreature pet = this.Pet;
BaseCreature pet = Pet;
if ( Deleted || pet == null || this.RootParent != from )
if ( Deleted || pet == null || RootParent != from )
return;
if ( Charges == 0 )
@ -252,9 +252,9 @@ namespace Server.Items
{
MessageHelper.SendLocalizedMessageTo( this, from, 1054127, 0x22 ); // The Crystal Ball fills with a red mist. You appear to have let your bond to your pet deteriorate.
}
else if ( from.Map == Map.Ilshenar || from.Region.IsPartOf( typeof( DungeonRegion ) ) || from.Region.IsPartOf( typeof( Jail ) ) || from.Region.IsPartOf( typeof( Server.Engines.ConPVP.SafeZone ) ) )
else if ( from.Map == Map.Ilshenar || from.Region.IsPartOf( typeof( DungeonRegion ) ) || from.Region.IsPartOf( typeof( Jail ) ) || from.Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) )
{
from.Send( new AsciiMessage( this.Serial, this.ItemID, MessageType.Regular, 0x22, 3, "", "You cannot summon your pet to this location." ) );
from.Send( new AsciiMessage( Serial, ItemID, MessageType.Regular, 0x22, 3, "", "You cannot summon your pet to this location." ) );
}
else if ( Core.ML && from is PlayerMobile mobile && DateTime.UtcNow < mobile.LastPetBallTime.AddSeconds( 15.0 ) )
{
@ -273,7 +273,7 @@ namespace Server.Items
public void SummonPet( Mobile from )
{
BaseCreature pet = this.Pet;
BaseCreature pet = Pet;
if ( pet == null )
return;
@ -310,7 +310,7 @@ namespace Server.Items
public void UnlinkPet( Mobile from )
{
if ( !Deleted && Pet != null && this.RootParent == from )
if ( !Deleted && Pet != null && RootParent == from )
{
Pet = null;
@ -325,7 +325,7 @@ namespace Server.Items
private void InternalUpdatePetName()
{
BaseCreature pet = this.Pet;
BaseCreature pet = Pet;
if ( pet == null )
m_PetName = "";
@ -348,7 +348,7 @@ namespace Server.Items
writer.WriteEncodedInt( (int) m_Recharges );
writer.WriteEncodedInt( (int) m_Charges );
writer.Write( (Mobile) this.Pet );
writer.Write( (Mobile) Pet );
writer.Write( (string) m_PetName );
}
@ -368,7 +368,7 @@ namespace Server.Items
case 0:
{
m_Charges = Math.Min( reader.ReadEncodedInt(), MaxCharges );
this.Pet = (BaseCreature) reader.ReadMobile();
Pet = (BaseCreature) reader.ReadMobile();
m_PetName = reader.ReadString();
break;
}

38
Scripts/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -23,8 +23,8 @@ namespace Server.Items
get => m_Charges;
set
{
if ( value > this.MaxCharges )
m_Charges = this.MaxCharges;
if ( value > MaxCharges )
m_Charges = MaxCharges;
else if ( value < 0 )
m_Charges = 0;
else
@ -40,8 +40,8 @@ namespace Server.Items
get => m_Recharges;
set
{
if ( value > this.MaxRecharges )
m_Recharges = this.MaxRecharges;
if ( value > MaxRecharges )
m_Recharges = MaxRecharges;
else if ( value < 0 )
m_Recharges = 0;
else
@ -106,9 +106,9 @@ namespace Server.Items
{
base.GetContextMenuEntries( from, list );
if ( from.Alive && this.IsChildOf( from ) )
if ( from.Alive && IsChildOf( from ) )
{
BraceletOfBinding bound = this.Bound;
BraceletOfBinding bound = Bound;
list.Add( new BraceletEntry( new BraceletCallback( Activate ), 6170, bound != null ) );
list.Add( new BraceletEntry( new BraceletCallback( Search ), 6171, bound != null ) );
@ -142,7 +142,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
BraceletOfBinding bound = this.Bound;
BraceletOfBinding bound = Bound;
if ( Bound == null )
{
@ -156,12 +156,12 @@ namespace Server.Items
public void Activate( Mobile from )
{
BraceletOfBinding bound = this.Bound;
BraceletOfBinding bound = Bound;
if ( Deleted || bound == null )
return;
if ( !this.IsChildOf( from ) )
if ( !IsChildOf( from ) )
{
from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it.
}
@ -218,12 +218,12 @@ namespace Server.Items
public void Search( Mobile from )
{
BraceletOfBinding bound = this.Bound;
BraceletOfBinding bound = Bound;
if ( Deleted || bound == null )
return;
if ( !this.IsChildOf( from ) )
if ( !IsChildOf( from ) )
{
from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it.
}
@ -235,7 +235,7 @@ namespace Server.Items
private bool CheckUse( Mobile from, bool successMessage )
{
BraceletOfBinding bound = this.Bound;
BraceletOfBinding bound = Bound;
if ( bound == null )
return false;
@ -295,17 +295,17 @@ namespace Server.Items
from.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
return false;
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( from ) )
else if ( Misc.WeightOverloading.IsOverloaded( from ) )
{
from.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
return false;
}
else if ( from.Region.IsPartOf( typeof( Server.Regions.Jail ) ) )
else if ( from.Region.IsPartOf( typeof( Regions.Jail ) ) )
{
from.SendLocalizedMessage( 1114345, "", 0x35 ); // You'll need a better jailbreak plan than that!
return false;
}
else if ( boundRoot.Region.IsPartOf( typeof( Server.Regions.Jail ) ) )
else if ( boundRoot.Region.IsPartOf( typeof( Regions.Jail ) ) )
{
from.SendLocalizedMessage( 1019004 ); // You are not allowed to travel there.
return false;
@ -324,7 +324,7 @@ namespace Server.Items
if ( Deleted )
return;
if ( !this.IsChildOf( from ) )
if ( !IsChildOf( from ) )
{
from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it.
}
@ -383,7 +383,7 @@ namespace Server.Items
if ( Deleted )
return;
if ( !this.IsChildOf( from ) )
if ( !IsChildOf( from ) )
{
from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it.
}
@ -439,7 +439,7 @@ namespace Server.Items
writer.WriteEncodedInt( (int) m_Charges );
writer.Write( (string) m_Inscription );
writer.Write( (Item) this.Bound );
writer.Write( (Item) Bound );
}
public override void Deserialize( GenericReader reader )
@ -459,7 +459,7 @@ namespace Server.Items
{
m_Charges = Math.Min( reader.ReadEncodedInt(), MaxCharges );
m_Inscription = reader.ReadString();
this.Bound = (BraceletOfBinding) reader.ReadItem();
Bound = (BraceletOfBinding) reader.ReadItem();
break;
}
}

2
Scripts/Items/Special/Solen Items/PowderOfTranslocation.cs
View file

@ -29,7 +29,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( this.GetWorldLocation(), 2 ) )
if ( from.InRange( GetWorldLocation(), 2 ) )
{
from.Target = new InternalTarget( this );
}

18
Scripts/Items/Special/SoulStone.cs
View file

@ -33,7 +33,7 @@ namespace Server.Items
m_ActiveItemID = value;
if ( !IsEmpty )
this.ItemID = m_ActiveItemID;
ItemID = m_ActiveItemID;
}
}
@ -46,7 +46,7 @@ namespace Server.Items
m_InactiveItemID = value;
if ( IsEmpty )
this.ItemID = m_InactiveItemID;
ItemID = m_InactiveItemID;
}
}
@ -86,9 +86,9 @@ namespace Server.Items
m_SkillValue = value;
if ( !IsEmpty )
this.ItemID = m_ActiveItemID;
ItemID = m_ActiveItemID;
else
this.ItemID = m_InactiveItemID;
ItemID = m_InactiveItemID;
InvalidateProperties();
}
@ -131,7 +131,7 @@ namespace Server.Items
if ( !IsEmpty )
list.Add( 1070721, "#{0}\t{1:0.0}", AosSkillBonuses.GetLabel( Skill ), SkillValue ); // Skill stored: ~1_skillname~ ~2_skillamount~
string name = this.LastUserName;
string name = LastUserName;
if ( name == null )
name = String.Format( "#{0}", 1074235 ); // Unknown
@ -158,16 +158,16 @@ namespace Server.Items
PlayerMobile pm = from as PlayerMobile;
if ( this.Deleted || !this.IsAccessibleTo( from ) )
if ( Deleted || !IsAccessibleTo( from ) )
{
return false;
}
else if ( from.Map != this.Map || !from.InRange( GetWorldLocation(), 2 ) )
else if ( from.Map != Map || !from.InRange( GetWorldLocation(), 2 ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
return false;
}
else if ( this.Account != null && ( !(from.Account is Account) || from.Account.Username != this.Account ) )
else if ( Account != null && ( !(from.Account is Account) || from.Account.Username != Account ) )
{
from.SendLocalizedMessage( 1070714 ); // This is an Account Bound Soulstone, and your character is not bound to it. You cannot use this Soulstone.
return false;
@ -238,7 +238,7 @@ namespace Server.Items
from.CloseGump( typeof( ConfirmRemovalGump ) );
from.CloseGump( typeof( ErrorGump ) );
if ( this.IsEmpty )
if ( IsEmpty )
from.SendGump( new SelectSkillGump( this, from ) );
else
from.SendGump( new ConfirmTransferGump( this, from ) );

6
Scripts/Items/Special/Special Scrolls/PowerScroll.cs
View file

@ -154,7 +154,7 @@ namespace Server.Items
{
Hue = 0x481;
if ( Value == 105.0 || skill == Server.SkillName.Blacksmith || skill == Server.SkillName.Tailoring )
if ( Value == 105.0 || skill == SkillName.Blacksmith || skill == SkillName.Tailoring )
LootType = LootType.Regular;
}
@ -180,9 +180,9 @@ namespace Server.Items
double level = ( Value - 105.0 ) / 5.0;
if ( level >= 0.0 && level <= 3.0 && Value % 5.0 == 0.0 )
base.LabelTo( from, 1049639 + (int)level, GetNameLocalized() );
LabelTo( from, 1049639 + (int)level, GetNameLocalized() );
else
base.LabelTo( from, "a power scroll of {0} ({1} Skill)", GetName(), Value );
LabelTo( from, "a power scroll of {0} ({1} Skill)", GetName(), Value );
}
public override bool CanUse( Mobile from )

2
Scripts/Items/Special/Special Scrolls/SpecialScroll.cs
View file

@ -87,7 +87,7 @@ namespace Server.Items
if ( !CanUse( from ) )
return;
from.CloseGump( typeof( SpecialScroll.InternalGump ) );
from.CloseGump( typeof( InternalGump ) );
from.SendGump( new InternalGump( from, this ) );
}

4
Scripts/Items/Special/Special Scrolls/StatScroll.cs
View file

@ -61,9 +61,9 @@ namespace Server.Items
int level = ( (int)Value - 230 ) / 5;
if ( level >= 0 && level <= 4 && (int)Value % 5 == 0 )
base.LabelTo( from, 1049463 + level, "#1049476" );
LabelTo( from, 1049463 + level, "#1049476" );
else
base.LabelTo( from, "a scroll of power ({0}{1} Maximum Stats)", (Value - 225) >= 0 ? "+" : "", Value - 225 );
LabelTo( from, "a scroll of power ({0}{1} Maximum Stats)", (Value - 225) >= 0 ? "+" : "", Value - 225 );
}
public override bool CanUse( Mobile from )

2
Scripts/Items/Special/Valentines/2007/ValentinesCard.cs
View file

@ -60,7 +60,7 @@ namespace Server.Items
{
if (m_To == null)
{
if (this.IsChildOf(from))
if (IsChildOf(from))
{
from.BeginTarget(10, false, TargetFlags.None, new TargetCallback(OnTarget));

2
Scripts/Items/Special/Veteran Rewards/Brazier.cs
View file

@ -69,7 +69,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( !from.InRange( this.GetWorldLocation(), 2 ) )
if ( !from.InRange( GetWorldLocation(), 2 ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
}

2
Scripts/Items/Special/Veteran Rewards/MiningCart.cs
View file

@ -159,7 +159,7 @@ namespace Server.Items
if (!from.InRange(GetWorldLocation(), 2) || !from.InLOS(this) || !((from.Z - Z) > -3 && (from.Z - Z) < 3))
{
from.LocalOverheadMessage(Network.MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
}
else if ( house != null && house.HasSecureAccess( from, SecureLevel.Friends ) )
{

2
Scripts/Items/Special/Veteran Rewards/TreeStump.cs
View file

@ -82,7 +82,7 @@ namespace Server.Items
if (!from.InRange(GetWorldLocation(), 2) || !from.InLOS(this) || !((from.Z - Z) > -3 && (from.Z - Z) < 3))
{
from.LocalOverheadMessage(Network.MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
}
else if ( house != null && house.HasSecureAccess( from, SecureLevel.Friends ) )
{

2
Scripts/Items/Special/Veteran Rewards/WallBanner.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
public class WallBannerComponent : AddonComponent, IDyable
{
public override bool NeedsWall => true;
public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 );
public override Point3D WallPosition => East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 );
public bool East => ((WallBanner)Addon).East;

4
Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs
View file

@ -237,7 +237,7 @@ namespace Server.Items
AddTextEntry( 75, 245, 350, 40, 0x0, (int) Buttons.Text, "" );
}
public override void OnResponse( Server.Network.NetState state, RelayInfo info )
public override void OnResponse( Network.NetState state, RelayInfo info )
{
if ( m_Tool == null || m_Tool.Deleted || m_Target == null || m_Target.Deleted )
return;
@ -314,7 +314,7 @@ namespace Server.Items
AddHtmlLocalized( 40, 109, 100, 20, 1060051, 0x7FFF, false, false ); // CANCEL
}
public override void OnResponse( Server.Network.NetState state, RelayInfo info )
public override void OnResponse( Network.NetState state, RelayInfo info )
{
if ( m_Engraver == null || m_Engraver.Deleted )
return;