Formatting FIxes (#58)

This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions

View file

@ -17,26 +17,6 @@ namespace Server.Mobiles
public override bool DoActionWander()
{
// Old:
#if false
if (AcquireFocusMob(m_Mobile.RangePerception, m_Mobile.FightMode, true, false, true))
{
m_Mobile.DebugSay( "There is something near, I go away" );
Action = ActionType.Backoff;
}
else if ( m_Mobile.IsHurt() || m_Mobile.Combatant != null )
{
m_Mobile.DebugSay( "I am hurt or being attacked, I flee" );
Action = ActionType.Flee;
}
else
{
base.DoActionWander();
}
return true;
#endif
// New, only flee @ 10%
double hitPercent = (double)m_Mobile.Hits / m_Mobile.HitsMax;

View file

@ -789,10 +789,7 @@ namespace Server.Mobiles
}
}
public virtual bool OnAtWayPoint()
{
return true;
}
public virtual bool OnAtWayPoint() => true;
public virtual bool DoActionWander()
{
@ -901,15 +898,9 @@ namespace Server.Mobiles
return true;
}
public virtual bool DoActionInteract()
{
return true;
}
public virtual bool DoActionInteract() => true;
public virtual bool DoActionBackoff()
{
return true;
}
public virtual bool DoActionBackoff() => true;
public virtual bool Obey()
{
@ -1785,15 +1776,9 @@ namespace Server.Mobiles
return delay;
}
public virtual bool CheckMove()
{
return Core.TickCount - NextMove >= 0;
}
public virtual bool CheckMove() => Core.TickCount - NextMove >= 0;
public virtual bool DoMove(Direction d)
{
return DoMove(d, false);
}
public virtual bool DoMove(Direction d) => DoMove(d, false);
public virtual bool DoMove(Direction d, bool badStateOk)
{
@ -2561,10 +2546,7 @@ namespace Server.Mobiles
{
}
public static bool IsInCombat(BaseCreature creature)
{
return creature != null && (creature.Aggressors.Count > 0 || creature.Aggressed.Count > 0);
}
public static bool IsInCombat(BaseCreature creature) => creature != null && (creature.Aggressors.Count > 0 || creature.Aggressed.Count > 0);
public override void Serialize(GenericWriter writer)
{

View file

@ -137,20 +137,11 @@ namespace Server.Mobiles
return null;
}
private static bool NeedCure(Mobile m)
{
return m.Poisoned;
}
private static bool NeedCure(Mobile m) => m.Poisoned;
private static bool NeedGHeal(Mobile m)
{
return m.Hits < m.HitsMax - 40;
}
private static bool NeedGHeal(Mobile m) => m.Hits < m.HitsMax - 40;
private static bool NeedLHeal(Mobile m)
{
return m.Hits < m.HitsMax - 10;
}
private static bool NeedLHeal(Mobile m) => m.Hits < m.HitsMax - 10;
private delegate bool NeedDelegate(Mobile m);
}

View file

@ -76,10 +76,7 @@ namespace Server.Mobiles
return base.Think();
}
public virtual double ScaleBySkill(double v, SkillName skill)
{
return v * m_Mobile.Skills[skill].Value / 100;
}
public virtual double ScaleBySkill(double v, SkillName skill) => v * m_Mobile.Skills[skill].Value / 100;
public override bool DoActionWander()
{
@ -252,10 +249,7 @@ namespace Server.Mobiles
return false;
}
public virtual Spell GetRandomDamageSpell()
{
return UseNecromancy() ? GetRandomDamageSpellNecro() : GetRandomDamageSpellMage();
}
public virtual Spell GetRandomDamageSpell() => UseNecromancy() ? GetRandomDamageSpellNecro() : GetRandomDamageSpellMage();
public virtual Spell GetRandomDamageSpellNecro()
{
@ -308,10 +302,7 @@ namespace Server.Mobiles
}
}
public virtual Spell GetRandomCurseSpell()
{
return UseNecromancy() ? GetRandomCurseSpellNecro() : GetRandomCurseSpellMage();
}
public virtual Spell GetRandomCurseSpell() => UseNecromancy() ? GetRandomCurseSpellNecro() : GetRandomCurseSpellMage();
public virtual Spell GetRandomCurseSpellNecro()
{
@ -947,11 +938,9 @@ namespace Server.Mobiles
return null;
}
public bool CanDispel(Mobile m)
{
return m is BaseCreature creature && creature.Summoned && m_Mobile.CanBeHarmful(creature, false) &&
!creature.IsAnimatedDead;
}
public bool CanDispel(Mobile m) =>
m is BaseCreature creature && creature.Summoned && m_Mobile.CanBeHarmful(creature, false) &&
!creature.IsAnimatedDead;
private bool ProcessTarget()
{

View file

@ -7,10 +7,7 @@ namespace Server
{
private Type[][] m_Types;
public OppositionGroup(Type[][] types)
{
m_Types = types;
}
public OppositionGroup(Type[][] types) => m_Types = types;
public static OppositionGroup TerathansAndOphidians{ get; } = new OppositionGroup(new[]
{

View file

@ -42,30 +42,15 @@ namespace Server.Mobiles
public override int Feathers => 25;
public override int GetAngerSound()
{
return 0x4D9;
}
public override int GetAngerSound() => 0x4D9;
public override int GetIdleSound()
{
return 0x4D8;
}
public override int GetIdleSound() => 0x4D8;
public override int GetAttackSound()
{
return 0x4D7;
}
public override int GetAttackSound() => 0x4D7;
public override int GetHurtSound()
{
return 0x4DA;
}
public override int GetHurtSound() => 0x4DA;
public override int GetDeathSound()
{
return 0x4D6;
}
public override int GetDeathSound() => 0x4D6;
public override void Serialize(GenericWriter writer)
{

View file

@ -49,30 +49,15 @@ namespace Server.Mobiles
public override int Hides => 15;
public override FoodType FavoriteFood => FoodType.GrainsAndHay;
public override int GetAngerSound()
{
return 0x4F8;
}
public override int GetAngerSound() => 0x4F8;
public override int GetIdleSound()
{
return 0x4F7;
}
public override int GetIdleSound() => 0x4F7;
public override int GetAttackSound()
{
return 0x4F6;
}
public override int GetAttackSound() => 0x4F6;
public override int GetHurtSound()
{
return 0x4F9;
}
public override int GetHurtSound() => 0x4F9;
public override int GetDeathSound()
{
return 0x4F5;
}
public override int GetDeathSound() => 0x4F5;
public override void OnDeath(Container c)
{

View file

@ -47,20 +47,11 @@ namespace Server.Mobiles
public override int Hides => 15;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override int GetAttackSound()
{
return 0x82;
}
public override int GetAttackSound() => 0x82;
public override int GetHurtSound()
{
return 0x83;
}
public override int GetHurtSound() => 0x83;
public override int GetDeathSound()
{
return 0x84;
}
public override int GetDeathSound() => 0x84;
public override void Serialize(GenericWriter writer)
{

View file

@ -46,20 +46,11 @@ namespace Server.Mobiles
public override int Hides => 8;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override int GetAttackSound()
{
return 0x82;
}
public override int GetAttackSound() => 0x82;
public override int GetHurtSound()
{
return 0x83;
}
public override int GetHurtSound() => 0x83;
public override int GetDeathSound()
{
return 0x84;
}
public override int GetDeathSound() => 0x84;
public override void Serialize(GenericWriter writer)
{

View file

@ -90,10 +90,7 @@ namespace Server.Mobiles
return true;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item)
{
return DeathMoveResult.MoveToCorpse;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item) => DeathMoveResult.MoveToCorpse;
public override bool IsSnoop(Mobile from)
{
@ -117,15 +114,9 @@ namespace Server.Mobiles
return base.OnDragDrop(from, item);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target) => PackAnimal.CheckAccess(this, from);
public override bool CheckNonlocalLift(Mobile from, Item item)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalLift(Mobile from, Item item) => PackAnimal.CheckAccess(this, from);
public override void OnDoubleClick(Mobile from)
{

View file

@ -89,10 +89,7 @@ namespace Server.Mobiles
return true;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item)
{
return DeathMoveResult.MoveToCorpse;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item) => DeathMoveResult.MoveToCorpse;
public override bool IsSnoop(Mobile from)
{
@ -116,15 +113,9 @@ namespace Server.Mobiles
return base.OnDragDrop(from, item);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target) => PackAnimal.CheckAccess(this, from);
public override bool CheckNonlocalLift(Mobile from, Item item)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalLift(Mobile from, Item item) => PackAnimal.CheckAccess(this, from);
public override void OnDoubleClick(Mobile from)
{

View file

@ -277,10 +277,7 @@ namespace Server.Mobiles
return result;
}
public virtual bool DoMountAbility(int damage, Mobile attacker)
{
return false;
}
public virtual bool DoMountAbility(int damage, Mobile attacker) => false;
}
public class MountItem : Item, IMountItem

View file

@ -59,30 +59,15 @@ namespace Server.Mobiles
public override FoodType FavoriteFood => FoodType.Meat;
public override int GetAngerSound()
{
return 0x21D;
}
public override int GetAngerSound() => 0x21D;
public override int GetIdleSound()
{
return 0x21D;
}
public override int GetIdleSound() => 0x21D;
public override int GetAttackSound()
{
return 0x162;
}
public override int GetAttackSound() => 0x162;
public override int GetHurtSound()
{
return 0x163;
}
public override int GetHurtSound() => 0x163;
public override int GetDeathSound()
{
return 0x21D;
}
public override int GetDeathSound() => 0x21D;
public override void OnHarmfulSpell(Mobile from)
{
@ -122,10 +107,7 @@ namespace Server.Mobiles
return true;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item)
{
return DeathMoveResult.MoveToCorpse;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item) => DeathMoveResult.MoveToCorpse;
public override bool IsSnoop(Mobile from)
{
@ -149,15 +131,9 @@ namespace Server.Mobiles
return base.OnDragDrop(from, item);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target) => PackAnimal.CheckAccess(this, from);
public override bool CheckNonlocalLift(Mobile from, Item item)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalLift(Mobile from, Item item) => PackAnimal.CheckAccess(this, from);
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{

View file

@ -350,25 +350,13 @@ namespace Server.Mobiles
m_Mount.IsDonationItem && RewardSystem.GetRewardLevel(m_Rider) < 3 ? 7.5 + (Core.AOS ? 3.0 : 2.0) :
Core.AOS ? 3.0 : 2.0);
public override TimeSpan GetCastRecovery()
{
return TimeSpan.Zero;
}
public override TimeSpan GetCastRecovery() => TimeSpan.Zero;
public override int GetMana()
{
return 0;
}
public override int GetMana() => 0;
public override bool ConsumeReagents()
{
return true;
}
public override bool ConsumeReagents() => true;
public override bool CheckFizzle()
{
return true;
}
public override bool CheckFizzle() => true;
public void Stop()
{

View file

@ -67,10 +67,7 @@ namespace Server.Mobiles
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
private static int GetHue()
{
@ -131,30 +128,15 @@ namespace Server.Mobiles
}
public override int GetAngerSound()
{
return 0x4FE;
}
public override int GetAngerSound() => 0x4FE;
public override int GetIdleSound()
{
return 0x4FD;
}
public override int GetIdleSound() => 0x4FD;
public override int GetAttackSound()
{
return 0x4FC;
}
public override int GetAttackSound() => 0x4FC;
public override int GetHurtSound()
{
return 0x4FF;
}
public override int GetHurtSound() => 0x4FF;
public override int GetDeathSound()
{
return 0x4FB;
}
public override int GetDeathSound() => 0x4FB;
public override void GenerateLoot()
{

View file

@ -64,10 +64,7 @@ namespace Server.Mobiles
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
private static int GetHue()
{
@ -107,30 +104,15 @@ namespace Server.Mobiles
return false;
}
public override int GetAngerSound()
{
return 0x4FE;
}
public override int GetAngerSound() => 0x4FE;
public override int GetIdleSound()
{
return 0x4FD;
}
public override int GetIdleSound() => 0x4FD;
public override int GetAttackSound()
{
return 0x4FC;
}
public override int GetAttackSound() => 0x4FC;
public override int GetHurtSound()
{
return 0x4FF;
}
public override int GetHurtSound() => 0x4FF;
public override int GetDeathSound()
{
return 0x4FB;
}
public override int GetDeathSound() => 0x4FB;
public override void GenerateLoot()
{

View file

@ -48,15 +48,9 @@ namespace Server.Mobiles
public override HideType HideType => HideType.Spined;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void Serialize(GenericWriter writer)
{

View file

@ -48,15 +48,9 @@ namespace Server.Mobiles
public override HideType HideType => HideType.Spined;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void Serialize(GenericWriter writer)
{

View file

@ -45,15 +45,9 @@ namespace Server.Mobiles
public override bool AutoDispel => !Controlled;
public override FoodType FavoriteFood => FoodType.Meat;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void Serialize(GenericWriter writer)
{

View file

@ -139,35 +139,17 @@ namespace Server.Mobiles
public override ScaleType ScaleType => ScaleType.Green;
public override bool CanAngerOnTame => true;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override int GetIdleSound()
{
return 0x2CE;
}
public override int GetIdleSound() => 0x2CE;
public override int GetDeathSound()
{
return 0x2CC;
}
public override int GetDeathSound() => 0x2CC;
public override int GetHurtSound()
{
return 0x2D1;
}
public override int GetHurtSound() => 0x2D1;
public override int GetAttackSound()
{
return 0x2C8;
}
public override int GetAttackSound() => 0x2C8;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void GetProperties(ObjectPropertyList list)
{

View file

@ -47,20 +47,11 @@ namespace Server.Mobiles
public override int Hides => 1;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies;
public override int GetAttackSound()
{
return 0xC9;
}
public override int GetAttackSound() => 0xC9;
public override int GetHurtSound()
{
return 0xCA;
}
public override int GetHurtSound() => 0xCA;
public override int GetDeathSound()
{
return 0xCB;
}
public override int GetDeathSound() => 0xCB;
public override void Serialize(GenericWriter writer)
{

View file

@ -48,20 +48,11 @@ namespace Server.Mobiles
public override int Hides => 1;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies;
public override int GetAttackSound()
{
return 0xC9;
}
public override int GetAttackSound() => 0xC9;
public override int GetHurtSound()
{
return 0xCA;
}
public override int GetHurtSound() => 0xCA;
public override int GetDeathSound()
{
return 0xCB;
}
public override int GetDeathSound() => 0xCB;
public override void Serialize(GenericWriter writer)
{

View file

@ -27,30 +27,15 @@ namespace Server.Mobiles
public override string CorpseName => "a jwilson corpse";
public override string DefaultName => "a jwilson";
public override int GetAngerSound()
{
return 0x1C8;
}
public override int GetAngerSound() => 0x1C8;
public override int GetIdleSound()
{
return 0x1C9;
}
public override int GetIdleSound() => 0x1C9;
public override int GetAttackSound()
{
return 0x1CA;
}
public override int GetAttackSound() => 0x1CA;
public override int GetHurtSound()
{
return 0x1CB;
}
public override int GetHurtSound() => 0x1CB;
public override int GetDeathSound()
{
return 0x1CC;
}
public override int GetDeathSound() => 0x1CC;
public override void Serialize(GenericWriter writer)
{

View file

@ -29,30 +29,15 @@ namespace Server.Mobiles
public override string CorpseName => "a parrot corpse";
public override string DefaultName => "a parrot";
public override int GetAngerSound()
{
return 0x1B;
}
public override int GetAngerSound() => 0x1B;
public override int GetIdleSound()
{
return 0x1C;
}
public override int GetIdleSound() => 0x1C;
public override int GetAttackSound()
{
return 0x1D;
}
public override int GetAttackSound() => 0x1D;
public override int GetHurtSound()
{
return 0x1E;
}
public override int GetHurtSound() => 0x1E;
public override int GetDeathSound()
{
return 0x1F;
}
public override int GetDeathSound() => 0x1F;
public override void Serialize(GenericWriter writer)
{

View file

@ -130,19 +130,13 @@ namespace Server.Mobiles
m_Damage = damage;
}
public int CompareTo(DamageStore ds)
{
return ds?.m_Damage ?? 0 - m_Damage;
}
public int CompareTo(DamageStore ds) => ds?.m_Damage ?? 0 - m_Damage;
}
[AttributeUsage(AttributeTargets.Class)]
public class FriendlyNameAttribute : Attribute
{
public FriendlyNameAttribute(TextDefinition friendlyName)
{
FriendlyName = friendlyName;
}
public FriendlyNameAttribute(TextDefinition friendlyName) => FriendlyName = friendlyName;
//future use: Talisman 'Protection/Bonus vs. Specific Creature
public TextDefinition FriendlyName{ get; }
@ -802,10 +796,7 @@ namespace Server.Mobiles
public HonorContext ReceivedHonorContext{ get; set; }
public virtual WeaponAbility GetWeaponAbility()
{
return null;
}
public virtual WeaponAbility GetWeaponAbility() => null;
public virtual bool IsEnemy(Mobile m)
{
@ -868,10 +859,7 @@ namespace Server.Mobiles
return false;
}
public virtual bool CanBeControlledBy(Mobile m)
{
return GetControlChance(m) > 0.0;
}
public virtual bool CanBeControlledBy(Mobile m) => GetControlChance(m) > 0.0;
public virtual double GetControlChance(Mobile m, bool useBaseSkill = false)
{
@ -987,11 +975,9 @@ namespace Server.Mobiles
return result;
}
public override bool CheckPoisonImmunity(Mobile from, Poison poison)
{
return base.CheckPoisonImmunity(from, poison) ||
(m_Paragon ? PoisonImpl.IncreaseLevel(PoisonImmune) : PoisonImmune)?.Level >= poison.Level;
}
public override bool CheckPoisonImmunity(Mobile from, Poison poison) =>
base.CheckPoisonImmunity(from, poison) ||
(m_Paragon ? PoisonImpl.IncreaseLevel(PoisonImmune) : PoisonImmune)?.Level >= poison.Level;
public void Unpacify()
{
@ -1571,15 +1557,9 @@ namespace Server.Mobiles
AnimateDeadSpell.Register(m_SummonMaster, this);
}
public virtual bool IsHumanInTown()
{
return Body.IsHuman && Region.IsPartOf<GuardedRegion>();
}
public virtual bool IsHumanInTown() => Body.IsHuman && Region.IsPartOf<GuardedRegion>();
public virtual bool CheckGold(Mobile from, Item dropped)
{
return dropped is Gold gold && OnGoldGiven(from, gold);
}
public virtual bool CheckGold(Mobile from, Item dropped) => dropped is Gold gold && OnGoldGiven(from, gold);
public virtual bool OnGoldGiven(Mobile from, Gold dropped)
{
@ -1614,10 +1594,7 @@ namespace Server.Mobiles
return false;
}
public virtual bool OverrideBondingReqs()
{
return false;
}
public virtual bool OverrideBondingReqs() => false;
public override bool OnDragDrop(Mobile from, Item dropped)
{
@ -1846,15 +1823,9 @@ namespace Server.Mobiles
SetDirection((Direction)((((v & 0x7) + iTurnSteps) & 0x7) | (v & 0x80)));
}
public bool IsHurt()
{
return Hits != HitsMax;
}
public bool IsHurt() => Hits != HitsMax;
public double GetHomeDistance()
{
return GetDistanceToSqrt(m_Home);
}
public double GetHomeDistance() => GetDistanceToSqrt(m_Home);
public virtual int GetTeamSize(int iRange)
{
@ -1974,11 +1945,9 @@ namespace Server.Mobiles
}
}
public override bool HandlesOnSpeech(Mobile from)
{
return (SpeechType?.Flags & IHSFlags.OnSpeech) != 0 && from.InRange(this, 3) ||
AIObject?.HandlesOnSpeech(from) == true && from.InRange(this, RangePerception);
}
public override bool HandlesOnSpeech(Mobile from) =>
(SpeechType?.Flags & IHSFlags.OnSpeech) != 0 && from.InRange(this, 3) ||
AIObject?.HandlesOnSpeech(from) == true && from.InRange(this, RangePerception);
public override void OnSpeech(SpeechEventArgs e)
{
@ -1990,12 +1959,10 @@ namespace Server.Mobiles
AIObject.OnSpeech(e);
}
public override bool IsHarmfulCriminal(Mobile target)
{
return (!Controlled || target != m_ControlMaster) && (!Summoned || target != m_SummonMaster) &&
(!(target is BaseCreature creature) || !creature.InitialInnocent || creature.Controlled) &&
(!(target is PlayerMobile mobile) || mobile.PermaFlags.Count <= 0) && base.IsHarmfulCriminal(target);
}
public override bool IsHarmfulCriminal(Mobile target) =>
(!Controlled || target != m_ControlMaster) && (!Summoned || target != m_SummonMaster) &&
(!(target is BaseCreature creature) || !creature.InitialInnocent || creature.Controlled) &&
(!(target is PlayerMobile mobile) || mobile.PermaFlags.Count <= 0) && base.IsHarmfulCriminal(target);
public override void CriminalAction(bool message)
{
@ -2774,11 +2741,9 @@ namespace Server.Mobiles
return base.CanBeHarmful(target, message, ignoreOurBlessedness);
}
public override bool CanBeRenamedBy(Mobile from)
{
return Controlled && from == ControlMaster && !from.Region.IsPartOf<Jail>() ||
base.CanBeRenamedBy(from);
}
public override bool CanBeRenamedBy(Mobile from) =>
Controlled && from == ControlMaster && !from.Region.IsPartOf<Jail>() ||
base.CanBeRenamedBy(from);
public bool SetControlMaster(Mobile m)
{
@ -2842,10 +2807,7 @@ namespace Server.Mobiles
}
}
public static bool Summon(BaseCreature creature, Mobile caster, Point3D p, int sound, TimeSpan duration)
{
return Summon(creature, true, caster, p, sound, duration);
}
public static bool Summon(BaseCreature creature, Mobile caster, Point3D p, int sound, TimeSpan duration) => Summon(creature, true, caster, p, sound, duration);
public static bool Summon(BaseCreature creature, bool controlled, Mobile caster, Point3D p, int sound,
TimeSpan duration)
@ -3160,12 +3122,10 @@ namespace Server.Mobiles
return base.CanBeDamaged();
}
private bool IsSpawnerBound()
{
return Map != null && Map != Map.Internal &&
FightMode != FightMode.None && RangeHome >= 0 &&
!Controlled && !Summoned && Spawner is Spawner spawner && spawner.Map == Map;
}
private bool IsSpawnerBound() =>
Map != null && Map != Map.Internal &&
FightMode != FightMode.None && RangeHome >= 0 &&
!Controlled && !Summoned && Spawner is Spawner spawner && spawner.Map == Map;
public override void OnSectorDeactivate()
{
@ -3234,10 +3194,7 @@ namespace Server.Mobiles
{
private BaseCreature m_Charmed;
public DeathAdderCharmTarget(BaseCreature charmed) : base(-1, false, TargetFlags.Harmful)
{
m_Charmed = charmed;
}
public DeathAdderCharmTarget(BaseCreature charmed) : base(-1, false, TargetFlags.Harmful) => m_Charmed = charmed;
protected override void OnTarget(Mobile from, object targeted)
{
@ -3333,10 +3290,7 @@ namespace Server.Mobiles
public virtual bool CanGiveMLQuest => MLQuests.Count != 0;
public virtual bool StaticMLQuester => true;
protected virtual List<MLQuest> ConstructQuestList()
{
return null;
}
protected virtual List<MLQuest> ConstructQuestList() => null;
public virtual bool CanShout => false;
@ -3767,10 +3721,7 @@ namespace Server.Mobiles
kappa+acidslime, grizzles+whatever, etc.
*/
public virtual Item NewHarmfulItem()
{
return new PoolOfAcid(TimeSpan.FromSeconds(10), 30, 30);
}
public virtual Item NewHarmfulItem() => new PoolOfAcid(TimeSpan.FromSeconds(10), 30, 30);
#endregion
@ -3812,10 +3763,7 @@ namespace Server.Mobiles
public virtual bool AllowNewPetFriend => Friends == null || Friends.Count < 5;
public virtual bool IsPetFriend(Mobile m)
{
return Friends.Contains(m);
}
public virtual bool IsPetFriend(Mobile m) => Friends.Contains(m);
public virtual void AddPetFriend(Mobile m)
{
@ -3830,11 +3778,9 @@ namespace Server.Mobiles
Friends?.Remove(m);
}
public virtual bool IsFriend(Mobile m)
{
return OppositionGroup?.IsEnemy(this, m) != true && m is BaseCreature c && m_Team == c.m_Team
&& (m_bSummoned || m_Controlled) == (c.m_bSummoned || c.m_Controlled);
}
public virtual bool IsFriend(Mobile m) =>
OppositionGroup?.IsEnemy(this, m) != true && m is BaseCreature c && m_Team == c.m_Team
&& (m_bSummoned || m_Controlled) == (c.m_bSummoned || c.m_Controlled);
#endregion
@ -4678,10 +4624,7 @@ namespace Server.Mobiles
pack.Generate(this, backpack, m_Spawning, m_KillersLuck);
}
public bool PackArmor(int minLevel, int maxLevel)
{
return PackArmor(minLevel, maxLevel, 1.0);
}
public bool PackArmor(int minLevel, int maxLevel) => PackArmor(minLevel, maxLevel, 1.0);
public bool PackArmor(int minLevel, int maxLevel, double chance)
{

View file

@ -136,10 +136,7 @@ namespace Server.Mobiles
return true;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item)
{
return DeathMoveResult.MoveToCorpse;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item) => DeathMoveResult.MoveToCorpse;
public override bool IsSnoop(Mobile from)
{
@ -163,15 +160,9 @@ namespace Server.Mobiles
return base.OnDragDrop(from, item);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target) => PackAnimal.CheckAccess(this, from);
public override bool CheckNonlocalLift(Mobile from, Item item)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalLift(Mobile from, Item item) => PackAnimal.CheckAccess(this, from);
public override void OnDoubleClick(Mobile from)
{

View file

@ -201,9 +201,8 @@ namespace Server.Mobiles
public AvengeTimer(Mobile focus) :
base(TimeSpan.FromSeconds(2.5), TimeSpan.FromSeconds(1.0),
3) // After 2.5 seconds, one guard will spawn every 1.0 second, three times
{
m_Focus = focus;
}
=>
m_Focus = focus;
protected override void OnTick()
{
@ -216,10 +215,7 @@ namespace Server.Mobiles
private ArcherGuard m_Owner;
// private bool m_Shooting;
public AttackTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1))
{
m_Owner = owner;
}
public AttackTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1)) => m_Owner = owner;
public void DoOnTick()
{
@ -328,20 +324,11 @@ namespace Server.Mobiles
}*/
}
private bool TimeToSpare()
{
return m_Owner.NextCombatTime - Core.TickCount > 1000;
}
private bool TimeToSpare() => m_Owner.NextCombatTime - Core.TickCount > 1000;
private bool OutOfMaxDistance(Mobile target)
{
return !m_Owner.InRange(target, m_Owner.Weapon.MaxRange);
}
private bool OutOfMaxDistance(Mobile target) => !m_Owner.InRange(target, m_Owner.Weapon.MaxRange);
private bool InMinDistance(Mobile target)
{
return m_Owner.InRange(target, 4);
}
private bool InMinDistance(Mobile target) => m_Owner.InRange(target, 4);
private void TeleportTo(Mobile target)
{
@ -364,10 +351,7 @@ namespace Server.Mobiles
private ArcherGuard m_Owner;
private int m_Stage;
public IdleTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5))
{
m_Owner = owner;
}
public IdleTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5)) => m_Owner = owner;
protected override void OnTick()
{

View file

@ -234,10 +234,7 @@ namespace Server.Mobiles
{
private Mobile m_Focus;
public AvengeTimer(Mobile focus) : base(TimeSpan.FromSeconds(2.5), TimeSpan.FromSeconds(1.0), 3)
{
m_Focus = focus;
}
public AvengeTimer(Mobile focus) : base(TimeSpan.FromSeconds(2.5), TimeSpan.FromSeconds(1.0), 3) => m_Focus = focus;
protected override void OnTick()
{
@ -249,10 +246,7 @@ namespace Server.Mobiles
{
private WarriorGuard m_Owner;
public AttackTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1))
{
m_Owner = owner;
}
public AttackTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1)) => m_Owner = owner;
public void DoOnTick()
{
@ -354,10 +348,7 @@ namespace Server.Mobiles
private WarriorGuard m_Owner;
private int m_Stage;
public IdleTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5))
{
m_Owner = owner;
}
public IdleTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5)) => m_Owner = owner;
protected override void OnTick()
{

View file

@ -70,10 +70,7 @@ namespace Server.Mobiles
{
}
public virtual int GetRobeColor()
{
return Utility.RandomYellowHue();
}
public virtual int GetRobeColor() => Utility.RandomYellowHue();
public override void InitOutfit()
{
@ -82,10 +79,7 @@ namespace Server.Mobiles
AddItem(new Robe(GetRobeColor()));
}
public virtual bool CheckResurrect(Mobile m)
{
return true;
}
public virtual bool CheckResurrect(Mobile m) => true;
public virtual void OfferResurrection(Mobile m)
{

View file

@ -41,10 +41,7 @@ namespace Server.Mobiles
SBInfos.Add(new SBFortuneTeller());
}
public override int GetRobeColor()
{
return Utility.RandomBrightHue();
}
public override int GetRobeColor() => Utility.RandomBrightHue();
public override void InitOutfit()
{

View file

@ -39,10 +39,7 @@ namespace Server.Mobiles
m.SendGump(new ResurrectGump(m, this, Price));
}
public override bool CheckResurrect(Mobile m)
{
return true;
}
public override bool CheckResurrect(Mobile m) => true;
public override void Serialize(GenericWriter writer)
{

View file

@ -56,10 +56,7 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Lethal;
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.WhirlwindAttack;
}
public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.WhirlwindAttack;
public override void GenerateLoot()
{

View file

@ -52,10 +52,7 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Lethal;
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override void GenerateLoot()
{

View file

@ -194,10 +194,7 @@ namespace Server.Mobiles
return chance;
}
public static bool CheckArtifactChance(Mobile boss)
{
return GetArtifactChance(boss) > Utility.Random(100000);
}
public static bool CheckArtifactChance(Mobile boss) => GetArtifactChance(boss) > Utility.Random(100000);
public override WeaponAbility GetWeaponAbility()
{

View file

@ -47,10 +47,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override void GenerateLoot()
{

View file

@ -56,10 +56,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.ParalyzingBlow;
public override void GenerateLoot()
{
@ -74,30 +71,15 @@ namespace Server.Mobiles
DemonKnight.DistributeArtifact(this);
}
public override int GetAttackSound()
{
return 0x34C;
}
public override int GetAttackSound() => 0x34C;
public override int GetHurtSound()
{
return 0x354;
}
public override int GetHurtSound() => 0x354;
public override int GetAngerSound()
{
return 0x34C;
}
public override int GetAngerSound() => 0x34C;
public override int GetIdleSound()
{
return 0x34C;
}
public override int GetIdleSound() => 0x34C;
public override int GetDeathSound()
{
return 0x354;
}
public override int GetDeathSound() => 0x354;
public override void Serialize(GenericWriter writer)
{

View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override void GenerateLoot()
{

View file

@ -49,10 +49,7 @@ namespace Server.Mobiles
AddLoot(LootPack.Average);
}
public override int GetDeathSound()
{
return 1218;
}
public override int GetDeathSound() => 1218;
public override void Serialize(GenericWriter writer)
{

View file

@ -57,10 +57,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.BleedAttack;
public override void GenerateLoot()
{

View file

@ -50,10 +50,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override void GenerateLoot()
{

View file

@ -44,10 +44,7 @@ namespace Server.Mobiles
public override string DefaultName => "a ravager";
public override WeaponAbility GetWeaponAbility()
{
return Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.CrushingBlow;
}
public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.CrushingBlow;
public override void GenerateLoot()
{

View file

@ -65,10 +65,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 1;
public override WeaponAbility GetWeaponAbility()
{
return Utility.RandomBool() ? WeaponAbility.ConcussionBlow : WeaponAbility.CrushingBlow;
}
public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.ConcussionBlow : WeaponAbility.CrushingBlow;
public override void GenerateLoot()
{
@ -83,25 +80,13 @@ namespace Server.Mobiles
DemonKnight.DistributeArtifact(this);
}
public override int GetIdleSound()
{
return 0x2CE;
}
public override int GetIdleSound() => 0x2CE;
public override int GetDeathSound()
{
return 0x2C1;
}
public override int GetDeathSound() => 0x2C1;
public override int GetHurtSound()
{
return 0x2D1;
}
public override int GetHurtSound() => 0x2D1;
public override int GetAttackSound()
{
return 0x2C8;
}
public override int GetAttackSound() => 0x2C8;
public override void OnCombatantChange()
{

View file

@ -47,25 +47,13 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override int GetIdleSound()
{
return 443;
}
public override int GetIdleSound() => 443;
public override int GetDeathSound()
{
return 31;
}
public override int GetDeathSound() => 31;
public override int GetAttackSound()
{
return 672;
}
public override int GetAttackSound() => 672;
public override void GenerateLoot()
{

View file

@ -47,10 +47,7 @@ namespace Server.Mobiles
AddLoot(LootPack.Poor);
}
public override int GetIdleSound()
{
return 0x29B;
}
public override int GetIdleSound() => 0x29B;
public override void Serialize(GenericWriter writer)
{

View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.MortalStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike;
public override void GenerateLoot()
{

View file

@ -76,30 +76,15 @@ namespace Server.Mobiles
public override string CorpseName => "an ant lion corpse";
public override string DefaultName => "an ant lion";
public override int GetAngerSound()
{
return 0x5A;
}
public override int GetAngerSound() => 0x5A;
public override int GetIdleSound()
{
return 0x5A;
}
public override int GetIdleSound() => 0x5A;
public override int GetAttackSound()
{
return 0x164;
}
public override int GetAttackSound() => 0x164;
public override int GetHurtSound()
{
return 0x187;
}
public override int GetHurtSound() => 0x187;
public override int GetDeathSound()
{
return 0x1BA;
}
public override int GetDeathSound() => 0x1BA;
public override void GenerateLoot()
{

View file

@ -49,30 +49,15 @@ namespace Server.Mobiles
public override string CorpseName => "a solen infiltrator corpse";
public override string DefaultName => "a black solen infiltrator";
public override int GetAngerSound()
{
return 0x259;
}
public override int GetAngerSound() => 0x259;
public override int GetIdleSound()
{
return 0x259;
}
public override int GetIdleSound() => 0x259;
public override int GetAttackSound()
{
return 0x195;
}
public override int GetAttackSound() => 0x195;
public override int GetHurtSound()
{
return 0x250;
}
public override int GetHurtSound() => 0x250;
public override int GetDeathSound()
{
return 0x25B;
}
public override int GetDeathSound() => 0x25B;
public override void GenerateLoot()
{

View file

@ -49,30 +49,15 @@ namespace Server.Mobiles
public override string CorpseName => "a solen infiltrator corpse";
public override string DefaultName => "a black solen infiltrator";
public override int GetAngerSound()
{
return 0xB5;
}
public override int GetAngerSound() => 0xB5;
public override int GetIdleSound()
{
return 0xB5;
}
public override int GetIdleSound() => 0xB5;
public override int GetAttackSound()
{
return 0x289;
}
public override int GetAttackSound() => 0x289;
public override int GetHurtSound()
{
return 0xBC;
}
public override int GetHurtSound() => 0xBC;
public override int GetDeathSound()
{
return 0xE4;
}
public override int GetDeathSound() => 0xE4;
public override void GenerateLoot()
{

View file

@ -55,30 +55,15 @@ namespace Server.Mobiles
public override string DefaultName => "a black solen queen";
public override int GetAngerSound()
{
return 0x259;
}
public override int GetAngerSound() => 0x259;
public override int GetIdleSound()
{
return 0x259;
}
public override int GetIdleSound() => 0x259;
public override int GetAttackSound()
{
return 0x195;
}
public override int GetAttackSound() => 0x195;
public override int GetHurtSound()
{
return 0x250;
}
public override int GetHurtSound() => 0x250;
public override int GetDeathSound()
{
return 0x25B;
}
public override int GetDeathSound() => 0x25B;
public override void GenerateLoot()
{

View file

@ -55,30 +55,15 @@ namespace Server.Mobiles
public override string DefaultName => "a black solen warrior";
public override int GetAngerSound()
{
return 0xB5;
}
public override int GetAngerSound() => 0xB5;
public override int GetIdleSound()
{
return 0xB5;
}
public override int GetIdleSound() => 0xB5;
public override int GetAttackSound()
{
return 0x289;
}
public override int GetAttackSound() => 0x289;
public override int GetHurtSound()
{
return 0xBC;
}
public override int GetHurtSound() => 0xBC;
public override int GetDeathSound()
{
return 0xE4;
}
public override int GetDeathSound() => 0xE4;
public override void GenerateLoot()
{

View file

@ -50,30 +50,15 @@ namespace Server.Mobiles
public override string CorpseName => "a solen worker corpse";
public override string DefaultName => "a black solen worker";
public override int GetAngerSound()
{
return 0x269;
}
public override int GetAngerSound() => 0x269;
public override int GetIdleSound()
{
return 0x269;
}
public override int GetIdleSound() => 0x269;
public override int GetAttackSound()
{
return 0x186;
}
public override int GetAttackSound() => 0x186;
public override int GetHurtSound()
{
return 0x1BE;
}
public override int GetHurtSound() => 0x1BE;
public override int GetDeathSound()
{
return 0x8E;
}
public override int GetDeathSound() => 0x8E;
public override void GenerateLoot()
{

View file

@ -48,30 +48,15 @@ namespace Server.Mobiles
public override string CorpseName => "a solen infiltrator corpse";
public override string DefaultName => "a red solen infiltrator";
public override int GetAngerSound()
{
return 0x259;
}
public override int GetAngerSound() => 0x259;
public override int GetIdleSound()
{
return 0x259;
}
public override int GetIdleSound() => 0x259;
public override int GetAttackSound()
{
return 0x195;
}
public override int GetAttackSound() => 0x195;
public override int GetHurtSound()
{
return 0x250;
}
public override int GetHurtSound() => 0x250;
public override int GetDeathSound()
{
return 0x25B;
}
public override int GetDeathSound() => 0x25B;
public override void GenerateLoot()
{

View file

@ -48,30 +48,15 @@ namespace Server.Mobiles
public override string CorpseName => "a solen infiltrator corpse";
public override string DefaultName => "a red solen infiltrator";
public override int GetAngerSound()
{
return 0xB5;
}
public override int GetAngerSound() => 0xB5;
public override int GetIdleSound()
{
return 0xB5;
}
public override int GetIdleSound() => 0xB5;
public override int GetAttackSound()
{
return 0x289;
}
public override int GetAttackSound() => 0x289;
public override int GetHurtSound()
{
return 0xBC;
}
public override int GetHurtSound() => 0xBC;
public override int GetDeathSound()
{
return 0xE4;
}
public override int GetDeathSound() => 0xE4;
public override void GenerateLoot()
{

View file

@ -54,30 +54,15 @@ namespace Server.Mobiles
public override string DefaultName => "a red solen queen";
public override int GetAngerSound()
{
return 0x259;
}
public override int GetAngerSound() => 0x259;
public override int GetIdleSound()
{
return 0x259;
}
public override int GetIdleSound() => 0x259;
public override int GetAttackSound()
{
return 0x195;
}
public override int GetAttackSound() => 0x195;
public override int GetHurtSound()
{
return 0x250;
}
public override int GetHurtSound() => 0x250;
public override int GetDeathSound()
{
return 0x25B;
}
public override int GetDeathSound() => 0x25B;
public override void GenerateLoot()
{

View file

@ -53,30 +53,15 @@ namespace Server.Mobiles
public override string DefaultName => "a red solen warrior";
public override int GetAngerSound()
{
return 0xB5;
}
public override int GetAngerSound() => 0xB5;
public override int GetIdleSound()
{
return 0xB5;
}
public override int GetIdleSound() => 0xB5;
public override int GetAttackSound()
{
return 0x289;
}
public override int GetAttackSound() => 0x289;
public override int GetHurtSound()
{
return 0xBC;
}
public override int GetHurtSound() => 0xBC;
public override int GetDeathSound()
{
return 0xE4;
}
public override int GetDeathSound() => 0xE4;
public override void GenerateLoot()
{

View file

@ -49,30 +49,15 @@ namespace Server.Mobiles
public override string CorpseName => "a solen worker corpse";
public override string DefaultName => "a red solen worker";
public override int GetAngerSound()
{
return 0x269;
}
public override int GetAngerSound() => 0x269;
public override int GetIdleSound()
{
return 0x269;
}
public override int GetIdleSound() => 0x269;
public override int GetAttackSound()
{
return 0x186;
}
public override int GetAttackSound() => 0x186;
public override int GetHurtSound()
{
return 0x1BE;
}
public override int GetHurtSound() => 0x1BE;
public override int GetDeathSound()
{
return 0x8E;
}
public override int GetDeathSound() => 0x8E;
public override void GenerateLoot()
{

View file

@ -57,30 +57,15 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Lethal;
public override int TreasureMapLevel => 5;
public override int GetIdleSound()
{
return 0x19D;
}
public override int GetIdleSound() => 0x19D;
public override int GetAngerSound()
{
return 0x175;
}
public override int GetAngerSound() => 0x175;
public override int GetDeathSound()
{
return 0x108;
}
public override int GetDeathSound() => 0x108;
public override int GetAttackSound()
{
return 0xE2;
}
public override int GetAttackSound() => 0xE2;
public override int GetHurtSound()
{
return 0x28B;
}
public override int GetHurtSound() => 0x28B;
public override void GenerateLoot()
{

View file

@ -50,10 +50,7 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Deadly;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ConcussionBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ConcussionBlow;
public override void GenerateLoot()
{

View file

@ -87,20 +87,11 @@ namespace Server.Mobiles
}
}
public override int GetDeathSound()
{
return 0x423;
}
public override int GetDeathSound() => 0x423;
public override int GetAttackSound()
{
return 0x23B;
}
public override int GetAttackSound() => 0x23B;
public override int GetHurtSound()
{
return 0x140;
}
public override int GetHurtSound() => 0x140;
public override void GenerateLoot()
{

View file

@ -54,10 +54,7 @@ namespace Server.Mobiles
public override int Meat => 1;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.WhirlwindAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.WhirlwindAttack;
public override void GenerateLoot()
{

View file

@ -45,10 +45,7 @@ namespace Server.Mobiles
public override string DefaultName => "a chaos daemon";
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.CrushingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow;
public override void GenerateLoot()
{

View file

@ -56,10 +56,7 @@ namespace Server.Mobiles
public override bool AlwaysMurderer => true;
public override int GetAttackSound()
{
return -1;
}
public override int GetAttackSound() => -1;
public override void GenerateLoot()
{

View file

@ -45,30 +45,15 @@ namespace Server.Mobiles
public override string CorpseName => "a horde minion corpse";
public override string DefaultName => "a horde minion";
public override int GetIdleSound()
{
return 338;
}
public override int GetIdleSound() => 338;
public override int GetAngerSound()
{
return 338;
}
public override int GetAngerSound() => 338;
public override int GetDeathSound()
{
return 338;
}
public override int GetDeathSound() => 338;
public override int GetAttackSound()
{
return 406;
}
public override int GetAttackSound() => 406;
public override int GetHurtSound()
{
return 194;
}
public override int GetHurtSound() => 194;
public override void Serialize(GenericWriter writer)
{

View file

@ -90,20 +90,11 @@ namespace Server.Mobiles
AddLoot(LootPack.Gems, 1);
}
public override int GetDeathSound()
{
return 0x423;
}
public override int GetDeathSound() => 0x423;
public override int GetAttackSound()
{
return 0x23B;
}
public override int GetAttackSound() => 0x23B;
public override int GetHurtSound()
{
return 0x140;
}
public override int GetHurtSound() => 0x140;
public override void OnGaveMeleeAttack(Mobile defender)
{

View file

@ -100,29 +100,17 @@ namespace Server.Mobiles
m_Set.Add(killer);
}
public static bool IsInsideKhaldun(Mobile from)
{
return from?.Region?.IsPartOf("Khaldun") == true;
}
public static bool IsInsideKhaldun(Mobile from) => from?.Region?.IsPartOf("Khaldun") == true;
public override void DisplayPaperdollTo(Mobile to)
{
}
public override int GetIdleSound()
{
return 0x1BF;
}
public override int GetIdleSound() => 0x1BF;
public override int GetAngerSound()
{
return 0x107;
}
public override int GetAngerSound() => 0x107;
public override int GetDeathSound()
{
return 0xFD;
}
public override int GetDeathSound() => 0xFD;
public override void OnThink()
{

View file

@ -75,25 +75,13 @@ namespace Server.Mobiles
public override bool AlwaysMurderer => true;
public override bool Unprovokable => true;
public override int GetIdleSound()
{
return 0x184;
}
public override int GetIdleSound() => 0x184;
public override int GetAngerSound()
{
return 0x286;
}
public override int GetAngerSound() => 0x286;
public override int GetDeathSound()
{
return 0x288;
}
public override int GetDeathSound() => 0x288;
public override int GetHurtSound()
{
return 0x19F;
}
public override int GetHurtSound() => 0x19F;
public override bool OnBeforeDeath()
{

View file

@ -84,25 +84,13 @@ namespace Server.Mobiles
public override bool Unprovokable => true;
public override Poison PoisonImmune => Poison.Deadly;
public override int GetIdleSound()
{
return 0x184;
}
public override int GetIdleSound() => 0x184;
public override int GetAngerSound()
{
return 0x286;
}
public override int GetAngerSound() => 0x286;
public override int GetDeathSound()
{
return 0x288;
}
public override int GetDeathSound() => 0x288;
public override int GetHurtSound()
{
return 0x19F;
}
public override int GetHurtSound() => 0x19F;
public override bool OnBeforeDeath()
{

View file

@ -44,10 +44,7 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Regular;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ConcussionBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ConcussionBlow;
public override void GenerateLoot()
{

View file

@ -68,20 +68,11 @@ namespace Server.Mobiles
list.RemoveAt(i--);
}
public override int GetIdleSound()
{
return 0x107;
}
public override int GetIdleSound() => 0x107;
public override int GetAngerSound()
{
return 0x1BF;
}
public override int GetAngerSound() => 0x1BF;
public override int GetDeathSound()
{
return 0xFD;
}
public override int GetDeathSound() => 0xFD;
public override bool IsEnemy(Mobile m)
{

View file

@ -56,30 +56,15 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override int GetIdleSound()
{
return 0x37A;
}
public override int GetIdleSound() => 0x37A;
public override int GetAngerSound()
{
return 0x379;
}
public override int GetAngerSound() => 0x379;
public override int GetDeathSound()
{
return 0x381;
}
public override int GetDeathSound() => 0x381;
public override int GetAttackSound()
{
return 0x37F;
}
public override int GetAttackSound() => 0x37F;
public override int GetHurtSound()
{
return 0x380;
}
public override int GetHurtSound() => 0x380;
public override bool OnBeforeDeath()
{

View file

@ -60,15 +60,9 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Regular;
public override int GetIdleSound()
{
return 0x200;
}
public override int GetIdleSound() => 0x200;
public override int GetAngerSound()
{
return 0x56;
}
public override int GetAngerSound() => 0x56;
public override bool OnBeforeDeath()
{

View file

@ -76,30 +76,15 @@ namespace Server.Mobiles
AddLoot(LootPack.Rich);
}
public override int GetIdleSound()
{
return 0x218;
}
public override int GetIdleSound() => 0x218;
public override int GetAngerSound()
{
return 0x26C;
}
public override int GetAngerSound() => 0x26C;
public override int GetDeathSound()
{
return 0x211;
}
public override int GetDeathSound() => 0x211;
public override int GetAttackSound()
{
return 0x232;
}
public override int GetAttackSound() => 0x232;
public override int GetHurtSound()
{
return 0x140;
}
public override int GetHurtSound() => 0x140;
public override void AlterMeleeDamageFrom(Mobile from, ref int damage)
{

View file

@ -66,30 +66,15 @@ namespace Server.Mobiles
AddLoot(LootPack.Rich);
}
public override int GetIdleSound()
{
return 0xFD;
}
public override int GetIdleSound() => 0xFD;
public override int GetAngerSound()
{
return 0x26C;
}
public override int GetAngerSound() => 0x26C;
public override int GetDeathSound()
{
return 0x211;
}
public override int GetDeathSound() => 0x211;
public override int GetAttackSound()
{
return 0x23B;
}
public override int GetAttackSound() => 0x23B;
public override int GetHurtSound()
{
return 0x140;
}
public override int GetHurtSound() => 0x140;
public override void AlterMeleeDamageFrom(Mobile from, ref int damage)
{

View file

@ -155,25 +155,13 @@ namespace Server.Mobiles
public override bool AlwaysMurderer => true;
public override bool ShowFameTitle => false;
public override int GetIdleSound()
{
return 0x2CE;
}
public override int GetIdleSound() => 0x2CE;
public override int GetDeathSound()
{
return 0x2CC;
}
public override int GetDeathSound() => 0x2CC;
public override int GetHurtSound()
{
return 0x2D1;
}
public override int GetHurtSound() => 0x2D1;
public override int GetAttackSound()
{
return 0x2C8;
}
public override int GetAttackSound() => 0x2C8;
public override void GenerateLoot()
{

View file

@ -192,25 +192,13 @@ namespace Server.Mobiles
public override bool AlwaysMurderer => true;
public override bool ShowFameTitle => false;
public override int GetIdleSound()
{
return 0x2CE;
}
public override int GetIdleSound() => 0x2CE;
public override int GetDeathSound()
{
return 0x2CC;
}
public override int GetDeathSound() => 0x2CC;
public override int GetHurtSound()
{
return 0x2D1;
}
public override int GetHurtSound() => 0x2D1;
public override int GetAttackSound()
{
return 0x2C8;
}
public override int GetAttackSound() => 0x2C8;
public override void GenerateLoot()
{

View file

@ -90,25 +90,13 @@ namespace Server.Mobiles
base.OnDamage(amount, from, willKill);
}
public override int GetIdleSound()
{
return 0x262;
}
public override int GetIdleSound() => 0x262;
public override int GetAngerSound()
{
return 0x263;
}
public override int GetAngerSound() => 0x263;
public override int GetHurtSound()
{
return 0x1D0;
}
public override int GetHurtSound() => 0x1D0;
public override int GetDeathSound()
{
return 0x28D;
}
public override int GetDeathSound() => 0x28D;
public override void Serialize(GenericWriter writer)
{

View file

@ -85,25 +85,13 @@ namespace Server.Mobiles
AddLoot(LootPack.MedScrolls, 2);
}
public override int GetIdleSound()
{
return 0x1AC;
}
public override int GetIdleSound() => 0x1AC;
public override int GetAngerSound()
{
return 0x1CD;
}
public override int GetAngerSound() => 0x1CD;
public override int GetHurtSound()
{
return 0x1D0;
}
public override int GetHurtSound() => 0x1D0;
public override int GetDeathSound()
{
return 0x28D;
}
public override int GetDeathSound() => 0x28D;
public override void OnThink()
{

View file

@ -61,25 +61,13 @@ namespace Server.Mobiles
AddLoot(LootPack.Gems, 1);
}
public override int GetIdleSound()
{
return 0x1AC;
}
public override int GetIdleSound() => 0x1AC;
public override int GetAngerSound()
{
return 0x1CD;
}
public override int GetAngerSound() => 0x1CD;
public override int GetHurtSound()
{
return 0x1D0;
}
public override int GetHurtSound() => 0x1D0;
public override int GetDeathSound()
{
return 0x28D;
}
public override int GetDeathSound() => 0x28D;
public override void OnGaveMeleeAttack(Mobile defender)
{

View file

@ -4,10 +4,7 @@ namespace Server.Mobiles
{
public class EnragedRabbit : BaseEnraged
{
public EnragedRabbit(Mobile summoner) : base(summoner)
{
Body = 0xcd;
}
public EnragedRabbit(Mobile summoner) : base(summoner) => Body = 0xcd;
public EnragedRabbit(Serial serial) : base(serial)
{
@ -16,20 +13,11 @@ namespace Server.Mobiles
public override string CorpseName => "a hare corpse";
public override string DefaultName => "a rabbit";
public override int GetAttackSound()
{
return 0xC9;
}
public override int GetAttackSound() => 0xC9;
public override int GetHurtSound()
{
return 0xCA;
}
public override int GetHurtSound() => 0xCA;
public override int GetDeathSound()
{
return 0xCB;
}
public override int GetDeathSound() => 0xCB;
public override void Serialize(GenericWriter writer)
{
@ -46,10 +34,7 @@ namespace Server.Mobiles
public class EnragedHart : BaseEnraged
{
public EnragedHart(Mobile summoner) : base(summoner)
{
Body = 0xea;
}
public EnragedHart(Mobile summoner) : base(summoner) => Body = 0xea;
public EnragedHart(Serial serial) : base(serial)
{
@ -58,20 +43,11 @@ namespace Server.Mobiles
public override string CorpseName => "a deer corpse";
public override string DefaultName => "a great hart";
public override int GetAttackSound()
{
return 0x82;
}
public override int GetAttackSound() => 0x82;
public override int GetHurtSound()
{
return 0x83;
}
public override int GetHurtSound() => 0x83;
public override int GetDeathSound()
{
return 0x84;
}
public override int GetDeathSound() => 0x84;
public override void Serialize(GenericWriter writer)
{
@ -88,10 +64,7 @@ namespace Server.Mobiles
public class EnragedHind : BaseEnraged
{
public EnragedHind(Mobile summoner) : base(summoner)
{
Body = 0xed;
}
public EnragedHind(Mobile summoner) : base(summoner) => Body = 0xed;
public EnragedHind(Serial serial) : base(serial)
{
@ -100,20 +73,11 @@ namespace Server.Mobiles
public override string CorpseName => "a deer corpse";
public override string DefaultName => "a hind";
public override int GetAttackSound()
{
return 0x82;
}
public override int GetAttackSound() => 0x82;
public override int GetHurtSound()
{
return 0x83;
}
public override int GetHurtSound() => 0x83;
public override int GetDeathSound()
{
return 0x84;
}
public override int GetDeathSound() => 0x84;
public override void Serialize(GenericWriter writer)
{

View file

@ -107,20 +107,11 @@ namespace Server.Mobiles
AddLoot(LootPack.Meager);
}
public override int GetHurtSound()
{
return 0x14D;
}
public override int GetHurtSound() => 0x14D;
public override int GetDeathSound()
{
return 0x314;
}
public override int GetDeathSound() => 0x314;
public override int GetAttackSound()
{
return 0x75;
}
public override int GetAttackSound() => 0x75;
public override void OnThink()
{

View file

@ -66,20 +66,11 @@ namespace Server.Mobiles
AddLoot(LootPack.HighScrolls, 2);
}
public override int GetHurtSound()
{
return 0x167;
}
public override int GetHurtSound() => 0x167;
public override int GetDeathSound()
{
return 0xBC;
}
public override int GetDeathSound() => 0xBC;
public override int GetAttackSound()
{
return 0x28B;
}
public override int GetAttackSound() => 0x28B;
private void DoAreaLeech()
{

View file

@ -68,20 +68,11 @@ namespace Server.Mobiles
// TODO: Daemon bone ...
}
public override int GetHurtSound()
{
return 0x14D;
}
public override int GetHurtSound() => 0x14D;
public override int GetDeathSound()
{
return 0x314;
}
public override int GetDeathSound() => 0x314;
public override int GetAttackSound()
{
return 0x75;
}
public override int GetAttackSound() => 0x75;
public override void OnThink()
{
@ -157,10 +148,7 @@ namespace Server.Mobiles
base.OnThink();
}
public static bool UnderEffect(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool UnderEffect(Mobile m) => m_Table.ContainsKey(m);
public static void StopEffect(Mobile m, bool message)
{

View file

@ -65,15 +65,9 @@ namespace Server.Mobiles
base.OnDamage(amount, from, willKill);
}
public override int GetHurtSound()
{
return 0x156;
}
public override int GetHurtSound() => 0x156;
public override int GetDeathSound()
{
return 0x15C;
}
public override int GetDeathSound() => 0x15C;
public override void Serialize(GenericWriter writer)
{

View file

@ -99,35 +99,17 @@ namespace Server.Mobiles
base.OnDoubleClick(from);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override int GetIdleSound()
{
return 0x577;
}
public override int GetIdleSound() => 0x577;
public override int GetAttackSound()
{
return 0x576;
}
public override int GetAttackSound() => 0x576;
public override int GetAngerSound()
{
return 0x578;
}
public override int GetAngerSound() => 0x578;
public override int GetHurtSound()
{
return 0x576;
}
public override int GetHurtSound() => 0x576;
public override int GetDeathSound()
{
return 0x579;
}
public override int GetDeathSound() => 0x579;
public override void Serialize(GenericWriter writer)
{

View file

@ -66,10 +66,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.CrushingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow;
public override void Serialize(GenericWriter writer)
{

View file

@ -70,10 +70,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void Serialize(GenericWriter writer)
{

View file

@ -66,10 +66,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.WhirlwindAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.WhirlwindAttack;
public override void OnDeath(Container c)
{

View file

@ -61,10 +61,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.MortalStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike;
public override void OnDeath(Container c)
{

View file

@ -51,10 +51,7 @@ namespace Server.Mobiles
AddLoot(LootPack.FilthyRich, 4);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ArmorIgnore;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ArmorIgnore;
public override void OnDeath(Container c)
{

View file

@ -52,30 +52,15 @@ namespace Server.Mobiles
AddLoot(LootPack.FilthyRich);
}
public override int GetAngerSound()
{
return 0x56d;
}
public override int GetAngerSound() => 0x56d;
public override int GetIdleSound()
{
return 0x56b;
}
public override int GetIdleSound() => 0x56b;
public override int GetAttackSound()
{
return 0x56c;
}
public override int GetAttackSound() => 0x56c;
public override int GetHurtSound()
{
return 0x56c;
}
public override int GetHurtSound() => 0x56c;
public override int GetDeathSound()
{
return 0x56e;
}
public override int GetDeathSound() => 0x56e;
public override void Serialize(GenericWriter writer)
{

View file

@ -68,30 +68,15 @@ namespace Server.Mobiles
* Acid last 10 seconds
*/
public override int GetAngerSound()
{
return 0x581;
}
public override int GetAngerSound() => 0x581;
public override int GetIdleSound()
{
return 0x582;
}
public override int GetIdleSound() => 0x582;
public override int GetAttackSound()
{
return 0x580;
}
public override int GetAttackSound() => 0x580;
public override int GetHurtSound()
{
return 0x583;
}
public override int GetHurtSound() => 0x583;
public override int GetDeathSound()
{
return 0x584;
}
public override int GetDeathSound() => 0x584;
public override void OnDamage(int amount, Mobile from, bool willKill)
{
@ -101,15 +86,9 @@ namespace Server.Mobiles
base.OnDamage(amount, from, willKill);
}
private int RandomPoint(int mid)
{
return mid + Utility.RandomMinMax(-2, 2);
}
private int RandomPoint(int mid) => mid + Utility.RandomMinMax(-2, 2);
public virtual Point3D GetSpawnPosition(int range)
{
return GetSpawnPosition(Location, Map, range);
}
public virtual Point3D GetSpawnPosition(int range) => GetSpawnPosition(Location, Map, range);
public virtual Point3D GetSpawnPosition(Point3D from, Map map, int range)
{

View file

@ -114,11 +114,9 @@ namespace Server.Mobiles
PlaySound(0x1D3);
}
public bool IsValidTarget(PlayerMobile m)
{
return m?.PeacedUntil < DateTime.UtcNow && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
CanBeHarmful(m);
}
public bool IsValidTarget(PlayerMobile m) =>
m?.PeacedUntil < DateTime.UtcNow && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
CanBeHarmful(m);
#endregion

View file

@ -59,10 +59,7 @@ namespace Server.Mobiles
return 0x0;
}*/
public override int GetAttackSound()
{
return 0x233;
}
public override int GetAttackSound() => 0x233;
// TODO: Proper OnDeath Effect

View file

@ -48,25 +48,13 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override int GetIdleSound()
{
return 443;
}
public override int GetIdleSound() => 443;
public override int GetDeathSound()
{
return 31;
}
public override int GetDeathSound() => 31;
public override int GetAttackSound()
{
return 672;
}
public override int GetAttackSound() => 672;
public override void GenerateLoot()
{

View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override string DefaultName => "a minotaur";
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void GenerateLoot()
{
@ -59,30 +56,15 @@ namespace Server.Mobiles
}
// Using Tormented Minotaur sounds - Need to veryfy
public override int GetAngerSound()
{
return 0x597;
}
public override int GetAngerSound() => 0x597;
public override int GetIdleSound()
{
return 0x596;
}
public override int GetIdleSound() => 0x596;
public override int GetAttackSound()
{
return 0x599;
}
public override int GetAttackSound() => 0x599;
public override int GetHurtSound()
{
return 0x59a;
}
public override int GetHurtSound() => 0x59a;
public override int GetDeathSound()
{
return 0x59c;
}
public override int GetDeathSound() => 0x59c;
public override void Serialize(GenericWriter writer)
{

View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override string DefaultName => "a minotaur captain";
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void GenerateLoot()
{
@ -59,30 +56,15 @@ namespace Server.Mobiles
}
// Using Tormented Minotaur sounds - Need to veryfy
public override int GetAngerSound()
{
return 0x597;
}
public override int GetAngerSound() => 0x597;
public override int GetIdleSound()
{
return 0x596;
}
public override int GetIdleSound() => 0x596;
public override int GetAttackSound()
{
return 0x599;
}
public override int GetAttackSound() => 0x599;
public override int GetHurtSound()
{
return 0x59a;
}
public override int GetHurtSound() => 0x59a;
public override int GetDeathSound()
{
return 0x59c;
}
public override int GetDeathSound() => 0x59c;
public override void Serialize(GenericWriter writer)
{

View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override string DefaultName => "a minotaur scout";
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void GenerateLoot()
{
@ -59,30 +56,15 @@ namespace Server.Mobiles
}
// Using Tormented Minotaur sounds - Need to veryfy
public override int GetAngerSound()
{
return 0x597;
}
public override int GetAngerSound() => 0x597;
public override int GetIdleSound()
{
return 0x596;
}
public override int GetIdleSound() => 0x596;
public override int GetAttackSound()
{
return 0x599;
}
public override int GetAttackSound() => 0x599;
public override int GetHurtSound()
{
return 0x59a;
}
public override int GetHurtSound() => 0x59a;
public override int GetDeathSound()
{
return 0x59c;
}
public override int GetDeathSound() => 0x59c;
public override void Serialize(GenericWriter writer)
{

View file

@ -45,40 +45,22 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Deadly;
public override int TreasureMapLevel => 3;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override void GenerateLoot()
{
AddLoot(LootPack.FilthyRich, 10);
}
public override int GetDeathSound()
{
return 0x596;
}
public override int GetDeathSound() => 0x596;
public override int GetAttackSound()
{
return 0x597;
}
public override int GetAttackSound() => 0x597;
public override int GetIdleSound()
{
return 0x598;
}
public override int GetIdleSound() => 0x598;
public override int GetAngerSound()
{
return 0x599;
}
public override int GetAngerSound() => 0x599;
public override int GetHurtSound()
{
return 0x59A;
}
public override int GetHurtSound() => 0x59A;
public override void Serialize(GenericWriter writer)
{

View file

@ -91,10 +91,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 4);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.MortalStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike;
public override void Serialize(GenericWriter writer)
{

View file

@ -74,10 +74,7 @@ namespace Server.Mobiles
AddLoot(LootPack.Gems, 8);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override void Serialize(GenericWriter writer)
{

Some files were not shown because too many files have changed in this diff Show more