From d34817c5a873df4e90212daf856cae3bc7b8a1be Mon Sep 17 00:00:00 2001 From: SouNourS Date: Thu, 22 Feb 2018 16:02:16 +0100 Subject: [PATCH] 10 / 100 * 255 = 0 When a player dont have full life, he is on ground with 0 HP ;) --- .../objects/definition/converter/AvatarConverter.scala | 4 ++-- pslogin/src/main/scala/WorldSessionActor.scala | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala index 99fa4d2cc..3d8bda7e2 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala @@ -15,8 +15,8 @@ class AvatarConverter extends ObjectCreateConverter[Player]() { Success( CharacterData( MakeAppearanceData(obj), - obj.Health / obj.MaxHealth * 255, //TODO not precise - if(MaxArmor == 0) { 0 } else { obj.Armor / MaxArmor * 255 }, //TODO not precise + 255 * obj.Health / obj.MaxHealth, //TODO not precise + if(MaxArmor == 0) { 0 } else { 255 * obj.Armor / MaxArmor }, //TODO not precise DressBattleRank(obj), DressCommandRank(obj), recursiveMakeImplantEffects(obj.Implants.iterator), diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index 909076b26..5f3082dab 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -1041,6 +1041,7 @@ class WorldSessionActor extends Actor with MDCContextAware { log.info("Load the now-registered player") //load the now-registered player tplayer.Spawn + tplayer.Health = 50 val dcdata = tplayer.Definition.Packet.DetailedConstructorData(tplayer).get sendResponse(PacketCoding.CreateGamePacket(0, ObjectCreateDetailedMessage(ObjectClass.avatar, tplayer.GUID, dcdata))) avatarService ! AvatarServiceMessage(tplayer.Continent, AvatarAction.LoadPlayer(tplayer.GUID, tplayer.Definition.Packet.ConstructorData(tplayer).get))