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

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

54
Scripts/Items/Food/Beverage.cs
View file

@ -489,9 +489,9 @@ namespace Server.Items
public override void Deserialize( GenericReader reader )
{
if ( CheckType( "PitcherWater" ) || CheckType( "GlassPitcher" ) )
base.InternalDeserialize( reader, false );
InternalDeserialize( reader, false );
else
base.InternalDeserialize( reader, true );
InternalDeserialize( reader, true );
int version = reader.ReadInt();
@ -711,18 +711,18 @@ namespace Server.Items
if ( bev.IsEmpty || !bev.ValidateUse( from, true ) )
return;
this.Content = bev.Content;
this.Poison = bev.Poison;
this.Poisoner = bev.Poisoner;
Content = bev.Content;
Poison = bev.Poison;
Poisoner = bev.Poisoner;
if ( bev.Quantity > this.MaxQuantity )
if ( bev.Quantity > MaxQuantity )
{
this.Quantity = this.MaxQuantity;
bev.Quantity -= this.MaxQuantity;
Quantity = MaxQuantity;
bev.Quantity -= MaxQuantity;
}
else
{
this.Quantity += bev.Quantity;
Quantity += bev.Quantity;
bev.Quantity = 0;
}
}
@ -758,18 +758,18 @@ namespace Server.Items
return;
}
this.Content = BeverageType.Water;
this.Poison = null;
this.Poisoner = null;
Content = BeverageType.Water;
Poison = null;
Poisoner = null;
if ( src.Quantity > this.MaxQuantity )
if ( src.Quantity > MaxQuantity )
{
this.Quantity = this.MaxQuantity;
src.Quantity -= this.MaxQuantity;
Quantity = MaxQuantity;
src.Quantity -= MaxQuantity;
}
else
{
this.Quantity += src.Quantity;
Quantity += src.Quantity;
src.Quantity = 0;
}
@ -913,7 +913,7 @@ namespace Server.Items
}
// *hic*
m_Drunk.PublicOverheadMessage( Network.MessageType.Regular, 0x3B2, 500849 );
m_Drunk.PublicOverheadMessage( MessageType.Regular, 0x3B2, 500849 );
}
if ( m_Drunk.BAC <= 0 )
@ -939,7 +939,7 @@ namespace Server.Items
if ( !bev.ValidateUse( from, true ) )
return;
if ( bev.IsFull && bev.Content == this.Content )
if ( bev.IsFull && bev.Content == Content )
{
from.SendLocalizedMessage( 500848 ); // Couldn't pour it there. It was already full.
}
@ -949,19 +949,19 @@ namespace Server.Items
}
else
{
bev.Content = this.Content;
bev.Poison = this.Poison;
bev.Poisoner = this.Poisoner;
bev.Content = Content;
bev.Poison = Poison;
bev.Poisoner = Poisoner;
if ( this.Quantity > bev.MaxQuantity )
if ( Quantity > bev.MaxQuantity )
{
bev.Quantity = bev.MaxQuantity;
this.Quantity -= bev.MaxQuantity;
Quantity -= bev.MaxQuantity;
}
else
{
bev.Quantity += this.Quantity;
this.Quantity = 0;
bev.Quantity += Quantity;
Quantity = 0;
}
from.PlaySound( 0x4E );
@ -976,7 +976,7 @@ namespace Server.Items
{
int bac = 0;
switch( this.Content )
switch( Content )
{
case BeverageType.Ale: bac = 1; break;
case BeverageType.Wine: bac = 2; break;
@ -1028,7 +1028,7 @@ namespace Server.Items
}
else if ( targ is AddonComponent component &&
( component.Addon is WaterVatEast || component.Addon is WaterVatSouth ) &&
this.Content == BeverageType.Water )
Content == BeverageType.Water )
{
if ( from is PlayerMobile player )
{

4
Scripts/Items/Food/BeverageEmpty.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
[Constructible]
public Glass() : base( 0x1f81 )
{
this.Weight = 0.1;
Weight = 0.1;
}
public Glass( Serial serial ) : base( serial )
@ -33,7 +33,7 @@ namespace Server.Items
[Constructible]
public GlassBottle() : base( 0xe2b )
{
this.Weight = 0.3;
Weight = 0.3;
}
public GlassBottle( Serial serial ) : base( serial )

2
Scripts/Items/Food/CookableFood.cs
View file

@ -104,7 +104,7 @@ namespace Server.Items
{
if ( m_Item.Deleted ) return;
if ( CookableFood.IsHeatSource( targeted ) )
if ( IsHeatSource( targeted ) )
{
if ( from.BeginAction( typeof( CookableFood ) ) )
{

4
Scripts/Items/Food/Cooking.cs
View file

@ -623,8 +623,8 @@ namespace Server.Items
{
int needs = mill.MaxFlour - mill.CurFlour;
if ( needs > this.Amount )
needs = this.Amount;
if ( needs > Amount )
needs = Amount;
mill.CurFlour += needs;
Consume( needs );

126
Scripts/Items/Food/Food.cs
View file

@ -50,7 +50,7 @@ namespace Server.Items
base.GetContextMenuEntries( from, list );
if ( from.Alive )
list.Add( new ContextMenus.EatEntry( from, this ) );
list.Add( new EatEntry( from, this ) );
}
public override void OnDoubleClick( Mobile from )
@ -58,7 +58,7 @@ namespace Server.Items
if ( !Movable )
return;
if ( from.InRange( this.GetWorldLocation(), 1 ) )
if ( from.InRange( GetWorldLocation(), 1 ) )
{
Eat( from );
}
@ -189,8 +189,8 @@ namespace Server.Items
[Constructible]
public BreadLoaf( int amount ) : base( amount, 0x103B )
{
this.Weight = 1.0;
this.FillFactor = 3;
Weight = 1.0;
FillFactor = 3;
}
public BreadLoaf( Serial serial ) : base( serial )
@ -222,8 +222,8 @@ namespace Server.Items
[Constructible]
public Bacon( int amount ) : base( amount, 0x979 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Bacon( Serial serial ) : base( serial )
@ -255,8 +255,8 @@ namespace Server.Items
[Constructible]
public SlabOfBacon( int amount ) : base( amount, 0x976 )
{
this.Weight = 1.0;
this.FillFactor = 3;
Weight = 1.0;
FillFactor = 3;
}
public SlabOfBacon( Serial serial ) : base( serial )
@ -290,7 +290,7 @@ namespace Server.Items
[Constructible]
public FishSteak( int amount ) : base( amount, 0x97B )
{
this.FillFactor = 3;
FillFactor = 3;
}
public FishSteak( Serial serial ) : base( serial )
@ -324,7 +324,7 @@ namespace Server.Items
[Constructible]
public CheeseWheel( int amount ) : base( amount, 0x97E )
{
this.FillFactor = 3;
FillFactor = 3;
}
public CheeseWheel( Serial serial ) : base( serial )
@ -358,7 +358,7 @@ namespace Server.Items
[Constructible]
public CheeseWedge( int amount ) : base( amount, 0x97D )
{
this.FillFactor = 3;
FillFactor = 3;
}
public CheeseWedge( Serial serial ) : base( serial )
@ -392,7 +392,7 @@ namespace Server.Items
[Constructible]
public CheeseSlice( int amount ) : base( amount, 0x97C )
{
this.FillFactor = 1;
FillFactor = 1;
}
public CheeseSlice( Serial serial ) : base( serial )
@ -424,8 +424,8 @@ namespace Server.Items
[Constructible]
public FrenchBread( int amount ) : base( amount, 0x98C )
{
this.Weight = 2.0;
this.FillFactor = 3;
Weight = 2.0;
FillFactor = 3;
}
public FrenchBread( Serial serial ) : base( serial )
@ -458,8 +458,8 @@ namespace Server.Items
[Constructible]
public FriedEggs( int amount ) : base( amount, 0x9B6 )
{
this.Weight = 1.0;
this.FillFactor = 4;
Weight = 1.0;
FillFactor = 4;
}
public FriedEggs( Serial serial ) : base( serial )
@ -491,8 +491,8 @@ namespace Server.Items
[Constructible]
public CookedBird( int amount ) : base( amount, 0x9B7 )
{
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public CookedBird( Serial serial ) : base( serial )
@ -524,8 +524,8 @@ namespace Server.Items
[Constructible]
public RoastPig( int amount ) : base( amount, 0x9BB )
{
this.Weight = 45.0;
this.FillFactor = 20;
Weight = 45.0;
FillFactor = 20;
}
public RoastPig( Serial serial ) : base( serial )
@ -557,8 +557,8 @@ namespace Server.Items
[Constructible]
public Sausage( int amount ) : base( amount, 0x9C0 )
{
this.Weight = 1.0;
this.FillFactor = 4;
Weight = 1.0;
FillFactor = 4;
}
public Sausage( Serial serial ) : base( serial )
@ -590,8 +590,8 @@ namespace Server.Items
[Constructible]
public Ham( int amount ) : base( amount, 0x9C9 )
{
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public Ham( Serial serial ) : base( serial )
@ -619,8 +619,8 @@ namespace Server.Items
public Cake() : base( 0x9E9 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 10;
Weight = 1.0;
FillFactor = 10;
}
public Cake( Serial serial ) : base( serial )
@ -652,8 +652,8 @@ namespace Server.Items
[Constructible]
public Ribs( int amount ) : base( amount, 0x9F2 )
{
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public Ribs( Serial serial ) : base( serial )
@ -681,8 +681,8 @@ namespace Server.Items
public Cookies() : base( 0x160b )
{
Stackable = Core.ML;
this.Weight = 1.0;
this.FillFactor = 4;
Weight = 1.0;
FillFactor = 4;
}
public Cookies( Serial serial ) : base( serial )
@ -710,8 +710,8 @@ namespace Server.Items
public Muffins() : base( 0x9eb )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 4;
Weight = 1.0;
FillFactor = 4;
}
public Muffins( Serial serial ) : base( serial )
@ -742,8 +742,8 @@ namespace Server.Items
public CheesePizza() : base( 0x1040 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 6;
Weight = 1.0;
FillFactor = 6;
}
public CheesePizza( Serial serial ) : base( serial )
@ -773,8 +773,8 @@ namespace Server.Items
public SausagePizza() : base( 0x1040 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 6;
Weight = 1.0;
FillFactor = 6;
}
public SausagePizza( Serial serial ) : base( serial )
@ -835,8 +835,8 @@ namespace Server.Items
public FruitPie() : base( 0x1041 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public FruitPie( Serial serial ) : base( serial )
@ -866,8 +866,8 @@ namespace Server.Items
public MeatPie() : base( 0x1041 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public MeatPie( Serial serial ) : base( serial )
@ -897,8 +897,8 @@ namespace Server.Items
public PumpkinPie() : base( 0x1041 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public PumpkinPie( Serial serial ) : base( serial )
@ -928,8 +928,8 @@ namespace Server.Items
public ApplePie() : base( 0x1041 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public ApplePie( Serial serial ) : base( serial )
@ -959,8 +959,8 @@ namespace Server.Items
public PeachCobbler() : base( 0x1041 )
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public PeachCobbler( Serial serial ) : base( serial )
@ -990,8 +990,8 @@ namespace Server.Items
public Quiche() : base( 0x1041 )
{
Stackable = Core.ML;
this.Weight = 1.0;
this.FillFactor = 5;
Weight = 1.0;
FillFactor = 5;
}
public Quiche( Serial serial ) : base( serial )
@ -1023,8 +1023,8 @@ namespace Server.Items
[Constructible]
public LambLeg( int amount ) : base( amount, 0x160a )
{
this.Weight = 2.0;
this.FillFactor = 5;
Weight = 2.0;
FillFactor = 5;
}
public LambLeg( Serial serial ) : base( serial )
@ -1056,8 +1056,8 @@ namespace Server.Items
[Constructible]
public ChickenLeg( int amount ) : base( amount, 0x1608 )
{
this.Weight = 1.0;
this.FillFactor = 4;
Weight = 1.0;
FillFactor = 4;
}
public ChickenLeg( Serial serial ) : base( serial )
@ -1090,8 +1090,8 @@ namespace Server.Items
[Constructible]
public HoneydewMelon( int amount ) : base( amount, 0xC74 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public HoneydewMelon( Serial serial ) : base( serial )
@ -1124,8 +1124,8 @@ namespace Server.Items
[Constructible]
public YellowGourd( int amount ) : base( amount, 0xC64 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public YellowGourd( Serial serial ) : base( serial )
@ -1158,8 +1158,8 @@ namespace Server.Items
[Constructible]
public GreenGourd( int amount ) : base( amount, 0xC66 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public GreenGourd( Serial serial ) : base( serial )
@ -1192,8 +1192,8 @@ namespace Server.Items
[Constructible]
public EarOfCorn( int amount ) : base( amount, 0xC81 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public EarOfCorn( Serial serial ) : base( serial )
@ -1225,8 +1225,8 @@ namespace Server.Items
[Constructible]
public Turnip( int amount ) : base( amount, 0xD3A )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Turnip( Serial serial ) : base( serial )
@ -1253,7 +1253,7 @@ namespace Server.Items
[Constructible]
public SheafOfHay() : base( 0xF36 )
{
this.Weight = 10.0;
Weight = 10.0;
}
public SheafOfHay( Serial serial ) : base( serial )

72
Scripts/Items/Food/Fruits.cs
View file

@ -49,8 +49,8 @@ namespace Server.Items
[Constructible]
public Banana( int amount ) : base( amount, 0x171f )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Banana( Serial serial ) : base( serial )
@ -82,8 +82,8 @@ namespace Server.Items
[Constructible]
public Bananas( int amount ) : base( amount, 0x1721 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Bananas( Serial serial ) : base( serial )
@ -114,8 +114,8 @@ namespace Server.Items
[Constructible]
public SplitCoconut( int amount ) : base( amount, 0x1725 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public SplitCoconut( Serial serial ) : base( serial )
@ -146,8 +146,8 @@ namespace Server.Items
[Constructible]
public Lemon( int amount ) : base( amount, 0x1728 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Lemon( Serial serial ) : base( serial )
@ -178,8 +178,8 @@ namespace Server.Items
[Constructible]
public Lemons( int amount ) : base( amount, 0x1729 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Lemons( Serial serial ) : base( serial )
@ -210,8 +210,8 @@ namespace Server.Items
[Constructible]
public Lime( int amount ) : base( amount, 0x172a )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Lime( Serial serial ) : base( serial )
@ -242,8 +242,8 @@ namespace Server.Items
[Constructible]
public Limes( int amount ) : base( amount, 0x172B )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Limes( Serial serial ) : base( serial )
@ -274,8 +274,8 @@ namespace Server.Items
[Constructible]
public Coconut( int amount ) : base( amount, 0x1726 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Coconut( Serial serial ) : base( serial )
@ -306,8 +306,8 @@ namespace Server.Items
[Constructible]
public OpenCoconut( int amount ) : base( amount, 0x1723 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public OpenCoconut( Serial serial ) : base( serial )
@ -338,8 +338,8 @@ namespace Server.Items
[Constructible]
public Dates( int amount ) : base( amount, 0x1727 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Dates( Serial serial ) : base( serial )
@ -370,8 +370,8 @@ namespace Server.Items
[Constructible]
public Grapes( int amount ) : base( amount, 0x9D1 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Grapes( Serial serial ) : base( serial )
@ -402,8 +402,8 @@ namespace Server.Items
[Constructible]
public Peach( int amount ) : base( amount, 0x9D2 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Peach( Serial serial ) : base( serial )
@ -434,8 +434,8 @@ namespace Server.Items
[Constructible]
public Pear( int amount ) : base( amount, 0x994 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Pear( Serial serial ) : base( serial )
@ -466,8 +466,8 @@ namespace Server.Items
[Constructible]
public Apple( int amount ) : base( amount, 0x9D0 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Apple( Serial serial ) : base( serial )
@ -498,8 +498,8 @@ namespace Server.Items
[Constructible]
public Watermelon( int amount ) : base( amount, 0xC5C )
{
this.Weight = 5.0;
this.FillFactor = 5;
Weight = 5.0;
FillFactor = 5;
}
public Watermelon( Serial serial ) : base( serial )
@ -539,8 +539,8 @@ namespace Server.Items
[Constructible]
public SmallWatermelon( int amount ) : base( amount, 0xC5D )
{
this.Weight = 5.0;
this.FillFactor = 5;
Weight = 5.0;
FillFactor = 5;
}
public SmallWatermelon( Serial serial ) : base( serial )
@ -572,8 +572,8 @@ namespace Server.Items
[Constructible]
public Squash( int amount ) : base( amount, 0xc72 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Squash( Serial serial ) : base( serial )
@ -605,8 +605,8 @@ namespace Server.Items
[Constructible]
public Cantaloupe( int amount ) : base( amount, 0xc79 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Cantaloupe( Serial serial ) : base( serial )

24
Scripts/Items/Food/Vegetables.cs
View file

@ -11,8 +11,8 @@ namespace Server.Items
[Constructible]
public Carrot( int amount ) : base( amount, 0xc78 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Carrot( Serial serial ) : base( serial )
@ -44,8 +44,8 @@ namespace Server.Items
[Constructible]
public Cabbage( int amount ) : base( amount, 0xc7b )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Cabbage( Serial serial ) : base( serial )
@ -77,8 +77,8 @@ namespace Server.Items
[Constructible]
public Onion( int amount ) : base( amount, 0xc6d )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Onion( Serial serial ) : base( serial )
@ -110,8 +110,8 @@ namespace Server.Items
[Constructible]
public Lettuce( int amount ) : base( amount, 0xc70 )
{
this.Weight = 1.0;
this.FillFactor = 1;
Weight = 1.0;
FillFactor = 1;
}
public Lettuce( Serial serial ) : base( serial )
@ -143,8 +143,8 @@ namespace Server.Items
[Constructible]
public Pumpkin( int amount ) : base( amount, 0xC6A )
{
this.Weight = 1.0;
this.FillFactor = 8;
Weight = 1.0;
FillFactor = 8;
}
public Pumpkin( Serial serial ) : base( serial )
@ -184,8 +184,8 @@ namespace Server.Items
[Constructible]
public SmallPumpkin( int amount ) : base( amount, 0xC6C )
{
this.Weight = 1.0;
this.FillFactor = 8;
Weight = 1.0;
FillFactor = 8;
}
public SmallPumpkin( Serial serial ) : base( serial )