From fce876480e7f83f1ae50a7c47c0130562a4d2da9 Mon Sep 17 00:00:00 2001 From: Aphedox Date: Sat, 13 Aug 2016 19:51:20 -0500 Subject: [PATCH] rename building_guid to object_guid --- .../scala/net/psforever/packet/game/SetEmpireMessage.scala | 6 +++--- common/src/test/scala/GamePacketTest.scala | 4 ++-- pslogin/src/main/scala/WorldSessionActor.scala | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala b/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala index a0a42020..0dcc7428 100644 --- a/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala @@ -7,9 +7,9 @@ import scodec.codecs._ /** * The object_guid space for SetEmpireMessage is continent specific. - * SetEmpireMessage is usually followed by HackMessage (indicating the hack disposition of the same building_guid) + * SetEmpireMessage is usually followed by HackMessage (indicating the hack disposition of the same object_guid) */ -final case class SetEmpireMessage(building_guid : PlanetSideGUID, +final case class SetEmpireMessage(object_guid : PlanetSideGUID, empire : PlanetSideEmpire.Value) extends PlanetSideGamePacket { type Packet = SetEmpireMessage @@ -19,7 +19,7 @@ final case class SetEmpireMessage(building_guid : PlanetSideGUID, object SetEmpireMessage extends Marshallable[SetEmpireMessage] { implicit val codec : Codec[SetEmpireMessage] = ( - ("building_guid" | PlanetSideGUID.codec) :: + ("object_guid" | PlanetSideGUID.codec) :: ("empire" | PlanetSideEmpire.codec) ).as[SetEmpireMessage] } diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index 847bc7e3..51aa7713 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -801,8 +801,8 @@ class GamePacketTest extends Specification { "decode" in { PacketCoding.DecodePacket(string).require match { - case SetEmpireMessage(building_guid, empire) => - building_guid mustEqual PlanetSideGUID(2) + case SetEmpireMessage(object_guid, empire) => + object_guid mustEqual PlanetSideGUID(2) empire mustEqual PlanetSideEmpire.VS case default => ko diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index e0e5f03a..48da8b0a 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -140,7 +140,7 @@ class WorldSessionActor extends Actor with MDCContextAware { sendRawResponse(hex"31 85 6D 61 70 31 33 85 68 6F 6D 65 33 A4 9C 19 00 00 00 AE 30 5E 70 00 ") sendRawResponse(objectHex) - // These building_guids are specfic to VS Sanc + // These object_guids are specfic to VS Sanc sendResponse(PacketCoding.CreateGamePacket(0, SetEmpireMessage(PlanetSideGUID(2), PlanetSideEmpire.VS))) //HART building C sendResponse(PacketCoding.CreateGamePacket(0, SetEmpireMessage(PlanetSideGUID(29), PlanetSideEmpire.NC))) //South Villa Gun Tower