cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed appearance bugs. Fixed a lua arg bug.

Browse Source 
-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
Download Patch File Download Diff File Expand all files Collapse all files

3
Lobby Server/DataObjects/Appearance.cs
View File

@@ -55,8 +55,11 @@ namespace Meteor.Lobby.DataObjects
public uint hands = 0;
public uint feet = 0;
public uint waist = 0;
public uint neck = 0;
public uint rightEar = 0;
public uint leftEar = 0;
public uint rightIndex = 0;
public uint leftIndex = 0;
public uint rightFinger = 0;
public uint leftFinger = 0;
//Chara Info

11
Lobby Server/DataObjects/CharaInfo.cs
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);

8
Lobby Server/Database.cs
View File

@@ -623,6 +623,7 @@ namespace Meteor.Lobby
hairStyle,
hairColor,
hairHighlightColor,
hairVariation,
eyeColor,
characteristics,
characteristicsColor,
@@ -642,6 +643,9 @@ namespace Meteor.Lobby
hands,
feet,
waist,
neck,
leftIndex,
rightIndex,
leftFinger,
rightFinger,
leftEar,
@@ -660,6 +664,7 @@ namespace Meteor.Lobby
appearance.hairStyle = reader.GetUInt16("hairStyle");
appearance.hairColor = reader.GetUInt16("hairColor");
appearance.hairHighlightColor = reader.GetUInt16("hairHighlightColor");
appearance.hairVariation = reader.GetUInt16("hairVariation");
appearance.eyeColor = reader.GetUInt16("eyeColor");
appearance.characteristics = reader.GetByte("characteristics");
appearance.characteristicsColor = reader.GetByte("characteristicsColor");
@@ -681,8 +686,11 @@ namespace Meteor.Lobby
appearance.hands = reader.GetUInt32("hands");
appearance.feet = reader.GetUInt32("feet");
appearance.waist = reader.GetUInt32("waist");
appearance.neck = reader.GetUInt32("neck");
appearance.leftFinger = reader.GetUInt32("leftFinger");
appearance.rightFinger = reader.GetUInt32("rightFinger");
appearance.leftIndex = reader.GetUInt32("leftIndex");
appearance.rightIndex = reader.GetUInt32("rightIndex");
appearance.leftEar = reader.GetUInt32("leftEar");
appearance.rightEar = reader.GetUInt32("rightEar");
}