diff --git a/Distribution/Data/npc-speeds.json b/Distribution/Data/npc-speeds.json index b2b376d92..ea3146211 100644 --- a/Distribution/Data/npc-speeds.json +++ b/Distribution/Data/npc-speeds.json @@ -2,7 +2,7 @@ { "name": "Slow", "active": 0.6, - "passive": 1.2, + "passive": 1.4, "types": [ "AntLion", "ArcticOgreLord", "BogThing", "Bogle", "BoneKnight", "EarthElemental", @@ -14,13 +14,14 @@ "SewerRat", "Skeleton", "Slime", "Zombie", "Walrus", "RestlessSoul", "CrystalElemental", "DarknightCreeper", "MoundOfMaggots", - "Juggernaut", "Yamandon", "Serado" + "Juggernaut", "Yamandon", "Serado", + "GreaterDragon", "PlagueBeastLord" ] }, { "name": "Fast", - "active": 0.4, - "passive": 0.8, + "active": 0.3, + "passive": 1.0, "types": [ "LordOaks", "Silvani", "AirElemental", "AncientWyrm", "Balron", "BladeSpirits", @@ -39,12 +40,18 @@ "Grobu", "Gnaw", "Guile", "Irk", "Spite", "LadyLissith", "LadySabrix", "Malefic", "Silk", - "Virulent", "SeaHorse" + "Virulent", "SeaHorse", "UnholyFamiliar", + "HolyFamiliar", "GiantIceWorm", "Phoenix", + "Succubus", "EnragedRabbit", "EnragedHind", + "EnragedHart", "EnragedBlackBear", "EnragedEagle", + "RagingGrizzlyBear", "CorrosiveSlime", "DarkWisp", + "DarkGuardian", "HarrowerTentacles", "ServantOfSemidar", + "Ninja", "Samurai" ] }, { "name": "Very Fast", - "active": 0.35, + "active": 0.25, "passive": 0.7, "types": [ "Barracoon", "Mephitis", "Neira", @@ -61,7 +68,7 @@ { "name": "Medium", "active": 0.5, - "passive": 1.0, + "passive": 1.2, "types": [ "AcidElemental", "AgapiteElemental", "Alligator", "AncientLich", "Betrayer", "Bird", @@ -133,7 +140,9 @@ "Kappa", "KazeKemono", "DeathwatchBeetle", "TsukiWolf", "YomotsuElder", "YomotsuPriest", "YomotsuWarrior", "RevenantLion", "Oni", - "Gaman", "Crane", "Beetle" + "Gaman", "Crane", "Beetle", + "Parrot", "ElfBrigand", "GreaterMongbat", + "AnimatedWeapon", "Reaper", "Corpser" ] } ] diff --git a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs index e0ee6d231..2b05632e9 100644 --- a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs +++ b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs @@ -5,8 +5,7 @@ namespace Server.Mobiles public class UnholyFamiliar : BaseCreature { [Constructible] - public UnholyFamiliar() - : base(AIType.AI_Melee) + public UnholyFamiliar() : base(AIType.AI_Melee) { Body = 99; BaseSoundID = 0xE5; diff --git a/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs index 5b59ecb6f..ebabde5c0 100644 --- a/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs +++ b/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs @@ -37,6 +37,7 @@ namespace Server.Factions public BaseFactionGuard(string title) : base(AIType.AI_Melee) { + SetSpeed(0.3, 1.0); Orders = new Orders(this); Title = title; diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs index a01569975..6164a70f0 100644 --- a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs +++ b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs @@ -13,6 +13,7 @@ namespace Server.Engines.Quests.Necro { m_Necromancer = necromancer; + SetSpeed(0.3, 1.0); InitStats(45, 30, 5); Title = "the Paladin"; 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 d4e24e217..69d17d058 100644 --- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs +++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Mobiles/Henchman.cs @@ -8,6 +8,7 @@ namespace Server.Engines.Quests.Ninja [Constructible] public Henchman() : base(AIType.AI_Melee, FightMode.Aggressor) { + SetSpeed(0.3, 1.0); InitStats(45, 30, 5); Hue = Race.Human.RandomSkinHue(); 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 151f85901..4e9e4b2d2 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/CursedSoul.cs @@ -11,6 +11,7 @@ namespace Server.Engines.Quests.Samurai Body = 3; BaseSoundID = 471; + SetSpeed(0.3, 1.0); SetStr(20, 40); SetDex(40, 60); SetInt(15, 25); 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 7d9085567..abfcf594b 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DeadlyImp.cs @@ -11,6 +11,7 @@ namespace Server.Engines.Quests.Samurai BaseSoundID = 422; Hue = 0x66A; + SetSpeed(0.3, 1.0); SetStr(91, 115); SetDex(61, 80); SetInt(86, 105); 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 c73bbc558..6b47e683d 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/DiseasedCat.cs @@ -11,6 +11,7 @@ namespace Server.Engines.Quests.Samurai Hue = Utility.RandomAnimalHue(); BaseSoundID = 0x69; + SetSpeed(0.3, 1.0); SetStr(9); SetDex(35); SetInt(5); 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 914aec85e..010514878 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs @@ -10,6 +10,7 @@ namespace Server.Engines.Quests.Samurai Body = 103; BaseSoundID = 362; + SetSpeed(0.3, 1.0); SetStr(6000, 6020); SetDex(0); SetInt(850, 870); 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 fd7ab7078..484342255 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs @@ -12,6 +12,7 @@ namespace Server.Engines.Quests.Samurai Hue = Utility.RandomAnimalHue(); + SetSpeed(0.3, 1.0); SetStr(10, 20); SetDex(45, 65); SetInt(10, 15); 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 f3b63e1b2..51d97861a 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungNinja.cs @@ -8,6 +8,7 @@ namespace Server.Engines.Quests.Samurai [Constructible] public YoungNinja() : base(AIType.AI_Melee, FightMode.Aggressor) { + SetSpeed(0.3, 1.0); 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 c2f1aed70..29644ffbd 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/YoungRonin.cs @@ -8,6 +8,7 @@ namespace Server.Engines.Quests.Samurai [Constructible] public YoungRonin() : base(AIType.AI_Melee, FightMode.Aggressor) { + SetSpeed(0.3, 1.0); 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 34b3947a6..505add3d7 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs @@ -11,6 +11,7 @@ namespace Server.Engines.Quests.Haven [Constructible] public MilitiaFighter() : base(AIType.AI_Melee) { + SetSpeed(0.3, 1.0); 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 a1cc80e8b..c66f1ccf2 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs @@ -275,9 +275,9 @@ namespace Server.Engines.Events private readonly Mobile m_From; - public NaughtyTwin(Mobile from) - : base(AIType.AI_Melee, FightMode.None) + public NaughtyTwin(Mobile from) : base(AIType.AI_Melee, FightMode.None) { + SetSpeed(0.3, 1.0); if (TrickOrTreat.CheckMobile(from)) { Body = from.Body; diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs b/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs index cf1e2ad43..c24d2572f 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs @@ -145,8 +145,7 @@ namespace Server.Engines.Events public partial class PlayerBones : BaseContainer { [Constructible] - public PlayerBones(string name) - : base(Utility.RandomMinMax(0x0ECA, 0x0ED2)) + public PlayerBones(string name) : base(Utility.RandomMinMax(0x0ECA, 0x0ED2)) { Name = $"{name}'s bones"; @@ -168,14 +167,14 @@ 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) + public ZombieSkeleton(PlayerMobile player = null) : base(AIType.AI_Melee) { _deadPlayer = player; Body = 0x93; BaseSoundID = 0x1c3; + SetSpeed(0.3, 1.0); SetStr(500); SetDex(500); SetInt(500); diff --git a/Projects/UOContent/Items/Talismans/TalismanSummons.cs b/Projects/UOContent/Items/Talismans/TalismanSummons.cs index 262334eb7..4f8a4ddf9 100644 --- a/Projects/UOContent/Items/Talismans/TalismanSummons.cs +++ b/Projects/UOContent/Items/Talismans/TalismanSummons.cs @@ -11,6 +11,7 @@ namespace Server.Mobiles public BaseTalismanSummon() : base(AIType.AI_Melee, FightMode.None) { + SetSpeed(0.3, 1.0); // TODO: Stats/skills } diff --git a/Projects/UOContent/Mobiles/BaseCreature.cs b/Projects/UOContent/Mobiles/BaseCreature.cs index 44ba6a520..a57f8443a 100644 --- a/Projects/UOContent/Mobiles/BaseCreature.cs +++ b/Projects/UOContent/Mobiles/BaseCreature.cs @@ -321,9 +321,6 @@ namespace Server.Mobiles FightMode mode = FightMode.Closest, int iRangePerception = 10, int iRangeFight = 1 - // , - // double activeSpeed = 0, - // double passiveSpeed = 0 ) { if (iRangePerception == OldRangePerception) @@ -341,16 +338,12 @@ namespace Server.Mobiles FightMode = mode; - // if (activeSpeed > 0 && passiveSpeed > 0) - // { - // ActiveSpeed = activeSpeed; - // PassiveSpeed = passiveSpeed; - // CurrentSpeed = passiveSpeed; - // } - // else - // { - // CurrentSpeed = SpeedInfo.MaxMonsterDelay * 2; - // } + if (LegacySpeedInfo.Enabled && LegacySpeedInfo.GetSpeeds(GetType(), out var activeSpeed, out var passiveSpeed)) + { + ActiveSpeed = activeSpeed; + PassiveSpeed = passiveSpeed; + CurrentSpeed = passiveSpeed; + } m_Team = 0; diff --git a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs index ac550132a..dba69c327 100644 --- a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs +++ b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs @@ -8,9 +8,9 @@ namespace Server.Mobiles { private bool m_LastHidden; - public BaseFamiliar() - : base(AIType.AI_Melee) + public BaseFamiliar() : base(AIType.AI_Melee) { + SetSpeed(0.1, 0.1); } public BaseFamiliar(Serial serial) : base(serial) diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs index 26eeb161c..f55806873 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles Body = 0x190; Hue = Race.Human.RandomSkinHue(); - SetSpeed(0.25, 0.55); + SetSpeed(0.25, 1.0); SetStr(176, 225); SetDex(81, 95); diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs index fea4c1383..331056eb8 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles Body = 0x190; Hue = Race.Human.RandomSkinHue(); - SetSpeed(0.25, 0.55); + SetSpeed(0.25, 1.0); SetStr(276, 350); SetDex(66, 90); diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs index cb3996be4..2a09bf7b9 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs @@ -150,29 +150,18 @@ namespace Server.Mobiles public class BaseEnraged : BaseCreature { - public BaseEnraged(Mobile summoner) - : base(AIType.AI_Melee) + public BaseEnraged(Mobile summoner) : base(AIType.AI_Melee) { SetStr(50, 200); SetDex(50, 200); - SetHits(50, 200); - SetStam(50, 200); /* - On OSI, all stats are random 50-200, but - str is never less than hits, and dex is never - less than stam. + * On OSI, all stats are random 50-200, but + * str is never less than hits, and dex is never + * less than stam. */ - - if (Str < Hits) - { - Str = Hits; - } - - if (Dex < Stam) - { - Dex = Stam; - } + SetHits(50, Str); + SetStam(50, Dex); Karma = -1000; Tamable = false; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs index 413886152..9441427ae 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Ferret.cs @@ -19,6 +19,7 @@ namespace Server.Mobiles { Body = 0x117; + SetSpeed(0.3, 1.0); SetStr(41, 48); SetDex(55); SetInt(75); diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs b/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs index d02acc83e..e2d67ddca 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs @@ -8,6 +8,7 @@ namespace Server.Mobiles Body = 212; BaseSoundID = 0xA3; + SetSpeed(0.3, 1.0); SetStr(1251, 1550); SetDex(801, 1050); SetInt(151, 400); diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs index 1749f7d73..3ca9ff581 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Animal/Squirrel.cs @@ -7,6 +7,7 @@ namespace Server.Mobiles { Body = 0x116; + SetSpeed(0.3, 1.0); SetStr(44, 50); SetDex(35); SetInt(5); diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs b/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs index b4b5e06f9..a9c563b0b 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs @@ -5,8 +5,7 @@ namespace Server.Mobiles public class Hydra : BaseCreature { [Constructible] - public Hydra() - : base(AIType.AI_Melee) + public Hydra() : base(AIType.AI_Melee) { Body = 0x109; BaseSoundID = 0x16A; diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs index 710c5420c..0f88661c9 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles { Body = 574; - SetSpeed(0.6, 1.25); + SetSpeed(0.5, 1.2); SetStr(150); SetDex(150); SetInt(100); diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs index ae7a1517b..f081cedff 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs @@ -6,8 +6,7 @@ namespace Server.Mobiles public class EnergyVortex : BaseCreature { [Constructible] - public EnergyVortex() - : base(AIType.AI_Melee) + public EnergyVortex() : 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/SE/KazeKemono.cs b/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs index 2eacb266b..d4810186c 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs @@ -7,12 +7,10 @@ namespace Server.Mobiles { private static readonly Dictionary m_FlurryOfTwigsTable = new(); - private static readonly Dictionary m_ChlorophylBlastTable = - new(); + private static readonly Dictionary m_ChlorophylBlastTable = new(); [Constructible] - public KazeKemono() - : base(AIType.AI_Mage) + public KazeKemono() : 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 17881e488..46d841731 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs @@ -10,8 +10,7 @@ namespace Server.Mobiles private static readonly Dictionary m_Table = new(); [Constructible] - public LadyOfTheSnow() - : base(AIType.AI_Mage) + public LadyOfTheSnow() : base(AIType.AI_Mage) { Body = 252; BaseSoundID = 0x482; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs b/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs index 8a389b035..6ff33c378 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs @@ -10,8 +10,7 @@ namespace Server.Mobiles private static readonly Dictionary m_Table = new(); [Constructible] - public TsukiWolf() - : base(AIType.AI_Melee) + public TsukiWolf() : base(AIType.AI_Melee) { Body = 250; Hue = Utility.Random(3) == 0 ? Utility.RandomNeutralHue() : 0; diff --git a/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs b/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs index a978383c2..829cea481 100644 --- a/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs +++ b/Projects/UOContent/Mobiles/Special/BaseShieldGuard.cs @@ -7,6 +7,7 @@ namespace Server.Mobiles { public BaseShieldGuard() : base(AIType.AI_Melee, FightMode.Aggressor, 14) { + SetSpeed(0.5, 2.0); InitStats(1000, 1000, 1000); Title = "the guard"; diff --git a/Projects/UOContent/Mobiles/Townfolk/Actor.cs b/Projects/UOContent/Mobiles/Townfolk/Actor.cs index 6b0352779..38078b040 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Actor.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Actor.cs @@ -7,6 +7,7 @@ namespace Server.Mobiles [Constructible] public Actor() : base(AIType.AI_Animal, FightMode.None) { + SetSpeed(0.6, 1.2); InitStats(31, 41, 51); SpeechHue = Utility.RandomDyedHue(); diff --git a/Projects/UOContent/Mobiles/Townfolk/Artist.cs b/Projects/UOContent/Mobiles/Townfolk/Artist.cs index dd72595c9..4f6276882 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Artist.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Artist.cs @@ -5,9 +5,9 @@ namespace Server.Mobiles public class Artist : BaseCreature { [Constructible] - public Artist() - : base(AIType.AI_Animal, FightMode.None) + public Artist() : base(AIType.AI_Animal, FightMode.None) { + SetSpeed(0.6, 1.2); InitStats(31, 41, 51); SetSkill(SkillName.Healing, 36, 68); diff --git a/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs b/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs index ff01a3247..b6cc02447 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Gypsy.cs @@ -5,9 +5,9 @@ namespace Server.Mobiles public class Gypsy : BaseCreature { [Constructible] - public Gypsy() - : base(AIType.AI_Animal, FightMode.None) + public Gypsy() : base(AIType.AI_Animal, FightMode.None) { + SetSpeed(0.6, 1.2); InitStats(31, 41, 51); SpeechHue = Utility.RandomDyedHue(); diff --git a/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs b/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs index b3c9eea4b..50b2edd3f 100644 --- a/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs +++ b/Projects/UOContent/Mobiles/Townfolk/HarborMaster.cs @@ -5,9 +5,9 @@ namespace Server.Mobiles public class HarborMaster : BaseCreature { [Constructible] - public HarborMaster() - : base(AIType.AI_Animal, FightMode.None) + public HarborMaster() : base(AIType.AI_Animal, FightMode.None) { + SetSpeed(0.6, 1.2); InitStats(31, 41, 51); SetSkill(SkillName.Mining, 36, 68); diff --git a/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs b/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs index 26034b762..2ce527740 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Sculptor.cs @@ -5,9 +5,9 @@ namespace Server.Mobiles public class Sculptor : BaseCreature { [Constructible] - public Sculptor() - : base(AIType.AI_Animal, FightMode.None) + public Sculptor() : base(AIType.AI_Animal, FightMode.None) { + SetSpeed(0.6, 1.2); InitStats(31, 41, 51); SpeechHue = Utility.RandomDyedHue(); diff --git a/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs b/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs index 896d01456..ed4712940 100644 --- a/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs +++ b/Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs @@ -130,6 +130,7 @@ namespace Server.Mobiles public Clone(Mobile caster) : base(AIType.AI_Melee, FightMode.None) { + SetSpeed(0.3, 1.0); m_Caster = caster; Body = caster.Body; diff --git a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs index 3f1defbde..243dffd13 100644 --- a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs +++ b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFey.cs @@ -9,6 +9,7 @@ namespace Server.Mobiles Body = 128; BaseSoundID = 0x467; + SetSpeed(0.3, 1.0); SetStr(20); SetDex(150); SetInt(125); diff --git a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs index 6041979af..34300b5aa 100644 --- a/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs +++ b/Projects/UOContent/Spells/Spellweaving/Mobiles/ArcaneFiend.cs @@ -8,6 +8,7 @@ namespace Server.Mobiles Body = 74; BaseSoundID = 422; + SetSpeed(0.3, 1.0); SetStr(55); SetDex(40); SetInt(60); diff --git a/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs b/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs index effcf7802..61bad44b1 100644 --- a/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs +++ b/Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs @@ -5,12 +5,12 @@ namespace Server.Mobiles public class NatureFury : BaseCreature { [Constructible] - public NatureFury() - : base(AIType.AI_Melee) + public NatureFury() : base(AIType.AI_Melee) { Body = 0x33; Hue = 0x4001; + SetSpeed(0.3, 1.0); SetStr(150); SetDex(150); SetInt(100);