warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Fixes EvilMage/Lord spawning naked, without hair (#1755)

Browse source
This commit is contained in:
Bohica 2024-05-03 18:27:16 -07:00 • committed by GitHub
parent 4ea1d79cad
commit af67c48621
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 45 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs
View file

@ -11,7 +11,17 @@ namespace Server.Mobiles
{ {
Name = NameList.RandomName("evil mage"); Name = NameList.RandomName("evil mage");
Title = "the evil mage"; Title = "the evil mage";
Body = Core.UOR ? 124 : 0x190; if (Core.UOR)
{
Body = 124;
}
else
{
Body = 0x190;
Hue = Race.Human.RandomSkinHue();
Utility.AssignRandomHair(this);
Utility.AssignRandomFacialHair(this, HairHue);
}
SetStr(81, 105); SetStr(81, 105);
SetDex(91, 115); SetDex(91, 115);
@ -39,8 +49,9 @@ namespace Server.Mobiles
VirtualArmor = 16; VirtualArmor = 16;
PackReg(6); PackReg(6);
PackItem(new Robe(Utility.RandomNeutralHue()));
PackItem(new Sandals()); EquipItem(new Robe(Utility.RandomNeutralHue()));
EquipItem(new Sandals());
} }
public override string CorpseName => "an evil mage corpse"; public override string CorpseName => "an evil mage corpse";
@ -63,22 +74,20 @@ namespace Server.Mobiles
{ {
if (Body == 0x190) if (Body == 0x190)
{ {
Body = 124; Body = Utility.Random(125, 2);
} HairItemID = 0;
HairHue = 0;
if (Hue != 0) FacialHairItemID = 0;
{ FacialHairItemID = 0;
Hue = 0; Hue = 0;
} }
} }
else if (Body == 124) else if (Body.BodyID is 125 or 126)
{ {
Body = 0x190; Body = 0x190;
Hue = Race.Human.RandomSkinHue();
if (Hue == 0) Utility.AssignRandomHair(this);
{ Utility.AssignRandomFacialHair(this, HairHue);
Hue = Race.Human.RandomSkinHue();
}
} }
} }
} }

44
Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs
View file

@ -10,8 +10,17 @@ namespace Server.Mobiles
public EvilMageLord() : base(AIType.AI_Mage) public EvilMageLord() : base(AIType.AI_Mage)
{ {
Name = NameList.RandomName("evil mage lord"); Name = NameList.RandomName("evil mage lord");
Body = Core.UOR ? Utility.Random(125, 2) : 0x190; if (Core.UOR)
Hue = Core.UOR ? 0 : Race.Human.RandomSkinHue(); {
Body = Utility.Random(125, 2);
}
else
{
Body = 0x190;
Hue = Race.Human.RandomSkinHue();
Utility.AssignRandomHair(this);
Utility.AssignRandomFacialHair(this, HairHue);
}
SetStr(81, 105); SetStr(81, 105);
SetDex(191, 215); SetDex(191, 215);
@ -42,17 +51,10 @@ namespace Server.Mobiles
VirtualArmor = 16; VirtualArmor = 16;
PackReg(23); PackReg(23);
PackItem(new Robe(Utility.RandomMetalHue())); var hue = Utility.RandomNeutralHue();
PackItem(new WizardsHat(Utility.RandomMetalHue())); EquipItem(new Robe(hue));
EquipItem(new WizardsHat(hue));
if (Utility.RandomBool()) EquipItem(new Sandals());
{
PackItem(new Shoes());
}
else
{
PackItem(new Sandals());
}
} }
public override string CorpseName => "an evil mage lord corpse"; public override string CorpseName => "an evil mage lord corpse";
@ -77,21 +79,19 @@ namespace Server.Mobiles
if (Body == 0x190) if (Body == 0x190)
{ {
Body = Utility.Random(125, 2); Body = Utility.Random(125, 2);
} HairItemID = 0;
HairHue = 0;
if (Hue != 0) FacialHairItemID = 0;
{ FacialHairItemID = 0;
Hue = 0; Hue = 0;
} }
} }
else if (Body.BodyID is 125 or 126) else if (Body.BodyID is 125 or 126)
{ {
Body = 0x190; Body = 0x190;
Hue = Race.Human.RandomSkinHue();
if (Hue == 0) Utility.AssignRandomHair(this);
{ Utility.AssignRandomFacialHair(this, HairHue);
Hue = Race.Human.RandomSkinHue();
}
} }
} }
} }