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

18
Scripts/Items/Aquarium/Aquarium.cs
View file

@ -132,7 +132,7 @@ namespace Server.Items
}
}
public override double DefaultWeight{ get{ return 10.0; } }
public override double DefaultWeight => 10.0;
public Aquarium( int itemID ) : base( itemID )
{
@ -342,9 +342,9 @@ namespace Server.Items
this.LabelTo( from, 1074251, "#" + WaterNumber() ); // Water state: ~1_STATE~
if ( m_Food.State == (int) FoodState.Dead )
this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Improve) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~
this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Improve) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~
else if ( m_Food.State == (int) FoodState.Overfed )
this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Maintain) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~
this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Maintain) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~
else
this.LabelTo( from, 1074253, String.Format("{0}\t{1}\t{2}", m_Food.Added, m_Food.Maintain, m_Food.Improve) ); // Food Added: ~1_CUR~ Feed: ~2_NEED~ Improve: ~3_GROW~
@ -1152,11 +1152,11 @@ namespace Server.Items
public class AquariumEastDeed : BaseAddonContainerDeed
{
public override BaseAddonContainer Addon{ get{ return new Aquarium( 0x3062 ); } }
public override int LabelNumber{ get{ return 1074501; } } // Large Aquarium (east)
public override BaseAddonContainer Addon => new Aquarium( 0x3062 );
public override int LabelNumber => 1074501; // Large Aquarium (east)
[Constructible]
public AquariumEastDeed() : base()
public AquariumEastDeed()
{
}
@ -1181,11 +1181,11 @@ namespace Server.Items
public class AquariumNorthDeed : BaseAddonContainerDeed
{
public override BaseAddonContainer Addon{ get{ return new Aquarium( 0x3060 ); } }
public override int LabelNumber{ get{ return 1074497; } } // Large Aquarium (north)
public override BaseAddonContainer Addon => new Aquarium( 0x3060 );
public override int LabelNumber => 1074497; // Large Aquarium (north)
[Constructible]
public AquariumNorthDeed() : base()
public AquariumNorthDeed()
{
}

4
Scripts/Items/Aquarium/AquariumFishingNet.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
{
public class AquariumFishNet : SpecialFishingNet
{
public override int LabelNumber{ get{ return 1074463; } } // An aquarium fishing net
public override int LabelNumber => 1074463; // An aquarium fishing net
[Constructible]
public AquariumFishNet()
@ -137,7 +137,7 @@ namespace Server.Items
// Legacy code
public class AquariumFishingNet : Item
{
public override int LabelNumber{ get{ return 1074463; } } // An aquarium fishing net
public override int LabelNumber => 1074463; // An aquarium fishing net
public AquariumFishingNet()
{

8
Scripts/Items/Aquarium/AquariumFood.cs
View file

@ -5,9 +5,9 @@ using Server.Mobiles;
namespace Server.Items
{
public class AquariumFood : Item
{
public override int LabelNumber{ get{ return 1074819; } } // Aquarium food
{
public override int LabelNumber => 1074819; // Aquarium food
[Constructible]
public AquariumFood() : base( 0xEFC )
{
@ -15,7 +15,7 @@ namespace Server.Items
public AquariumFood( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/AlbinoCourtesanFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class AlbinoCourtesanFish : BaseFish
{
public override int LabelNumber{ get{ return 1074592; } } // Albino Courtesan Fish
{
public override int LabelNumber => 1074592; // Albino Courtesan Fish
[Constructible]
public AlbinoCourtesanFish() : base( 0x3B04 )
{
}
public AlbinoCourtesanFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/AlbinoFrog.cs
View file

@ -4,9 +4,9 @@ using Server;
namespace Server.Items
{
public class AlbinoFrog : BaseFish
{
public override int LabelNumber{ get{ return 1073824; } } // An Albino Frog
{
public override int LabelNumber => 1073824; // An Albino Frog
[Constructible]
public AlbinoFrog() : base( 0x3B0D )
{
@ -14,7 +14,7 @@ namespace Server.Items
}
public AlbinoFrog( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/BritainCrownFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class BritainCrownFish : BaseFish
{
public override int LabelNumber{ get{ return 1074589; } } // Britain Crown Fish
{
public override int LabelNumber => 1074589; // Britain Crown Fish
[Constructible]
public BritainCrownFish() : base( 0x3AFF )
{
}
public BritainCrownFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/FandancerFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class FandancerFish : BaseFish
{
public override int LabelNumber{ get{ return 1074591; } } // Fandancer Fish
{
public override int LabelNumber => 1074591; // Fandancer Fish
[Constructible]
public FandancerFish() : base( 0x3B02 )
{
}
public FandancerFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/GoldenBroadtail.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class GoldenBroadtail : BaseFish
{
public override int LabelNumber{ get{ return 1073828; } } // A Golden Broadtail
{
public override int LabelNumber => 1073828; // A Golden Broadtail
[Constructible]
public GoldenBroadtail() : base( 0x3B03 )
{
}
public GoldenBroadtail( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/Jellyfish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class Jellyfish : BaseFish
{
public override int LabelNumber{ get{ return 1074593; } } // Jellyfish
{
public override int LabelNumber => 1074593; // Jellyfish
[Constructible]
public Jellyfish() : base( 0x3B0E )
{
}
public Jellyfish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/KillerFrog.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class KillerFrog : BaseFish
{
public override int LabelNumber{ get{ return 1073825; } } // A Killer Frog
{
public override int LabelNumber => 1073825; // A Killer Frog
[Constructible]
public KillerFrog() : base( 0x3B0D )
{
}
public KillerFrog( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/LongClawCrab.cs
View file

@ -4,9 +4,9 @@ using Server;
namespace Server.Items
{
public class LongClawCrab : BaseFish
{
public override int LabelNumber{ get{ return 1073827; } } // A Long Claw Crab
{
public override int LabelNumber => 1073827; // A Long Claw Crab
[Constructible]
public LongClawCrab() : base( 0x3AFC )
{
@ -14,7 +14,7 @@ namespace Server.Items
}
public LongClawCrab( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/MakotoCourtesanFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class MakotoCourtesanFish : BaseFish
{
public override int LabelNumber{ get{ return 1073835; } } // A Makoto Courtesan Fish
{
public override int LabelNumber => 1073835; // A Makoto Courtesan Fish
[Constructible]
public MakotoCourtesanFish() : base( 0x3AFD )
{
}
public MakotoCourtesanFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/MinocBlueFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class MinocBlueFish : BaseFish
{
public override int LabelNumber{ get{ return 1073829; } } // A Minoc Blue Fish
{
public override int LabelNumber => 1073829; // A Minoc Blue Fish
[Constructible]
public MinocBlueFish() : base( 0x3AFE )
{
}
public MinocBlueFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/NujelmHoneyFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class NujelmHoneyFish : BaseFish
{
public override int LabelNumber{ get{ return 1073830; } } // A Nujel'm Honey Fish
{
public override int LabelNumber => 1073830; // A Nujel'm Honey Fish
[Constructible]
public NujelmHoneyFish() : base( 0x3B06 )
{
}
public NujelmHoneyFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/PurpleFrog.cs
View file

@ -4,9 +4,9 @@ using Server;
namespace Server.Items
{
public class PurpleFrog : BaseFish
{
public override int LabelNumber{ get{ return 1073823; } } // A Purple Frog
{
public override int LabelNumber => 1073823; // A Purple Frog
[Constructible]
public PurpleFrog() : base( 0x3B0D )
{
@ -14,7 +14,7 @@ namespace Server.Items
}
public PurpleFrog( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/RedDartFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class RedDartFish : BaseFish
{
public override int LabelNumber{ get{ return 1073834; } } // A Red Dart Fish
{
public override int LabelNumber => 1073834; // A Red Dart Fish
[Constructible]
public RedDartFish() : base( 0x3B00 )
{
}
public RedDartFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/Shrimp.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class Shrimp : BaseFish
{
public override int LabelNumber{ get{ return 1074596; } } // Shrimp
{
public override int LabelNumber => 1074596; // Shrimp
[Constructible]
public Shrimp() : base( 0x3B14 )
{
}
public Shrimp( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/SmallMouthSuckerFin.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class SmallMouthSuckerFin : BaseFish
{
public override int LabelNumber{ get{ return 1074590; } } // Small Mouth Sucker Fin
{
public override int LabelNumber => 1074590; // Small Mouth Sucker Fin
[Constructible]
public SmallMouthSuckerFin() : base( 0x3B01 )
{
}
public SmallMouthSuckerFin( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/SpeckledCrab.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class SpeckledCrab : BaseFish
{
public override int LabelNumber{ get{ return 1073826; } } // A Speckled Crab
{
public override int LabelNumber => 1073826; // A Speckled Crab
[Constructible]
public SpeckledCrab() : base( 0x3AFC )
{
}
public SpeckledCrab( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/SpinedScratcherFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class SpinedScratcherFish : BaseFish
{
public override int LabelNumber{ get{ return 1073832; } } // A Spined Scratcher Fish
{
public override int LabelNumber => 1073832; // A Spined Scratcher Fish
[Constructible]
public SpinedScratcherFish() : base( 0x3B05 )
{
}
public SpinedScratcherFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/SpottedBuccaneer.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class SpottedBuccaneer : BaseFish
{
public override int LabelNumber{ get{ return 1073833; } } // A Spotted Buccaneer
{
public override int LabelNumber => 1073833; // A Spotted Buccaneer
[Constructible]
public SpottedBuccaneer() : base( 0x3B09 )
{
}
public SpottedBuccaneer( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/VesperReefTiger.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class VesperReefTiger : BaseFish
{
public override int LabelNumber{ get{ return 1073836; } } // A Vesper Reef Tiger
{
public override int LabelNumber => 1073836; // A Vesper Reef Tiger
[Constructible]
public VesperReefTiger() : base( 0x3B08 )
{
}
public VesperReefTiger( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Fish/YellowFinBluebelly.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class YellowFinBluebelly : BaseFish
{
public override int LabelNumber{ get{ return 1073831; } } // A Yellow Fin Bluebelly
{
public override int LabelNumber => 1073831; // A Yellow Fin Bluebelly
[Constructible]
public YellowFinBluebelly() : base( 0x3B07 )
{
}
public YellowFinBluebelly( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

4
Scripts/Items/Aquarium/FishBowl.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
{
public class FishBowl : BaseContainer
{
public override int LabelNumber{ get{ return 1074499; } } // A fish bowl
public override int LabelNumber => 1074499; // A fish bowl
[CommandProperty( AccessLevel.GameMaster )]
public bool Empty
@ -32,7 +32,7 @@ namespace Server.Items
}
}
public override double DefaultWeight { get { return 2.0; } }
public override double DefaultWeight => 2.0;
[Constructible]
public FishBowl() : base( 0x241C )

8
Scripts/Items/Aquarium/Reward Fish/BrineShrimp.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class BrineShrimp : BaseFish
{
public override int LabelNumber{ get{ return 1074415; } } // Brine shrimp
{
public override int LabelNumber => 1074415; // Brine shrimp
[Constructible]
public BrineShrimp() : base( 0x3B11 )
{
}
public BrineShrimp( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

10
Scripts/Items/Aquarium/Reward Fish/Coral.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class Coral : BaseFish
{
public override int LabelNumber{ get{ return 1074588; } } // Coral
{
public override int LabelNumber => 1074588; // Coral
[Constructible]
public Coral() : base( Utility.RandomList( 0x3AF9, 0x3AFA, 0x3AFB ) )
{
}
public Coral( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

10
Scripts/Items/Aquarium/Reward Fish/FullMoonFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class FullMoonFish : BaseFish
{
public override int LabelNumber{ get{ return 1074597; } } // A Full Moon Fish
{
public override int LabelNumber => 1074597; // A Full Moon Fish
[Constructible]
public FullMoonFish() : base( 0x3B15 )
{
}
}
public FullMoonFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Reward Fish/SeaHorse.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class SeaHorseFish : BaseFish
{
public override int LabelNumber{ get{ return 1074414; } } // A sea horse
{
public override int LabelNumber => 1074414; // A sea horse
[Constructible]
public SeaHorseFish() : base( 0x3B10 )
{
}
public SeaHorseFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Reward Fish/StrippedFlakeFish.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class StrippedFlakeFish : BaseFish
{
public override int LabelNumber{ get{ return 1074595; } } // Stripped Flake Fish
{
public override int LabelNumber => 1074595; // Stripped Flake Fish
[Constructible]
public StrippedFlakeFish() : base( 0x3B0A )
{
}
public StrippedFlakeFish( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

8
Scripts/Items/Aquarium/Reward Fish/StrippedSosarianSwill.cs
View file

@ -4,16 +4,16 @@ using Server;
namespace Server.Items
{
public class StrippedSosarianSwill : BaseFish
{
public override int LabelNumber{ get{ return 1074594; } } // Stripped Sosarian Swill
{
public override int LabelNumber => 1074594; // Stripped Sosarian Swill
[Constructible]
public StrippedSosarianSwill() : base( 0x3B0A )
{
}
public StrippedSosarianSwill( Serial serial ) : base( serial )
{
{
}
public override void Serialize( GenericWriter writer )

4
Scripts/Items/Aquarium/Rewards/AquariumMessage.cs
View file

@ -6,10 +6,10 @@ namespace Server.Items
{
public class AquariumMessage : MessageInABottle
{
public override int LabelNumber{ get{ return 1073894; } } // Message in a Bottle
public override int LabelNumber => 1073894; // Message in a Bottle
[Constructible]
public AquariumMessage() : base()
public AquariumMessage()
{
}

4
Scripts/Items/Aquarium/Rewards/CaptainBlackheartsFishingPole.cs
View file

@ -6,10 +6,10 @@ namespace Server.Items
{
public class CaptainBlackheartsFishingPole : FishingPole
{
public override int LabelNumber{ get{ return 1074571; } } // Captain Blackheart's Fishing Pole
public override int LabelNumber => 1074571; // Captain Blackheart's Fishing Pole
[Constructible]
public CaptainBlackheartsFishingPole() : base()
public CaptainBlackheartsFishingPole()
{
}

16
Scripts/Items/Aquarium/Rewards/CraftysFishingHat.cs
View file

@ -6,16 +6,16 @@ namespace Server.Items
{
public class CraftysFishingHat : BaseHat
{
public override int LabelNumber{ get{ return 1074572; } } // Crafty's Fishing Hat
public override int LabelNumber => 1074572; // Crafty's Fishing Hat
public override int BasePhysicalResistance{ get{ return 0; } }
public override int BaseFireResistance{ get{ return 5; } }
public override int BaseColdResistance{ get{ return 9; } }
public override int BasePoisonResistance{ get{ return 5; } }
public override int BaseEnergyResistance{ get{ return 5; } }
public override int BasePhysicalResistance => 0;
public override int BaseFireResistance => 5;
public override int BaseColdResistance => 9;
public override int BasePoisonResistance => 5;
public override int BaseEnergyResistance => 5;
public override int InitMinHits{ get{ return 20; } }
public override int InitMaxHits{ get{ return 30; } }
public override int InitMinHits => 20;
public override int InitMaxHits => 30;
[Constructible]
public CraftysFishingHat() : base( 0x1713 )

4
Scripts/Items/Aquarium/Rewards/FishBones.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class FishBones : Item
{
public override int LabelNumber{ get{ return 1074601; } } // Fish bones
public override double DefaultWeight{ get{ return 1.0; } }
public override int LabelNumber => 1074601; // Fish bones
public override double DefaultWeight => 1.0;
[Constructible]
public FishBones() : base( 0x3B0C )

14
Scripts/Items/Aquarium/Rewards/IslandStatue.cs
View file

@ -5,23 +5,23 @@ using Server.Items;
namespace Server.Items
{
public class IslandStatue : Item
{
public override int LabelNumber{ get{ return 1074600; } } // An island statue
public override double DefaultWeight{ get{ return 1.0; } }
{
public override int LabelNumber => 1074600; // An island statue
public override double DefaultWeight => 1.0;
[Constructible]
public IslandStatue() : base( 0x3B0F )
{
}
public IslandStatue( Serial serial ) : base( serial )
{
{
}
public override void AddNameProperties( ObjectPropertyList list )
{
base.AddNameProperties( list );
list.Add( 1073634 ); // An aquarium decoration
}

4
Scripts/Items/Aquarium/Rewards/Shell.cs
View file

@ -6,8 +6,8 @@ namespace Server.Items
{
public class Shell : Item
{
public override int LabelNumber{ get{ return 1074598; } } // A shell
public override double DefaultWeight{ get{ return 1.0; } }
public override int LabelNumber => 1074598; // A shell
public override double DefaultWeight => 1.0;
[Constructible]
public Shell() : base( Utility.RandomList( 0x3B12, 0x3B13 ) )

4
Scripts/Items/Aquarium/Rewards/ToyBoat.cs
View file

@ -7,8 +7,8 @@ namespace Server.Items
[FlippableAttribute( 0x14F3, 0x14F4 )]
public class ToyBoat : Item
{
public override int LabelNumber{ get{ return 1074363; } } // A toy boat
public override double DefaultWeight{ get{ return 1.0; } }
public override int LabelNumber => 1074363; // A toy boat
public override double DefaultWeight => 1.0;
[Constructible]
public ToyBoat() : base( 0x14F4 )

2
Scripts/Items/Aquarium/Rewards/WaterloggedBoots.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class WaterloggedBoots : BaseShoes
{
public override int LabelNumber{ get{ return 1074364; } } // Waterlogged boots
public override int LabelNumber => 1074364; // Waterlogged boots
[Constructible]
public WaterloggedBoots() : base( 0x1711 )

2
Scripts/Items/Aquarium/VacationWafer.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
{
public const int VacationDays = 7;
public override int LabelNumber{ get{ return 1074431; } } // An aquarium flake sphere
public override int LabelNumber => 1074431; // An aquarium flake sphere
[Constructible]
public VacationWafer() : base( 0x973 )