diff --git a/FFXIVClassic Lobby Server/Database.cs b/FFXIVClassic Lobby Server/Database.cs index 97840e3d..b37b8efc 100644 --- a/FFXIVClassic Lobby Server/Database.cs +++ b/FFXIVClassic Lobby Server/Database.cs @@ -128,9 +128,9 @@ namespace FFXIVClassic_Lobby_Server WHERE userId=@userId AND id=@cid; INSERT INTO characters_appearance - (characterId, baseId, size, voice, skinColor, hairStyle, hairColor, hairHighlightColor, eyeColor, faceType, faceEyebrows, faceEyeShape, faceIrisSize, faceNose, faceMouth, faceFeatures, ears, characteristics, characteristicsColor, mainhand, offhand, head, body, hands, legs, feet, waist) + (characterId, baseId, size, voice, skinColor, hairStyle, hairColor, hairHighlightColor, hairVariation, eyeColor, faceType, faceEyebrows, faceEyeShape, faceIrisSize, faceNose, faceMouth, faceFeatures, ears, characteristics, characteristicsColor, mainhand, offhand, head, body, hands, legs, feet, waist) VALUES - (@cid, 4294967295, @size, @voice, @skinColor, @hairStyle, @hairColor, @hairHighlightColor, @eyeColor, @faceType, @faceEyebrows, @faceEyeShape, @faceIrisSize, @faceNose, @faceMouth, @faceFeatures, @ears, @characteristics, @characteristicsColor, @mainhand, @offhand, @head, @body, @hands, @legs, @feet, @waist) + (@cid, 4294967295, @size, @voice, @skinColor, @hairStyle, @hairColor, @hairHighlightColor, @hairVariation, @eyeColor, @faceType, @faceEyebrows, @faceEyeShape, @faceIrisSize, @faceNose, @faceMouth, @faceFeatures, @ears, @characteristics, @characteristicsColor, @mainhand, @offhand, @head, @body, @hands, @legs, @feet, @waist) "; cmd.Parameters.AddWithValue("@userId", accountId); cmd.Parameters.AddWithValue("@cid", cid); @@ -152,6 +152,7 @@ namespace FFXIVClassic_Lobby_Server cmd.Parameters.AddWithValue("@hairStyle", charaInfo.appearance.hairStyle); cmd.Parameters.AddWithValue("@hairColor", charaInfo.appearance.hairColor); cmd.Parameters.AddWithValue("@hairHighlightColor", charaInfo.appearance.hairHighlightColor); + cmd.Parameters.AddWithValue("@hairVariation", charaInfo.appearance.hairVariation); cmd.Parameters.AddWithValue("@eyeColor", charaInfo.appearance.eyeColor); cmd.Parameters.AddWithValue("@faceType", charaInfo.appearance.faceType); cmd.Parameters.AddWithValue("@faceEyebrows", charaInfo.appearance.faceEyebrows); diff --git a/FFXIVClassic Lobby Server/dataobjects/Appearance.cs b/FFXIVClassic Lobby Server/dataobjects/Appearance.cs index f8cc0dd4..6d4457aa 100644 --- a/FFXIVClassic Lobby Server/dataobjects/Appearance.cs +++ b/FFXIVClassic Lobby Server/dataobjects/Appearance.cs @@ -17,6 +17,7 @@ namespace FFXIVClassic_Lobby_Server.dataobjects public ushort hairStyle = 0; public ushort hairColor = 0; public ushort hairHighlightColor = 0; + public ushort hairVariation = 0; public ushort eyeColor = 0; public byte characteristicsColor = 0; diff --git a/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs b/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs index 3cf3be03..008e5f2b 100644 --- a/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs +++ b/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs @@ -76,7 +76,8 @@ namespace FFXIVClassic_Lobby_Server.dataobjects info.tribe = reader.ReadByte(); appearance.size = reader.ReadByte(); appearance.hairStyle = reader.ReadUInt16(); - appearance.hairHighlightColor = reader.ReadUInt16(); + appearance.hairHighlightColor = reader.ReadByte(); + appearance.hairVariation = reader.ReadByte(); appearance.faceType = reader.ReadByte(); appearance.characteristics = reader.ReadByte(); appearance.characteristicsColor = reader.ReadByte(); @@ -140,7 +141,6 @@ namespace FFXIVClassic_Lobby_Server.dataobjects faceInfo.mouth = appearance.faceMouth; faceInfo.nose = appearance.faceNose; - string location1 = "prv0Inn01\0"; string location2 = "defaultTerritory\0";