Replaces corpse name (#23)

Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs

@@ -5,9 +5,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an evil corpse" )]
 	public class UnholyFamiliar : BaseCreature
 	{
+		public override string CorpseName => "an evil corpse";
 		public override bool IsDispellable => false;
 		public override bool IsBondable => false;
 		public override string DefaultName => "a dark wolf";

Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs

@@ -5,9 +5,9 @@ using Server.Ethics;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an unholy corpse" )]
 	public class UnholySteed : BaseMount
 	{
+		public override string CorpseName => "an unholy corpse";
 		public override bool IsDispellable => false;
 		public override bool IsBondable => false;
 

Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs

@@ -5,9 +5,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a holy corpse" )]
 	public class HolyFamiliar : BaseCreature
 	{
+		public override string CorpseName => "a holy corpse";
 		public override bool IsDispellable => false;
 		public override bool IsBondable => false;
 

Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs

@@ -5,9 +5,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a holy corpse" )]
 	public class HolySteed : BaseMount
 	{
+		public override string CorpseName => "a holy corpse";
 		public override bool IsDispellable  => false;
 		public override bool IsBondable => false;
 

Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs

@@ -4,9 +4,9 @@ using Server.Mobiles;
 
 namespace Server.Factions
 {
-	[CorpseName( "a war horse corpse" )]
 	public class FactionWarHorse : BaseMount
 	{
+		public override string CorpseName => "a war horse corpse";
 		private Faction m_Faction;
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]

Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs

@@ -3,9 +3,9 @@ using Server;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a giant ice worm corpse" )]
 	public class GiantIceWorm : BaseCreature
 	{
+		public override string CorpseName => "a giant ice worm corpse";
 		public override bool SubdueBeforeTame => true;
 		public override string DefaultName => "a giant ice worm";
 

Scripts/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Engines.Quests.Samurai
 {
-	[CorpseName( "a cursed soul corpse" )]
 	public class CursedSoul : BaseCreature
 	{
+		public override string CorpseName => "a cursed soul corpse";
 		public override string DefaultName => "a cursed soul";
 
 		[Constructible]

Scripts/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Engines.Quests.Samurai
 {
-	[CorpseName( "an injured wolf corpse" )]
 	public class InjuredWolf : BaseCreature
 	{
+		public override string CorpseName => "an injured wolf corpse";
 		public override string DefaultName => "an injured wolf";
 
 		[Constructible]

Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs

@@ -5,9 +5,9 @@ using Server.Items;
 
 namespace Server.Engines.Quests.Samurai
 {
-	[CorpseName( "a young ninja's corpse" )]
 	public class YoungNinja : BaseCreature
 	{
+		public override string CorpseName => "a young ninja's corpse";
 		public override string DefaultName => "a young ninja";
 
 		[Constructible]

Scripts/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs

@@ -5,9 +5,9 @@ using Server.Items;
 
 namespace Server.Engines.Quests.Samurai
 {
-	[CorpseName( "a young ronin's corpse" )]
 	public class YoungRonin : BaseCreature
 	{
+		public override string CorpseName => "a young ronin's corpse";
 		public override string DefaultName => "a young ronin";
 
 		[Constructible]

Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs

@@ -6,9 +6,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a killer pumpkin corpse" )]
 	public class PumpkinHead : BaseCreature
 	{
+		public override string CorpseName => "a killer pumpkin corpse";
 		public override bool AutoDispel => true;
 		public override bool BardImmune => true;
 		public override bool Unprovokable => true;

Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs

@@ -181,9 +181,9 @@ namespace Server.Engines.Events
 		}
 	}
 
-	[CorpseName( "a rotting corpse" )]
 	public class ZombieSkeleton : BaseCreature
 	{
+		public override string CorpseName => "a rotting corpse";
 		private static readonly string m_Name = "Zombie Skeleton";
 
 		private PlayerMobile m_DeadPlayer;

Scripts/Items/Misc/Corpses/Corpse.cs

@@ -439,21 +439,7 @@ namespace Server.Items
 			if ( m is BaseCreature )
 			{
 				BaseCreature bc = (BaseCreature)m;
-
+				return bc.CorpseNameOverride ?? bc.CorpseName;
-				if ( bc.CorpseNameOverride != null )
-					return bc.CorpseNameOverride;
-			}
-
-			Type t = m.GetType();
-
-			object[] attrs = t.GetCustomAttributes( typeof( CorpseNameAttribute ), true );
-
-			if ( attrs != null && attrs.Length > 0 )
-			{
-				CorpseNameAttribute attr = attrs[0] as CorpseNameAttribute;
-
-				if ( attr != null )
-					return attr.Name;
 			}
 
 			return null;

Scripts/Mobiles/Animals/Bears/BlackBear.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bear corpse" )]
 	[TypeAlias( "Server.Mobiles.Bear" )]
 	public class BlackBear : BaseCreature
 	{
+		public override string CorpseName => "a bear corpse";
 		public override string DefaultName => "a black bear";
 
 		[Constructible]

Scripts/Mobiles/Animals/Bears/BrownBear.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bear corpse" )]
 	public class BrownBear : BaseCreature
 	{
+		public override string CorpseName => "a bear corpse";
 		public override string DefaultName => "a brown bear";
 
 		[Constructible]

Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a grizzly bear corpse" )]
 	[TypeAlias( "Server.Mobiles.Grizzlybear" )]
 	public class GrizzlyBear : BaseCreature
 	{
+		public override string CorpseName => "a grizzly bear corpse";
 		public override string DefaultName => "a grizzly bear";
 
 		[Constructible]

Scripts/Mobiles/Animals/Bears/PolarBear.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a polar bear corpse" )]
 	[TypeAlias( "Server.Mobiles.Polarbear" )]
 	public class PolarBear : BaseCreature
 	{
+		public override string CorpseName => "a polar bear corpse";
 		public override string DefaultName => "a polar bear";
 
 		[Constructible]

Scripts/Mobiles/Animals/Birds/Chicken.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a chicken corpse" )]
 	public class Chicken : BaseCreature
 	{
+		public override string CorpseName => "a chicken corpse";
 		public override string DefaultName => "a chicken";
 
 		[Constructible]

Scripts/Mobiles/Animals/Birds/Crane.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bird corpse" )]
 	public class Crane : BaseCreature
 	{
+		public override string CorpseName => "a bird corpse";
 		public override string DefaultName => "a crane";
 
 		[Constructible]

Scripts/Mobiles/Animals/Birds/Eagle.cs

@@ -4,9 +4,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bird corpse" )]
 	public class Eagle : BaseCreature
 	{
+		public override string CorpseName => "a bird corpse";
 		public override string DefaultName => "an eagle";
 
 		[Constructible]

Scripts/Mobiles/Animals/Birds/Phoenix.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a phoenix corpse" )]
 	public class Phoenix : BaseCreature
 	{
+		public override string CorpseName => "a phoenix corpse";
 		public override string DefaultName => "a phoenix";
 
 		[Constructible]

Scripts/Mobiles/Animals/Canines/DireWolf.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a dire wolf corpse" )]
 	[TypeAlias( "Server.Mobiles.Direwolf" )]
 	public class DireWolf : BaseCreature
 	{
+		public override string CorpseName => "a dire wolf corpse";
 		public override string DefaultName => "a dire wolf";
 
 		[Constructible]

Scripts/Mobiles/Animals/Canines/GreyWolf.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a grey wolf corpse" )]
 	[TypeAlias( "Server.Mobiles.Greywolf" )]
 	public class GreyWolf : BaseCreature
 	{
+		public override string CorpseName => "a grey wolf corpse";
 		public override string DefaultName => "a grey wolf";
 
 		[Constructible]

Scripts/Mobiles/Animals/Canines/TimberWolf.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a timber wolf corpse" )]
 	[TypeAlias( "Server.Mobiles.Timberwolf" )]
 	public class TimberWolf : BaseCreature
 	{
+		public override string CorpseName => "a timber wolf corpse";
 		public override string DefaultName => "a timber wolf";
 
 		[Constructible]

Scripts/Mobiles/Animals/Canines/WhiteWolf.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a white wolf corpse" )]
 	[TypeAlias( "Server.Mobiles.Whitewolf" )]
 	public class WhiteWolf : BaseCreature
 	{
+		public override string CorpseName => "a white wolf corpse";
 		public override string DefaultName => "a white wolf";
 
 		[Constructible]

Scripts/Mobiles/Animals/Cows/Bull.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bull corpse" )]
 	public class Bull : BaseCreature
 	{
+		public override string CorpseName => "a bull corpse";
 		public override string DefaultName => "a bull";
 
 		[Constructible]

Scripts/Mobiles/Animals/Cows/Cow.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a cow corpse" )]
 	public class Cow : BaseCreature
 	{
+		public override string CorpseName => "a cow corpse";
 		private DateTime m_MilkedOn;
 
 		[CommandProperty( AccessLevel.GameMaster )]

Scripts/Mobiles/Animals/Felines/Cougar.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a cougar corpse" )]
 	public class Cougar : BaseCreature
 	{
+		public override string CorpseName => "a cougar corpse";
 		public override string DefaultName => "a cougar";
 
 		[Constructible]

Scripts/Mobiles/Animals/Felines/HellCat.cs

@@ -4,10 +4,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a hell cat corpse" )]
 	[TypeAlias( "Server.Mobiles.Hellcat" )]
 	public class HellCat : BaseCreature
 	{
+		public override string CorpseName => "a hell cat corpse";
 		public override string DefaultName => "a hell cat";
 
 		[Constructible]

Scripts/Mobiles/Animals/Felines/Panther.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a panther corpse" )]
 	public class Panther : BaseCreature
 	{
+		public override string CorpseName => "a panther corpse";
 		public override string DefaultName => "a panther";
 
 		[Constructible]

Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a hell cat corpse" )]
 	[TypeAlias( "Server.Mobiles.Preditorhellcat" )]
 	public class PredatorHellCat : BaseCreature
 	{
+		public override string CorpseName => "a hell cat corpse";
 		public override string DefaultName => "a hell cat";
 
 		[Constructible]

Scripts/Mobiles/Animals/Felines/SnowLeopard.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a leopard corpse" )]
 	[TypeAlias( "Server.Mobiles.Snowleopard" )]
 	public class SnowLeopard : BaseCreature
 	{
+		public override string CorpseName => "a leopard corpse";
 		public override string DefaultName => "a snow leopard";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Boar.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a pig corpse" )]
 	public class Boar : BaseCreature
 	{
+		public override string CorpseName => "a pig corpse";
 		public override string DefaultName => "a boar";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/BullFrog.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bull frog corpse" )]
 	[TypeAlias( "Server.Mobiles.Bullfrog" )]
 	public class BullFrog : BaseCreature
 	{
+		public override string CorpseName => "a bull frog corpse";
 		public override string DefaultName => "a bull frog";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Dolphin.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a dolphin corpse" )]
 	public class Dolphin : BaseCreature
 	{
+		public override string CorpseName => "a dolphin corpse";
 		public override string DefaultName => "a dolphin";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Gaman.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a gaman corpse" )]
 	public class Gaman : BaseCreature
 	{
+		public override string CorpseName => "a gaman corpse";
 		public override string DefaultName => "a gaman";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/GiantToad.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a giant toad corpse" )]
 	[TypeAlias( "Server.Mobiles.Gianttoad" )]
 	public class GiantToad : BaseCreature
 	{
+		public override string CorpseName => "a giant toad corpse";
 		public override string DefaultName => "a giant toad";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Goat.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a goat corpse" )]
 	public class Goat : BaseCreature
 	{
+		public override string CorpseName => "a goat corpse";
 		public override string DefaultName => "a goat";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Gorilla.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a gorilla corpse" )]
 	public class Gorilla : BaseCreature
 	{
+		public override string CorpseName => "a gorilla corpse";
 		public override string DefaultName => "a gorilla";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/GreatHart.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a deer corpse" )]
 	[TypeAlias( "Server.Mobiles.Greathart" )]
 	public class GreatHart : BaseCreature
 	{
+		public override string CorpseName => "a deer corpse";
 		public override string DefaultName => "a great hart";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Hind.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a deer corpse" )]
 	public class Hind : BaseCreature
 	{
+		public override string CorpseName => "a deer corpse";
 		public override string DefaultName => "a hind";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Llama.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a llama corpse" )]
 	public class Llama : BaseCreature
 	{
+		public override string CorpseName => "a llama corpse";
 		public override string DefaultName => "a llama";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/MountainGoat.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a mountain goat corpse" )]
 	public class MountainGoat : BaseCreature
 	{
+		public override string CorpseName => "a mountain goat corpse";
 		public override string DefaultName => "a mountain goat";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/PackHorse.cs

@@ -7,9 +7,9 @@ using Server.ContextMenus;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a horse corpse" )]
 	public class PackHorse : BaseCreature
 	{
+		public override string CorpseName => "a horse corpse";
 		public override string DefaultName => "a pack horse";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/PackLlama.cs

@@ -6,9 +6,9 @@ using Server.ContextMenus;
 
 namespace Server.Mobiles
 {
-	[CorpseName("a llama corpse")]
 	public class PackLlama : BaseCreature
 	{
+		public override string CorpseName => "a llama corpse";
 		public override string DefaultName => "a pack llama";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Pig.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a pig corpse" )]
 	public class Pig : BaseCreature
 	{
+		public override string CorpseName => "a pig corpse";
 		public override string DefaultName => "a pig";
 
 		[Constructible]

Scripts/Mobiles/Animals/Misc/Sheep.cs

@@ -6,9 +6,9 @@ using Server.Network;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a sheep corpse" )]
 	public class Sheep : BaseCreature, ICarvable
 	{
+		public override string CorpseName => "a sheep corpse";
 		private DateTime m_NextWoolTime;
 
 		[CommandProperty( AccessLevel.GameMaster )]

Scripts/Mobiles/Animals/Misc/Walrus.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a walrus corpse" )]
 	public class Walrus : BaseCreature
 	{
+		public override string CorpseName => "a walrus corpse";
 		public override string DefaultName => "a walrus";
 
 		[Constructible]

Scripts/Mobiles/Animals/Mounts/Beetle.cs

@@ -8,9 +8,9 @@ using Server.ContextMenus;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a giant beetle corpse" )]
 	public class Beetle : BaseMount
 	{
+		public override string CorpseName => "a giant beetle corpse";
 		public virtual double BoostedSpeed{ get{ return 0.1; } }
 
 		[Constructible]

Scripts/Mobiles/Animals/Mounts/DesertOstard.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an ostard corpse" )]
 	public class DesertOstard : BaseMount
 	{
+		public override string CorpseName => "an ostard corpse";
 		[Constructible]
 		public DesertOstard() : this( "a desert ostard" )
 		{

Scripts/Mobiles/Animals/Mounts/FireSteed.cs

@@ -4,9 +4,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a fire steed corpse" )]
 	public class FireSteed : BaseMount
 	{
+		public override string CorpseName => "a fire steed corpse";
 		[Constructible]
 		public FireSteed() : this( "a fire steed" )
 		{

Scripts/Mobiles/Animals/Mounts/ForestOstard.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an ostard corpse" )]
 	public class ForestOstard : BaseMount
 	{
+		public override string CorpseName => "an ostard corpse";
 		[Constructible]
 		public ForestOstard() : this( "a forest ostard" )
 		{

Scripts/Mobiles/Animals/Mounts/FrenziedOstard.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an ostard corpse" )]
 	public class FrenziedOstard : BaseMount
 	{
+		public override string CorpseName => "an ostard corpse";
 		[Constructible]
 		public FrenziedOstard() : this( "a frenzied ostard" )
 		{

Scripts/Mobiles/Animals/Mounts/HellSteed.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a hellsteed corpse" )]
 	public class HellSteed : BaseMount
 	{
+		public override string CorpseName => "a hellsteed corpse";
 		public override bool HasBreath => true;
 		public override int BreathChaosDamage => 100;
 		public override Poison PoisonImmune => Poison.Lethal;

Scripts/Mobiles/Animals/Mounts/Hiryu.cs

@@ -5,9 +5,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a hiryu corpse" )]
 	public class Hiryu : BaseMount
 	{
+		public override string CorpseName => "a hiryu corpse";
 		public override double WeaponAbilityChance => 0.07; /* 1 in 15 chance of using per landed hit */
 
 		public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;

Scripts/Mobiles/Animals/Mounts/Horse.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a horse corpse" )]
 	[TypeAlias( "Server.Mobiles.BrownHorse", "Server.Mobiles.DirtyHorse", "Server.Mobiles.GrayHorse", "Server.Mobiles.TanHorse" )]
 	public class Horse : BaseMount
 	{
+		public override string CorpseName => "a horse corpse";
 		private static int[] m_IDs = new int[]
 			{
 				0xC8, 0x3E9F,

Scripts/Mobiles/Animals/Mounts/Kirin.cs

@@ -5,9 +5,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a ki-rin corpse" )]
 	public class Kirin : BaseMount
 	{
+		public override string CorpseName => "a ki-rin corpse";
 		public override bool AllowFemaleRider => false;
 		public override bool AllowFemaleTamer => false;
 

Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs

@@ -5,9 +5,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a hiryu corpse" )]
 	public class LesserHiryu : BaseMount
 	{
+		public override string CorpseName => "a hiryu corpse";
 		public override double WeaponAbilityChance => 0.07; /* 1 in 15 chance of using; 1 in 5 chance of success */
 
 		public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;

Scripts/Mobiles/Animals/Mounts/Nightmare.cs

@@ -5,9 +5,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a nightmare corpse" )]
 	public class Nightmare : BaseMount
 	{
+		public override string CorpseName => "a nightmare corpse";
 		[Constructible]
 		public Nightmare() : this( "a nightmare" )
 		{

Scripts/Mobiles/Animals/Mounts/RidableLlama.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a llama corpse" )]
 	public class RidableLlama : BaseMount
 	{
+		public override string CorpseName => "a llama corpse";
 		[Constructible]
 		public RidableLlama() : this( "a ridable llama" )
 		{

Scripts/Mobiles/Animals/Mounts/Ridgeback.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a ridgeback corpse" )]
 	public class Ridgeback : BaseMount
 	{
+		public override string CorpseName => "a ridgeback corpse";
 		[Constructible]
 		public Ridgeback() : this( "a ridgeback" )
 		{

Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a savage ridgeback corpse" )]
 	public class SavageRidgeback : BaseMount
 	{
+		public override string CorpseName => "a savage ridgeback corpse";
 		[Constructible]
 		public SavageRidgeback() : this( "a savage ridgeback" )
 		{

Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a swamp dragon corpse" )]
 	public class ScaledSwampDragon : BaseMount
 	{
+		public override string CorpseName => "a swamp dragon corpse";
 		[Constructible]
 		public ScaledSwampDragon() : this( "a swamp dragon" )
 		{

Scripts/Mobiles/Animals/Mounts/SeaHorse.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a sea horse corpse" )]
 	public class SeaHorse : BaseMount
 	{
+		public override string CorpseName => "a sea horse corpse";
 		[Constructible]
 		public SeaHorse() : this( "a sea horse" )
 		{
@@ -38,4 +38,4 @@ namespace Server.Mobiles
 			int version = reader.ReadInt();
 		}
 	}
-}
+}

Scripts/Mobiles/Animals/Mounts/SilverSteed.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a silver steed corpse" )]
 	public class SilverSteed : BaseMount
 	{
+		public override string CorpseName => "a silver steed corpse";
 		[Constructible]
 		public SilverSteed() : this( "a silver steed" )
 		{
@@ -42,4 +42,4 @@ namespace Server.Mobiles
 			int version = reader.ReadInt();
 		}
 	}
-}
+}

Scripts/Mobiles/Animals/Mounts/SkeletalMount.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an undead horse corpse" )]
 	public class SkeletalMount : BaseMount
 	{
+		public override string CorpseName => "an undead horse corpse";
 		public override string DefaultName => "a skeletal steed";
 
 		[Constructible]

Scripts/Mobiles/Animals/Mounts/SwampDragon.cs

@@ -4,9 +4,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a swamp dragon corpse" )]
 	public class SwampDragon : BaseMount
 	{
+		public override string CorpseName => "a swamp dragon corpse";
 		private bool m_BardingExceptional;
 		private Mobile m_BardingCrafter;
 		private int m_BardingHP;

Scripts/Mobiles/Animals/Mounts/Unicorn.cs

@@ -5,9 +5,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a unicorn corpse" )]
 	public class Unicorn : BaseMount
 	{
+		public override string CorpseName => "a unicorn corpse";
 		public override bool AllowMaleRider => false;
 		public override bool AllowMaleTamer => false;
 

Scripts/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs

@@ -4,9 +4,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a war horse corpse" )]
 	public abstract class BaseWarHorse : BaseMount
 	{
+		public override string CorpseName => "a war horse corpse";
+
 		public BaseWarHorse( int bodyID, int itemID, AIType aiType, FightMode fightMode, int rangePerception, int rangeFight, double activeSpeed, double passiveSpeed ) : base ( "a war horse", bodyID, itemID, aiType, fightMode, rangePerception, rangeFight, activeSpeed, passiveSpeed )
 		{
 			BaseSoundID = 0xA8;

Scripts/Mobiles/Animals/Reptiles/Alligator.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an alligator corpse" )]
 	public class Alligator : BaseCreature
 	{
+		public override string CorpseName => "an alligator corpse";
 		public override string DefaultName => "an alligator";
 
 		[Constructible]

Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs

@@ -4,10 +4,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a giant serpent corpse" )]
 	[TypeAlias( "Server.Mobiles.Serpant" )]
 	public class GiantSerpent : BaseCreature
 	{
+		public override string CorpseName => "a giant serpent corpse";
 		public override string DefaultName => "a giant snake";
 
 		[Constructible]

Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs

@@ -4,10 +4,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an ice serpent corpse" )]
 	[TypeAlias( "Server.Mobiles.Iceserpant" )]
 	public class IceSerpent : BaseCreature
 	{
+		public override string CorpseName => "an ice serpent corpse";
 		public override string DefaultName => "a giant ice serpent";
 
 		[Constructible]

Scripts/Mobiles/Animals/Reptiles/IceSnake.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an ice snake corpse" )]
 	[TypeAlias( "Server.Mobiles.Icesnake" )]
 	public class IceSnake : BaseCreature
 	{
+		public override string CorpseName => "an ice snake corpse";
 		public override string DefaultName => "an ice snake";
 
 		[Constructible]

Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs

@@ -4,10 +4,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a lava lizard corpse" )]
 	[TypeAlias( "Server.Mobiles.Lavalizard" )]
 	public class LavaLizard : BaseCreature
 	{
+		public override string CorpseName => "a lava lizard corpse";
 		public override string DefaultName => "a lava lizard";
 
 		[Constructible]

Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs

@@ -5,10 +5,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a lava serpent corpse" )]
 	[TypeAlias( "Server.Mobiles.Lavaserpant" )]
 	public class LavaSerpent : BaseCreature
 	{
+		public override string CorpseName => "a lava serpent corpse";
 		public override string DefaultName => "a lava serpent";
 
 		[Constructible]

Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs

@@ -4,10 +4,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName("a lava snake corpse")]
 	[TypeAlias( "Server.Mobiles.Lavasnake" )]
 	public class LavaSnake : BaseCreature
 	{
+		public override string CorpseName => "a lava snake corpse";
 		public override string DefaultName => "a lava snake";
 
 		[Constructible]

Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs

@@ -4,10 +4,10 @@ using Server.Factions;
 
 namespace Server.Mobiles
 {
-	[CorpseName("a silver serpent corpse")]
 	[TypeAlias( "Server.Mobiles.Silverserpant" )]
 	public class SilverSerpent : BaseCreature
 	{
+		public override string CorpseName => "a silver serpent corpse";
 		public override Faction FactionAllegiance => TrueBritannians.Instance;
 		public override Ethics.Ethic EthicAllegiance => Ethics.Ethic.Hero;
 

Scripts/Mobiles/Animals/Reptiles/Snake.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a snake corpse" )]
 	public class Snake : BaseCreature
 	{
+		public override string CorpseName => "a snake corpse";
 		public override string DefaultName => "a snake";
 
 		[Constructible]

Scripts/Mobiles/Animals/Rodents/GiantRat.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a giant rat corpse" )]
 	[TypeAlias( "Server.Mobiles.Giantrat" )]
 	public class GiantRat : BaseCreature
 	{
+		public override string CorpseName => "a giant rat corpse";
 		public override string DefaultName => "a giant rat";
 
 		[Constructible]

Scripts/Mobiles/Animals/Rodents/JackRabbit.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a jack rabbit corpse" )]
 	[TypeAlias( "Server.Mobiles.Jackrabbit" )]
 	public class JackRabbit : BaseCreature
 	{
+		public override string CorpseName => "a jack rabbit corpse";
 		public override string DefaultName => "a jack rabbit";
 
 		[Constructible]

Scripts/Mobiles/Animals/Rodents/Rabbit.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a hare corpse" )]
 	public class Rabbit : BaseCreature
 	{
+		public override string CorpseName => "a hare corpse";
 		public override string DefaultName => "a rabbit";
 
 		[Constructible]

Scripts/Mobiles/Animals/Rodents/SewerRat.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a rat corpse" )]
 	[TypeAlias("Server.Mobiles.Sewerrat")]
 	public class SewerRat : BaseCreature
 	{
+		public override string CorpseName => "a rat corpse";
 		public override string DefaultName => "a sewer rat";
 
 		[Constructible]

Scripts/Mobiles/Animals/Slimes/Jwilson.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a jwilson corpse" )]
 	public class Jwilson : BaseCreature
 	{
+		public override string CorpseName => "a jwilson corpse";
 		public override string DefaultName => "a jwilson";
 
 		[Constructible]

Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName("a parrot corpse")]
 	public class Parrot : BaseCreature
 	{
+		public override string CorpseName => "a parrot corpse";
 		public override string DefaultName => "a parrot";
 
 		[Constructible]

Scripts/Mobiles/Animals/Town Critters/Bird.cs

@@ -4,9 +4,9 @@ using Server.Misc;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bird corpse" )]
 	public class Bird : BaseCreature
 	{
+		public override string CorpseName => "a bird corpse";
 		[Constructible]
 		public Bird() : base( AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 )
 		{
@@ -79,9 +79,9 @@ namespace Server.Mobiles
 		}
 	}
 
-	[CorpseName( "a bird corpse" )]
 	public class TropicalBird : BaseCreature
 	{
+		public override string CorpseName => "a bird corpse";
 		public override string DefaultName => "a tropical bird";
 
 		[Constructible]

Scripts/Mobiles/Animals/Town Critters/Cat.cs

@@ -3,10 +3,10 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a cat corpse" )]
 	[TypeAlias( "Server.Mobiles.Housecat" )]
 	public class Cat : BaseCreature
 	{
+		public override string CorpseName => "a cat corpse";
 		public override string DefaultName => "a cat";
 
 		[Constructible]

Scripts/Mobiles/Animals/Town Critters/Dog.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a dog corpse" )]
 	public class Dog : BaseCreature
 	{
+		public override string CorpseName => "a dog corpse";
 		public override string DefaultName => "a dog";
 
 		[Constructible]

Scripts/Mobiles/Animals/Town Critters/Rat.cs

@@ -3,9 +3,9 @@ using Server.Mobiles;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a rat corpse" )]
 	public class Rat : BaseCreature
 	{
+		public override string CorpseName => "a rat corpse";
 		public override string DefaultName => "a rat";
 
 		[Constructible]

Scripts/Mobiles/BaseCreature.cs

@@ -135,13 +135,7 @@ namespace Server.Mobiles
 		//future use: Talisman 'Protection/Bonus vs. Specific Creature
 		private TextDefinition m_FriendlyName;
 
-		public TextDefinition FriendlyName
+		public TextDefinition FriendlyName => m_FriendlyName;
-		{
-			get
-			{
-				return m_FriendlyName;
-			}
-		}
 
 		public FriendlyNameAttribute( TextDefinition friendlyName )
 		{
@@ -254,7 +248,8 @@ namespace Server.Mobiles
 
 		#endregion
 
-		public virtual string DefaultName{ get{ return null; } }
+		public virtual string DefaultName => null;
+		public virtual string CorpseName => null;
 
 		[CommandProperty(AccessLevel.GameMaster)]
 		public override string Name

Scripts/Mobiles/Familiars/DarkWolf.cs

@@ -7,9 +7,9 @@ using Server.Network;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a dark wolf corpse" )]
 	public class DarkWolfFamiliar : BaseFamiliar
 	{
+		public override string CorpseName => "a dark wolf corpse";
 		public override string DefaultName => "a dark wolf";
 
 		public DarkWolfFamiliar()

Scripts/Mobiles/Familiars/DeathAdder.cs

@@ -3,9 +3,9 @@ using Server;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a death adder corpse" )]
 	public class DeathAdder : BaseFamiliar
 	{
+		public override string CorpseName => "a death adder corpse";
 		public override string DefaultName => "a death adder";
 
 		public DeathAdder()

Scripts/Mobiles/Familiars/HordeMinion.cs

@@ -9,9 +9,9 @@ using Server.ContextMenus;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a horde minion corpse" )]
 	public class HordeMinionFamiliar : BaseFamiliar
 	{
+		public override string CorpseName => "a horde minion corpse";
 		public override bool DisplayWeight => true;
 
 		public override string DefaultName => "a horde minion";

Scripts/Mobiles/Familiars/ShadowWisp.cs

@@ -7,9 +7,9 @@ using Server.Network;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a shadow wisp corpse" )]
 	public class ShadowWispFamiliar : BaseFamiliar
 	{
+		public override string CorpseName => "a shadow wisp corpse";
 		public override string DefaultName => "a shadow wisp";
 
 		public ShadowWispFamiliar()

Scripts/Mobiles/Familiars/VampireBat.cs

@@ -7,9 +7,9 @@ using Server.Network;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a vampire bat corpse" )]
 	public class VampireBatFamiliar : BaseFamiliar
 	{
+		public override string CorpseName => "a vampire bat corpse";
 		public override string DefaultName => "a vampire bat";
 
 		public VampireBatFamiliar()

Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "an abysmal horror corpse" )]
 	public class AbysmalHorror : BaseCreature
 	{
+		public override string CorpseName => "an abysmal horror corpse";
 		public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.WhirlwindAttack;
 
 		public override bool IgnoreYoungProtection => Core.ML;

Scripts/Mobiles/Monsters/AOS/BoneDemon.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a bone demon corpse" )]
 	public class BoneDemon : BaseCreature
 	{
+		public override string CorpseName => "a bone demon corpse";
 		public override string DefaultName => "a bone demon";
 
 		[Constructible]

Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a crystal elemental corpse" )]
 	public class CrystalElemental : BaseCreature
 	{
+		public override string CorpseName => "a crystal elemental corpse";
 		public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
 
 		public override string DefaultName => "a crystal elemental";

Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a darknight creeper corpse" )]
 	public class DarknightCreeper : BaseCreature
 	{
+		public override string CorpseName => "a darknight creeper corpse";
 		public override bool IgnoreYoungProtection => Core.ML;
 
 		[Constructible]

Scripts/Mobiles/Monsters/AOS/DemonKnight.cs

@@ -6,9 +6,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a demon knight corpse" )]
 	public class DemonKnight : BaseCreature
 	{
+		public override string CorpseName => "a demon knight corpse";
 		public override bool IgnoreYoungProtection => Core.ML;
 
 		public static Type[] ArtifactRarity10 => m_ArtifactRarity10;

Scripts/Mobiles/Monsters/AOS/Devourer.cs

@@ -4,9 +4,9 @@ using Server.Items;
 
 namespace Server.Mobiles
 {
-	[CorpseName( "a devourer of souls corpse" )]
 	public class Devourer : BaseCreature
 	{
+		public override string CorpseName => "a devourer of souls corpse";
 		public override string DefaultName => "a devourer of souls";
 
 		[Constructible]