modified constructors and clarified fields in both commentary and name; fixed tests

common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala

@@ -7,17 +7,30 @@ import scodec.codecs._
 import shapeless.{::, HNil}
 
 /**
-  * na
+  * An entry regarding a target's health and, if applicable, any secondary defensive option they possess, hitherto, "armor."
   * @param target_guid the target
-  * @param unk1 na
+  * @param health the amount of health the target has, as a percentage of a filled bar scaled between 0f and 1f inclusive
-  * @param unk2 na
+  * @param armor the amount of armor the target has, as a percentage of a filled bar scaled between 0f and 1f inclusive;
+  *              defaults to 0f
   */
 final case class TargetInfo(target_guid : PlanetSideGUID,
-                            unk1 : Float,
+                            health : Float,
-                            unk2 : Float = 0f)
+                            armor : Float = 0f)
 
 /**
-  * na
+  * Dispatched by the server to update status information regarding the listed targets.<br>
+  * <br>
+  * This packet is often in response to a client-sent `TargetingImplantRequest` packet, when related to the implant's operation.
+  * It can also arrive independent of a formal request and will operate even without the implant.
+  * The enumerated targets report their status as two "progress bars" that can be empty (0f) or filled (1f).
+  * When this packet is received, the client will actually update the current fields associated with those values for the target.
+  * For example, for `0x17` player characters, the values are assigned to their health points and armor points respectively.
+  * Allied player characters will have their "progress bar" visuals updated immediately;
+  * the implant is still necessary to view enemy target progress bars, if they will be visible.<br>
+  * <br>
+  * This function can be used to update fields properly.
+  * The value between 0 and 255 (0f to 1f) can be inserted directly into `ObjectCreateMessage` creations as it matches the scale.
+  * The target will be killed or destroyed as expected when health is set to zero.
   * @param target_list a list of targets
   */
 final case class TargetingInfoMessage(target_list : List[TargetInfo])
@@ -29,11 +42,39 @@ final case class TargetingInfoMessage(target_list : List[TargetInfo])
 
 object TargetInfo {
   /**
-    * Transform an unsigned number between 0 and 256 into a percentage of a 255 number.
+    * Overloaded constructor that takes `Integer` values rather than `Float` values.
-    * @param n an unsigned `Integer` number
+    * @param target_guid the target
-    * @return a scaled `Float` number
+    * @param health the amount of health the target has
+    * @param armor the amount of armor the target has
+    * @return a `TargetInfo` object
     */
-  private def rangedFloat(n : Int) : Float = {
+  def apply(target_guid : PlanetSideGUID, health : Int, armor : Int) : TargetInfo = {
+    val health2 : Float = TargetingInfoMessage.rangedFloat(health)
+    val armor2 : Float = TargetingInfoMessage.rangedFloat(armor)
+    TargetInfo(target_guid, health2, armor2)
+  }
+
+  /**
+    * Overloaded constructor that takes `Integer` values rather than `Float` values and only expects the first field.
+    * @param target_guid the target
+    * @param health the amount of health the target has
+    * @return a `TargetInfo` object
+    */
+  def apply(target_guid : PlanetSideGUID, health : Int) : TargetInfo = {
+    val health2 : Float = TargetingInfoMessage.rangedFloat(health)
+    TargetInfo(target_guid, health2)
+  }
+}
+
+object TargetingInfoMessage extends Marshallable[TargetingInfoMessage] {
+  private final val unit : Double = 0.0039215689 //common constant for 1/255
+
+  /**
+    * Transform an unsigned `Integer` number into a scaled `Float`.
+    * @param n an unsigned `Integer` number inclusive 0 and below 256
+    * @return a scaled `Float` number inclusive to 0f to 1f
+    */
+  def rangedFloat(n : Int) : Float = {
     (
       (if(n <= 0) {
         0
@@ -43,38 +84,28 @@ object TargetInfo {
       }
       else {
         n
-      }).toDouble * TargetingInfoMessage.unit
+      }).toDouble * unit
-    ).toFloat
+      ).toFloat
   }
-
   /**
-    * Overloaded constructor that takes `Integer` values rather than `Float` values.
+    * Transform a scaled `Float` number into an unsigned `Integer`.
-    * @param target_guid the target
+    * @param n `Float` number inclusive to 0f to 1f
-    * @param unk1 na
+    * @return a scaled unsigned `Integer` number inclusive 0 and below 256
-    * @param unk2 na
-    * @return a `TargetInfo` object
     */
-  def apply(target_guid : PlanetSideGUID, unk1 : Int, unk2 : Int) : TargetInfo = {
+  def rangedInt(n : Float) : Int = {
-    val unk1_2 : Float = rangedFloat(unk1)
+    (
-    val unk2_2 : Float = rangedFloat(unk2)
+      (if(n <= 0f) {
-    TargetInfo(target_guid, unk1_2, unk2_2)
+        0f
+      }
+      else if(n >= 1.0f) {
+        1.0f
+      }
+      else {
+        n
+      }).toDouble * 255
+    ).toInt
   }
 
-  /**
-    * Overloaded constructor that takes `Integer` values rather than `Float` values and assumes the second `Integer` is zero.
-    * @param target_guid the target
-    * @param unk na
-    * @return a `TargetInfo` object
-    */
-  def apply(target_guid : PlanetSideGUID, unk : Int) : TargetInfo = {
-    val unk1_2 : Float = rangedFloat(unk)
-    TargetInfo(target_guid, unk1_2, 0)
-  }
-}
-
-object TargetingInfoMessage extends Marshallable[TargetingInfoMessage] {
-  final val unit : Double = 0.0039215689 //common constant for 1/255
-
   private val info_codec : Codec[TargetInfo] = (
     ("target_guid" | PlanetSideGUID.codec) ::
       ("unk1" | uint8L) ::
@@ -82,15 +113,15 @@ object TargetingInfoMessage extends Marshallable[TargetingInfoMessage] {
   ).xmap[TargetInfo] (
     {
       case a :: b :: c :: HNil =>
-        val bFloat : Float = (b.toDouble * unit).toFloat
+        val b2 : Float = rangedFloat(b)
-        val cFloat : Float = (c.toDouble * unit).toFloat
+        val c2 : Float = rangedFloat(c)
-        TargetInfo(a, bFloat, cFloat)
+        TargetInfo(a, b2, c2)
     },
     {
-      case TargetInfo(a, bFloat, cFloat) =>
+      case TargetInfo(a, b, c) =>
-        val b : Int = (bFloat.toDouble * 255).toInt
+        val b2 : Int = rangedInt(b)
-        val c : Int = (cFloat.toDouble * 255).toInt
+        val c2 : Int = rangedInt(c)
-        a :: b :: c :: HNil
+        a :: b2 :: c2 :: HNil
     }
   )
 

common/src/test/scala/game/TargetingInfoMessageTest.scala

@@ -15,24 +15,24 @@ class TargetingInfoMessageTest extends Specification {
         target_list.size mustEqual 5
         //0
         target_list.head.target_guid mustEqual PlanetSideGUID(4157)
-        target_list.head.unk1 mustEqual 0.7607844f
+        target_list.head.health mustEqual 0.7607844f
-        target_list.head.unk2 mustEqual 0f
+        target_list.head.armor mustEqual 0f
         //1
         target_list(1).target_guid mustEqual PlanetSideGUID(3671)
-        target_list(1).unk1 mustEqual 1.0000001f
+        target_list(1).health mustEqual 1.0000001f
-        target_list(1).unk2 mustEqual 0.23529413f
+        target_list(1).armor mustEqual 0.23529413f
         //2
         target_list(2).target_guid mustEqual PlanetSideGUID(1572)
-        target_list(2).unk1 mustEqual 0.92549026f
+        target_list(2).health mustEqual 0.92549026f
-        target_list(2).unk2 mustEqual 0f
+        target_list(2).armor mustEqual 0f
         //3
         target_list(3).target_guid mustEqual PlanetSideGUID(1579)
-        target_list(3).unk1 mustEqual 0.54901963f
+        target_list(3).health mustEqual 0.54901963f
-        target_list(3).unk2 mustEqual 0f
+        target_list(3).armor mustEqual 0f
         //4
         target_list(4).target_guid mustEqual PlanetSideGUID(1578)
-        target_list(4).unk1 mustEqual 0.5803922f
+        target_list(4).health mustEqual 0.5803922f
-        target_list(4).unk2 mustEqual 0f
+        target_list(4).armor mustEqual 0f
       case _ =>
         ko
     }