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

@ -114,30 +114,15 @@ namespace Server.Mobiles
m_Table[defender] = timer;
}
public override int GetAngerSound()
{
return 0x4DE;
}
public override int GetAngerSound() => 0x4DE;
public override int GetIdleSound()
{
return 0x4DD;
}
public override int GetIdleSound() => 0x4DD;
public override int GetAttackSound()
{
return 0x4DC;
}
public override int GetAttackSound() => 0x4DC;
public override int GetHurtSound()
{
return 0x4DF;
}
public override int GetHurtSound() => 0x4DF;
public override int GetDeathSound()
{
return 0x4DB;
}
public override int GetDeathSound() => 0x4DB;
public override void Serialize(GenericWriter writer)
{

View file

@ -76,35 +76,17 @@ namespace Server.Mobiles
public override int Hides => 8;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.CrushingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow;
public override int GetAngerSound()
{
return 0x4F3;
}
public override int GetAngerSound() => 0x4F3;
public override int GetIdleSound()
{
return 0x4F2;
}
public override int GetIdleSound() => 0x4F2;
public override int GetAttackSound()
{
return 0x4F1;
}
public override int GetAttackSound() => 0x4F1;
public override int GetHurtSound()
{
return 0x4F4;
}
public override int GetHurtSound() => 0x4F4;
public override int GetDeathSound()
{
return 0x4F0;
}
public override int GetDeathSound() => 0x4F0;
public override void GenerateLoot()
{

View file

@ -75,30 +75,15 @@ namespace Server.Mobiles
public override string DefaultName => "a deathwatch beetle hatchling";
public override int Hides => 8;
public override int GetAngerSound()
{
return 0x4F3;
}
public override int GetAngerSound() => 0x4F3;
public override int GetIdleSound()
{
return 0x4F2;
}
public override int GetIdleSound() => 0x4F2;
public override int GetAttackSound()
{
return 0x4F1;
}
public override int GetAttackSound() => 0x4F1;
public override int GetHurtSound()
{
return 0x4F4;
}
public override int GetHurtSound() => 0x4F4;
public override int GetDeathSound()
{
return 0x4F0;
}
public override int GetDeathSound() => 0x4F0;
public override void GenerateLoot()
{

View file

@ -146,10 +146,7 @@ namespace Server.Mobiles
}
}
public bool IsFanned(Mobile m)
{
return m_Table.Contains(m);
}
public bool IsFanned(Mobile m) => m_Table.Contains(m);
public override void Serialize(GenericWriter writer)
{

View file

@ -69,40 +69,19 @@ namespace Server.Mobiles
CurrentSpeed = PassiveSpeed;
}
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
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 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

@ -70,30 +70,15 @@ namespace Server.Mobiles
AddLoot(LootPack.Average);
}
public override int GetAngerSound()
{
return 0x50B;
}
public override int GetAngerSound() => 0x50B;
public override int GetIdleSound()
{
return 0x50A;
}
public override int GetIdleSound() => 0x50A;
public override int GetAttackSound()
{
return 0x509;
}
public override int GetAttackSound() => 0x509;
public override int GetHurtSound()
{
return 0x50C;
}
public override int GetHurtSound() => 0x50C;
public override int GetDeathSound()
{
return 0x508;
}
public override int GetDeathSound() => 0x508;
public override void OnGaveMeleeAttack(Mobile defender)
{
@ -108,10 +93,7 @@ namespace Server.Mobiles
}
}
public static bool IsBeingDrained(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool IsBeingDrained(Mobile m) => m_Table.ContainsKey(m);
public static void BeginLifeDrain(Mobile m, Mobile from)
{
@ -171,10 +153,7 @@ namespace Server.Mobiles
base.OnDamage(amount, from, willKill);
}
public override Item NewHarmfulItem()
{
return new AcidSlime(TimeSpan.FromSeconds(10), 5, 10);
}
public override Item NewHarmfulItem() => new AcidSlime(TimeSpan.FromSeconds(10), 5, 10);
public override void Serialize(GenericWriter writer)
{

View file

@ -63,10 +63,7 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override int TreasureMapLevel => 4;
public override int GetDeathSound()
{
return 0x370;
}
public override int GetDeathSound() => 0x370;
public override void GenerateLoot()
{

View file

@ -62,30 +62,15 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override int TreasureMapLevel => 4;
public override int GetAngerSound()
{
return 0x4E3;
}
public override int GetAngerSound() => 0x4E3;
public override int GetIdleSound()
{
return 0x4E2;
}
public override int GetIdleSound() => 0x4E2;
public override int GetAttackSound()
{
return 0x4E1;
}
public override int GetAttackSound() => 0x4E1;
public override int GetHurtSound()
{
return 0x4E4;
}
public override int GetHurtSound() => 0x4E4;
public override int GetDeathSound()
{
return 0x4E0;
}
public override int GetDeathSound() => 0x4E0;
public override void GenerateLoot()
{

View file

@ -85,35 +85,17 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Greater;
public override Poison HitPoison => Poison.Greater;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override int GetAngerSound()
{
return 0x518;
}
public override int GetAngerSound() => 0x518;
public override int GetIdleSound()
{
return 0x517;
}
public override int GetIdleSound() => 0x517;
public override int GetAttackSound()
{
return 0x516;
}
public override int GetAttackSound() => 0x516;
public override int GetHurtSound()
{
return 0x519;
}
public override int GetHurtSound() => 0x519;
public override int GetDeathSound()
{
return 0x515;
}
public override int GetDeathSound() => 0x515;
public override void GenerateLoot()
{

View file

@ -97,35 +97,17 @@ namespace Server.Mobiles
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override bool CanAngerOnTame => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override int GetAngerSound()
{
return 0x4E8;
}
public override int GetAngerSound() => 0x4E8;
public override int GetIdleSound()
{
return 0x4E7;
}
public override int GetIdleSound() => 0x4E7;
public override int GetAttackSound()
{
return 0x4E6;
}
public override int GetAttackSound() => 0x4E6;
public override int GetHurtSound()
{
return 0x4E9;
}
public override int GetHurtSound() => 0x4E9;
public override int GetDeathSound()
{
return 0x4E5;
}
public override int GetDeathSound() => 0x4E5;
public override void GenerateLoot()
{

View file

@ -142,30 +142,15 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
public override int GetAngerSound()
{
return 0x52D;
}
public override int GetAngerSound() => 0x52D;
public override int GetIdleSound()
{
return 0x52C;
}
public override int GetIdleSound() => 0x52C;
public override int GetAttackSound()
{
return 0x52B;
}
public override int GetAttackSound() => 0x52B;
public override int GetHurtSound()
{
return 0x52E;
}
public override int GetHurtSound() => 0x52E;
public override int GetDeathSound()
{
return 0x52A;
}
public override int GetDeathSound() => 0x52A;
private class ExpireTimer : Timer
{

View file

@ -58,10 +58,7 @@ namespace Server.Mobiles
public override int TreasureMapLevel => 5;
public override int Hides => 20;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.DoubleStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike;
public override void GenerateLoot()
{
@ -138,30 +135,15 @@ namespace Server.Mobiles
}
}
public override int GetAttackSound()
{
return 1260;
}
public override int GetAttackSound() => 1260;
public override int GetAngerSound()
{
return 1262;
}
public override int GetAngerSound() => 1262;
public override int GetDeathSound()
{
return 1259; //Other Death sound is 1258... One for Yamadon, one for Serado?
}
public override int GetDeathSound() => 1259;
public override int GetHurtSound()
{
return 1263;
}
public override int GetHurtSound() => 1263;
public override int GetIdleSound()
{
return 1261;
}
public override int GetIdleSound() => 1261;
public override void Serialize(GenericWriter writer)
{

View file

@ -84,10 +84,7 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override int TreasureMapLevel => 5;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.DoubleStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike;
public override void GenerateLoot()
@ -129,24 +126,12 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
public override int GetIdleSound()
{
return 0x42A;
}
public override int GetIdleSound() => 0x42A;
public override int GetAttackSound()
{
return 0x435;
}
public override int GetAttackSound() => 0x435;
public override int GetHurtSound()
{
return 0x436;
}
public override int GetHurtSound() => 0x436;
public override int GetDeathSound()
{
return 0x43A;
}
public override int GetDeathSound() => 0x43A;
}
}

View file

@ -84,10 +84,7 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.DoubleStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike;
public override void GenerateLoot()
@ -130,24 +127,12 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
public override int GetIdleSound()
{
return 0x42A;
}
public override int GetIdleSound() => 0x42A;
public override int GetAttackSound()
{
return 0x435;
}
public override int GetAttackSound() => 0x435;
public override int GetHurtSound()
{
return 0x436;
}
public override int GetHurtSound() => 0x436;
public override int GetDeathSound()
{
return 0x43A;
}
public override int GetDeathSound() => 0x43A;
}
}

View file

@ -79,10 +79,7 @@ namespace Server.Mobiles
public override bool CanRummageCorpses => true;
public override int TreasureMapLevel => 3;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.DoubleStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike;
public override void GenerateLoot()
{
@ -123,24 +120,12 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
public override int GetIdleSound()
{
return 0x42A;
}
public override int GetIdleSound() => 0x42A;
public override int GetAttackSound()
{
return 0x435;
}
public override int GetAttackSound() => 0x435;
public override int GetHurtSound()
{
return 0x436;
}
public override int GetHurtSound() => 0x436;
public override int GetDeathSound()
{
return 0x43A;
}
public override int GetDeathSound() => 0x43A;
}
}