Merge branch 'mount-vehicle'

This commit is contained in:
FateJH 2017-01-18 22:23:35 -05:00
commit e06fb91b1f
4 changed files with 63 additions and 1 deletions

View file

@ -334,7 +334,7 @@ object GamePacketOpcode extends Enumeration {
case 0x0b => noDecoder(DamageMessage)
case 0x0c => noDecoder(DestroyMessage)
case 0x0d => game.ReloadMessage.decode
case 0x0e => noDecoder(MountVehicleMsg)
case 0x0e => game.MountVehicleMsg.decode
case 0x0f => noDecoder(DismountVehicleMsg)
// OPCODES 0x10-1f

View file

@ -0,0 +1,37 @@
// Copyright (c) 2016 PSForever.net to present
package net.psforever.packet.game
import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket}
import scodec.Codec
import scodec.codecs._
/**
* Alert that the player wishes to board a vehicle at a specific entry point.<br>
* <br>
* The client will only dispatch this packet when it feels confident that the player can get into a vehicle.
* It makes its own check whether or not to display that "enter vehicle here" icon on the ground.
* This is called an "entry point."
* Entry points and seat numbers are not required as one-to-one;
* multiple entry points can lead to the same seat, such as the driver seat of an ANT.<br>
* <br>
* The player is not allowed to board anything until the server responds in affirmation.
* @param player_guid the player
* @param vehicle_guid the vehicle
* @param entry_point the entry index that maps to a seat index, specific to the selected vehicle
*/
final case class MountVehicleMsg(player_guid : PlanetSideGUID,
vehicle_guid : PlanetSideGUID,
entry_point : Int)
extends PlanetSideGamePacket {
type Packet = MountVehicleMsg
def opcode = GamePacketOpcode.MountVehicleMsg
def encode = MountVehicleMsg.encode(this)
}
object MountVehicleMsg extends Marshallable[MountVehicleMsg] {
implicit val codec : Codec[MountVehicleMsg] = (
("player_guid" | PlanetSideGUID.codec) ::
("vehicle_guid" | PlanetSideGUID.codec) ::
("entry_point" | uint8L)
).as[MountVehicleMsg]
}

View file

@ -915,6 +915,28 @@ class GamePacketTest extends Specification {
}
}
"MountVehicleMsg" should {
val string = hex"0E E104 6704 06"
"decode" in {
PacketCoding.DecodePacket(string).require match {
case MountVehicleMsg(player_guid, vehicle_guid, entry) =>
player_guid mustEqual PlanetSideGUID(1249)
vehicle_guid mustEqual PlanetSideGUID(1127)
entry mustEqual 6
case default =>
ko
}
}
"encode" in {
val msg = MountVehicleMsg(PlanetSideGUID(1249), PlanetSideGUID(1127), 6)
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string
}
}
"ObjectHeldMessage" should {
val string = hex"33 4B00 02 00"

View file

@ -324,6 +324,9 @@ class WorldSessionActor extends Actor with MDCContextAware {
case msg @ AvatarFirstTimeEventMessage(avatar_guid, object_guid, unk1, event_name) =>
log.info("AvatarFirstTimeEvent: " + msg)
case msg @ MountVehicleMsg(player_guid, vehicle_guid, unk) =>
log.info("MounVehicleMsg: "+msg)
case default => log.debug(s"Unhandled GamePacket ${pkt}")
}