From 8ffb455b5dd8604aaf6850d9d523a83a2780ed27 Mon Sep 17 00:00:00 2001
From: tfarley <tfarley@users.noreply.github.com>
Date: Sat, 23 Jul 2016 23:53:35 -0700
Subject: [PATCH] Packet: MoveItemMessage

* Add MoveItemMessage packet

* Add MoveItemMessage test

* Add MoveItemMessage handler stub
---
 .../psforever/packet/GamePacketOpcode.scala   |  2 +-
 .../packet/game/MoveItemMessage.scala         | 27 +++++++++++++++++++
 common/src/test/scala/GamePacketTest.scala    | 24 +++++++++++++++++
 .../src/main/scala/WorldSessionActor.scala    |  3 +++
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala

diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
index 0bd04d7a..719d84eb 100644
--- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
+++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
@@ -338,7 +338,7 @@ object GamePacketOpcode extends Enumeration {
       case MountVehicleMsg => noDecoder(opcode)
       case DismountVehicleMsg => noDecoder(opcode)
       case UseItemMessage => noDecoder(opcode)
-      case MoveItemMessage => noDecoder(opcode)
+      case MoveItemMessage => game.MoveItemMessage.decode
       case ChatMsg => game.ChatMsg.decode
       case CharacterNoRecordMessage => noDecoder(opcode)
 
diff --git a/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala
new file mode 100644
index 00000000..515041b5
--- /dev/null
+++ b/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala
@@ -0,0 +1,27 @@
+// Copyright (c) 2016 PSForever.net to present
+package net.psforever.packet.game
+
+import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket}
+import scodec.Codec
+import scodec.codecs._
+
+final case class MoveItemMessage(item_guid : PlanetSideGUID,
+                                 avatar_guid_1 : PlanetSideGUID,
+                                 avatar_guid_2 : PlanetSideGUID,
+                                 dest : Int,
+                                 unk1 : Int)
+  extends PlanetSideGamePacket {
+  type Packet = MoveItemMessage
+  def opcode = GamePacketOpcode.MoveItemMessage
+  def encode = MoveItemMessage.encode(this)
+}
+
+object MoveItemMessage extends Marshallable[MoveItemMessage] {
+  implicit val codec : Codec[MoveItemMessage] = (
+      ("item_guid" | PlanetSideGUID.codec) ::
+        ("avatar_guid_1" | PlanetSideGUID.codec) ::
+        ("avatar_guid_2" | PlanetSideGUID.codec) ::
+        ("dest" | uint16L) ::
+        ("unk1" | uint16L)
+    ).as[MoveItemMessage]
+}
diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala
index 47e94f41..b66df10a 100644
--- a/common/src/test/scala/GamePacketTest.scala
+++ b/common/src/test/scala/GamePacketTest.scala
@@ -390,5 +390,29 @@ class GamePacketTest extends Specification {
         pkt mustEqual string
       }
     }
+
+    "MoveItemMessage" should {
+      val string = hex"11 4C00 4B00 4B00 0900 0100"
+
+      "decode" in {
+        PacketCoding.DecodePacket(string).require match {
+          case MoveItemMessage(item_guid, avatar_guid_1, avatar_guid_2, dest, unk1) =>
+            item_guid mustEqual PlanetSideGUID(76)
+            avatar_guid_1 mustEqual PlanetSideGUID(75)
+            avatar_guid_2 mustEqual PlanetSideGUID(75)
+            dest mustEqual 9
+            unk1 mustEqual 1
+          case default =>
+            ko
+        }
+      }
+
+      "encode" in {
+        val msg = MoveItemMessage(PlanetSideGUID(76), PlanetSideGUID(75), PlanetSideGUID(75), 9, 1)
+        val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
+
+        pkt mustEqual string
+      }
+    }
   }
 }
diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index 79f3cc45..2c395f8c 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -185,6 +185,9 @@ class WorldSessionActor extends Actor with MDCContextAware {
     case msg @ ObjectDeleteMessage(object_guid, unk1) =>
       log.info("ObjectDelete: " + msg)
 
+    case msg @ MoveItemMessage(item_guid, avatar_guid_1, avatar_guid_2, dest, unk1) =>
+      log.info("MoveItem: " + msg)
+
     case default => log.debug(s"Unhandled GamePacket ${pkt}")
   }