This commit is contained in:
Filip Maj
2016-01-09 21:35:45 -05:00
parent c9f35a207b
commit 44c45c4ad2
4 changed files with 57 additions and 56 deletions

View File

@@ -79,24 +79,24 @@ namespace FFXIVClassic_Map_Server.dataobjects.chara
{
DBAppearance appearance = Database.getAppearance(true, actorId);
modelID = DBAppearance.getTribeModel(appearance.tribe);
appearanceIDs[SIZE] = appearance.size;
appearanceIDs[COLORINFO] = (uint)(appearance.skinColor | (appearance.hairColor << 10) | (appearance.eyeColor << 20));
appearanceIDs[FACEINFO] = PrimitiveConversion.ToUInt32(appearance.getFaceInfo());
appearanceIDs[HIGHLIGHT_HAIR] = (uint)(appearance.hairHighlightColor | appearance.hairStyle << 10);
appearanceIDs[VOICE] = appearance.voice;
appearanceIDs[WEAPON1] = appearance.mainHand;
appearanceIDs[WEAPON2] = appearance.offHand;
appearanceIDs[HEADGEAR] = appearance.head;
appearanceIDs[BODYGEAR] = appearance.body;
appearanceIDs[LEGSGEAR] = appearance.legs;
appearanceIDs[HANDSGEAR] = appearance.hands;
appearanceIDs[FEETGEAR] = appearance.feet;
appearanceIDs[WAISTGEAR] = appearance.waist;
appearanceIDs[R_EAR] = appearance.rightEar;
appearanceIDs[L_EAR] = appearance.leftEar;
appearanceIDs[R_FINGER] = appearance.rightFinger;
appearanceIDs[L_FINGER] = appearance.leftFinger;
modelId = DBAppearance.getTribeModel(appearance.tribe);
appearanceIds[SIZE] = appearance.size;
appearanceIds[COLORINFO] = (uint)(appearance.skinColor | (appearance.hairColor << 10) | (appearance.eyeColor << 20));
appearanceIds[FACEINFO] = PrimitiveConversion.ToUInt32(appearance.getFaceInfo());
appearanceIds[HIGHLIGHT_HAIR] = (uint)(appearance.hairHighlightColor | appearance.hairStyle << 10);
appearanceIds[VOICE] = appearance.voice;
appearanceIds[WEAPON1] = appearance.mainHand;
appearanceIds[WEAPON2] = appearance.offHand;
appearanceIds[HEADGEAR] = appearance.head;
appearanceIds[BODYGEAR] = appearance.body;
appearanceIds[LEGSGEAR] = appearance.legs;
appearanceIds[HANDSGEAR] = appearance.hands;
appearanceIds[FEETGEAR] = appearance.feet;
appearanceIds[WAISTGEAR] = appearance.waist;
appearanceIds[R_EAR] = appearance.rightEar;
appearanceIds[L_EAR] = appearance.leftEar;
appearanceIds[R_FINGER] = appearance.rightFinger;
appearanceIds[L_FINGER] = appearance.leftFinger;
}
public List<SubPacket> create0x132Packets(uint playerActorId)
@@ -122,7 +122,6 @@ namespace FFXIVClassic_Map_Server.dataobjects.chara
}
else
lParams = LuaUtils.createLuaParamList("/Chara/Player/Player_work", false, false, false, false, false, true);
return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, className, lParams);
}