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

26
Scripts/Items/Lights/BaseLight.cs
View file

@ -13,13 +13,13 @@ namespace Server.Items
private TimeSpan m_Duration = TimeSpan.Zero;
public abstract int LitItemID{ get; }
public virtual int UnlitItemID{ get { return 0; } }
public virtual int BurntOutItemID{ get { return 0; } }
public virtual int LitSound{ get { return 0x47; } }
public virtual int UnlitSound{ get { return 0x3be; } }
public virtual int BurntOutSound{ get { return 0x4b8; } }
public virtual int UnlitItemID => 0;
public virtual int BurntOutItemID => 0;
public virtual int LitSound => 0x47;
public virtual int UnlitSound => 0x3be;
public virtual int BurntOutSound => 0x4b8;
public static readonly bool Burnout = false;
@ -82,9 +82,9 @@ namespace Server.Items
{
Point3D loc = GetWorldLocation();
Effects.PlaySound( loc, Map, LitSound );
}
}
}
public virtual void PlayUnlitSound()
{
int sound = UnlitSound;
@ -92,12 +92,12 @@ namespace Server.Items
if ( m_BurntOut && BurntOutSound != 0 )
sound = BurntOutSound;
if ( sound != 0 )
{
Point3D loc = GetWorldLocation();
Effects.PlaySound( loc, Map, sound );
}
}
}
public virtual void Ignite()
@ -115,7 +115,7 @@ namespace Server.Items
public virtual void Douse()
{
m_Burning = false;
if ( m_BurntOut && BurntOutItemID != 0 )
ItemID = BurntOutItemID;
else
@ -141,7 +141,7 @@ namespace Server.Items
private void DoTimer( TimeSpan delay )
{
m_Duration = delay;
if ( m_Timer != null )
m_Timer.Stop();

6
Scripts/Items/Lights/Brazier.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class Brazier : BaseLight
{
public override int LitItemID{ get { return 0xE31; } }
public override int LitItemID => 0xE31;
[Constructible]
public Brazier() : base( 0xE31 )
{
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Lights/BrazierTall.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class BrazierTall : BaseLight
{
public override int LitItemID{ get { return 0x19AA; } }
public override int LitItemID => 0x19AA;
[Constructible]
public BrazierTall() : base( 0x19AA )
{
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Lights/Candelabra.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class Candelabra : BaseLight, IShipwreckedItem
{
public override int LitItemID{ get { return 0xB1D; } }
public override int UnlitItemID{ get { return 0xA27; } }
public override int LitItemID => 0xB1D;
public override int UnlitItemID => 0xA27;
[Constructible]
public Candelabra() : base( 0xA27 )
@ -72,4 +72,4 @@ namespace Server.Items
}
#endregion
}
}
}

6
Scripts/Items/Lights/CandelabraStand.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class CandelabraStand : BaseLight
{
public override int LitItemID{ get { return 0xB26; } }
public override int UnlitItemID{ get { return 0xA29; } }
public override int LitItemID => 0xB26;
public override int UnlitItemID => 0xA29;
[Constructible]
public CandelabraStand() : base( 0xA29 )
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Lights/Candle.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class Candle : BaseEquipableLight
{
public override int LitItemID{ get { return 0xA0F; } }
public override int UnlitItemID{ get { return 0xA28; } }
public override int LitItemID => 0xA0F;
public override int UnlitItemID => 0xA28;
[Constructible]
public Candle() : base( 0xA28 )
@ -37,4 +37,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Lights/CandleLarge.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class CandleLarge : BaseLight
{
public override int LitItemID{ get { return 0xB1A; } }
public override int UnlitItemID{ get { return 0xA26; } }
public override int LitItemID => 0xB1A;
public override int UnlitItemID => 0xA26;
[Constructible]
public CandleLarge() : base( 0xA26 )
@ -37,4 +37,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Lights/CandleLong.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class CandleLong : BaseLight
{
public override int LitItemID{ get { return 0x1430; } }
public override int UnlitItemID{ get { return 0x1433; } }
public override int LitItemID => 0x1430;
public override int UnlitItemID => 0x1433;
[Constructible]
public CandleLong() : base( 0x1433 )
@ -37,4 +37,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Lights/CandleShort.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class CandleShort : BaseLight
{
public override int LitItemID{ get { return 0x142C; } }
public override int UnlitItemID{ get { return 0x142F; } }
public override int LitItemID => 0x142C;
public override int UnlitItemID => 0x142F;
[Constructible]
public CandleShort() : base( 0x142F )
@ -37,4 +37,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Lights/HangingLantern.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class HangingLantern : BaseLight
{
public override int LitItemID{ get { return 0xA1A; } }
public override int UnlitItemID{ get { return 0xA1D; } }
public override int LitItemID => 0xA1A;
public override int UnlitItemID => 0xA1D;
[Constructible]
public HangingLantern() : base( 0xA1D )
{
@ -34,4 +34,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Lights/HeatingStand.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class HeatingStand : BaseLight
{
public override int LitItemID{ get { return 0x184A; } }
public override int UnlitItemID{ get { return 0x1849; } }
public override int LitItemID => 0x184A;
public override int UnlitItemID => 0x1849;
[Constructible]
public HeatingStand() : base( 0x1849 )
@ -57,4 +57,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Lights/LampPost1.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class LampPost1 : BaseLight
{
public override int LitItemID{ get { return 0xB20; } }
public override int UnlitItemID{ get { return 0xB21; } }
public override int LitItemID => 0xB20;
public override int UnlitItemID => 0xB21;
[Constructible]
public LampPost1() : base( 0xB21 )
{
@ -34,4 +34,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Lights/LampPost2.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class LampPost2 : BaseLight
{
public override int LitItemID{ get { return 0xB22; } }
public override int UnlitItemID{ get { return 0xB23; } }
public override int LitItemID => 0xB22;
public override int UnlitItemID => 0xB23;
[Constructible]
public LampPost2() : base( 0xB23 )
{
@ -34,4 +34,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Lights/LampPost3.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class LampPost3 : BaseLight
{
public override int LitItemID{ get { return 0xB24; } }
public override int UnlitItemID{ get { return 0xB25; } }
public override int LitItemID => 0xB24;
public override int UnlitItemID => 0xB25;
[Constructible]
public LampPost3() : base( 0xb25 )
{
@ -34,4 +34,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Lights/Lantern.cs
View file

@ -59,7 +59,7 @@ namespace Server.Items
public class LanternOfSouls : Lantern
{
public override int LabelNumber{ get{ return 1061618; } } // Lantern of Souls
public override int LabelNumber => 1061618; // Lantern of Souls
[Constructible]
public LanternOfSouls()
@ -83,4 +83,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Lights/PaperLantern.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
[Flippable]
public class PaperLantern : BaseLight
{
public override int LitItemID{ get { return 0x24BD; } }
public override int UnlitItemID{ get { return 0x24BE; } }
public override int LitItemID => 0x24BD;
public override int UnlitItemID => 0x24BE;
[Constructible]
public PaperLantern() : base( 0x24BE )
{
@ -35,4 +35,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Lights/RoundPaperLantern.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
[Flippable]
public class RoundPaperLantern : BaseLight
{
public override int LitItemID{ get { return 0x24C9; } }
public override int UnlitItemID{ get { return 0x24CA; } }
public override int LitItemID => 0x24C9;
public override int UnlitItemID => 0x24CA;
[Constructible]
public RoundPaperLantern() : base( 0x24CA )
{
@ -35,4 +35,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Lights/ShojiLantern.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
[Flippable]
public class ShojiLantern : BaseLight
{
public override int LitItemID{ get { return 0x24BB; } }
public override int UnlitItemID{ get { return 0x24BC; } }
public override int LitItemID => 0x24BB;
public override int UnlitItemID => 0x24BC;
[Constructible]
public ShojiLantern() : base( 0x24BC )
{
@ -35,4 +35,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

12
Scripts/Items/Lights/Torch.cs
View file

@ -5,12 +5,12 @@ namespace Server.Items
{
public class Torch : BaseEquipableLight
{
public override int LitItemID{ get { return 0xA12; } }
public override int UnlitItemID{ get { return 0xF6B; } }
public override int LitItemID => 0xA12;
public override int UnlitItemID => 0xF6B;
public override int LitSound => 0x54;
public override int UnlitSound => 0x4BB;
public override int LitSound{ get { return 0x54; } }
public override int UnlitSound{ get { return 0x4BB; } }
[Constructible]
public Torch() : base( 0xF6B )
{
@ -59,4 +59,4 @@ namespace Server.Items
Weight = 1.0;
}
}
}
}