Fixed appearance bugs. Fixed a lua arg bug.

-Due to using ordinals instead of keys, the NPC voices were set wrong. This is fixed now, as all appearance loading from the DB uses keys now.
-Fixed hairVariation not loading for lobby/map server.
-Fixed a lua arg bug.
This commit is contained in:
Filip Maj 2020-03-13 23:14:24 -04:00
parent 99c8aff702
commit eecb5ac8a1
7 changed files with 93 additions and 58 deletions

View file

@ -175,7 +175,7 @@ namespace Meteor.Lobby.DataObjects
var bitfield = PrimitiveConversion.ToUInt32(faceInfo);
writer.Write((UInt32)bitfield); //FACE, Figure this out!
uint hairVal = appearance.hairHighlightColor | (uint)(appearance.hairStyle << 10) | (uint)(appearance.characteristicsColor << 20);
uint hairVal = appearance.hairHighlightColor | (uint)(appearance.hairVariation << 5) | (uint)(appearance.hairStyle << 10);
writer.Write((UInt32)hairVal);
writer.Write((UInt32)appearance.voice);
writer.Write((UInt32)appearance.mainHand);
@ -194,14 +194,11 @@ namespace Meteor.Lobby.DataObjects
writer.Write((UInt32)appearance.feet);
writer.Write((UInt32)appearance.waist);
writer.Write((UInt32)0);
writer.Write((UInt32)appearance.neck);
writer.Write((UInt32)appearance.rightEar);
writer.Write((UInt32)appearance.leftEar);
writer.Write((UInt32)0);
writer.Write((UInt32)0);
writer.Write((UInt32)appearance.rightIndex);
writer.Write((UInt32)appearance.leftIndex);
writer.Write((UInt32)appearance.rightFinger);
writer.Write((UInt32)appearance.leftFinger);