PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Packet: EmoteMsg

Browse source 
Still need an Enum for emote messages.

* Add EmoteMsg packet

* Add EmoteMsg test

* Add EmoteMsg handler stub
This commit is contained in:
tfarley 2016-07-23 18:10:40 -07:00 committed by pschord
parent 4c4f1341be
commit 3e980bbe15
4 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
View file

@ -362,7 +362,7 @@ object GamePacketOpcode extends Enumeration {
case ActionCancelMessage => noDecoder(opcode)
case ActionCancelAcknowledgeMessage => noDecoder(opcode)
case SetEmpireMessage => noDecoder(opcode)
case EmoteMsg => noDecoder(opcode)
case EmoteMsg => game.EmoteMsg.decode
case UnuseItemMessage => noDecoder(opcode)
case ObjectDetachMessage => noDecoder(opcode)

21
common/src/main/scala/net/psforever/packet/game/EmoteMsg.scala Normal file
View file

@ -0,0 +1,21 @@
// 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 EmoteMsg(avatar_guid : PlanetSideGUID,
emote_id : Int)
extends PlanetSideGamePacket {
type Packet = EmoteMsg
def opcode = GamePacketOpcode.EmoteMsg
def encode = EmoteMsg.encode(this)
}
object EmoteMsg extends Marshallable[EmoteMsg] {
implicit val codec : Codec[EmoteMsg] = (
("avatar_guid" | PlanetSideGUID.codec) ::
("emote_id" | uint8L)
).as[EmoteMsg]
}

21
common/src/test/scala/GamePacketTest.scala
View file

@ -264,5 +264,26 @@ class GamePacketTest extends Specification {
pkt mustEqual string
}
}
"EmoteMsg" should {
val string = hex"25 4B0004"
"decode" in {
PacketCoding.DecodePacket(string).require match {
case EmoteMsg(avatar_guid, emote_id) =>
avatar_guid mustEqual PlanetSideGUID(75)
emote_id mustEqual 4
case default =>
ko
}
}
"encode" in {
val msg = EmoteMsg(PlanetSideGUID(75), 4)
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string
}
}
}
}

4
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -163,6 +163,10 @@ class WorldSessionActor extends Actor with MDCContextAware {
case msg @ ChangeFireStateMessage_Stop(item_guid) =>
log.info("ChangeFireState_Stop: " + msg)
case msg @ EmoteMsg(avatar_guid, emote_id) =>
log.info("Emote: " + msg)
sendResponse(PacketCoding.CreateGamePacket(0, EmoteMsg(avatar_guid, emote_id)))
case default => log.debug(s"Unhandled GamePacket ${pkt}")
}