diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj index b33bf4c7d..8c727c281 100644 --- a/Projects/Server.Tests/Server.Tests.csproj +++ b/Projects/Server.Tests/Server.Tests.csproj @@ -11,9 +11,6 @@ - - Data\Professions\LBR\prof.txt - diff --git a/Projects/Server/Configuration/ServerConfiguration.cs b/Projects/Server/Configuration/ServerConfiguration.cs index 77f76db2f..5cb173e62 100644 --- a/Projects/Server/Configuration/ServerConfiguration.cs +++ b/Projects/Server/Configuration/ServerConfiguration.cs @@ -67,6 +67,12 @@ public static class ServerConfiguration return Enum.TryParse(strValue, out T value) ? value : defaultValue; } + public static double GetSetting(string key, double defaultValue) + { + m_Settings.Settings.TryGetValue(key, out var strValue); + return double.TryParse(strValue, out var value) ? value : defaultValue; + } + public static T? GetSetting(string key) where T : struct, Enum { if (!m_Settings.Settings.TryGetValue(key, out var strValue)) @@ -168,6 +174,24 @@ public static class ServerConfiguration return value; } + public static double GetOrUpdateSetting(string key, double defaultValue) + { + double value; + + if (m_Settings.Settings.TryGetValue(key, out var strValue)) + { + value = double.TryParse(strValue, out value) ? value : defaultValue; + } + else + { + SetSetting(key, (value = defaultValue).ToString()); + } + + return value; + } + + public static void SetSetting(string key, double value) => SetSetting(key, value.ToString()); + public static void SetSetting(string key, TimeSpan value) => SetSetting(key, value.ToString()); public static void SetSetting(string key, int value) => SetSetting(key, value.ToString()); diff --git a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs index 91d82e580..e0ee6d231 100644 --- a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs +++ b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public UnholyFamiliar() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 99; BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs index 5baa0466b..5546f571c 100644 --- a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs +++ b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public UnholySteed() - : base("a dark steed", 0x74, 0x3EA7, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + : base("a dark steed", 0x74, 0x3EA7, AIType.AI_Melee, FightMode.Aggressor, 10, 1) { SetStr(496, 525); SetDex(86, 105); diff --git a/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs b/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs index b07570a89..7f67f8f06 100644 --- a/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs +++ b/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public HolyFamiliar() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 100; BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs b/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs index a3f088fd4..c6c41aa1e 100644 --- a/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs +++ b/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public HolySteed() - : base("a silver steed", 0x75, 0x3EA8, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + : base("a silver steed", 0x75, 0x3EA8, AIType.AI_Melee, FightMode.Aggressor, 10, 1) { SetStr(496, 525); SetDex(86, 105); diff --git a/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs b/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs index a90e44678..e313de059 100644 --- a/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs +++ b/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs @@ -10,7 +10,7 @@ namespace Server.Factions [Constructible] public FactionWarHorse(Faction faction = null) - : base("a war horse", 0xE2, 0x3EA0, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + : base("a war horse", 0xE2, 0x3EA0, AIType.AI_Melee, FightMode.Aggressor, 10, 1) { BaseSoundID = 0xA8; diff --git a/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs index aa7716781..5b59ecb6f 100644 --- a/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs +++ b/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs @@ -35,7 +35,7 @@ namespace Server.Factions private DateTime m_OrdersEnd; private Town m_Town; - public BaseFactionGuard(string title) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BaseFactionGuard(string title) : base(AIType.AI_Melee) { Orders = new Orders(this); Title = title; diff --git a/Projects/UOContent/Engines/Khaldun/Mobiles/GrimmochDrummel.cs b/Projects/UOContent/Engines/Khaldun/Mobiles/GrimmochDrummel.cs index 7adde3926..d18e54dc8 100644 --- a/Projects/UOContent/Engines/Khaldun/Mobiles/GrimmochDrummel.cs +++ b/Projects/UOContent/Engines/Khaldun/Mobiles/GrimmochDrummel.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GrimmochDrummel : BaseCreature { [Constructible] - public GrimmochDrummel() : base(AIType.AI_Archer, FightMode.Closest, 10, 1, 0.2, 0.4) + public GrimmochDrummel() : base(AIType.AI_Archer) { Title = "the Cursed"; diff --git a/Projects/UOContent/Engines/Khaldun/Mobiles/LysanderGathenwale.cs b/Projects/UOContent/Engines/Khaldun/Mobiles/LysanderGathenwale.cs index c35736293..8d7f2cb3d 100644 --- a/Projects/UOContent/Engines/Khaldun/Mobiles/LysanderGathenwale.cs +++ b/Projects/UOContent/Engines/Khaldun/Mobiles/LysanderGathenwale.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class LysanderGathenwale : BaseCreature { [Constructible] - public LysanderGathenwale() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public LysanderGathenwale() : base(AIType.AI_Mage) { Title = "the Cursed"; diff --git a/Projects/UOContent/Engines/Khaldun/Mobiles/MorgBergen.cs b/Projects/UOContent/Engines/Khaldun/Mobiles/MorgBergen.cs index 6c6bf8f46..fa1a61a20 100644 --- a/Projects/UOContent/Engines/Khaldun/Mobiles/MorgBergen.cs +++ b/Projects/UOContent/Engines/Khaldun/Mobiles/MorgBergen.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class MorgBergen : BaseCreature { [Constructible] - public MorgBergen() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public MorgBergen() : base(AIType.AI_Melee) { Title = "the Cursed"; diff --git a/Projects/UOContent/Engines/Khaldun/Mobiles/TavaraSewel.cs b/Projects/UOContent/Engines/Khaldun/Mobiles/TavaraSewel.cs index c568c64f8..4e01e38b8 100644 --- a/Projects/UOContent/Engines/Khaldun/Mobiles/TavaraSewel.cs +++ b/Projects/UOContent/Engines/Khaldun/Mobiles/TavaraSewel.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class TavaraSewel : BaseCreature { [Constructible] - public TavaraSewel() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public TavaraSewel() : base(AIType.AI_Melee) { Title = "the Cursed"; diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs b/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs index 31bf2a6de..26da2dce7 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs @@ -180,7 +180,7 @@ namespace Server.Engines.MLQuests.Definitions { [Constructible] public Jamal() - : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.2, 0.4) + : base(AIType.AI_Vendor, FightMode.None, 2) { Title = "the Fisherman"; Body = 400; @@ -224,7 +224,7 @@ namespace Server.Engines.MLQuests.Definitions { [Constructible] public Iosep() - : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.2, 0.4) + : base(AIType.AI_Vendor, FightMode.None, 2) { Title = "the Exporter"; Body = 400; diff --git a/Projects/UOContent/Engines/Plants/MiscMobiles/GiantIceWorm.cs b/Projects/UOContent/Engines/Plants/MiscMobiles/GiantIceWorm.cs index a882b772a..8ba3969f7 100644 --- a/Projects/UOContent/Engines/Plants/MiscMobiles/GiantIceWorm.cs +++ b/Projects/UOContent/Engines/Plants/MiscMobiles/GiantIceWorm.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class GiantIceWorm : BaseCreature { [Constructible] - public GiantIceWorm() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GiantIceWorm() : base(AIType.AI_Melee) { Body = 89; BaseSoundID = 0xDC; diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs index a4f020cb7..a01569975 100644 --- a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs +++ b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs @@ -9,7 +9,7 @@ namespace Server.Engines.Quests.Necro private PlayerMobile m_Necromancer; private bool m_ToDelete; - public SummonedPaladin(PlayerMobile necromancer) : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public SummonedPaladin(PlayerMobile necromancer) : base(AIType.AI_Melee, FightMode.Aggressor) { m_Necromancer = necromancer; diff --git a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs index 1d10745b6..d4e24e217 100644 --- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs +++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Ninja public class Henchman : BaseCreature { [Constructible] - public Henchman() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Henchman() : base(AIType.AI_Melee, FightMode.Aggressor) { InitStats(45, 30, 5); diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs index 5defbf092..151f85901 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Samurai public class CursedSoul : BaseCreature { [Constructible] - public CursedSoul() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public CursedSoul() : base(AIType.AI_Melee, FightMode.Aggressor) { Body = 3; BaseSoundID = 471; diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs index bc5cd2092..7d9085567 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Samurai public class DeadlyImp : BaseCreature { [Constructible] - public DeadlyImp() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public DeadlyImp() : base(AIType.AI_Melee, FightMode.Aggressor) { Body = 74; BaseSoundID = 422; diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs index 3b135a242..c73bbc558 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Samurai public class DiseasedCat : BaseCreature { [Constructible] - public DiseasedCat() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public DiseasedCat() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xC9; Hue = Utility.RandomAnimalHue(); diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs index 8e2016a15..914aec85e 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Samurai public class FierceDragon : BaseCreature { [Constructible] - public FierceDragon() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public FierceDragon() : base(AIType.AI_Melee, FightMode.Aggressor) { Body = 103; BaseSoundID = 362; diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs index 5bcf2fedf..fd7ab7078 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Samurai public class InjuredWolf : BaseCreature { [Constructible] - public InjuredWolf() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public InjuredWolf() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xE1; BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs index 130567bd9..f3b63e1b2 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Samurai public class YoungNinja : BaseCreature { [Constructible] - public YoungNinja() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public YoungNinja() : base(AIType.AI_Melee, FightMode.Aggressor) { InitStats(45, 30, 5); SetHits(20, 30); diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs index 98ddf1f45..c2f1aed70 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Samurai public class YoungRonin : BaseCreature { [Constructible] - public YoungRonin() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public YoungRonin() : base(AIType.AI_Melee, FightMode.Aggressor) { InitStats(45, 30, 5); SetHits(10, 20); diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs index ee0a3795c..34b3947a6 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs @@ -9,7 +9,7 @@ namespace Server.Engines.Quests.Haven public class MilitiaFighter : BaseCreature { [Constructible] - public MilitiaFighter() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public MilitiaFighter() : base(AIType.AI_Melee) { InitStats(40, 30, 5); Title = "the Militia Fighter"; diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs b/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs index 3384eec0f..a1cc80e8b 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs @@ -276,7 +276,7 @@ namespace Server.Engines.Events private readonly Mobile m_From; public NaughtyTwin(Mobile from) - : base(AIType.AI_Melee, FightMode.None, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee, FightMode.None) { if (TrickOrTreat.CheckMobile(from)) { diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs b/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs index e644f119f..605b1446c 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs @@ -8,7 +8,7 @@ public partial class CreepyCake : Food { [Constructible] - public CreepyCake() : base(0x9e9, 1) => Hue = 0x3E4; + public CreepyCake() : base(0x9e9) => Hue = 0x3E4; public override string DefaultName => "Creepy Cake"; } diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs b/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs index 74f3cca82..7b70e3a31 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs @@ -4,7 +4,7 @@ public partial class MrPlainsCookies : Food { [Constructible] - public MrPlainsCookies() : base(0x160C, 1) + public MrPlainsCookies() : base(0x160C) { Weight = 1.0; FillFactor = 4; diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs b/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs index a281b34f4..8f1a35d21 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { [Constructible] public PumpkinHead() - : base(Utility.RandomBool() ? AIType.AI_Melee : AIType.AI_Mage, FightMode.Closest, 10, 1, 0.05, 0.1) + : base(Utility.RandomBool() ? AIType.AI_Melee : AIType.AI_Mage) { Body = 1246 + Utility.Random(2); diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs b/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs index 1bc77cf3b..cf1e2ad43 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs @@ -169,7 +169,7 @@ namespace Server.Engines.Events public override string DefaultName => _deadPlayer != null ? $"{_deadPlayer.Name}'s Zombie Skeleton" : "Zombie Skeleton"; public ZombieSkeleton(PlayerMobile player = null) - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { _deadPlayer = player; diff --git a/Projects/UOContent/Items/Food/Asian.cs b/Projects/UOContent/Items/Food/Asian.cs index 98b35e0c3..b7ea61a6b 100644 --- a/Projects/UOContent/Items/Food/Asian.cs +++ b/Projects/UOContent/Items/Food/Asian.cs @@ -27,7 +27,7 @@ namespace Server.Items public class WasabiClumps : Food { [Constructible] - public WasabiClumps() : base(0x24EB, 1) + public WasabiClumps() : base(0x24EB) { Stackable = false; Weight = 1.0; @@ -80,7 +80,7 @@ namespace Server.Items public class BentoBox : Food { [Constructible] - public BentoBox() : base(0x2836, 1) + public BentoBox() : base(0x2836) { Stackable = false; Weight = 5.0; @@ -120,7 +120,7 @@ namespace Server.Items public class SushiRolls : Food { [Constructible] - public SushiRolls() : base(0x283E, 1) + public SushiRolls() : base(0x283E) { Stackable = false; Weight = 3.0; @@ -149,7 +149,7 @@ namespace Server.Items public class SushiPlatter : Food { [Constructible] - public SushiPlatter() : base(0x2840, 1) + public SushiPlatter() : base(0x2840) { Stackable = Core.ML; Weight = 3.0; @@ -202,7 +202,7 @@ namespace Server.Items public class GreenTea : Food { [Constructible] - public GreenTea() : base(0x284C, 1) + public GreenTea() : base(0x284C) { Stackable = false; Weight = 4.0; @@ -231,7 +231,7 @@ namespace Server.Items public class MisoSoup : Food { [Constructible] - public MisoSoup() : base(0x284D, 1) + public MisoSoup() : base(0x284D) { Stackable = false; Weight = 4.0; @@ -260,7 +260,7 @@ namespace Server.Items public class WhiteMisoSoup : Food { [Constructible] - public WhiteMisoSoup() : base(0x284E, 1) + public WhiteMisoSoup() : base(0x284E) { Stackable = false; Weight = 4.0; @@ -289,7 +289,7 @@ namespace Server.Items public class RedMisoSoup : Food { [Constructible] - public RedMisoSoup() : base(0x284F, 1) + public RedMisoSoup() : base(0x284F) { Stackable = false; Weight = 4.0; @@ -318,7 +318,7 @@ namespace Server.Items public class AwaseMisoSoup : Food { [Constructible] - public AwaseMisoSoup() : base(0x2850, 1) + public AwaseMisoSoup() : base(0x2850) { Stackable = false; Weight = 4.0; diff --git a/Projects/UOContent/Items/Food/Bowls.cs b/Projects/UOContent/Items/Food/Bowls.cs index d4b485d51..b5b98522a 100644 --- a/Projects/UOContent/Items/Food/Bowls.cs +++ b/Projects/UOContent/Items/Food/Bowls.cs @@ -51,7 +51,7 @@ namespace Server.Items public class WoodenBowlOfCarrots : Food { [Constructible] - public WoodenBowlOfCarrots() : base(0x15F9, 1) + public WoodenBowlOfCarrots() : base(0x15F9) { Stackable = false; Weight = 1.0; @@ -91,7 +91,7 @@ namespace Server.Items public class WoodenBowlOfCorn : Food { [Constructible] - public WoodenBowlOfCorn() : base(0x15FA, 1) + public WoodenBowlOfCorn() : base(0x15FA) { Stackable = false; Weight = 1.0; @@ -131,7 +131,7 @@ namespace Server.Items public class WoodenBowlOfLettuce : Food { [Constructible] - public WoodenBowlOfLettuce() : base(0x15FB, 1) + public WoodenBowlOfLettuce() : base(0x15FB) { Stackable = false; Weight = 1.0; @@ -171,7 +171,7 @@ namespace Server.Items public class WoodenBowlOfPeas : Food { [Constructible] - public WoodenBowlOfPeas() : base(0x15FC, 1) + public WoodenBowlOfPeas() : base(0x15FC) { Stackable = false; Weight = 1.0; @@ -211,7 +211,7 @@ namespace Server.Items public class PewterBowlOfCarrots : Food { [Constructible] - public PewterBowlOfCarrots() : base(0x15FE, 1) + public PewterBowlOfCarrots() : base(0x15FE) { Stackable = false; Weight = 1.0; @@ -251,7 +251,7 @@ namespace Server.Items public class PewterBowlOfCorn : Food { [Constructible] - public PewterBowlOfCorn() : base(0x15FF, 1) + public PewterBowlOfCorn() : base(0x15FF) { Stackable = false; Weight = 1.0; @@ -291,7 +291,7 @@ namespace Server.Items public class PewterBowlOfLettuce : Food { [Constructible] - public PewterBowlOfLettuce() : base(0x1600, 1) + public PewterBowlOfLettuce() : base(0x1600) { Stackable = false; Weight = 1.0; @@ -331,7 +331,7 @@ namespace Server.Items public class PewterBowlOfPeas : Food { [Constructible] - public PewterBowlOfPeas() : base(0x1601, 1) + public PewterBowlOfPeas() : base(0x1601) { Stackable = false; Weight = 1.0; @@ -371,7 +371,7 @@ namespace Server.Items public class PewterBowlOfPotatos : Food { [Constructible] - public PewterBowlOfPotatos() : base(0x1602, 1) + public PewterBowlOfPotatos() : base(0x1602) { Stackable = false; Weight = 1.0; @@ -461,7 +461,7 @@ namespace Server.Items public class WoodenBowlOfStew : Food { [Constructible] - public WoodenBowlOfStew() : base(0x1604, 1) + public WoodenBowlOfStew() : base(0x1604) { Stackable = false; Weight = 2.0; @@ -501,7 +501,7 @@ namespace Server.Items public class WoodenBowlOfTomatoSoup : Food { [Constructible] - public WoodenBowlOfTomatoSoup() : base(0x1606, 1) + public WoodenBowlOfTomatoSoup() : base(0x1606) { Stackable = false; Weight = 2.0; diff --git a/Projects/UOContent/Items/Food/Food.cs b/Projects/UOContent/Items/Food/Food.cs index cc86ebe68..8110b24d4 100644 --- a/Projects/UOContent/Items/Food/Food.cs +++ b/Projects/UOContent/Items/Food/Food.cs @@ -534,7 +534,7 @@ namespace Server.Items public class Cake : Food { [Constructible] - public Cake() : base(0x9E9, 1) + public Cake() : base(0x9E9) { Stackable = false; Weight = 1.0; @@ -591,7 +591,7 @@ namespace Server.Items public class Cookies : Food { [Constructible] - public Cookies() : base(0x160b, 1) + public Cookies() : base(0x160b) { Stackable = Core.ML; Weight = 1.0; @@ -620,7 +620,7 @@ namespace Server.Items public class Muffins : Food { [Constructible] - public Muffins() : base(0x9eb, 1) + public Muffins() : base(0x9eb) { Stackable = false; Weight = 1.0; @@ -650,7 +650,7 @@ namespace Server.Items public class CheesePizza : Food { [Constructible] - public CheesePizza() : base(0x1040, 1) + public CheesePizza() : base(0x1040) { Stackable = false; Weight = 1.0; @@ -681,7 +681,7 @@ namespace Server.Items public class SausagePizza : Food { [Constructible] - public SausagePizza() : base(0x1040, 1) + public SausagePizza() : base(0x1040) { Stackable = false; Weight = 1.0; @@ -712,7 +712,7 @@ namespace Server.Items public class FruitPie : Food { [Constructible] - public FruitPie() : base(0x1041, 1) + public FruitPie() : base(0x1041) { Stackable = false; Weight = 1.0; @@ -743,7 +743,7 @@ namespace Server.Items public class MeatPie : Food { [Constructible] - public MeatPie() : base(0x1041, 1) + public MeatPie() : base(0x1041) { Stackable = false; Weight = 1.0; @@ -774,7 +774,7 @@ namespace Server.Items public class PumpkinPie : Food { [Constructible] - public PumpkinPie() : base(0x1041, 1) + public PumpkinPie() : base(0x1041) { Stackable = false; Weight = 1.0; @@ -805,7 +805,7 @@ namespace Server.Items public class ApplePie : Food { [Constructible] - public ApplePie() : base(0x1041, 1) + public ApplePie() : base(0x1041) { Stackable = false; Weight = 1.0; @@ -836,7 +836,7 @@ namespace Server.Items public class PeachCobbler : Food { [Constructible] - public PeachCobbler() : base(0x1041, 1) + public PeachCobbler() : base(0x1041) { Stackable = false; Weight = 1.0; @@ -867,7 +867,7 @@ namespace Server.Items public class Quiche : Food { [Constructible] - public Quiche() : base(0x1041, 1) + public Quiche() : base(0x1041) { Stackable = Core.ML; Weight = 1.0; diff --git a/Projects/UOContent/Items/Food/Fruits.cs b/Projects/UOContent/Items/Food/Fruits.cs index 7f6c377fb..90ec2b3bf 100644 --- a/Projects/UOContent/Items/Food/Fruits.cs +++ b/Projects/UOContent/Items/Food/Fruits.cs @@ -3,7 +3,7 @@ namespace Server.Items public class FruitBasket : Food { [Constructible] - public FruitBasket() : base(0x993, 1) + public FruitBasket() : base(0x993) { Weight = 2.0; FillFactor = 5; diff --git a/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs b/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs index 47d7fa94e..43ad98350 100644 --- a/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs +++ b/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs @@ -13,7 +13,7 @@ namespace Server.Items { } - public CandyCane(int itemID) : base(itemID, 1) + public CandyCane(int itemID) : base(itemID) { Stackable = false; LootType = LootType.Blessed; @@ -126,7 +126,7 @@ namespace Server.Items [Constructible] public GingerBreadCookie() - : base(Utility.RandomBool() ? 0x2be1 : 0x2be2, 1) + : base(Utility.RandomBool() ? 0x2be1 : 0x2be2) { Stackable = false; LootType = LootType.Blessed; diff --git a/Projects/UOContent/Items/Special/Holiday/PKHolidayStuff.cs b/Projects/UOContent/Items/Special/Holiday/PKHolidayStuff.cs index c772739cb..be141020c 100644 --- a/Projects/UOContent/Items/Special/Holiday/PKHolidayStuff.cs +++ b/Projects/UOContent/Items/Special/Holiday/PKHolidayStuff.cs @@ -65,7 +65,7 @@ namespace Server.Items public class Spam : Food { [Constructible] - public Spam() : base(0x1044, 1) + public Spam() : base(0x1044) { Stackable = false; LootType = LootType.Blessed; diff --git a/Projects/UOContent/Items/Talismans/TalismanSummons.cs b/Projects/UOContent/Items/Talismans/TalismanSummons.cs index e74dd8f4f..262334eb7 100644 --- a/Projects/UOContent/Items/Talismans/TalismanSummons.cs +++ b/Projects/UOContent/Items/Talismans/TalismanSummons.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { // public override bool IsInvulnerable => true; // TODO: Wailing banshees are NOT invulnerable, are any of the others? - public BaseTalismanSummon() : base(AIType.AI_Melee, FightMode.None, 10, 1, 0.2, 0.4) + public BaseTalismanSummon() : base(AIType.AI_Melee, FightMode.None) { // TODO: Stats/skills } diff --git a/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs b/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs index 17d4ffc8a..c3171dbd8 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs @@ -103,7 +103,7 @@ namespace Server.Items { int damage = Utility.RandomMinMax(15, 35); - AOS.Damage(From, From, damage, false, 0, 0, 0, 0, 0, 0, 100, false, false, false); + AOS.Damage(From, From, damage, false, 0, 0, 0, 0, 0, 0, 100); } } } diff --git a/Projects/UOContent/Mobiles/AI/BaseAI.cs b/Projects/UOContent/Mobiles/AI/BaseAI.cs index af010e7c4..e7d8c2994 100644 --- a/Projects/UOContent/Mobiles/AI/BaseAI.cs +++ b/Projects/UOContent/Mobiles/AI/BaseAI.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.IO; using Server.ContextMenus; using Server.Engines.Quests; using Server.Engines.Quests.Necro; @@ -810,31 +809,45 @@ namespace Server.Mobiles switch (Action) { case ActionType.Wander: - m_Mobile.OnActionWander(); - return DoActionWander(); + { + m_Mobile.OnActionWander(); + return DoActionWander(); + } case ActionType.Combat: - m_Mobile.OnActionCombat(); - return DoActionCombat(); + { + m_Mobile.OnActionCombat(); + return DoActionCombat(); + } case ActionType.Guard: - m_Mobile.OnActionGuard(); - return DoActionGuard(); + { + m_Mobile.OnActionGuard(); + return DoActionGuard(); + } case ActionType.Flee: - m_Mobile.OnActionFlee(); - return DoActionFlee(); + { + m_Mobile.OnActionFlee(); + return DoActionFlee(); + } case ActionType.Interact: - m_Mobile.OnActionInteract(); - return DoActionInteract(); + { + m_Mobile.OnActionInteract(); + return DoActionInteract(); + } case ActionType.Backoff: - m_Mobile.OnActionBackoff(); - return DoActionBackoff(); + { + m_Mobile.OnActionBackoff(); + return DoActionBackoff(); + } default: - return false; + { + return false; + } } } @@ -843,42 +856,54 @@ namespace Server.Mobiles switch (Action) { case ActionType.Wander: - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - m_Mobile.FocusMob = null; - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - break; + { + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + m_Mobile.FocusMob = null; + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + break; + } case ActionType.Combat: - m_Mobile.Warmode = true; - m_Mobile.FocusMob = null; - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - break; + { + m_Mobile.Warmode = true; + m_Mobile.FocusMob = null; + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + break; + } case ActionType.Guard: - m_Mobile.Warmode = true; - m_Mobile.FocusMob = null; - m_Mobile.Combatant = null; - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - m_NextStopGuard = Core.TickCount + (int)TimeSpan.FromSeconds(10).TotalMilliseconds; - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - break; + { + m_Mobile.Warmode = true; + m_Mobile.FocusMob = null; + m_Mobile.Combatant = null; + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + m_NextStopGuard = Core.TickCount + (int)TimeSpan.FromSeconds(10).TotalMilliseconds; + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + break; + } case ActionType.Flee: - m_Mobile.Warmode = true; - m_Mobile.FocusMob = null; - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - break; + { + m_Mobile.Warmode = true; + m_Mobile.FocusMob = null; + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + break; + } case ActionType.Interact: - m_Mobile.Warmode = false; - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - break; + { + m_Mobile.Warmode = false; + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + break; + } case ActionType.Backoff: - m_Mobile.Warmode = false; - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - break; + { + m_Mobile.Warmode = false; + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + break; + } } } @@ -1012,12 +1037,7 @@ namespace Server.Mobiles public virtual bool Obey() { - if (m_Mobile.Deleted) - { - return false; - } - - return m_Mobile.ControlOrder switch + var shouldObey = !m_Mobile.Deleted && m_Mobile.ControlOrder switch { OrderType.None => DoOrderNone(), OrderType.Come => DoOrderCome(), @@ -1034,6 +1054,15 @@ namespace Server.Mobiles OrderType.Transfer => DoOrderTransfer(), _ => false }; + + if (shouldObey) + { + // TODO: This might cause the movement timer to reset too often if someone is spamming commands. + // Test this thoroughly. + m_Mobile.ResetSpeeds(); + } + + return shouldObey; } public virtual void OnCurrentOrderChanged() @@ -1046,104 +1075,128 @@ namespace Server.Mobiles switch (m_Mobile.ControlOrder) { case OrderType.None: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.Home = m_Mobile.Location; - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.Home = m_Mobile.Location; + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } case OrderType.Come: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } case OrderType.Drop: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = true; - m_Mobile.Combatant = null; - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = true; + m_Mobile.Combatant = null; + break; + } case OrderType.Friend: case OrderType.Unfriend: - m_Mobile.ControlMaster.RevealingAction(); - break; + { + m_Mobile.ControlMaster.RevealingAction(); + break; + } case OrderType.Guard: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = true; - m_Mobile.Combatant = null; - var petname = $"{m_Mobile.Name}"; - m_Mobile.ControlMaster.SendLocalizedMessage(1049671, petname); // ~1_PETNAME~ is now guarding you. - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = true; + m_Mobile.Combatant = null; + var petname = $"{m_Mobile.Name}"; + m_Mobile.ControlMaster.SendLocalizedMessage(1049671, petname); // ~1_PETNAME~ is now guarding you. + break; + } case OrderType.Attack: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = true; - m_Mobile.Combatant = null; - break; + m_Mobile.Warmode = true; + m_Mobile.Combatant = null; + break; + } case OrderType.Patrol: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } case OrderType.Release: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } case OrderType.Stay: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } case OrderType.Stop: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.Home = m_Mobile.Location; - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.Home = m_Mobile.Location; + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } case OrderType.Follow: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } case OrderType.Transfer: - m_Mobile.ControlMaster.RevealingAction(); - m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; - m_Mobile.PlaySound(m_Mobile.GetIdleSound()); + { + m_Mobile.ControlMaster.RevealingAction(); + m_Mobile.CurrentSpeed = m_Mobile.PassiveSpeed; + m_Mobile.PlaySound(m_Mobile.GetIdleSound()); - m_Mobile.Warmode = false; - m_Mobile.Combatant = null; - break; + m_Mobile.Warmode = false; + m_Mobile.Combatant = null; + break; + } } } @@ -1824,32 +1877,50 @@ namespace Server.Mobiles switch (iRndMove) { case 0: - DoMove(Direction.Up); - break; + { + DoMove(Direction.Up); + break; + } case 1: - DoMove(Direction.North); - break; + { + DoMove(Direction.North); + break; + } case 2: - DoMove(Direction.Left); - break; + { + DoMove(Direction.Left); + break; + } case 3: - DoMove(Direction.West); - break; + { + DoMove(Direction.West); + break; + } case 5: - DoMove(Direction.Down); - break; + { + DoMove(Direction.Down); + break; + } case 6: - DoMove(Direction.South); - break; + { + DoMove(Direction.South); + break; + } case 7: - DoMove(Direction.Right); - break; + { + DoMove(Direction.Right); + break; + } case 8: - DoMove(Direction.East); - break; + { + DoMove(Direction.East); + break; + } default: - DoMove(m_Mobile.Direction); - break; + { + DoMove(m_Mobile.Direction); + break; + } } } } @@ -1857,100 +1928,24 @@ namespace Server.Mobiles public double TransformMoveDelay(double delay) { - var isPassive = delay == m_Mobile.PassiveSpeed; - var isControlled = m_Mobile.Controlled || m_Mobile.Summoned; + double max = m_Mobile.IsMonster ? SpeedInfo.MaxMonsterDelay : SpeedInfo.MaxDelay; - if (delay == 0.2) + if (!m_Mobile.IsDeadPet && (m_Mobile.ReduceSpeedWithDamage || m_Mobile.IsSubdued)) { - delay = 0.3; - } - else if (delay == 0.25) - { - delay = 0.45; - } - else if (delay == 0.3) - { - delay = 0.6; - } - else if (delay == 0.4) - { - delay = 0.9; - } - else if (delay == 0.5) - { - delay = 1.05; - } - else if (delay == 0.6) - { - delay = 1.2; - } - else if (delay == 0.8) - { - delay = 1.5; - } + double offset = m_Mobile.StamMax <= 0 ? 1.0 : m_Mobile.Stam / (double)m_Mobile.StamMax; - if (isPassive) - { - delay += 0.2; - } - - if (!isControlled) - { - delay += 0.1; - } - else if (m_Mobile.Controlled) - { - if (m_Mobile.ControlOrder == OrderType.Follow && m_Mobile.ControlTarget == m_Mobile.ControlMaster) + if (offset < 1.0) { - delay *= 0.5; + delay += (max - delay) * (1.0 - offset); } - - delay -= 0.075; } - if (m_Mobile.ReduceSpeedWithDamage || m_Mobile.IsSubdued) - { - var offset = (double)m_Mobile.Hits / m_Mobile.HitsMax; - - if (offset < 0.0) - { - offset = 0.0; - } - else if (offset > 1.0) - { - offset = 1.0; - } - - offset = 1.0 - offset; - - delay += offset * 0.8; - } - - if (delay < 0.0) - { - delay = 0.0; - } - - if (double.IsNaN(delay)) - { - using (var op = new StreamWriter("nan_transform.txt", true)) - { - op.WriteLine( - $"NaN in TransformMoveDelay: {Core.Now}, {GetType()}, {m_Mobile?.GetType()}, {m_Mobile.HitsMax}" - ); - } - - return 1.0; - } - - return delay; + return Math.Min(delay, max); } public virtual bool CheckMove() => Core.TickCount - NextMove >= 0; - public virtual bool DoMove(Direction d) => DoMove(d, false); - - public virtual bool DoMove(Direction d, bool badStateOk) + public virtual bool DoMove(Direction d, bool badStateOk = false) { var res = DoMoveImpl(d); @@ -2712,7 +2707,7 @@ namespace Server.Mobiles public virtual void OnCurrentSpeedChanged() { m_Timer.Stop(); - m_Timer.Delay = TimeSpan.FromSeconds(Utility.RandomDouble()); + m_Timer.Delay = TimeSpan.FromMilliseconds(Utility.Random(128) * 8); m_Timer.Interval = TimeSpan.FromSeconds(Math.Max(0.0, m_Mobile.CurrentSpeed)); m_Timer.Start(); } @@ -2740,70 +2735,72 @@ namespace Server.Mobiles public override void OnClick() { - if (!m_Mobile.Deleted && m_Mobile.Controlled && m_From.CheckAlive()) + if (m_Mobile.Deleted || !m_Mobile.Controlled || !m_From.CheckAlive()) { - if (m_Mobile.IsDeadPet && m_Order is OrderType.Guard or OrderType.Attack or OrderType.Transfer or OrderType.Drop) - { - return; - } + return; + } - var isOwner = m_From == m_Mobile.ControlMaster; - var isFriend = !isOwner && m_Mobile.IsPetFriend(m_From); + if (m_Mobile.IsDeadPet && m_Order is OrderType.Guard or OrderType.Attack or OrderType.Transfer or OrderType.Drop) + { + return; + } - if (!isOwner && !isFriend) - { - return; - } + var isOwner = m_From == m_Mobile.ControlMaster; + var isFriend = !isOwner && m_Mobile.IsPetFriend(m_From); - if (isFriend && m_Order != OrderType.Follow && m_Order != OrderType.Stay && m_Order != OrderType.Stop) - { - return; - } + if (!isOwner && !isFriend) + { + return; + } - switch (m_Order) - { - case OrderType.Follow: - case OrderType.Attack: - case OrderType.Transfer: - case OrderType.Friend: - case OrderType.Unfriend: + if (isFriend && m_Order != OrderType.Follow && m_Order != OrderType.Stay && m_Order != OrderType.Stop) + { + return; + } + + switch (m_Order) + { + case OrderType.Follow: + case OrderType.Attack: + case OrderType.Transfer: + case OrderType.Friend: + case OrderType.Unfriend: + { + if (m_Order == OrderType.Transfer && m_From.HasTrade) { - if (m_Order == OrderType.Transfer && m_From.HasTrade) - { - m_From.SendLocalizedMessage(1010507); // You cannot transfer a pet with a trade pending - } - else if (m_Order == OrderType.Friend && m_From.HasTrade) - { - m_From.SendLocalizedMessage(1070947); // You cannot friend a pet with a trade pending - } - else - { - m_AI.BeginPickTarget(m_From, m_Order); - } - - break; + m_From.SendLocalizedMessage(1010507); // You cannot transfer a pet with a trade pending } - case OrderType.Release: + else if (m_Order == OrderType.Friend && m_From.HasTrade) { - if (m_Mobile.Summoned) - { - goto default; - } - - m_From.SendGump(new ConfirmReleaseGump(m_From, m_Mobile)); - - break; + m_From.SendLocalizedMessage(1070947); // You cannot friend a pet with a trade pending } - default: + else { - if (m_Mobile.CheckControlChance(m_From)) - { - m_Mobile.ControlOrder = m_Order; - } - - break; + m_AI.BeginPickTarget(m_From, m_Order); } - } + + break; + } + case OrderType.Release: + { + if (m_Mobile.Summoned) + { + goto default; + } + + m_From.SendGump(new ConfirmReleaseGump(m_From, m_Mobile)); + + break; + } + default: + { + if (m_Mobile.CheckControlChance(m_From)) + { + m_Mobile.ControlOrder = m_Order; + } + + break; + } } } } @@ -2904,14 +2901,10 @@ namespace Server.Mobiles { var args = $"{to.Name}\t{from.Name}\t "; - from.SendLocalizedMessage( - 1043248, - args - ); // The pet refuses to be transferred because it will not obey ~1_NAME~.~3_BLANK~ - to.SendLocalizedMessage( - 1043249, - args - ); // The pet will not accept you as a master because it does not trust you.~3_BLANK~ + // The pet refuses to be transferred because it will not obey ~1_NAME~.~3_BLANK~ + from.SendLocalizedMessage(1043248, args); + // The pet will not accept you as a master because it does not trust you.~3_BLANK~ + to.SendLocalizedMessage(1043249, args); return false; } @@ -2919,14 +2912,10 @@ namespace Server.Mobiles { var args = $"{to.Name}\t{from.Name}\t "; - from.SendLocalizedMessage( - 1043250, - args - ); // The pet refuses to be transferred because it will not obey you sufficiently.~3_BLANK~ - to.SendLocalizedMessage( - 1043251, - args - ); // The pet will not accept you as a master because it does not trust ~2_NAME~.~3_BLANK~ + // The pet refuses to be transferred because it will not obey you sufficiently.~3_BLANK~ + from.SendLocalizedMessage(1043250, args); + // The pet will not accept you as a master because it does not trust ~2_NAME~.~3_BLANK~ + to.SendLocalizedMessage(1043251, args); } else if (accepted && to.Followers + m_Creature.ControlSlots > to.FollowersMax) { @@ -2986,10 +2975,8 @@ namespace Server.Mobiles var args = $"{from.Name}\t{m_Creature.Name}\t{to.Name}"; from.SendLocalizedMessage(1043253, args); // You have transferred your pet to ~3_GETTER~. - to.SendLocalizedMessage( - 1043252, - args - ); // ~1_NAME~ has transferred the allegiance of ~2_PET_NAME~ to you. + // ~1_NAME~ has transferred the allegiance of ~2_PET_NAME~ to you. + to.SendLocalizedMessage(1043252, args); } } } @@ -3004,7 +2991,7 @@ namespace Server.Mobiles public AITimer(BaseAI owner) : base( - TimeSpan.FromSeconds(Utility.RandomDouble()), + TimeSpan.FromSeconds(Utility.Random(128) * 8), TimeSpan.FromSeconds(Math.Max(0.0, owner.m_Mobile.CurrentSpeed)) ) { diff --git a/Projects/UOContent/Mobiles/AI/SpeedInfo.cs b/Projects/UOContent/Mobiles/AI/SpeedInfo.cs index a6403922f..0fbd3a62c 100644 --- a/Projects/UOContent/Mobiles/AI/SpeedInfo.cs +++ b/Projects/UOContent/Mobiles/AI/SpeedInfo.cs @@ -1,228 +1,50 @@ using System; -using System.Collections.Generic; -using Server.Factions; using Server.Mobiles; -namespace Server +namespace Server; + +public static class SpeedInfo { - public class SpeedInfo + public static double MinDelay { get; private set; } + public static double MaxDelay { get; private set; } + public static double MinMonsterDelay { get; private set; } + public static double MaxMonsterDelay { get; private set; } + + // Determines the maximum dex for delay by dex + public static int MaxDex { get; private set; } + public static int MaxMonsterDex { get; private set; } + + public static void Configure() { - // Should we use the new method of speeds? - private static readonly bool Enabled = true; + // Default speed determined by dex (0 -> 190) for non-monster NPCs including pets + MinDelay = ServerConfiguration.GetOrUpdateSetting("movement.delay.npcMinDelay", 0.1); + MaxDelay = ServerConfiguration.GetOrUpdateSetting("movement.delay.npcMaxDelay", 0.5); + MaxDex = ServerConfiguration.GetOrUpdateSetting("movement.delay.maxDex", 190); - private static Dictionary m_Table; + // Default speed determined by dex (0 -> 150) for monsters + MinMonsterDelay = ServerConfiguration.GetOrUpdateSetting("movement.delay.monsterMinDelay", 0.4); + MaxMonsterDelay = ServerConfiguration.GetOrUpdateSetting("movement.delay.monsterMaxDelay", 0.8); + MaxMonsterDex = ServerConfiguration.GetOrUpdateSetting("movement.delay.monsterMaxDex", 150); + } - private static readonly SpeedInfo[] m_Speeds = + public static void GetSpeeds(BaseCreature bc, out double activeSpeed, out double passiveSpeed) + { + var isMonster = bc.IsMonster; + var monsterDelay = isMonster || bc.InActivePVPCombat(); + var maxDex = isMonster ? MaxMonsterDex : MaxDex; + + var dex = Math.Clamp(bc.Dex, 25, maxDex); + + double min = monsterDelay ? MinMonsterDelay : MinDelay; + double max = monsterDelay ? MaxMonsterDelay : MaxDelay; + + if (bc.IsParagon) { - /* Slow */ - new( - 0.3, - 0.6, - new[] - { - typeof(AntLion), typeof(ArcticOgreLord), typeof(BogThing), - typeof(Bogle), typeof(BoneKnight), typeof(EarthElemental), - typeof(Ettin), typeof(FrostOoze), typeof(FrostTroll), - typeof(GazerLarva), typeof(Ghoul), typeof(Golem), - typeof(HeadlessOne), typeof(Jwilson), typeof(Mummy), - typeof(Ogre), typeof(OgreLord), typeof(PlagueBeast), - typeof(Quagmire), typeof(Rat), typeof(RottingCorpse), - typeof(SewerRat), typeof(Skeleton), typeof(Slime), - typeof(Zombie), typeof(Walrus), typeof(RestlessSoul), - typeof(CrystalElemental), typeof(DarknightCreeper), typeof(MoundOfMaggots), - typeof(Juggernaut), typeof(Yamandon), typeof(Serado) - } - ), - /* Fast */ - new( - 0.2, - 0.4, - new[] - { - typeof(LordOaks), typeof(Silvani), typeof(AirElemental), - typeof(AncientWyrm), typeof(Balron), typeof(BladeSpirits), - typeof(DreadSpider), typeof(Efreet), typeof(EtherealWarrior), - typeof(Lich), typeof(Nightmare), typeof(OphidianArchmage), - typeof(OphidianMage), typeof(OphidianWarrior), typeof(OphidianMatriarch), - typeof(OphidianKnight), typeof(PoisonElemental), typeof(Revenant), - typeof(SandVortex), typeof(SavageRider), typeof(SavageShaman), - typeof(SnowElemental), typeof(WhiteWyrm), typeof(Wisp), - typeof(DemonKnight), typeof(GiantBlackWidow), typeof(SummonedAirElemental), - typeof(LesserHiryu), typeof(Hiryu), typeof(LadyOfTheSnow), - typeof(RaiJu), typeof(Ronin), typeof(RuneBeetle), - typeof(Changeling), typeof(LadyJennifyr), typeof(LadyMarai), typeof(MasterJonath), - typeof(MasterMikael), typeof(MasterTheophilus), typeof(RedDeath), - typeof(SirPatrick), typeof(Miasma), typeof(Rend), - typeof(Grobu), typeof(Gnaw), typeof(Guile), - typeof(Irk), typeof(Spite), typeof(LadyLissith), - typeof(LadySabrix), typeof(Malefic), typeof(Silk), - typeof(Virulent) - // TODO: Where to put Lurg, Putrefier, Swoop and Pyre? They seem slower. - } - ), - /* Very Fast */ - new( - 0.175, - 0.350, - new[] - { - typeof(Barracoon), typeof(Mephitis), typeof(Neira), - typeof(Rikktor), typeof(Semidar), typeof(EnergyVortex), - typeof(EliteNinja), typeof(Pixie), typeof(SilverSerpent), - typeof(VorpalBunny), typeof(FleshRenderer), typeof(KhaldunRevenant), - typeof(FactionDragoon), typeof(FactionKnight), typeof(FactionPaladin), - typeof(FactionHenchman), typeof(FactionMercenary), typeof(FactionNecromancer), - typeof(FactionSorceress), typeof(FactionWizard), typeof(FactionBerserker), - typeof(FactionPaladin), typeof(Leviathan), typeof(FireBeetle), - typeof(FanDancer), typeof(FactionDeathKnight) - } - ), - /* Medium */ - new( - 0.25, - 0.5, - new[] - { - typeof(AcidElemental), typeof(AgapiteElemental), typeof(Alligator), - typeof(AncientLich), typeof(Betrayer), typeof(Bird), - typeof(BlackBear), typeof(BlackSolenInfiltratorQueen), typeof(BlackSolenInfiltratorWarrior), - typeof(BlackSolenQueen), typeof(BlackSolenWarrior), typeof(BlackSolenWorker), - typeof(BloodElemental), typeof(Boar), typeof(Bogling), - typeof(BoneMagi), typeof(Brigand), typeof(BronzeElemental), - typeof(BrownBear), typeof(Bull), typeof(BullFrog), - typeof(Cat), typeof(Centaur), typeof(ChaosDaemon), - typeof(Chicken), typeof(GolemController), typeof(CopperElemental), - typeof(CopperElemental), typeof(Cougar), typeof(Cow), - typeof(Cyclops), typeof(Daemon), typeof(DeepSeaSerpent), - typeof(DesertOstard), typeof(DireWolf), typeof(Dog), - typeof(Dolphin), typeof(Dragon), typeof(Drake), - typeof(DullCopperElemental), typeof(Eagle), typeof(ElderGazer), - typeof(EvilMage), typeof(EvilMageLord), typeof(Executioner), - typeof(Savage), typeof(FireElemental), typeof(FireGargoyle), - typeof(FireSteed), typeof(ForestOstard), typeof(FrenziedOstard), - typeof(FrostSpider), typeof(Gargoyle), typeof(Gazer), - typeof(IceSerpent), typeof(GiantRat), typeof(GiantSerpent), - typeof(GiantSpider), typeof(GiantToad), typeof(Goat), - typeof(GoldenElemental), typeof(Gorilla), typeof(GreatHart), - typeof(GreyWolf), typeof(GrizzlyBear), typeof(Guardian), - typeof(Harpy), typeof(Harrower), typeof(HellHound), - typeof(Hind), typeof(HordeMinion), typeof(Horse), - typeof(Horse), typeof(IceElemental), typeof(IceFiend), - typeof(IceSnake), typeof(Imp), typeof(JackRabbit), - typeof(Kirin), typeof(Kraken), typeof(PredatorHellCat), - typeof(LavaLizard), typeof(LavaSerpent), typeof(LavaSnake), - typeof(Lizardman), typeof(Llama), typeof(Mongbat), - typeof(StrongMongbat), typeof(MountainGoat), typeof(Orc), - typeof(OrcBomber), typeof(OrcBrute), typeof(OrcCaptain), - typeof(OrcishLord), typeof(OrcishMage), typeof(PackHorse), - typeof(PackLlama), typeof(Panther), typeof(Pig), - typeof(PlagueSpawn), typeof(PolarBear), typeof(Rabbit), - typeof(Ratman), typeof(RatmanArcher), typeof(RatmanMage), - typeof(RedSolenInfiltratorQueen), typeof(RedSolenInfiltratorWarrior), typeof(RedSolenQueen), - typeof(RedSolenWarrior), typeof(RedSolenWorker), typeof(RidableLlama), - typeof(Ridgeback), typeof(Scorpion), typeof(SeaSerpent), - typeof(SerpentineDragon), typeof(Shade), typeof(ShadowIronElemental), - typeof(ShadowWisp), typeof(ShadowWyrm), typeof(Sheep), - typeof(SilverSteed), typeof(SkeletalDragon), typeof(SkeletalMage), - typeof(SkeletalMount), typeof(HellCat), typeof(Snake), - typeof(SnowLeopard), typeof(SpectralArmour), typeof(Spectre), - typeof(StoneGargoyle), typeof(StoneHarpy), typeof(SwampDragon), - typeof(ScaledSwampDragon), typeof(SwampTentacle), typeof(TerathanAvenger), - typeof(TerathanDrone), typeof(TerathanMatriarch), typeof(TerathanWarrior), - typeof(TimberWolf), typeof(Titan), typeof(Troll), - typeof(Unicorn), typeof(ValoriteElemental), typeof(VeriteElemental), - typeof(CoMWarHorse), typeof(MinaxWarHorse), typeof(SLWarHorse), - typeof(TBWarHorse), typeof(WaterElemental), typeof(WhippingVine), - typeof(WhiteWolf), typeof(Wraith), typeof(Wyvern), - typeof(KhaldunZealot), typeof(KhaldunSummoner), typeof(SavageRidgeback), - typeof(LichLord), typeof(SkeletalKnight), typeof(SummonedDaemon), - typeof(SummonedEarthElemental), typeof(SummonedWaterElemental), typeof(SummonedFireElemental), - typeof(MeerWarrior), typeof(MeerEternal), typeof(MeerMage), - typeof(MeerCaptain), typeof(JukaLord), typeof(JukaMage), - typeof(JukaWarrior), typeof(AbysmalHorror), typeof(BoneDemon), - typeof(Devourer), typeof(FleshGolem), typeof(Gibberling), - typeof(GoreFiend), typeof(Impaler), typeof(PatchworkSkeleton), - typeof(Ravager), typeof(ShadowKnight), typeof(SkitteringHopper), - typeof(Treefellow), typeof(VampireBat), typeof(WailingBanshee), - typeof(WandererOfTheVoid), typeof(Cursed), typeof(GrimmochDrummel), - typeof(LysanderGathenwale), typeof(MorgBergen), typeof(ShadowFiend), - typeof(SpectralArmour), typeof(TavaraSewel), typeof(ArcaneDaemon), - typeof(Doppleganger), typeof(EnslavedGargoyle), typeof(ExodusMinion), - typeof(ExodusOverseer), typeof(GargoyleDestroyer), typeof(GargoyleEnforcer), - typeof(Moloch), typeof(BakeKitsune), typeof(DeathwatchBeetleHatchling), - typeof(Kappa), typeof(KazeKemono), typeof(DeathwatchBeetle), - typeof(TsukiWolf), typeof(YomotsuElder), typeof(YomotsuPriest), - typeof(YomotsuWarrior), typeof(RevenantLion), typeof(Oni), - typeof(Gaman), typeof(Crane), typeof(Beetle) - } - ) - }; - - public SpeedInfo(double activeSpeed, double passiveSpeed, Type[] types) - { - ActiveSpeed = activeSpeed; - PassiveSpeed = passiveSpeed; - Types = types; + min /= 2; + max = min + 0.5; } - public double ActiveSpeed { get; set; } - - public double PassiveSpeed { get; set; } - - public Type[] Types { get; set; } - - public static bool Contains(object obj) - { - if (!Enabled) - { - return false; - } - - if (m_Table == null) - { - LoadTable(); - } - - return m_Table!.ContainsKey(obj.GetType()); - } - - public static bool GetSpeeds(object obj, ref double activeSpeed, ref double passiveSpeed) - { - if (!Enabled) - { - return false; - } - - if (m_Table == null) - { - LoadTable(); - } - - if (!m_Table!.TryGetValue(obj.GetType(), out var sp)) - { - return false; - } - - activeSpeed = sp.ActiveSpeed; - passiveSpeed = sp.PassiveSpeed; - - return true; - } - - private static void LoadTable() - { - m_Table = new Dictionary(); - - for (var i = 0; i < m_Speeds.Length; ++i) - { - var info = m_Speeds[i]; - var types = info.Types; - - for (var j = 0; j < types.Length; ++j) - { - m_Table[types[j]] = info; - } - } - } + activeSpeed = Math.Max(max - (max - min) * ((double)dex / maxDex), min); + passiveSpeed = activeSpeed * 2; } } diff --git a/Projects/UOContent/Mobiles/Animals/Bears/BlackBear.cs b/Projects/UOContent/Mobiles/Animals/Bears/BlackBear.cs index 536a9a97e..c692f9286 100644 --- a/Projects/UOContent/Mobiles/Animals/Bears/BlackBear.cs +++ b/Projects/UOContent/Mobiles/Animals/Bears/BlackBear.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class BlackBear : BaseCreature { [Constructible] - public BlackBear() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public BlackBear() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 211; BaseSoundID = 0xA3; diff --git a/Projects/UOContent/Mobiles/Animals/Bears/BrownBear.cs b/Projects/UOContent/Mobiles/Animals/Bears/BrownBear.cs index 1e3175411..781f7bb37 100644 --- a/Projects/UOContent/Mobiles/Animals/Bears/BrownBear.cs +++ b/Projects/UOContent/Mobiles/Animals/Bears/BrownBear.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class BrownBear : BaseCreature { [Constructible] - public BrownBear() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public BrownBear() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 167; BaseSoundID = 0xA3; diff --git a/Projects/UOContent/Mobiles/Animals/Bears/GrizzlyBear.cs b/Projects/UOContent/Mobiles/Animals/Bears/GrizzlyBear.cs index 56a40674c..709b2181a 100644 --- a/Projects/UOContent/Mobiles/Animals/Bears/GrizzlyBear.cs +++ b/Projects/UOContent/Mobiles/Animals/Bears/GrizzlyBear.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class GrizzlyBear : BaseCreature { [Constructible] - public GrizzlyBear() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public GrizzlyBear() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 212; BaseSoundID = 0xA3; diff --git a/Projects/UOContent/Mobiles/Animals/Bears/PolarBear.cs b/Projects/UOContent/Mobiles/Animals/Bears/PolarBear.cs index eccc1716d..2931c8931 100644 --- a/Projects/UOContent/Mobiles/Animals/Bears/PolarBear.cs +++ b/Projects/UOContent/Mobiles/Animals/Bears/PolarBear.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class PolarBear : BaseCreature { [Constructible] - public PolarBear() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public PolarBear() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 213; BaseSoundID = 0xA3; diff --git a/Projects/UOContent/Mobiles/Animals/Birds/Chicken.cs b/Projects/UOContent/Mobiles/Animals/Birds/Chicken.cs index 756de8844..bd8b7146b 100644 --- a/Projects/UOContent/Mobiles/Animals/Birds/Chicken.cs +++ b/Projects/UOContent/Mobiles/Animals/Birds/Chicken.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Chicken : BaseCreature { [Constructible] - public Chicken() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Chicken() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xD0; BaseSoundID = 0x6E; diff --git a/Projects/UOContent/Mobiles/Animals/Birds/Crane.cs b/Projects/UOContent/Mobiles/Animals/Birds/Crane.cs index 1cb10d33d..171a20fb5 100644 --- a/Projects/UOContent/Mobiles/Animals/Birds/Crane.cs +++ b/Projects/UOContent/Mobiles/Animals/Birds/Crane.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Crane : BaseCreature { [Constructible] - public Crane() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Crane() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 254; BaseSoundID = 0x4D7; diff --git a/Projects/UOContent/Mobiles/Animals/Birds/Eagle.cs b/Projects/UOContent/Mobiles/Animals/Birds/Eagle.cs index 593a2c694..4df82ef66 100644 --- a/Projects/UOContent/Mobiles/Animals/Birds/Eagle.cs +++ b/Projects/UOContent/Mobiles/Animals/Birds/Eagle.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Eagle : BaseCreature { [Constructible] - public Eagle() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Eagle() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 5; BaseSoundID = 0x2EE; diff --git a/Projects/UOContent/Mobiles/Animals/Birds/Phoenix.cs b/Projects/UOContent/Mobiles/Animals/Birds/Phoenix.cs index 49179359c..7c0befb94 100644 --- a/Projects/UOContent/Mobiles/Animals/Birds/Phoenix.cs +++ b/Projects/UOContent/Mobiles/Animals/Birds/Phoenix.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Phoenix : BaseCreature { [Constructible] - public Phoenix() : base(AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Phoenix() : base(AIType.AI_Mage, FightMode.Aggressor) { Body = 5; Hue = 0x674; diff --git a/Projects/UOContent/Mobiles/Animals/Canines/DireWolf.cs b/Projects/UOContent/Mobiles/Animals/Canines/DireWolf.cs index 2a6edf148..310338310 100644 --- a/Projects/UOContent/Mobiles/Animals/Canines/DireWolf.cs +++ b/Projects/UOContent/Mobiles/Animals/Canines/DireWolf.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class DireWolf : BaseCreature { [Constructible] - public DireWolf() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public DireWolf() : base(AIType.AI_Melee) { Body = 23; BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Mobiles/Animals/Canines/GreyWolf.cs b/Projects/UOContent/Mobiles/Animals/Canines/GreyWolf.cs index 195bcfadc..b0851992d 100644 --- a/Projects/UOContent/Mobiles/Animals/Canines/GreyWolf.cs +++ b/Projects/UOContent/Mobiles/Animals/Canines/GreyWolf.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class GreyWolf : BaseCreature { [Constructible] - public GreyWolf() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public GreyWolf() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = Utility.RandomList(25, 27); BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Mobiles/Animals/Canines/TimberWolf.cs b/Projects/UOContent/Mobiles/Animals/Canines/TimberWolf.cs index f808128cf..a33ad2b89 100644 --- a/Projects/UOContent/Mobiles/Animals/Canines/TimberWolf.cs +++ b/Projects/UOContent/Mobiles/Animals/Canines/TimberWolf.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class TimberWolf : BaseCreature { [Constructible] - public TimberWolf() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public TimberWolf() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 225; BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Mobiles/Animals/Canines/WhiteWolf.cs b/Projects/UOContent/Mobiles/Animals/Canines/WhiteWolf.cs index bb57d611d..9a5d08d06 100644 --- a/Projects/UOContent/Mobiles/Animals/Canines/WhiteWolf.cs +++ b/Projects/UOContent/Mobiles/Animals/Canines/WhiteWolf.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class WhiteWolf : BaseCreature { [Constructible] - public WhiteWolf() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public WhiteWolf() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = Utility.RandomList(34, 37); BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Mobiles/Animals/Cows/Bull.cs b/Projects/UOContent/Mobiles/Animals/Cows/Bull.cs index 3a495b6b4..2430532a0 100644 --- a/Projects/UOContent/Mobiles/Animals/Cows/Bull.cs +++ b/Projects/UOContent/Mobiles/Animals/Cows/Bull.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Bull : BaseCreature { [Constructible] - public Bull() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Bull() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = Utility.RandomList(0xE8, 0xE9); BaseSoundID = 0x64; diff --git a/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs b/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs index 043012ed8..ea74e6425 100644 --- a/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs +++ b/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Cow : BaseCreature { [Constructible] - public Cow() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Cow() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = Utility.RandomList(0xD8, 0xE7); BaseSoundID = 0x78; diff --git a/Projects/UOContent/Mobiles/Animals/Felines/Cougar.cs b/Projects/UOContent/Mobiles/Animals/Felines/Cougar.cs index ede2b5ae5..0dc46458d 100644 --- a/Projects/UOContent/Mobiles/Animals/Felines/Cougar.cs +++ b/Projects/UOContent/Mobiles/Animals/Felines/Cougar.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Cougar : BaseCreature { [Constructible] - public Cougar() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Cougar() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 63; BaseSoundID = 0x73; diff --git a/Projects/UOContent/Mobiles/Animals/Felines/HellCat.cs b/Projects/UOContent/Mobiles/Animals/Felines/HellCat.cs index b1742f463..346b50747 100644 --- a/Projects/UOContent/Mobiles/Animals/Felines/HellCat.cs +++ b/Projects/UOContent/Mobiles/Animals/Felines/HellCat.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class HellCat : BaseCreature { [Constructible] - public HellCat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public HellCat() : base(AIType.AI_Melee) { Body = 0xC9; Hue = Utility.RandomList(0x647, 0x650, 0x659, 0x662, 0x66B, 0x674); diff --git a/Projects/UOContent/Mobiles/Animals/Felines/Panther.cs b/Projects/UOContent/Mobiles/Animals/Felines/Panther.cs index 966d998a6..ff271a03b 100644 --- a/Projects/UOContent/Mobiles/Animals/Felines/Panther.cs +++ b/Projects/UOContent/Mobiles/Animals/Felines/Panther.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Panther : BaseCreature { [Constructible] - public Panther() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Panther() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xD6; Hue = 0x901; diff --git a/Projects/UOContent/Mobiles/Animals/Felines/PredatorHellCat.cs b/Projects/UOContent/Mobiles/Animals/Felines/PredatorHellCat.cs index 8dcf0286f..612497376 100644 --- a/Projects/UOContent/Mobiles/Animals/Felines/PredatorHellCat.cs +++ b/Projects/UOContent/Mobiles/Animals/Felines/PredatorHellCat.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class PredatorHellCat : BaseCreature { [Constructible] - public PredatorHellCat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public PredatorHellCat() : base(AIType.AI_Melee) { Body = 127; BaseSoundID = 0xBA; diff --git a/Projects/UOContent/Mobiles/Animals/Felines/SnowLeopard.cs b/Projects/UOContent/Mobiles/Animals/Felines/SnowLeopard.cs index 28f86bb0e..e0d0366e9 100644 --- a/Projects/UOContent/Mobiles/Animals/Felines/SnowLeopard.cs +++ b/Projects/UOContent/Mobiles/Animals/Felines/SnowLeopard.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class SnowLeopard : BaseCreature { [Constructible] - public SnowLeopard() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public SnowLeopard() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = Utility.RandomList(64, 65); BaseSoundID = 0x73; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Boar.cs b/Projects/UOContent/Mobiles/Animals/Misc/Boar.cs index 57dfbb36c..6763885b3 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Boar.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Boar.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Boar : BaseCreature { [Constructible] - public Boar() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Boar() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0x122; BaseSoundID = 0xC4; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/BullFrog.cs b/Projects/UOContent/Mobiles/Animals/Misc/BullFrog.cs index 7ef3d5fcd..139db24ab 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/BullFrog.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/BullFrog.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class BullFrog : BaseCreature { [Constructible] - public BullFrog() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public BullFrog() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 81; Hue = Utility.RandomList(0x5AC, 0x5A3, 0x59A, 0x591, 0x588, 0x57F); diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Dolphin.cs b/Projects/UOContent/Mobiles/Animals/Misc/Dolphin.cs index 7aae6d76a..2ae29cbbb 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Dolphin.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Dolphin.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { [Constructible] public Dolphin() - : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0x97; BaseSoundID = 0x8A; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Gaman.cs b/Projects/UOContent/Mobiles/Animals/Misc/Gaman.cs index 380890a2c..e852e697a 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Gaman.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Gaman.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Gaman : BaseCreature { [Constructible] - public Gaman() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Gaman() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 248; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/GiantToad.cs b/Projects/UOContent/Mobiles/Animals/Misc/GiantToad.cs index 6730d6b21..70342218a 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/GiantToad.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/GiantToad.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class GiantToad : BaseCreature { [Constructible] - public GiantToad() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GiantToad() : base(AIType.AI_Melee) { Body = 80; BaseSoundID = 0x26B; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Goat.cs b/Projects/UOContent/Mobiles/Animals/Misc/Goat.cs index 3e45ad600..67240f9fc 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Goat.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Goat.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Goat : BaseCreature { [Constructible] - public Goat() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Goat() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xD1; BaseSoundID = 0x99; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Gorilla.cs b/Projects/UOContent/Mobiles/Animals/Misc/Gorilla.cs index 9978d0118..70447f247 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Gorilla.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Gorilla.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Gorilla : BaseCreature { [Constructible] - public Gorilla() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Gorilla() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0x1D; BaseSoundID = 0x9E; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/GreatHart.cs b/Projects/UOContent/Mobiles/Animals/Misc/GreatHart.cs index 470c773b3..3681bfda6 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/GreatHart.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/GreatHart.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class GreatHart : BaseCreature { [Constructible] - public GreatHart() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public GreatHart() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xEA; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Hind.cs b/Projects/UOContent/Mobiles/Animals/Misc/Hind.cs index 96ba6bc12..7aec10de9 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Hind.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Hind.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Hind : BaseCreature { [Constructible] - public Hind() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Hind() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xED; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Llama.cs b/Projects/UOContent/Mobiles/Animals/Misc/Llama.cs index e8f4976d5..b67b023ab 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Llama.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Llama.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Llama : BaseCreature { [Constructible] - public Llama() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Llama() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xDC; BaseSoundID = 0x3F3; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/MountainGoat.cs b/Projects/UOContent/Mobiles/Animals/Misc/MountainGoat.cs index a0d403404..979d09153 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/MountainGoat.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/MountainGoat.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class MountainGoat : BaseCreature { [Constructible] - public MountainGoat() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public MountainGoat() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 88; BaseSoundID = 0x99; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs b/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs index dcb6b4f0d..ca5d8324e 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class PackHorse : BaseCreature { [Constructible] - public PackHorse() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public PackHorse() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 291; BaseSoundID = 0xA8; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/PackLlama.cs b/Projects/UOContent/Mobiles/Animals/Misc/PackLlama.cs index d916b6dba..8a523d840 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/PackLlama.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/PackLlama.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class PackLlama : BaseCreature { [Constructible] - public PackLlama() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public PackLlama() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 292; BaseSoundID = 0x3F3; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Pig.cs b/Projects/UOContent/Mobiles/Animals/Misc/Pig.cs index cbc1e4ae8..7c0d3a4d5 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Pig.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Pig.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Pig : BaseCreature { [Constructible] - public Pig() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Pig() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xCB; BaseSoundID = 0xC4; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Sheep.cs b/Projects/UOContent/Mobiles/Animals/Misc/Sheep.cs index 04e21dd45..61c54ec44 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Sheep.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Sheep.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private DateTime m_NextWoolTime; [Constructible] - public Sheep() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Sheep() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xCF; BaseSoundID = 0xD6; diff --git a/Projects/UOContent/Mobiles/Animals/Misc/Walrus.cs b/Projects/UOContent/Mobiles/Animals/Misc/Walrus.cs index 480744c5c..7fbd9001f 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/Walrus.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/Walrus.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Walrus : BaseCreature { [Constructible] - public Walrus() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Walrus() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xDD; BaseSoundID = 0xE0; diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs index 944ef0272..3e304765a 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles public BaseMount( string name, int bodyID, int itemID, AIType aiType, FightMode fightMode, int rangePerception, - int rangeFight, double activeSpeed, double passiveSpeed + int rangeFight, double activeSpeed = -1, double passiveSpeed = -1 ) : base( aiType, fightMode, diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs b/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs index 5aac32a1f..2297300f6 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs @@ -11,7 +11,7 @@ namespace Server.Mobiles [Constructible] public Hiryu() - : base("a hiryu", 243, 0x3E94, AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base("a hiryu", 243, 0x3E94, AIType.AI_Melee, FightMode.Closest, 10, 1) { Hue = GetHue(); diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/Kirin.cs b/Projects/UOContent/Mobiles/Animals/Mounts/Kirin.cs index 58ae0a3fc..e229bbfdc 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/Kirin.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/Kirin.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class Kirin : BaseMount { [Constructible] - public Kirin(string name = "a ki-rin") : base(name, 132, 0x3EAD, AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public Kirin(string name = "a ki-rin") : base(name, 132, 0x3EAD, AIType.AI_Mage, FightMode.Evil, 10, 1) { BaseSoundID = 0x3C5; diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs b/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs index dafed75de..aa0be7316 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs @@ -11,7 +11,7 @@ namespace Server.Mobiles [Constructible] public LesserHiryu() - : base("a lesser hiryu", 243, 0x3E94, AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base("a lesser hiryu", 243, 0x3E94, AIType.AI_Melee, FightMode.Closest, 10, 1) { Hue = GetHue(); diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/Unicorn.cs b/Projects/UOContent/Mobiles/Animals/Mounts/Unicorn.cs index aa4e46202..12bd1434c 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/Unicorn.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/Unicorn.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class Unicorn : BaseMount { [Constructible] - public Unicorn(string name = "a unicorn") : base(name, 0x7A, 0x3EB4, AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public Unicorn(string name = "a unicorn") : base(name, 0x7A, 0x3EB4, AIType.AI_Mage, FightMode.Evil, 10, 1) { BaseSoundID = 0x4BC; diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs index a103a344d..5c32ee070 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public BaseWarHorse( int bodyID, int itemID, AIType aiType, FightMode fightMode, int rangePerception, int rangeFight, - double activeSpeed, double passiveSpeed + double activeSpeed = -1, double passiveSpeed = -1 ) : base( "a war horse", bodyID, diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/CoMWarHorse.cs b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/CoMWarHorse.cs index 0b18db03f..302d98f3c 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/CoMWarHorse.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/CoMWarHorse.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class CoMWarHorse : BaseWarHorse { [Constructible] - public CoMWarHorse() : base(0x77, 0x3EB1, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public CoMWarHorse() : base(0x77, 0x3EB1, AIType.AI_Melee, FightMode.Aggressor, 10, 1) { } diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/MinaxWarHorse.cs b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/MinaxWarHorse.cs index e116dabdb..eb42361c9 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/MinaxWarHorse.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/MinaxWarHorse.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class MinaxWarHorse : BaseWarHorse { [Constructible] - public MinaxWarHorse() : base(0x78, 0x3EAF, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public MinaxWarHorse() : base(0x78, 0x3EAF, AIType.AI_Melee, FightMode.Aggressor, 10, 1) { } diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/SLWarHorse.cs b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/SLWarHorse.cs index fb2e04c5d..037a671c5 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/SLWarHorse.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/SLWarHorse.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SLWarHorse : BaseWarHorse { [Constructible] - public SLWarHorse() : base(0x79, 0x3EB0, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public SLWarHorse() : base(0x79, 0x3EB0, AIType.AI_Melee, FightMode.Aggressor, 10, 1) { } diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/TBWarHorse.cs b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/TBWarHorse.cs index aeced8675..ac65a8186 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/TBWarHorse.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/War Horses/TBWarHorse.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class TBWarHorse : BaseWarHorse { [Constructible] - public TBWarHorse() : base(0x76, 0x3EB2, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public TBWarHorse() : base(0x76, 0x3EB2, AIType.AI_Melee, FightMode.Aggressor, 10, 1) { } diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/Alligator.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/Alligator.cs index 5522cdedc..35ae29e9a 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/Alligator.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/Alligator.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Alligator : BaseCreature { [Constructible] - public Alligator() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Alligator() : base(AIType.AI_Melee) { Body = 0xCA; BaseSoundID = 660; diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/GiantSerpent.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/GiantSerpent.cs index c4258032c..8f23649a2 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/GiantSerpent.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/GiantSerpent.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class GiantSerpent : BaseCreature { [Constructible] - public GiantSerpent() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GiantSerpent() : base(AIType.AI_Melee) { Body = 0x15; Hue = Utility.RandomSnakeHue(); diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/IceSerpent.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/IceSerpent.cs index 17183f19e..030656723 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/IceSerpent.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/IceSerpent.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class IceSerpent : BaseCreature { [Constructible] - public IceSerpent() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public IceSerpent() : base(AIType.AI_Melee) { Body = 89; BaseSoundID = 219; diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/IceSnake.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/IceSnake.cs index 751be390b..b4348cdc8 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/IceSnake.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/IceSnake.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class IceSnake : BaseCreature { [Constructible] - public IceSnake() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public IceSnake() : base(AIType.AI_Melee) { Body = 52; Hue = 0x480; diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/LavaLizard.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/LavaLizard.cs index ac0dfb0b0..caff4953f 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/LavaLizard.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/LavaLizard.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class LavaLizard : BaseCreature { [Constructible] - public LavaLizard() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public LavaLizard() : base(AIType.AI_Melee) { Body = 0xCE; Hue = Utility.RandomList(0x647, 0x650, 0x659, 0x662, 0x66B, 0x674); diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSerpent.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSerpent.cs index f97697978..5e963937c 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSerpent.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSerpent.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class LavaSerpent : BaseCreature { [Constructible] - public LavaSerpent() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public LavaSerpent() : base(AIType.AI_Melee) { Body = 90; BaseSoundID = 219; diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSnake.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSnake.cs index cd6434ba6..3b7cb2609 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSnake.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/LavaSnake.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class LavaSnake : BaseCreature { [Constructible] - public LavaSnake() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public LavaSnake() : base(AIType.AI_Melee) { Body = 52; Hue = Utility.RandomList(0x647, 0x650, 0x659, 0x662, 0x66B, 0x674); diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/SilverSerpent.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/SilverSerpent.cs index 9be470ebe..9039c6281 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/SilverSerpent.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/SilverSerpent.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class SilverSerpent : BaseCreature { [Constructible] - public SilverSerpent() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SilverSerpent() : base(AIType.AI_Melee) { Body = 92; BaseSoundID = 219; diff --git a/Projects/UOContent/Mobiles/Animals/Reptiles/Snake.cs b/Projects/UOContent/Mobiles/Animals/Reptiles/Snake.cs index 4e8467de5..f89d0af66 100644 --- a/Projects/UOContent/Mobiles/Animals/Reptiles/Snake.cs +++ b/Projects/UOContent/Mobiles/Animals/Reptiles/Snake.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Snake : BaseCreature { [Constructible] - public Snake() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Snake() : base(AIType.AI_Melee) { Body = 52; Hue = Utility.RandomSnakeHue(); diff --git a/Projects/UOContent/Mobiles/Animals/Rodents/GiantRat.cs b/Projects/UOContent/Mobiles/Animals/Rodents/GiantRat.cs index cda852b99..6704129c6 100644 --- a/Projects/UOContent/Mobiles/Animals/Rodents/GiantRat.cs +++ b/Projects/UOContent/Mobiles/Animals/Rodents/GiantRat.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class GiantRat : BaseCreature { [Constructible] - public GiantRat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GiantRat() : base(AIType.AI_Melee) { Body = 0xD7; BaseSoundID = 0x188; diff --git a/Projects/UOContent/Mobiles/Animals/Rodents/JackRabbit.cs b/Projects/UOContent/Mobiles/Animals/Rodents/JackRabbit.cs index 35504b199..e40cb6d41 100644 --- a/Projects/UOContent/Mobiles/Animals/Rodents/JackRabbit.cs +++ b/Projects/UOContent/Mobiles/Animals/Rodents/JackRabbit.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class JackRabbit : BaseCreature { [Constructible] - public JackRabbit() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public JackRabbit() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xCD; Hue = 0x1BB; diff --git a/Projects/UOContent/Mobiles/Animals/Rodents/Rabbit.cs b/Projects/UOContent/Mobiles/Animals/Rodents/Rabbit.cs index 3592cb5da..173753f13 100644 --- a/Projects/UOContent/Mobiles/Animals/Rodents/Rabbit.cs +++ b/Projects/UOContent/Mobiles/Animals/Rodents/Rabbit.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Rabbit : BaseCreature { [Constructible] - public Rabbit() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Rabbit() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 205; diff --git a/Projects/UOContent/Mobiles/Animals/Rodents/SewerRat.cs b/Projects/UOContent/Mobiles/Animals/Rodents/SewerRat.cs index d2148adb8..6ccf7ed15 100644 --- a/Projects/UOContent/Mobiles/Animals/Rodents/SewerRat.cs +++ b/Projects/UOContent/Mobiles/Animals/Rodents/SewerRat.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class SewerRat : BaseCreature { [Constructible] - public SewerRat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SewerRat() : base(AIType.AI_Melee) { Body = 238; BaseSoundID = 0xCC; diff --git a/Projects/UOContent/Mobiles/Animals/Slimes/Jwilson.cs b/Projects/UOContent/Mobiles/Animals/Slimes/Jwilson.cs index 2b0e90b42..5c6326e1b 100644 --- a/Projects/UOContent/Mobiles/Animals/Slimes/Jwilson.cs +++ b/Projects/UOContent/Mobiles/Animals/Slimes/Jwilson.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Jwilson : BaseCreature { [Constructible] - public Jwilson() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Jwilson() : base(AIType.AI_Melee) { Hue = Utility.RandomList(0x89C, 0x8A2, 0x8A8, 0x8AE); Body = 0x33; diff --git a/Projects/UOContent/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs b/Projects/UOContent/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs index 71cc1be60..c802c255f 100644 --- a/Projects/UOContent/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs +++ b/Projects/UOContent/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Parrot : BaseCreature { [Constructible] - public Parrot() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Parrot() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 831; VirtualArmor = Utility.Random(0, 6); diff --git a/Projects/UOContent/Mobiles/Animals/Town Critters/Bird.cs b/Projects/UOContent/Mobiles/Animals/Town Critters/Bird.cs index 4f99f8350..990c6a6bf 100644 --- a/Projects/UOContent/Mobiles/Animals/Town Critters/Bird.cs +++ b/Projects/UOContent/Mobiles/Animals/Town Critters/Bird.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Bird : BaseCreature { [Constructible] - public Bird() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Bird() : base(AIType.AI_Animal, FightMode.Aggressor) { if (Utility.RandomBool()) { @@ -82,7 +82,7 @@ namespace Server.Mobiles public class TropicalBird : BaseCreature { [Constructible] - public TropicalBird() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public TropicalBird() : base(AIType.AI_Animal, FightMode.Aggressor) { Hue = Utility.RandomBirdHue(); diff --git a/Projects/UOContent/Mobiles/Animals/Town Critters/Cat.cs b/Projects/UOContent/Mobiles/Animals/Town Critters/Cat.cs index e27517958..7d533c429 100644 --- a/Projects/UOContent/Mobiles/Animals/Town Critters/Cat.cs +++ b/Projects/UOContent/Mobiles/Animals/Town Critters/Cat.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class Cat : BaseCreature { [Constructible] - public Cat() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Cat() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xC9; Hue = Utility.RandomAnimalHue(); diff --git a/Projects/UOContent/Mobiles/Animals/Town Critters/Dog.cs b/Projects/UOContent/Mobiles/Animals/Town Critters/Dog.cs index cd2c4ce10..f88e2b00f 100644 --- a/Projects/UOContent/Mobiles/Animals/Town Critters/Dog.cs +++ b/Projects/UOContent/Mobiles/Animals/Town Critters/Dog.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Dog : BaseCreature { [Constructible] - public Dog() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Dog() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0xD9; Hue = Utility.RandomAnimalHue(); diff --git a/Projects/UOContent/Mobiles/Animals/Town Critters/Rat.cs b/Projects/UOContent/Mobiles/Animals/Town Critters/Rat.cs index fad7e803a..c47ab5880 100644 --- a/Projects/UOContent/Mobiles/Animals/Town Critters/Rat.cs +++ b/Projects/UOContent/Mobiles/Animals/Town Critters/Rat.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Rat : BaseCreature { [Constructible] - public Rat() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Rat() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 238; BaseSoundID = 0xCC; diff --git a/Projects/UOContent/Mobiles/BaseCreature.cs b/Projects/UOContent/Mobiles/BaseCreature.cs index 1c0b91b4e..302f14043 100644 --- a/Projects/UOContent/Mobiles/BaseCreature.cs +++ b/Projects/UOContent/Mobiles/BaseCreature.cs @@ -152,7 +152,7 @@ namespace Server.Mobiles } } - public class BaseCreature : Mobile, IHonorTarget, IQuestGiver + public abstract class BaseCreature : Mobile, IHonorTarget, IQuestGiver { public enum Allegiance { @@ -197,16 +197,6 @@ namespace Server.Mobiles typeof(SkeletalMage), typeof(BoneMagi), typeof(PatchworkSkeleton) }; - private static readonly double[] m_StandardActiveSpeeds = - { - 0.175, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5, 0.6, 0.8 - }; - - private static readonly double[] m_StandardPassiveSpeeds = - { - 0.350, 0.2, 0.4, 0.5, 0.6, 0.8, 1.0, 1.2, 1.6, 2.0 - }; - private static Mobile m_NoDupeGuards; private static readonly bool EnableRummaging = true; @@ -332,11 +322,11 @@ namespace Server.Mobiles public BaseCreature( AIType ai, - FightMode mode, - int iRangePerception, - int iRangeFight, - double dActiveSpeed, - double dPassiveSpeed + FightMode mode = FightMode.Closest, + int iRangePerception = 10, + int iRangeFight = 1, + double activeSpeed = -1, + double passiveSpeed = -1 ) { if (iRangePerception == OldRangePerception) @@ -356,11 +346,16 @@ namespace Server.Mobiles m_Team = 0; - SpeedInfo.GetSpeeds(this, ref dActiveSpeed, ref dPassiveSpeed); - - ActiveSpeed = dActiveSpeed; - PassiveSpeed = dPassiveSpeed; - m_CurrentSpeed = dPassiveSpeed; + if (passiveSpeed < 0 || activeSpeed < 0) + { + ResetSpeeds(); + } + else + { + ActiveSpeed = activeSpeed; + PassiveSpeed = passiveSpeed; + CurrentSpeed = passiveSpeed; + } Debug = false; @@ -2005,42 +2000,6 @@ namespace Server.Mobiles Loyalty *= 10; } - var activeSpeed = ActiveSpeed; - var passiveSpeed = PassiveSpeed; - - SpeedInfo.GetSpeeds(this, ref activeSpeed, ref passiveSpeed); - - var isStandardActive = false; - for (var i = 0; !isStandardActive && i < m_StandardActiveSpeeds.Length; ++i) - { - isStandardActive = ActiveSpeed == m_StandardActiveSpeeds[i]; - } - - var isStandardPassive = false; - for (var i = 0; !isStandardPassive && i < m_StandardPassiveSpeeds.Length; ++i) - { - isStandardPassive = PassiveSpeed == m_StandardPassiveSpeeds[i]; - } - - if (isStandardActive && m_CurrentSpeed == ActiveSpeed) - { - m_CurrentSpeed = activeSpeed; - } - else if (isStandardPassive && m_CurrentSpeed == PassiveSpeed) - { - m_CurrentSpeed = passiveSpeed; - } - - if (isStandardActive && !m_Paragon) - { - ActiveSpeed = activeSpeed; - } - - if (isStandardPassive && !m_Paragon) - { - PassiveSpeed = passiveSpeed; - } - if (version >= 14) { RemoveIfUntamed = reader.ReadBool(); @@ -3041,6 +3000,12 @@ namespace Server.Mobiles return null; } + public virtual bool IsMonster => + !Controlled || GetMaster() is not BaseCreature { Controlled: true }; + + public bool InActivePVPCombat() => + Combatant is PlayerMobile && ControlOrder != OrderType.Follow; + public static List GetLootingRights(List damageEntries, int hitsMax) { var rights = new List(); @@ -4875,6 +4840,16 @@ namespace Server.Mobiles } } + // Reset speeds based on dex. Mainly used during construction and pet commands + public void ResetSpeeds(bool currentUseActive = false) + { + SpeedInfo.GetSpeeds(this, out var activeSpeed, out var passiveSpeed); + + ActiveSpeed = activeSpeed; + PassiveSpeed = passiveSpeed; + CurrentSpeed = currentUseActive ? activeSpeed : passiveSpeed; + } + public virtual void DropBackpack() { if (Backpack?.Items.Count > 0) diff --git a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs index 0f48c3587..ac550132a 100644 --- a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs +++ b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private bool m_LastHidden; public BaseFamiliar() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, .1, .1) + : base(AIType.AI_Melee) { } diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/AbysmalHorror.cs b/Projects/UOContent/Mobiles/Monsters/AOS/AbysmalHorror.cs index 074700bfc..c83a03e5c 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/AbysmalHorror.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/AbysmalHorror.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class AbysmalHorror : BaseCreature { [Constructible] - public AbysmalHorror() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public AbysmalHorror() : base(AIType.AI_Mage) { Body = 312; BaseSoundID = 0x451; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/BoneDemon.cs b/Projects/UOContent/Mobiles/Monsters/AOS/BoneDemon.cs index adbc7f5a1..75c9ef030 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/BoneDemon.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/BoneDemon.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class BoneDemon : BaseCreature { [Constructible] - public BoneDemon() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public BoneDemon() : base(AIType.AI_Mage) { Body = 308; BaseSoundID = 0x48D; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/CrystalElemental.cs b/Projects/UOContent/Mobiles/Monsters/AOS/CrystalElemental.cs index 3d1ba2821..d21249ff1 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/CrystalElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/CrystalElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class CrystalElemental : BaseCreature { [Constructible] - public CrystalElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public CrystalElemental() : base(AIType.AI_Mage) { Body = 300; BaseSoundID = 278; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/DarknightCreeper.cs b/Projects/UOContent/Mobiles/Monsters/AOS/DarknightCreeper.cs index 71c166e82..880b8835e 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/DarknightCreeper.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/DarknightCreeper.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class DarknightCreeper : BaseCreature { [Constructible] - public DarknightCreeper() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public DarknightCreeper() : base(AIType.AI_Mage) { Name = NameList.RandomName("darknight creeper"); Body = 313; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs b/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs index caa5c72e5..ef61460ef 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles private static bool m_InHere; [Constructible] - public DemonKnight() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public DemonKnight() : base(AIType.AI_Mage) { Name = NameList.RandomName("demon knight"); Title = "the Dark Father"; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/Devourer.cs b/Projects/UOContent/Mobiles/Monsters/AOS/Devourer.cs index 6e8417836..1055d3198 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/Devourer.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/Devourer.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Devourer : BaseCreature { [Constructible] - public Devourer() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Devourer() : base(AIType.AI_Mage) { Body = 303; BaseSoundID = 357; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/FleshGolem.cs b/Projects/UOContent/Mobiles/Monsters/AOS/FleshGolem.cs index a4b26857b..57be294ee 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/FleshGolem.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/FleshGolem.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class FleshGolem : BaseCreature { [Constructible] - public FleshGolem() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public FleshGolem() : base(AIType.AI_Melee) { Body = 304; BaseSoundID = 684; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/FleshRenderer.cs b/Projects/UOContent/Mobiles/Monsters/AOS/FleshRenderer.cs index e93ebdbed..f80fc7fde 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/FleshRenderer.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/FleshRenderer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class FleshRenderer : BaseCreature { [Constructible] - public FleshRenderer() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public FleshRenderer() : base(AIType.AI_Melee) { Body = 315; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/Gibberling.cs b/Projects/UOContent/Mobiles/Monsters/AOS/Gibberling.cs index d870f5f6a..b0eac7a40 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/Gibberling.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/Gibberling.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Gibberling : BaseCreature { [Constructible] - public Gibberling() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Gibberling() : base(AIType.AI_Melee) { Body = 307; BaseSoundID = 422; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/GoreFiend.cs b/Projects/UOContent/Mobiles/Monsters/AOS/GoreFiend.cs index ed3b5ccad..2eaa2318f 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/GoreFiend.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/GoreFiend.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class GoreFiend : BaseCreature { [Constructible] - public GoreFiend() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GoreFiend() : base(AIType.AI_Melee) { Body = 305; BaseSoundID = 224; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/Impaler.cs b/Projects/UOContent/Mobiles/Monsters/AOS/Impaler.cs index 4a80a1324..15272279a 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/Impaler.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/Impaler.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Impaler : BaseCreature { [Constructible] - public Impaler() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Impaler() : base(AIType.AI_Melee) { Name = NameList.RandomName("impaler"); Body = 306; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/MoundOfMaggots.cs b/Projects/UOContent/Mobiles/Monsters/AOS/MoundOfMaggots.cs index 84176bbd2..1e2a1321b 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/MoundOfMaggots.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/MoundOfMaggots.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class MoundOfMaggots : BaseCreature { [Constructible] - public MoundOfMaggots() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public MoundOfMaggots() : base(AIType.AI_Melee) { Body = 319; BaseSoundID = 898; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/PatchworkSkeleton.cs b/Projects/UOContent/Mobiles/Monsters/AOS/PatchworkSkeleton.cs index 3de36c43b..ea05afe33 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/PatchworkSkeleton.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/PatchworkSkeleton.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class PatchworkSkeleton : BaseCreature { [Constructible] - public PatchworkSkeleton() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public PatchworkSkeleton() : base(AIType.AI_Melee) { Body = 309; BaseSoundID = 0x48D; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/Ravager.cs b/Projects/UOContent/Mobiles/Monsters/AOS/Ravager.cs index 6e770b6f6..9c36f22b0 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/Ravager.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/Ravager.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Ravager : BaseCreature { [Constructible] - public Ravager() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Ravager() : base(AIType.AI_Melee) { Body = 314; BaseSoundID = 357; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs b/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs index 232be7b9f..762b4c371 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private TimerExecutionToken _soundTimerToken; [Constructible] - public ShadowKnight() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public ShadowKnight() : base(AIType.AI_Mage) { Name = NameList.RandomName("shadow knight"); Title = "the Shadow Knight"; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/SkitteringHopper.cs b/Projects/UOContent/Mobiles/Monsters/AOS/SkitteringHopper.cs index c88a3a9f2..a8552f711 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/SkitteringHopper.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/SkitteringHopper.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SkitteringHopper : BaseCreature { [Constructible] - public SkitteringHopper() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public SkitteringHopper() : base(AIType.AI_Melee, FightMode.Aggressor) { Body = 302; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/Treefellow.cs b/Projects/UOContent/Mobiles/Monsters/AOS/Treefellow.cs index b2850d857..8c4aa6082 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/Treefellow.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/Treefellow.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Treefellow : BaseCreature { [Constructible] - public Treefellow() : base(AIType.AI_Melee, FightMode.Evil, 10, 1, 0.2, 0.4) + public Treefellow() : base(AIType.AI_Melee, FightMode.Evil) { Body = 301; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/VampireBat.cs b/Projects/UOContent/Mobiles/Monsters/AOS/VampireBat.cs index 9629f4a7d..d2ea234fb 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/VampireBat.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/VampireBat.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class VampireBat : BaseCreature { [Constructible] - public VampireBat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public VampireBat() : base(AIType.AI_Melee) { Body = 317; BaseSoundID = 0x270; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/WailingBanshee.cs b/Projects/UOContent/Mobiles/Monsters/AOS/WailingBanshee.cs index ae86f37f7..0f1a447cd 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/WailingBanshee.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/WailingBanshee.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class WailingBanshee : BaseCreature { [Constructible] - public WailingBanshee() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public WailingBanshee() : base(AIType.AI_Melee) { Body = 310; BaseSoundID = 0x482; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/WandererOfTheVoid.cs b/Projects/UOContent/Mobiles/Monsters/AOS/WandererOfTheVoid.cs index 13051a7f8..8e3082de1 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/WandererOfTheVoid.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/WandererOfTheVoid.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class WandererOfTheVoid : BaseCreature { [Constructible] - public WandererOfTheVoid() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public WandererOfTheVoid() : base(AIType.AI_Mage) { Body = 316; BaseSoundID = 377; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/AntLion.cs b/Projects/UOContent/Mobiles/Monsters/Ants/AntLion.cs index 168d04296..47c4882a6 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/AntLion.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/AntLion.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class AntLion : BaseCreature { [Constructible] - public AntLion() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public AntLion() : base(AIType.AI_Melee) { Body = 787; BaseSoundID = 1006; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs index b3a787080..7d2bd5d5e 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorQueen.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class BlackSolenInfiltratorQueen : BaseCreature { [Constructible] - public BlackSolenInfiltratorQueen() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BlackSolenInfiltratorQueen() : base(AIType.AI_Melee) { Body = 807; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs index 6a89e2c20..9e2c8ed18 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenInfiltratorWarrior.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class BlackSolenInfiltratorWarrior : BaseCreature { [Constructible] - public BlackSolenInfiltratorWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BlackSolenInfiltratorWarrior() : base(AIType.AI_Melee) { Body = 806; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs index c6168f6dc..527b4b4ca 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenQueen.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class BlackSolenQueen : BaseCreature { [Constructible] - public BlackSolenQueen() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BlackSolenQueen() : base(AIType.AI_Melee) { Body = 807; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs index 4c493f49b..341c9fc51 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWarrior.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class BlackSolenWarrior : BaseCreature { [Constructible] - public BlackSolenWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BlackSolenWarrior() : base(AIType.AI_Melee) { Body = 806; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWorker.cs b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWorker.cs index 383784b1b..3ab873c82 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWorker.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/BlackSolenWorker.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class BlackSolenWorker : BaseCreature { [Constructible] - public BlackSolenWorker() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BlackSolenWorker() : base(AIType.AI_Melee) { Body = 805; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs index eaaf4105f..997f65955 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorQueen.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class RedSolenInfiltratorQueen : BaseCreature { [Constructible] - public RedSolenInfiltratorQueen() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public RedSolenInfiltratorQueen() : base(AIType.AI_Melee) { Body = 783; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs index 71584f6de..afd41fd2a 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenInfiltratorWarrior.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class RedSolenInfiltratorWarrior : BaseCreature { [Constructible] - public RedSolenInfiltratorWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public RedSolenInfiltratorWarrior() : base(AIType.AI_Melee) { Body = 782; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs index fbdf85c47..4e491e070 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenQueen.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class RedSolenQueen : BaseCreature { [Constructible] - public RedSolenQueen() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public RedSolenQueen() : base(AIType.AI_Melee) { Body = 783; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs index 4a0ba00d0..0f3ce8f46 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWarrior.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class RedSolenWarrior : BaseCreature { [Constructible] - public RedSolenWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public RedSolenWarrior() : base(AIType.AI_Melee) { Body = 782; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWorker.cs b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWorker.cs index 896920266..6443c286b 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWorker.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ants/RedSolenWorker.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class RedSolenWorker : BaseCreature { [Constructible] - public RedSolenWorker() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public RedSolenWorker() : base(AIType.AI_Melee) { Body = 781; BaseSoundID = 959; diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs index 8fe4d981d..794b52aab 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class DreadSpider : BaseCreature { [Constructible] - public DreadSpider() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public DreadSpider() : base(AIType.AI_Mage) { Body = 11; BaseSoundID = 1170; diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs index 1dca6c6c4..7bac271bc 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class TerathanAvenger : BaseCreature { [Constructible] - public TerathanAvenger() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public TerathanAvenger() : base(AIType.AI_Mage) { Body = 152; BaseSoundID = 0x24D; diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs index fbec2457a..29a77e6fa 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class TerathanMatriarch : BaseCreature { [Constructible] - public TerathanMatriarch() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public TerathanMatriarch() : base(AIType.AI_Mage) { Body = 72; BaseSoundID = 599; diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs index 09021bbba..2c551f41c 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class FrostSpider : BaseCreature { [Constructible] - public FrostSpider() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public FrostSpider() : base(AIType.AI_Melee) { Body = 20; BaseSoundID = 0x388; diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs index 9649635ae..26d69c88a 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GiantBlackWidow : BaseCreature { [Constructible] - public GiantBlackWidow() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GiantBlackWidow() : base(AIType.AI_Melee) { Body = 0x9D; BaseSoundID = 0x388; // TODO: validate diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs index dbe2c6852..1b967de50 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GiantSpider : BaseCreature { [Constructible] - public GiantSpider() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GiantSpider() : base(AIType.AI_Melee) { Body = 28; BaseSoundID = 0x388; diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs index ddc2fe0a9..6d6b107b0 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class TerathanDrone : BaseCreature { [Constructible] - public TerathanDrone() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public TerathanDrone() : base(AIType.AI_Melee) { Body = 71; BaseSoundID = 594; diff --git a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs index aa48250f3..b26d22a95 100644 --- a/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class TerathanWarrior : BaseCreature { [Constructible] - public TerathanWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public TerathanWarrior() : base(AIType.AI_Melee) { Body = 70; BaseSoundID = 589; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs index b0fb9541a..32377ffd4 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class AcidElemental : BaseCreature { [Constructible] - public AcidElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public AcidElemental() : base(AIType.AI_Mage) { Body = 0x9E; BaseSoundID = 278; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AirElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AirElemental.cs index 2e292c837..fc9a25a53 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AirElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/AirElemental.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class AirElemental : BaseCreature { [Constructible] - public AirElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public AirElemental() : base(AIType.AI_Mage) { Body = 13; Hue = 0x4001; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs index 81898c98a..d7d9ab5bc 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class BloodElemental : BaseCreature { [Constructible] - public BloodElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public BloodElemental() : base(AIType.AI_Mage) { Body = 159; BaseSoundID = 278; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/Efreet.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/Efreet.cs index 469f59827..85a47aa8c 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/Efreet.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/Efreet.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Efreet : BaseCreature { [Constructible] - public Efreet() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Efreet() : base(AIType.AI_Mage) { Body = 131; BaseSoundID = 768; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/FireElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/FireElemental.cs index e8ad5fb70..9549c1fe0 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/FireElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/FireElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class FireElemental : BaseCreature { [Constructible] - public FireElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public FireElemental() : base(AIType.AI_Mage) { Body = 15; BaseSoundID = 838; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/IceElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/IceElemental.cs index b55d93c93..f64ff2a4d 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/IceElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/IceElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class IceElemental : BaseCreature { [Constructible] - public IceElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public IceElemental() : base(AIType.AI_Mage) { Body = 161; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs index d0061309e..4aca1fb01 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class PoisonElemental : BaseCreature { [Constructible] - public PoisonElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public PoisonElemental() : base(AIType.AI_Mage) { Body = 162; BaseSoundID = 263; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs index f9ccba620..e3df50c68 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class WaterElemental : BaseCreature { [Constructible] - public WaterElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public WaterElemental() : base(AIType.AI_Mage) { Body = 16; BaseSoundID = 278; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs index 7af2c20c0..2ac62b633 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class EarthElemental : BaseCreature { [Constructible] - public EarthElemental() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public EarthElemental() : base(AIType.AI_Melee) { Body = 14; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs b/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs index 0b4ef83c4..123cac148 100644 --- a/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class SnowElemental : BaseCreature { [Constructible] - public SnowElemental() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SnowElemental() : base(AIType.AI_Melee) { Body = 163; BaseSoundID = 263; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs index 9018c87e6..be0856d36 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class AncientLich : BaseCreature { [Constructible] - public AncientLich() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public AncientLich() : base(AIType.AI_Mage) { Name = NameList.RandomName("ancient lich"); Body = 78; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs index d283f8996..3666b3872 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ArcaneDaemon.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class ArcaneDaemon : BaseCreature { [Constructible] - public ArcaneDaemon() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public ArcaneDaemon() : base(AIType.AI_Mage) { Body = 0x310; BaseSoundID = 0x47D; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Balron.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Balron.cs index c0132e5cb..1948e1ce1 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Balron.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Balron.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Balron : BaseCreature { [Constructible] - public Balron() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Balron() : base(AIType.AI_Mage) { Name = NameList.RandomName("balron"); Body = 40; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs index 79a0a4b31..d65b6bb5f 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private bool m_Stunning; [Constructible] - public Betrayer() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Betrayer() : base(AIType.AI_Mage) { Body = 767; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Bogle.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Bogle.cs index 07831fb92..b90623cda 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Bogle.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Bogle.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Bogle : BaseCreature { [Constructible] - public Bogle() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Bogle() : base(AIType.AI_Mage) { Body = 153; BaseSoundID = 0x482; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs index 2eabcc511..dcc897d7e 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class BoneMagi : BaseCreature { [Constructible] - public BoneMagi() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public BoneMagi() : base(AIType.AI_Mage) { Body = 148; BaseSoundID = 451; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Daemon.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Daemon.cs index 18de26c29..5d582c802 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Daemon.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Daemon.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class Daemon : BaseCreature { [Constructible] - public Daemon() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Daemon() : base(AIType.AI_Mage) { Name = NameList.RandomName("daemon"); Body = 9; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs index 827953361..376ad67e2 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class ElderGazer : BaseCreature { [Constructible] - public ElderGazer() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public ElderGazer() : base(AIType.AI_Mage) { Body = 22; BaseSoundID = 377; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs index 508ee434b..e2929ae18 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public partial class EvilMage : BaseCreature { [Constructible] - public EvilMage() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public EvilMage() : base(AIType.AI_Mage) { Name = NameList.RandomName("evil mage"); Title = "the evil mage"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs index 897983ebe..197f4acd0 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public partial class EvilMageLord : BaseCreature { [Constructible] - public EvilMageLord() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public EvilMageLord() : base(AIType.AI_Mage) { Name = NameList.RandomName("evil mage lord"); Body = Core.UOR ? Utility.Random(125, 2) : 0x190; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs index b86c9eca3..8595d6001 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class FireGargoyle : BaseCreature { [Constructible] - public FireGargoyle() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public FireGargoyle() : base(AIType.AI_Mage) { Name = NameList.RandomName("fire gargoyle"); Body = 130; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs index 599390b49..b09605b71 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Gargoyle : BaseCreature { [Constructible] - public Gargoyle() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Gargoyle() : base(AIType.AI_Mage) { Body = 4; BaseSoundID = 372; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs index 26fa9b698..24b4bd053 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GargoyleDestroyer : BaseCreature { [Constructible] - public GargoyleDestroyer() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public GargoyleDestroyer() : base(AIType.AI_Mage) { Body = 0x2F3; BaseSoundID = 0x174; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs index 242c8dffc..9a0c01753 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GargoyleEnforcer : BaseCreature { [Constructible] - public GargoyleEnforcer() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public GargoyleEnforcer() : base(AIType.AI_Mage) { Body = 0x2F2; BaseSoundID = 0x174; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gazer.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gazer.cs index 47aa1d08a..ed9e35dcb 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gazer.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Gazer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Gazer : BaseCreature { [Constructible] - public Gazer() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Gazer() : base(AIType.AI_Mage) { Body = 22; BaseSoundID = 377; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GolemController.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GolemController.cs index b76607323..87bbf8c41 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GolemController.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GolemController.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GolemController : BaseCreature { [Constructible] - public GolemController() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public GolemController() : base(AIType.AI_Mage) { Name = NameList.RandomName("golem controller"); Title = "the controller"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs index 8fa4cf347..513386a59 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class IceFiend : BaseCreature { [Constructible] - public IceFiend() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public IceFiend() : base(AIType.AI_Mage) { Body = 43; BaseSoundID = 357; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Imp.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Imp.cs index 43747d769..6bc8a560b 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Imp.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Imp.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Imp : BaseCreature { [Constructible] - public Imp() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Imp() : base(AIType.AI_Mage) { Body = 74; BaseSoundID = 422; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Lich.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Lich.cs index 75926f12b..96b93a502 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Lich.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Lich.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Lich : BaseCreature { [Constructible] - public Lich() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Lich() : base(AIType.AI_Mage) { Body = 24; BaseSoundID = 0x3E9; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/LichLord.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/LichLord.cs index 1717af145..3d29c14f9 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/LichLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/LichLord.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class LichLord : BaseCreature { [Constructible] - public LichLord() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public LichLord() : base(AIType.AI_Mage) { Body = 79; BaseSoundID = 412; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs index 0eb72f21c..b45d3f8db 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class OrcishMage : BaseCreature { [Constructible] - public OrcishMage() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public OrcishMage() : base(AIType.AI_Mage) { Body = 140; BaseSoundID = 0x45A; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs index c9c3944f3..64ed0626e 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class RatmanMage : BaseCreature { [Constructible] - public RatmanMage() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public RatmanMage() : base(AIType.AI_Mage) { Name = NameList.RandomName("ratman"); Body = 0x8F; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs index 29904bf35..9952033a3 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles public class SavageShaman : BaseCreature { [Constructible] - public SavageShaman() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SavageShaman() : base(AIType.AI_Mage) { Name = NameList.RandomName("savage shaman"); diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Shade.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Shade.cs index 06fc00dd9..6a9a04e17 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Shade.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Shade.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Shade : BaseCreature { [Constructible] - public Shade() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Shade() : base(AIType.AI_Mage) { Body = 26; Hue = 0x4001; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs index ad767f10d..c40390a17 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SkeletalMage.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class SkeletalMage : BaseCreature { [Constructible] - public SkeletalMage() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SkeletalMage() : base(AIType.AI_Mage) { Body = 148; BaseSoundID = 451; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Spectre.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Spectre.cs index fdff55b9b..c1e311333 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Spectre.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Spectre.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Spectre : BaseCreature { [Constructible] - public Spectre() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Spectre() : base(AIType.AI_Mage) { Body = 26; Hue = 0x4001; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Succubus.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Succubus.cs index 2af283bf4..0b43262fe 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Succubus.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Succubus.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Succubus : BaseCreature { [Constructible] - public Succubus() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Succubus() : base(AIType.AI_Mage) { Body = 149; BaseSoundID = 0x4B0; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Titan.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Titan.cs index 3dba46e41..0cbf87790 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Titan.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Titan.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Titan : BaseCreature { [Constructible] - public Titan() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Titan() : base(AIType.AI_Mage) { Body = 76; BaseSoundID = 609; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Wraith.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Wraith.cs index 51d506ef4..0806091db 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Wraith.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/Wraith.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Wraith : BaseCreature { [Constructible] - public Wraith() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Wraith() : base(AIType.AI_Mage) { Body = 26; Hue = 0x4001; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs index 0c516ccb8..3f6f75985 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class ArcticOgreLord : BaseCreature { [Constructible] - public ArcticOgreLord() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ArcticOgreLord() : base(AIType.AI_Melee) { Body = 135; BaseSoundID = 427; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs index e11ac3186..c64589ffc 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/BoneKnight.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class BoneKnight : BaseCreature { [Constructible] - public BoneKnight() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BoneKnight() : base(AIType.AI_Melee) { Body = 57; BaseSoundID = 451; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Brigand.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Brigand.cs index 936c0397a..8d687f6b6 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Brigand.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Brigand.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Brigand : BaseCreature { [Constructible] - public Brigand() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Brigand() : base(AIType.AI_Melee) { SpeechHue = Utility.RandomDyedHue(); Title = "the brigand"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs index 643516358..e2279f04b 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ChaosDaemon.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class ChaosDaemon : BaseCreature { [Constructible] - public ChaosDaemon() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ChaosDaemon() : base(AIType.AI_Melee) { Body = 792; BaseSoundID = 0x3E9; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cursed.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cursed.cs index 352cd3ae2..8bc329b6c 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cursed.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cursed.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Cursed : BaseCreature { [Constructible] - public Cursed() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Cursed() : base(AIType.AI_Melee) { Title = "the Cursed"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs index edc0183ad..1317d9a9a 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Cyclops : BaseCreature { [Constructible] - public Cyclops() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Cyclops() : base(AIType.AI_Melee) { Body = 75; BaseSoundID = 604; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs index 255977082..6f85f2edc 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Doppleganger : BaseCreature { [Constructible] - public Doppleganger() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Doppleganger() : base(AIType.AI_Melee) { Body = 0x309; BaseSoundID = 0x451; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs index 6e12d56d4..9dee70647 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class ElfBrigand : BaseCreature { [Constructible] - public ElfBrigand() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ElfBrigand() : base(AIType.AI_Melee) { SpeechHue = Utility.RandomDyedHue(); Title = "the brigand"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs index 22111a70d..ec29a7df1 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class EnslavedGargoyle : BaseCreature { [Constructible] - public EnslavedGargoyle() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public EnslavedGargoyle() : base(AIType.AI_Melee) { Body = 0x2F1; BaseSoundID = 0x174; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ettin.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ettin.cs index e41162e7b..23641dd69 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ettin.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ettin.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Ettin : BaseCreature { [Constructible] - public Ettin() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Ettin() : base(AIType.AI_Melee) { Body = 18; BaseSoundID = 367; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Executioner.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Executioner.cs index e241fb044..e5b2a9ea8 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Executioner.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Executioner.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Executioner : BaseCreature { [Constructible] - public Executioner() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Executioner() : base(AIType.AI_Melee) { SpeechHue = Utility.RandomDyedHue(); Title = "the executioner"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs index e96b21cdf..da5904924 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class FrostTroll : BaseCreature { [Constructible] - public FrostTroll() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public FrostTroll() : base(AIType.AI_Melee) { Body = 55; BaseSoundID = 461; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs index 7bbac091b..8a1209573 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GazerLarva : BaseCreature { [Constructible] - public GazerLarva() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GazerLarva() : base(AIType.AI_Melee) { Body = 778; BaseSoundID = 377; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs index f3130d9b7..2fb04ef1a 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ghoul.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Ghoul : BaseCreature { [Constructible] - public Ghoul() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Ghoul() : base(AIType.AI_Melee) { Body = 153; BaseSoundID = 0x482; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs index 4fcf786af..fff738990 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class GreaterMongbat : BaseCreature { [Constructible] - public GreaterMongbat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GreaterMongbat() : base(AIType.AI_Melee) { Body = 39; BaseSoundID = 422; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Guardian.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Guardian.cs index cb868762e..d6cec9f56 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Guardian.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Guardian.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Guardian : BaseCreature { [Constructible] - public Guardian() : base(AIType.AI_Archer, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Guardian() : base(AIType.AI_Archer, FightMode.Aggressor) { InitStats(100, 125, 25); Title = "the guardian"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs index 0934f9f8c..5abf05236 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class HeadlessOne : BaseCreature { [Constructible] - public HeadlessOne() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public HeadlessOne() : base(AIType.AI_Melee) { Body = 31; Hue = Race.Human.RandomSkinHue() & 0x7FFF; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs index b1fc8822f..416792596 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/HordeMinion.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class HordeMinion : BaseCreature { [Constructible] - public HordeMinion() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public HordeMinion() : base(AIType.AI_Melee) { Body = 776; BaseSoundID = 357; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs index 483d3a274..f241746f5 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private bool m_Stunning; [Constructible] - public Juggernaut() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.3, 0.6) + public Juggernaut() : base(AIType.AI_Melee) { Body = 768; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs index 501300865..fe00b9402 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs @@ -11,7 +11,7 @@ namespace Server.Mobiles private readonly Mobile m_Target; - public KhaldunRevenant(Mobile target) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.18, 0.36) + public KhaldunRevenant(Mobile target) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.175, 0.35) { Body = 0x3CA; Hue = 0x41CE; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs index 1b35f0f50..b69b0b3ac 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class KhaldunSummoner : BaseCreature { [Constructible] - public KhaldunSummoner() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public KhaldunSummoner() : base(AIType.AI_Mage) { Body = 0x190; Title = "the Summoner"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs index da25b342c..45c5d3b62 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class KhaldunZealot : BaseCreature { [Constructible] - public KhaldunZealot() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public KhaldunZealot() : base(AIType.AI_Melee) { Body = 0x190; Title = "the Knight"; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Moloch.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Moloch.cs index 75d8d80ba..b54a19af3 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Moloch.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Moloch.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Moloch : BaseCreature { [Constructible] - public Moloch() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Moloch() : base(AIType.AI_Melee) { Body = 0x311; BaseSoundID = 0x300; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs index b4628c2cc..fe691470f 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Mongbat : BaseCreature { [Constructible] - public Mongbat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Mongbat() : base(AIType.AI_Melee) { Body = 39; BaseSoundID = 422; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mummy.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mummy.cs index d345cf974..ebef3ae20 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mummy.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Mummy.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class Mummy : BaseCreature { [Constructible] - public Mummy() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8) + public Mummy() : base(AIType.AI_Melee) { Body = 154; BaseSoundID = 471; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ogre.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ogre.cs index cb68c9464..06eaf0413 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ogre.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ogre.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Ogre : BaseCreature { [Constructible] - public Ogre() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Ogre() : base(AIType.AI_Melee) { Body = 1; BaseSoundID = 427; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs index a3305cd0c..e147daf55 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class OgreLord : BaseCreature { [Constructible] - public OgreLord() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public OgreLord() : base(AIType.AI_Melee) { Body = 83; BaseSoundID = 427; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Orc.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Orc.cs index acb5c1e3b..1c9556b47 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Orc.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Orc.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class Orc : BaseCreature { [Constructible] - public Orc() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Orc() : base(AIType.AI_Melee) { Name = NameList.RandomName("orc"); Body = 17; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs index c55426b2f..1b2ff2afb 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private int m_Thrown; [Constructible] - public OrcBomber() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public OrcBomber() : base(AIType.AI_Melee) { Body = 182; BaseSoundID = 0x45A; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs index d07b31a81..34c4c410a 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class OrcBrute : BaseCreature { [Constructible] - public OrcBrute() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public OrcBrute() : base(AIType.AI_Melee) { Body = 189; BaseSoundID = 0x45A; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs index 417de8bca..2130ec3a6 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class OrcCaptain : BaseCreature { [Constructible] - public OrcCaptain() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public OrcCaptain() : base(AIType.AI_Melee) { Name = NameList.RandomName("orc"); Body = 7; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs index e43631519..c6e6a0a62 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class OrcishLord : BaseCreature { [Constructible] - public OrcishLord() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public OrcishLord() : base(AIType.AI_Melee) { Body = 138; BaseSoundID = 0x45A; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ratman.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ratman.cs index 9bac39e79..6eea3204a 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ratman.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Ratman.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Ratman : BaseCreature { [Constructible] - public Ratman() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Ratman() : base(AIType.AI_Melee) { Name = NameList.RandomName("ratman"); Body = 42; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs index b8ac7f09c..579932c2f 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class RatmanArcher : BaseCreature { [Constructible] - public RatmanArcher() : base(AIType.AI_Archer, FightMode.Closest, 10, 1, 0.2, 0.4) + public RatmanArcher() : base(AIType.AI_Archer) { Name = NameList.RandomName("ratman"); Body = 0x8E; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs index dfcae9946..76b8cf239 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class RestlessSoul : BaseCreature { [Constructible] - public RestlessSoul() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8) + public RestlessSoul() : base(AIType.AI_Melee) { Body = 0x3CA; Hue = 0x453; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs index 48dc7bfe4..284dd8fba 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class RottingCorpse : BaseCreature { [Constructible] - public RottingCorpse() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public RottingCorpse() : base(AIType.AI_Melee) { Body = 155; BaseSoundID = 471; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Savage.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Savage.cs index 54e899533..2b8a53ebb 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Savage.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Savage.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class Savage : BaseCreature { [Constructible] - public Savage() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Savage() : base(AIType.AI_Melee) { Name = NameList.RandomName("savage"); diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs index ad74f08ae..193e709fc 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class SavageRider : BaseCreature { [Constructible] - public SavageRider() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.15, 0.4) + public SavageRider() : base(AIType.AI_Melee) { Name = NameList.RandomName("savage rider"); diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs index 1003a2724..064e2221c 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles private UnhideTimer m_Timer; [Constructible] - public ShadowFiend() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ShadowFiend() : base(AIType.AI_Melee) { Body = 0xA8; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs index 0d3fe161e..0f1bf65f5 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SkeletalKnight.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class SkeletalKnight : BaseCreature { [Constructible] - public SkeletalKnight() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SkeletalKnight() : base(AIType.AI_Melee) { Body = 147; BaseSoundID = 451; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs index b1df50d4c..9d8ff90ef 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Skeleton.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Skeleton : BaseCreature { [Constructible] - public Skeleton() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Skeleton() : base(AIType.AI_Melee) { Body = Utility.RandomList(50, 56); BaseSoundID = 0x48D; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs index 7c46d85f5..8c4269d96 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/SpectralArmour.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class SpectralArmour : BaseCreature { [Constructible] - public SpectralArmour() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SpectralArmour() : base(AIType.AI_Melee) { Body = 637; Hue = 0x8026; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs index fe65c0fb5..e66d5796a 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class StoneGargoyle : BaseCreature { [Constructible] - public StoneGargoyle() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public StoneGargoyle() : base(AIType.AI_Melee) { Body = 67; BaseSoundID = 0x174; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs index 1d942c9da..49cc7ae65 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class StrongMongbat : BaseCreature { [Constructible] - public StrongMongbat() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public StrongMongbat() : base(AIType.AI_Melee) { Body = 39; BaseSoundID = 422; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Troll.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Troll.cs index 5b47fd587..ff0bc02d4 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Troll.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Troll.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Troll : BaseCreature { [Constructible] - public Troll() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Troll() : base(AIType.AI_Melee) { Body = Utility.RandomList(53, 54); BaseSoundID = 461; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Zombie.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Zombie.cs index dc886d409..bbb2f36b8 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Zombie.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Zombie.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Zombie : BaseCreature { [Constructible] - public Zombie() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Zombie() : base(AIType.AI_Melee) { Body = 3; BaseSoundID = 471; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs index 9d2cc5581..f70c42bb2 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class ExodusMinion : BaseCreature { [Constructible] - public ExodusMinion() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ExodusMinion() : base(AIType.AI_Melee) { Body = 0x2F5; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs index 09aa5a9d7..18aeed356 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class ExodusOverseer : BaseCreature { [Constructible] - public ExodusOverseer() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ExodusOverseer() : base(AIType.AI_Melee) { Body = 0x2F4; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaLord.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaLord.cs index 55fa320db..aac42f25e 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaLord.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class JukaLord : BaseCreature { [Constructible] - public JukaLord() : base(AIType.AI_Archer, FightMode.Closest, 10, 3, 0.2, 0.4) + public JukaLord() : base(AIType.AI_Archer, FightMode.Closest, 10, 3) { Body = 766; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaMage.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaMage.cs index eff006e42..cbbad4177 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaMage.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private DateTime m_NextAbilityTime; [Constructible] - public JukaMage() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public JukaMage() : base(AIType.AI_Mage) { Body = 765; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs index 57d256753..22e9160b1 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class JukaWarrior : BaseCreature { [Constructible] - public JukaWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public JukaWarrior() : base(AIType.AI_Melee) { Body = 764; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs index d6b4fbfb6..cb3996be4 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs @@ -151,7 +151,7 @@ namespace Server.Mobiles public class BaseEnraged : BaseCreature { public BaseEnraged(Mobile summoner) - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { SetStr(50, 200); SetDex(50, 200); diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs index 0cbe3214b..6be4fcdc7 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private DateTime m_NextAbilityTime; [Constructible] - public MeerCaptain() : base(AIType.AI_Archer, FightMode.Evil, 10, 1, 0.2, 0.4) + public MeerCaptain() : base(AIType.AI_Archer, FightMode.Evil) { Body = 773; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs index feb53f272..d7f064620 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles private DateTime m_NextAbilityTime; [Constructible] - public MeerEternal() : base(AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public MeerEternal() : base(AIType.AI_Mage, FightMode.Evil) { Body = 772; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs index 3d171a090..ce509df11 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles private DateTime m_NextAbilityTime; [Constructible] - public MeerMage() : base(AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public MeerMage() : base(AIType.AI_Mage, FightMode.Evil) { Body = 770; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs index 5019d678f..c56872294 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class MeerWarrior : BaseCreature { [Constructible] - public MeerWarrior() : base(AIType.AI_Melee, FightMode.Evil, 10, 1, 0.2, 0.4) + public MeerWarrior() : base(AIType.AI_Melee, FightMode.Evil) { Body = 771; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Animal/CuSidhe.cs b/Projects/UOContent/Mobiles/Monsters/ML/Animal/CuSidhe.cs index ff7c2ff5f..a06b0fa9f 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Animal/CuSidhe.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Animal/CuSidhe.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class CuSidhe : BaseMount { [Constructible] - public CuSidhe(string name = null) : base(name, 277, 0x3E91, AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public CuSidhe(string name = null) : base(name, 277, 0x3E91, AIType.AI_Animal, FightMode.Aggressor, 10, 1) { var chance = Utility.RandomDouble() * 23301; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs index cb578515f..413886152 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs @@ -15,7 +15,7 @@ namespace Server.Mobiles private bool m_CanTalk; [Constructible] - public Ferret() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Ferret() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0x117; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs b/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs index dfceeec83..d02acc83e 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class RagingGrizzlyBear : BaseCreature { [Constructible] - public RagingGrizzlyBear() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public RagingGrizzlyBear() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 212; BaseSoundID = 0xA3; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs index a94614772..1749f7d73 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Squirrel : BaseCreature { [Constructible] - public Squirrel() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Squirrel() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 0x116; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs b/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs index 6a8b5c609..b4b5e06f9 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public Hydra() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 0x109; BaseSoundID = 0x16A; @@ -67,7 +67,7 @@ namespace Server.Mobiles // TODO: uncomment once added if (Utility.RandomDouble() < 0.2) c.DropItem( new ParrotItem() ); - + if (Utility.RandomDouble() < 0.05) c.DropItem( new ThorvaldsMedallion() ); */ diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs index d5fd88ad8..59f9fdf57 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class FetidEssence : BaseCreature { [Constructible] - public FetidEssence() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public FetidEssence() : base(AIType.AI_Mage) { Body = 273; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs index 4b6df14d4..216656535 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class InterredGrizzle : BaseCreature { [Constructible] - public InterredGrizzle() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public InterredGrizzle() : base(AIType.AI_Mage) { Body = 259; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs index d3a1589ae..e5175f0b7 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private DateTime m_NextUndress; [Constructible] - public MLDryad() : base(AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public MLDryad() : base(AIType.AI_Mage, FightMode.Evil) { Body = 266; BaseSoundID = 0x57B; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs index 38ff955e2..c67242b21 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs @@ -15,7 +15,7 @@ namespace Server.Mobiles private DateTime m_NextUndress; [Constructible] - public Satyr() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Satyr() : base(AIType.AI_Animal, FightMode.Aggressor) { Body = 271; BaseSoundID = 0x586; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs index 9c1ab08a5..5fe6bb7b5 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class CorruptedSoul : BaseCreature { [Constructible] - public CorruptedSoul() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, .1, 5) + public CorruptedSoul() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.1, 5) { Body = 0x3CA; Hue = 0x453; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/FeralTreefellow.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/FeralTreefellow.cs index f375eeb4e..9dd6f72ab 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/FeralTreefellow.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/FeralTreefellow.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class FeralTreefellow : BaseCreature { [Constructible] - public FeralTreefellow() : base(AIType.AI_Melee, FightMode.Evil, 10, 1, 0.2, 0.4) + public FeralTreefellow() : base(AIType.AI_Melee, FightMode.Evil) { Body = 301; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs index 7fb8be852..3df0abe45 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Minotaur : BaseCreature { [Constructible] - public Minotaur() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) // NEED TO CHECK + public Minotaur() : base(AIType.AI_Melee) // NEED TO CHECK { Body = 263; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs index 701dd75a7..8bf35b72e 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class MinotaurCaptain : BaseCreature { [Constructible] - public MinotaurCaptain() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) // NEED TO CHECK + public MinotaurCaptain() : base(AIType.AI_Melee) // NEED TO CHECK { Body = 280; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs index ca8842240..e61b6de4d 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class MinotaurScout : BaseCreature { [Constructible] - public MinotaurScout() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) // NEED TO CHECK + public MinotaurScout() : base(AIType.AI_Melee) // NEED TO CHECK { Body = 281; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs index 321dd1f10..abe05b461 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/PestilentBandage.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class PestilentBandage : BaseCreature { [Constructible] - public PestilentBandage() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) // NEED TO CHECK + public PestilentBandage() : base(AIType.AI_Melee) // NEED TO CHECK { Body = 154; Hue = 0x515; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs index 25cbf5d27..703960d84 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class TormentedMinotaur : BaseCreature { [Constructible] - public TormentedMinotaur() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public TormentedMinotaur() : base(AIType.AI_Melee) { Body = 262; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs index e47f077c2..b2bfcffa1 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Melee/Troglodyte.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Troglodyte : BaseCreature { [Constructible] - public Troglodyte() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) // NEED TO CHECK + public Troglodyte() : base(AIType.AI_Melee) // NEED TO CHECK { Body = 267; BaseSoundID = 0x59F; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs b/Projects/UOContent/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs index d62c27d4f..671c1925f 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class GreaterDragon : BaseCreature { [Constructible] - public GreaterDragon() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.3, 0.5) + public GreaterDragon() : base(AIType.AI_Mage) { Body = Utility.RandomList(12, 59); BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs b/Projects/UOContent/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs index b54b44d78..b30c65035 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class CorrosiveSlime : BaseCreature { [Constructible] - public CorrosiveSlime() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public CorrosiveSlime() : base(AIType.AI_Melee) { Body = 51; BaseSoundID = 456; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs index 0c6c772c5..31a16b7dd 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public CorporealBrume() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 0x104; // TODO: Verify BaseSoundID = 0x56B; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs index b2e6726a5..a77d90e36 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { [Constructible] public CrystalDaemon() - : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Mage) { Body = 0x310; Hue = 0x3E8; @@ -46,7 +46,7 @@ namespace Server.Mobiles public override void OnDeath( Container c ) { base.OnDeath( c ); - + if (Utility.RandomDouble() < 0.4) c.DropItem( new ScatteredCrystals() ); } diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs index c0af63279..20f7859ef 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { [Constructible] public CrystalLatticeSeeker() - : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Mage) { Body = 0x7B; Hue = 0x47E; @@ -52,10 +52,10 @@ namespace Server.Mobiles public override void OnDeath( Container c ) { base.OnDeath( c ); - + if (Utility.RandomDouble() < 0.75) c.DropItem( new CrystallineFragments() ); - + if (Utility.RandomDouble() < 0.07) c.DropItem( new PiecesOfCrystal() ); } diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs index e20773064..b2c70f1c0 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { [Constructible] public CrystalVortex() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 0xD; Hue = 0x2B2; @@ -59,10 +59,10 @@ namespace Server.Mobiles public override void OnDeath( Container c ) { base.OnDeath( c ); - + if (Utility.RandomDouble() < 0.75) c.DropItem( new CrystallineFragments() ); - + if (Utility.RandomDouble() < 0.06) c.DropItem( new JaggedCrystals() ); } diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs index d1a0f67b2..7b6904de1 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/MantraEffervescence.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { [Constructible] public MantraEffervescence() - : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Mage) { Body = 0x111; BaseSoundID = 0x56E; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/Protector.cs b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/Protector.cs index 6b57008a1..88abdc8c4 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/Protector.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/Protector.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public Protector() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 401; Female = true; @@ -86,7 +86,7 @@ namespace Server.Mobiles public override void OnDeath( Container c ) { base.OnDeath( c ); - + if (Utility.RandomDouble() < 0.4) c.DropItem( new ProtectorsEssence() ); } diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs index 56ca7f095..453a7fdf4 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Prism of Light/UnfrozenMummy.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { [Constructible] public UnfrozenMummy() - : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.4, 0.8) + : base(AIType.AI_Mage) { Body = 0x9B; Hue = 0x480; @@ -46,10 +46,10 @@ namespace Server.Mobiles public override void OnDeath( Container c ) { base.OnDeath( c ); - + if (Utility.RandomDouble() < 0.6) c.DropItem( new BrokenCrystals() ); - + if (Utility.RandomDouble() < 0.1) c.DropItem( new ParrotItem() ); } diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs b/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs index c57b62524..5a14803c2 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs @@ -27,7 +27,7 @@ namespace Server.Mobiles [Constructible] public Changeling() - : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Mage) { Body = 264; Hue = DefaultHue; diff --git a/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/HellHound.cs b/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/HellHound.cs index d98775042..9c9942d45 100644 --- a/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/HellHound.cs +++ b/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/HellHound.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class HellHound : BaseCreature { [Constructible] - public HellHound() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public HellHound() : base(AIType.AI_Melee) { Body = 98; BaseSoundID = 229; diff --git a/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs b/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs index c386b5cae..c62860bca 100644 --- a/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs +++ b/Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class VorpalBunny : BaseCreature { [Constructible] - public VorpalBunny() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public VorpalBunny() : base(AIType.AI_Melee) { Body = 205; Hue = 0x480; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/DarkWisp.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/DarkWisp.cs index 0bbb5ee34..4dc452690 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/DarkWisp.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/DarkWisp.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles public class DarkWisp : BaseCreature { [Constructible] - public DarkWisp() : base(AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public DarkWisp() : base(AIType.AI_Mage, FightMode.Aggressor) { Body = 165; BaseSoundID = 466; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs index 1a1317ea0..f09582850 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private DateTime m_NextResurrect; [Constructible] - public EtherealWarrior() : base(AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public EtherealWarrior() : base(AIType.AI_Mage, FightMode.Evil) { Name = NameList.RandomName("ethereal warrior"); Body = 123; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Pixie.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Pixie.cs index 245d76f30..abacd88f5 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Pixie.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Pixie.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Pixie : BaseCreature { [Constructible] - public Pixie() : base(AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public Pixie() : base(AIType.AI_Mage, FightMode.Evil) { Name = NameList.RandomName("pixie"); Body = 128; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs index 451acc6d8..b88b25c73 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/ShadowWisp.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class ShadowWisp : BaseCreature { [Constructible] - public ShadowWisp() : base(AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.3, 0.6) + public ShadowWisp() : base(AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.25, 0.5) { Body = 165; BaseSoundID = 466; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Wisp.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Wisp.cs index 613b6b574..b4122c834 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Wisp.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/Wisp.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles public class Wisp : BaseCreature { [Constructible] - public Wisp() : base(AIType.AI_Mage, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Wisp() : base(AIType.AI_Mage, FightMode.Aggressor) { Body = 58; BaseSoundID = 466; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Centaur.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Centaur.cs index 7ac9b6286..4df4c37ef 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Centaur.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Centaur.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Centaur : BaseCreature { [Constructible] - public Centaur() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Centaur() : base(AIType.AI_Melee, FightMode.Aggressor) { Name = NameList.RandomName("centaur"); Body = 101; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs index a69586bc3..ae7a1517b 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { [Constructible] public EnergyVortex() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { if (Core.SE && Utility.RandomDouble() < 0.002) // Per OSI FoF, it's a 1/500 chance. { diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/FrostOoze.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/FrostOoze.cs index b4e4e5577..52e5704aa 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/FrostOoze.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/FrostOoze.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class FrostOoze : BaseCreature { [Constructible] - public FrostOoze() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public FrostOoze() : base(AIType.AI_Melee) { Body = 94; BaseSoundID = 456; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs index 263e86462..aec74b455 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private int m_DevourGoal; [Constructible] - public PlagueBeast() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public PlagueBeast() : base(AIType.AI_Melee) { Body = 775; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs index 0e69a4bb1..bd71a9d14 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private DecayTimer m_Timer; [Constructible] - public PlagueBeastLord() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public PlagueBeastLord() : base(AIType.AI_Melee) { Body = 775; BaseSoundID = 679; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs index e1ca92246..856dd233c 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class PlagueSpawn : BaseCreature { [Constructible] - public PlagueSpawn(Mobile owner = null) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public PlagueSpawn(Mobile owner = null) : base(AIType.AI_Melee) { Owner = owner; ExpireTime = Core.Now + TimeSpan.FromMinutes(1.0); diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/SandVortex.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/SandVortex.cs index 6674e685e..289149080 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/SandVortex.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/SandVortex.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles private DateTime m_NextAttack; [Constructible] - public SandVortex() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SandVortex() : base(AIType.AI_Melee) { Body = 790; BaseSoundID = 263; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Slime.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Slime.cs index 1ba5420a2..5e43b8a29 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Slime.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/Slime.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Slime : BaseCreature { [Constructible] - public Slime() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Slime() : base(AIType.AI_Melee) { Body = 51; BaseSoundID = 456; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs index 600e7f2b2..4afc602e6 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class AgapiteElemental : BaseCreature { [Constructible] - public AgapiteElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public AgapiteElemental(int oreAmount = 2) : base(AIType.AI_Melee) { Body = 107; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs index a9da2c0f7..3ff35fc5d 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class BronzeElemental : BaseCreature { [Constructible] - public BronzeElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public BronzeElemental(int oreAmount = 2) : base(AIType.AI_Melee) { // TODO: Gas attack Body = 108; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/CopperElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/CopperElemental.cs index 52c7319f4..e076e2c3f 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/CopperElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/CopperElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class CopperElemental : BaseCreature { [Constructible] - public CopperElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public CopperElemental(int oreAmount = 2) : base(AIType.AI_Melee) { Body = 109; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs index 6ba9e2e5d..e5c12b5e4 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class DullCopperElemental : BaseCreature { [Constructible] - public DullCopperElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public DullCopperElemental(int oreAmount = 2) : base(AIType.AI_Melee) { Body = 110; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs index b412dc8de..33efe5d66 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class GoldenElemental : BaseCreature { [Constructible] - public GoldenElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public GoldenElemental(int oreAmount = 2) : base(AIType.AI_Melee) { Body = 166; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs index c3d4b32e2..41c978361 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class ShadowIronElemental : BaseCreature { [Constructible] - public ShadowIronElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ShadowIronElemental(int oreAmount = 2) : base(AIType.AI_Melee) { Body = 111; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs index 6c4654249..7bad63bfd 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class ValoriteElemental : BaseCreature { [Constructible] - public ValoriteElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public ValoriteElemental(int oreAmount = 2) : base(AIType.AI_Melee) { // TODO: Gas attack Body = 112; diff --git a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs index 23ecc6a0e..8aaf413fc 100644 --- a/Projects/UOContent/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class VeriteElemental : BaseCreature { [Constructible] - public VeriteElemental(int oreAmount = 2) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public VeriteElemental(int oreAmount = 2) : base(AIType.AI_Melee) { Body = 113; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Plant/Magic/Reaper.cs b/Projects/UOContent/Mobiles/Monsters/Plant/Magic/Reaper.cs index ce16242dc..66dc20fe8 100644 --- a/Projects/UOContent/Mobiles/Monsters/Plant/Magic/Reaper.cs +++ b/Projects/UOContent/Mobiles/Monsters/Plant/Magic/Reaper.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Reaper : BaseCreature { [Constructible] - public Reaper() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Reaper() : base(AIType.AI_Mage) { Body = 47; BaseSoundID = 442; diff --git a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/BogThing.cs b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/BogThing.cs index 8f7528997..5a05f47f6 100644 --- a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/BogThing.cs +++ b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/BogThing.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class BogThing : BaseCreature { [Constructible] - public BogThing() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.6, 1.2) + public BogThing() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.3, 0.6) { Body = 780; diff --git a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Bogling.cs b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Bogling.cs index acfc3cfae..f736e7563 100644 --- a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Bogling.cs +++ b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Bogling.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class Bogling : BaseCreature { [Constructible] - public Bogling() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Bogling() : base(AIType.AI_Melee) { Body = 779; BaseSoundID = 422; diff --git a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Corpser.cs b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Corpser.cs index 16917fa89..5fa465692 100644 --- a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Corpser.cs +++ b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Corpser.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Corpser : BaseCreature { [Constructible] - public Corpser() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Corpser() : base(AIType.AI_Melee) { Body = 8; BaseSoundID = 684; diff --git a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Quagmire.cs b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Quagmire.cs index 851e8789d..b551b7d3f 100644 --- a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Quagmire.cs +++ b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/Quagmire.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Quagmire : BaseCreature { [Constructible] - public Quagmire() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8) + public Quagmire() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.3, 0.6) { Body = 789; BaseSoundID = 352; diff --git a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs index 119bc2aa8..8f9b68779 100644 --- a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs +++ b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/SwampTentacle.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SwampTentacle : BaseCreature { [Constructible] - public SwampTentacle() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SwampTentacle() : base(AIType.AI_Melee) { Body = 66; BaseSoundID = 352; diff --git a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/WhippingVine.cs b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/WhippingVine.cs index fe57af0ba..8fdf40f0d 100644 --- a/Projects/UOContent/Mobiles/Monsters/Plant/Melee/WhippingVine.cs +++ b/Projects/UOContent/Mobiles/Monsters/Plant/Melee/WhippingVine.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class WhippingVine : BaseCreature { [Constructible] - public WhippingVine() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public WhippingVine() : base(AIType.AI_Melee) { Body = 8; Hue = 0x851; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs index 092ce3d13..d98ed9fb7 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class AncientWyrm : BaseCreature { [Constructible] - public AncientWyrm() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public AncientWyrm() : base(AIType.AI_Mage) { Body = 46; BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs index f96df532b..6d4d2dc50 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class DeepSeaSerpent : BaseCreature { [Constructible] - public DeepSeaSerpent() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public DeepSeaSerpent() : base(AIType.AI_Mage) { Body = 150; BaseSoundID = 447; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Dragon.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Dragon.cs index cfdd61f66..9847941cc 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Dragon.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Dragon.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Dragon : BaseCreature { [Constructible] - public Dragon() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Dragon() : base(AIType.AI_Mage) { Body = Utility.RandomList(12, 59); BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Leviathan.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Leviathan.cs index a66b989df..272b8a85c 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Leviathan.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/Leviathan.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class Leviathan : BaseCreature { [Constructible] - public Leviathan(Mobile fisher = null) : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Leviathan(Mobile fisher = null) : base(AIType.AI_Mage) { Fisher = fisher; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs index aee35bbdf..783d73265 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles }; [Constructible] - public OphidianArchmage() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public OphidianArchmage() : base(AIType.AI_Mage) { Name = m_Names.RandomElement(); Body = 85; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs index ddbe1ad58..e1964962e 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles }; [Constructible] - public OphidianMage() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public OphidianMage() : base(AIType.AI_Mage) { Name = m_Names.RandomElement(); Body = 85; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs index 4847acc1d..3da099941 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class OphidianMatriarch : BaseCreature { [Constructible] - public OphidianMatriarch() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public OphidianMatriarch() : base(AIType.AI_Mage) { Body = 87; BaseSoundID = 644; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs index e142dfb0b..8fe8eca12 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class SeaSerpent : BaseCreature { [Constructible] - public SeaSerpent() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SeaSerpent() : base(AIType.AI_Mage) { Body = 150; BaseSoundID = 447; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs index 16e103d6f..0da6c0d54 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class SerpentineDragon : BaseCreature { [Constructible] - public SerpentineDragon() : base(AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public SerpentineDragon() : base(AIType.AI_Mage, FightMode.Evil) { Body = 103; BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs index 3043112b4..dae5c0e0b 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class ShadowWyrm : BaseCreature { [Constructible] - public ShadowWyrm() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public ShadowWyrm() : base(AIType.AI_Mage) { Body = 106; BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs index 1ca9c3303..646aafd59 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SkeletalDragon : BaseCreature { [Constructible] - public SkeletalDragon() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SkeletalDragon() : base(AIType.AI_Mage) { Body = 104; BaseSoundID = 0x488; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs index a3bb53046..37524dbe6 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class WhiteWyrm : BaseCreature { [Constructible] - public WhiteWyrm() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public WhiteWyrm() : base(AIType.AI_Mage) { Body = Utility.RandomBool() ? 180 : 49; BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Drake.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Drake.cs index 2b4af117b..ff14ed9c0 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Drake.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Drake.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Drake : BaseCreature { [Constructible] - public Drake() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Drake() : base(AIType.AI_Melee) { Body = Utility.RandomList(60, 61); BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Harpy.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Harpy.cs index fe6ca4a7d..c3c490f84 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Harpy.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Harpy.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class Harpy : BaseCreature { [Constructible] - public Harpy() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Harpy() : base(AIType.AI_Melee) { Body = 30; BaseSoundID = 402; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Kraken.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Kraken.cs index 119930286..19f3281a2 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Kraken.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Kraken.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Kraken : BaseCreature { [Constructible] - public Kraken() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Kraken() : base(AIType.AI_Melee) { Body = 77; BaseSoundID = 353; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Lizardman.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Lizardman.cs index 7b79bf063..b8fd3ee4f 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Lizardman.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Lizardman.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Lizardman : BaseCreature { [Constructible] - public Lizardman() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Lizardman() : base(AIType.AI_Melee) { Name = NameList.RandomName("lizardman"); Body = Utility.RandomList(35, 36); diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs index f530a516e..90a1b36e9 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles }; [Constructible] - public OphidianKnight() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public OphidianKnight() : base(AIType.AI_Melee) { Name = m_Names.RandomElement(); Body = 86; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs index 5a76ecb86..afce1e001 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles }; [Constructible] - public OphidianWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public OphidianWarrior() : base(AIType.AI_Melee) { Name = m_Names.RandomElement(); Body = 86; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Scorpion.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Scorpion.cs index 14db2e1e6..c3d172d7b 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Scorpion.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Scorpion.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Scorpion : BaseCreature { [Constructible] - public Scorpion() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Scorpion() : base(AIType.AI_Melee) { Body = 48; BaseSoundID = 397; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs index 3af776b96..39861b586 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class StoneHarpy : BaseCreature { [Constructible] - public StoneHarpy() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public StoneHarpy() : base(AIType.AI_Melee) { Body = 73; BaseSoundID = 402; diff --git a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Wyvern.cs b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Wyvern.cs index 25cb30493..36361e746 100644 --- a/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Wyvern.cs +++ b/Projects/UOContent/Mobiles/Monsters/Reptile/Melee/Wyvern.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Wyvern : BaseCreature { [Constructible] - public Wyvern() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Wyvern() : base(AIType.AI_Melee) { Body = 62; BaseSoundID = 362; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs b/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs index a4d405e88..0bc626613 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles private TimerExecutionToken _disguiseTimerToken; [Constructible] - public BakeKitsune() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public BakeKitsune() : base(AIType.AI_Mage) { Body = 246; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/DeathWatchBeetle.cs b/Projects/UOContent/Mobiles/Monsters/SE/DeathWatchBeetle.cs index 90d36b4fc..37b92ee25 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/DeathWatchBeetle.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/DeathWatchBeetle.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class DeathwatchBeetle : BaseCreature { [Constructible] - public DeathwatchBeetle() : base(AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest, 10, 1, 0.2, 0.4) + public DeathwatchBeetle() : base(AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest) { Body = 242; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/EliteNinja.cs b/Projects/UOContent/Mobiles/Monsters/SE/EliteNinja.cs index dc87d356d..8d21aa003 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/EliteNinja.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/EliteNinja.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class EliteNinja : BaseCreature { [Constructible] - public EliteNinja() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public EliteNinja() : base(AIType.AI_Melee) { SpeechHue = Utility.RandomDyedHue(); Hue = Race.Human.RandomSkinHue(); diff --git a/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs b/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs index 49b738f19..637af3571 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private static readonly HashSet m_Table = new(); [Constructible] - public FanDancer() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public FanDancer() : base(AIType.AI_Melee) { Body = 247; BaseSoundID = 0x372; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/FireBeetle.cs b/Projects/UOContent/Mobiles/Monsters/SE/FireBeetle.cs index 9e24b2336..b6ea95b88 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/FireBeetle.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/FireBeetle.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class FireBeetle : BaseMount { [Constructible] - public FireBeetle() : base("a fire beetle", 0xA9, 0x3E95, AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public FireBeetle() : base("a fire beetle", 0xA9, 0x3E95, AIType.AI_Melee, FightMode.Closest, 10, 1) { SetStr(300); SetDex(100); diff --git a/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs b/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs index 5abb5deb5..f10e68ba1 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private static readonly Dictionary m_Table = new(); [Constructible] - public Kappa() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Kappa() : base(AIType.AI_Melee) { Body = 240; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs b/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs index 05ebec43e..2eacb266b 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles [Constructible] public KazeKemono() - : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Mage) { Body = 196; BaseSoundID = 655; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs b/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs index cd3af17f3..17881e488 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs @@ -11,7 +11,7 @@ namespace Server.Mobiles [Constructible] public LadyOfTheSnow() - : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Mage) { Body = 252; BaseSoundID = 0x482; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/Oni.cs b/Projects/UOContent/Mobiles/Monsters/SE/Oni.cs index a75708399..fa5c6a6bc 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/Oni.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/Oni.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Oni : BaseCreature { [Constructible] - public Oni() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public Oni() : base(AIType.AI_Mage) { Body = 241; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs b/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs index b0d92e70c..73019d70c 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles private static readonly HashSet m_Table = new(); [Constructible] - public RaiJu() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public RaiJu() : base(AIType.AI_Melee) { Body = 199; BaseSoundID = 0x346; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/RevenantLion.cs b/Projects/UOContent/Mobiles/Monsters/SE/RevenantLion.cs index 50e336676..52da6b4dc 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/RevenantLion.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/RevenantLion.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class RevenantLion : BaseCreature { [Constructible] - public RevenantLion() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public RevenantLion() : base(AIType.AI_Mage) { Body = 251; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/Ronin.cs b/Projects/UOContent/Mobiles/Monsters/SE/Ronin.cs index b7c8e51b6..91ca622e6 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/Ronin.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/Ronin.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Ronin : BaseCreature { [Constructible] - public Ronin() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Ronin() : base(AIType.AI_Melee) { SpeechHue = Utility.RandomDyedHue(); Hue = Race.Human.RandomSkinHue(); diff --git a/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs b/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs index b705c518f..8825b753d 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private static readonly Dictionary m_Table = new(); [Constructible] - public RuneBeetle() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public RuneBeetle() : base(AIType.AI_Mage) { Body = 244; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs b/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs index 54ed25ea7..8a389b035 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs @@ -11,7 +11,7 @@ namespace Server.Mobiles [Constructible] public TsukiWolf() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 250; Hue = Utility.Random(3) == 0 ? Utility.RandomNeutralHue() : 0; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/Yamandon.cs b/Projects/UOContent/Mobiles/Monsters/SE/Yamandon.cs index 7e7856efb..b475c769c 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/Yamandon.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/Yamandon.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class Yamandon : BaseCreature { [Constructible] - public Yamandon() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public Yamandon() : base(AIType.AI_Melee) { Body = 249; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/YomotsuElder.cs b/Projects/UOContent/Mobiles/Monsters/SE/YomotsuElder.cs index b323bbb82..4a6a2e4c6 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/YomotsuElder.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/YomotsuElder.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class YomotsuElder : BaseCreature { [Constructible] - public YomotsuElder() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public YomotsuElder() : base(AIType.AI_Melee) { Body = 255; BaseSoundID = 0x452; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/YomotsuPriest.cs b/Projects/UOContent/Mobiles/Monsters/SE/YomotsuPriest.cs index e443a15a4..00dd628c6 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/YomotsuPriest.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/YomotsuPriest.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class YomotsuPriest : BaseCreature { [Constructible] - public YomotsuPriest() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public YomotsuPriest() : base(AIType.AI_Mage) { Body = 253; BaseSoundID = 0x452; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/YomotsuWarrior.cs b/Projects/UOContent/Mobiles/Monsters/SE/YomotsuWarrior.cs index b4bcac395..22973b4aa 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/YomotsuWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/YomotsuWarrior.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class YomotsuWarrior : BaseCreature { [Constructible] - public YomotsuWarrior() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public YomotsuWarrior() : base(AIType.AI_Melee) { Body = 245; BaseSoundID = 0x452; diff --git a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedAirElemental.cs b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedAirElemental.cs index bc733ae92..d430af376 100644 --- a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedAirElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedAirElemental.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SummonedAirElemental : BaseCreature { [Constructible] - public SummonedAirElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SummonedAirElemental() : base(AIType.AI_Mage) { Body = 13; Hue = 0x4001; diff --git a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedDaemon.cs b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedDaemon.cs index 776d5dba8..0f4bbcbd3 100644 --- a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedDaemon.cs +++ b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedDaemon.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SummonedDaemon : BaseCreature { [Constructible] - public SummonedDaemon() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SummonedDaemon() : base(AIType.AI_Mage) { Name = NameList.RandomName("daemon"); Body = Core.AOS ? 10 : 9; diff --git a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedEarthElemental.cs b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedEarthElemental.cs index b7d499ed7..d1fd54a2b 100644 --- a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedEarthElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedEarthElemental.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SummonedEarthElemental : BaseCreature { [Constructible] - public SummonedEarthElemental() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public SummonedEarthElemental() : base(AIType.AI_Melee) { Body = 14; BaseSoundID = 268; diff --git a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedFireElemental.cs b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedFireElemental.cs index e76e2a472..19d8f5662 100644 --- a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedFireElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedFireElemental.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class SummonedFireElemental : BaseCreature { [Constructible] - public SummonedFireElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SummonedFireElemental() : base(AIType.AI_Mage) { Body = 15; BaseSoundID = 838; diff --git a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedWaterElemental.cs b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedWaterElemental.cs index 1228bb03d..1a08bedd0 100644 --- a/Projects/UOContent/Mobiles/Monsters/Summons/SummonedWaterElemental.cs +++ b/Projects/UOContent/Mobiles/Monsters/Summons/SummonedWaterElemental.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class SummonedWaterElemental : BaseCreature { [Constructible] - public SummonedWaterElemental() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public SummonedWaterElemental() : base(AIType.AI_Mage) { Body = 16; BaseSoundID = 278; diff --git a/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs b/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs index 85eaaaba4..a978383c2 100644 --- a/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs +++ b/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public abstract class BaseShieldGuard : BaseCreature { - public BaseShieldGuard() : base(AIType.AI_Melee, FightMode.Aggressor, 14, 1, 0.8, 1.6) + public BaseShieldGuard() : base(AIType.AI_Melee, FightMode.Aggressor, 14) { InitStats(1000, 1000, 1000); Title = "the guard"; diff --git a/Projects/UOContent/Mobiles/Special/DarkGuardian.cs b/Projects/UOContent/Mobiles/Special/DarkGuardian.cs index 2e6bbeca2..6f2326973 100644 --- a/Projects/UOContent/Mobiles/Special/DarkGuardian.cs +++ b/Projects/UOContent/Mobiles/Special/DarkGuardian.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class DarkGuardian : BaseCreature { [Constructible] - public DarkGuardian() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public DarkGuardian() : base(AIType.AI_Mage) { Body = 78; BaseSoundID = 0x3E9; diff --git a/Projects/UOContent/Mobiles/Special/Harrower.cs b/Projects/UOContent/Mobiles/Special/Harrower.cs index 967f2fb3a..cd6ba03c9 100644 --- a/Projects/UOContent/Mobiles/Special/Harrower.cs +++ b/Projects/UOContent/Mobiles/Special/Harrower.cs @@ -48,7 +48,7 @@ namespace Server.Mobiles private bool m_TrueForm; [Constructible] - public Harrower() : base(AIType.AI_Mage, FightMode.Closest, 18, 1, 0.2, 0.4) + public Harrower() : base(AIType.AI_Mage, FightMode.Closest, 18) { Instances.Add(this); Body = 146; diff --git a/Projects/UOContent/Mobiles/Special/HarrowerTentacles.cs b/Projects/UOContent/Mobiles/Special/HarrowerTentacles.cs index d0521bb08..eb98639d4 100644 --- a/Projects/UOContent/Mobiles/Special/HarrowerTentacles.cs +++ b/Projects/UOContent/Mobiles/Special/HarrowerTentacles.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles private DrainTimer m_Timer; [Constructible] - public HarrowerTentacles(Mobile harrower = null) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + public HarrowerTentacles(Mobile harrower = null) : base(AIType.AI_Melee) { Harrower = harrower; Body = 129; diff --git a/Projects/UOContent/Mobiles/Special/ServantOfSemidar.cs b/Projects/UOContent/Mobiles/Special/ServantOfSemidar.cs index d7cd010ba..8aec98cf3 100644 --- a/Projects/UOContent/Mobiles/Special/ServantOfSemidar.cs +++ b/Projects/UOContent/Mobiles/Special/ServantOfSemidar.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class ServantOfSemidar : BaseCreature { [Constructible] - public ServantOfSemidar() : base(AIType.AI_Melee, FightMode.None, 10, 1, 0.2, 0.4) => Body = 0x26; + public ServantOfSemidar() : base(AIType.AI_Melee, FightMode.None) => Body = 0x26; public ServantOfSemidar(Serial serial) : base(serial) { diff --git a/Projects/UOContent/Mobiles/Townfolk/Actor.cs b/Projects/UOContent/Mobiles/Townfolk/Actor.cs index 60feea63f..6b0352779 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Actor.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Actor.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Actor : BaseCreature { [Constructible] - public Actor() : base(AIType.AI_Animal, FightMode.None, 10, 1, 0.2, 0.4) + public Actor() : base(AIType.AI_Animal, FightMode.None) { InitStats(31, 41, 51); diff --git a/Projects/UOContent/Mobiles/Townfolk/Artist.cs b/Projects/UOContent/Mobiles/Townfolk/Artist.cs index 2945fa96b..dd72595c9 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Artist.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Artist.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public Artist() - : base(AIType.AI_Animal, FightMode.None, 10, 1, 0.2, 0.4) + : base(AIType.AI_Animal, FightMode.None) { InitStats(31, 41, 51); diff --git a/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs b/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs index ca5ee2ed6..ff01a3247 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public Gypsy() - : base(AIType.AI_Animal, FightMode.None, 10, 1, 0.2, 0.4) + : base(AIType.AI_Animal, FightMode.None) { InitStats(31, 41, 51); diff --git a/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs b/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs index 2d03f6099..b3c9eea4b 100644 --- a/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs +++ b/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public HarborMaster() - : base(AIType.AI_Animal, FightMode.None, 10, 1, 0.2, 0.4) + : base(AIType.AI_Animal, FightMode.None) { InitStats(31, 41, 51); diff --git a/Projects/UOContent/Mobiles/Townfolk/Ninja.cs b/Projects/UOContent/Mobiles/Townfolk/Ninja.cs index 91f4e0667..d7ff674a3 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Ninja.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Ninja.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Ninja : BaseCreature { [Constructible] - public Ninja() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Ninja() : base(AIType.AI_Melee, FightMode.Aggressor) { Title = "the ninja"; diff --git a/Projects/UOContent/Mobiles/Townfolk/Samurai.cs b/Projects/UOContent/Mobiles/Townfolk/Samurai.cs index 86d28bae2..3f4022367 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Samurai.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Samurai.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles public class Samurai : BaseCreature { [Constructible] - public Samurai() : base(AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4) + public Samurai() : base(AIType.AI_Melee, FightMode.Aggressor) { Title = "the samurai"; diff --git a/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs b/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs index 00b6de015..26034b762 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public Sculptor() - : base(AIType.AI_Animal, FightMode.None, 10, 1, 0.2, 0.4) + : base(AIType.AI_Animal, FightMode.None) { InitStats(31, 41, 51); diff --git a/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs b/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs index 4444a19c0..896d01456 100644 --- a/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs +++ b/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs @@ -128,7 +128,7 @@ namespace Server.Mobiles { private Mobile m_Caster; - public Clone(Mobile caster) : base(AIType.AI_Melee, FightMode.None, 10, 1, 0.2, 0.4) + public Clone(Mobile caster) : base(AIType.AI_Melee, FightMode.None) { m_Caster = caster; diff --git a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs index d93e03c44..3f1defbde 100644 --- a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs +++ b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class ArcaneFey : BaseCreature { [Constructible] - public ArcaneFey() : base(AIType.AI_Mage, FightMode.Evil, 10, 1, 0.2, 0.4) + public ArcaneFey() : base(AIType.AI_Mage, FightMode.Evil) { Name = NameList.RandomName("pixie"); Body = 128; diff --git a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs index 3b44cca14..6041979af 100644 --- a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs +++ b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class ArcaneFiend : BaseCreature { [Constructible] - public ArcaneFiend() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) + public ArcaneFiend() : base(AIType.AI_Mage) { Body = 74; BaseSoundID = 422; diff --git a/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs b/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs index 0c0d7f7ac..effcf7802 100644 --- a/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs +++ b/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { [Constructible] public NatureFury() - : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) + : base(AIType.AI_Melee) { Body = 0x33; Hue = 0x4001; diff --git a/version.json b/version.json index dd101024d..f1698afbc 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.8.3" + "version": "0.9.0" }