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

Packet: UseItemMessage (#35)

Browse source 
* Add UseItemMessage packet

* Add UseItemMessage test

* Add UseItemMessage handler stub
This commit is contained in:
tfarley 2016-07-25 18:30:50 -07:00 committed by pschord
parent 3ccb31f961
commit 5b5bf28c52
4 changed files with 77 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

@ -337,7 +337,7 @@ object GamePacketOpcode extends Enumeration {
case ReloadMessage => game.ReloadMessage.decode
case MountVehicleMsg => noDecoder(opcode)
case DismountVehicleMsg => noDecoder(opcode)
case UseItemMessage => noDecoder(opcode)
case UseItemMessage => game.UseItemMessage.decode
case MoveItemMessage => game.MoveItemMessage.decode
case ChatMsg => game.ChatMsg.decode
case CharacterNoRecordMessage => noDecoder(opcode)

40
common/src/main/scala/net/psforever/packet/game/UseItemMessage.scala Normal file
View file

@ -0,0 +1,40 @@
// Copyright (c) 2016 PSForever.net to present
package net.psforever.packet.game
import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket}
import net.psforever.types.Vector3
import scodec.Codec
import scodec.codecs._
final case class UseItemMessage(avatar_guid : PlanetSideGUID,
unk1 : Int,
object_guid : PlanetSideGUID,
unk2 : Long,
unk3 : Boolean,
unk4 : Vector3,
unk5 : Vector3,
unk6 : Int,
unk7 : Int,
unk8 : Int,
unk9 : Long)
extends PlanetSideGamePacket {
type Packet = UseItemMessage
def opcode = GamePacketOpcode.UseItemMessage
def encode = UseItemMessage.encode(this)
}
object UseItemMessage extends Marshallable[UseItemMessage] {
implicit val codec : Codec[UseItemMessage] = (
("avatar_guid" | PlanetSideGUID.codec) ::
("unk1" | uint16L) ::
("object_guid" | PlanetSideGUID.codec) ::
("unk2" | uint32L) ::
("unk3" | bool) ::
("unk4" | Vector3.codec_pos) ::
("unk5" | Vector3.codec_pos) ::
("unk6" | uint8L) ::
("unk7" | uint8L) ::
("unk8" | uint8L) ::
("unk9" | uint32L)
).as[UseItemMessage]
}

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

@ -468,5 +468,35 @@ class GamePacketTest extends Specification {
pkt mustEqual string
}
}
"UseItemMessage" should {
val string = hex"10 4B00 0000 7401 FFFFFFFF 4001000000000000000000000000058C803600800000"
"decode" in {
PacketCoding.DecodePacket(string).require match {
case UseItemMessage(avatar_guid, unk1, object_guid, unk2, unk3, unk4, unk5, unk6, unk7, unk8, unk9) =>
avatar_guid mustEqual PlanetSideGUID(75)
unk1 mustEqual 0
object_guid mustEqual PlanetSideGUID(372)
unk2 mustEqual 0xFFFFFFFFL
unk3 mustEqual false
unk4 mustEqual Vector3(5.0f, 0.0f, 0.0f)
unk5 mustEqual Vector3(0.0f, 0.0f, 0.0f)
unk6 mustEqual 11
unk7 mustEqual 25
unk8 mustEqual 0
unk9 mustEqual 364
case default =>
ko
}
}
"encode" in {
val msg = UseItemMessage(PlanetSideGUID(75), 0, PlanetSideGUID(372), 0xFFFFFFFFL, false, Vector3(5.0f, 0.0f, 0.0f), Vector3(0.0f, 0.0f, 0.0f), 11, 25, 0, 364)
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string
}
}
}
}

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

@ -192,6 +192,12 @@ class WorldSessionActor extends Actor with MDCContextAware {
case msg @ ChangeAmmoMessage(item_guid, unk1) =>
log.info("ChangeAmmo: " + msg)
case msg @ UseItemMessage(avatar_guid, unk1, object_guid, unk2, unk3, unk4, unk5, unk6, unk7, unk8, unk9) =>
log.info("UseItem: " + msg)
// TODO: Not all fields in the response are identical to source in real packet logs (but seems to be ok)
// TODO: Not all incoming UseItemMessage's respond with another UseItemMessage (i.e. doors only send out GenericObjectStateMsg)
sendResponse(PacketCoding.CreateGamePacket(0, UseItemMessage(avatar_guid, unk1, object_guid, unk2, unk3, unk4, unk5, unk6, unk7, unk8, unk9)))
case default => log.debug(s"Unhandled GamePacket ${pkt}")
}