mirror of
https://github.com/2revoemag/PSF-BotServer.git
synced 2026-02-28 18:53:37 +00:00
proper remote projectile handling; allowances for the Decimator alt-fire mode; initial DamageMessage packet and tests; initial DamageFeedbackMessage packet and tests
This commit is contained in:
FateJH
parent
043512d6a3
commit
693a3a5d78
18 changed files with 421 additions and 245 deletions
|
|
@ -3076,9 +3076,11 @@ object GlobalDefinitions {
|
|||
phoenix_missile_guided_projectile.ProjectileDamageType = DamageType.Splash
|
||||
phoenix_missile_guided_projectile.InitialVelocity = 0
|
||||
phoenix_missile_guided_projectile.Lifespan = 3f
|
||||
//not naturally a remote projectile, but being governed as one for convenience
|
||||
phoenix_missile_guided_projectile.ExistsOnRemoteClients = true
|
||||
phoenix_missile_guided_projectile.RemoteClientData = (39577, 201) //hunter_seeker_missile_projectile data
|
||||
phoenix_missile_guided_projectile.RemoteClientData = (0,63)
|
||||
phoenix_missile_guided_projectile.Packet = projectileConverter
|
||||
//
|
||||
ProjectileDefinition.CalculateDerivedFields(phoenix_missile_guided_projectile)
|
||||
|
||||
phoenix_missile_projectile.Name = "phoenix_missile_projectile"
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ package net.psforever.objects.definition.converter
|
|||
|
||||
import net.psforever.objects.ballistics.Projectile
|
||||
import net.psforever.packet.game.PlanetSideGUID
|
||||
import net.psforever.packet.game.objectcreate.{CommonFieldData, CommonFieldDataWithPlacement, FlightPhysics, PlacementData, TrackedProjectileData}
|
||||
import net.psforever.packet.game.objectcreate.{CommonFieldData, CommonFieldDataWithPlacement, FlightPhysics, PlacementData, RemoteProjectileData}
|
||||
|
||||
import scala.util.{Failure, Success, Try}
|
||||
|
||||
class ProjectileConverter extends ObjectCreateConverter[Projectile]() {
|
||||
override def ConstructorData(obj : Projectile) : Try[TrackedProjectileData] = {
|
||||
override def ConstructorData(obj : Projectile) : Try[RemoteProjectileData] = {
|
||||
Success(
|
||||
TrackedProjectileData(
|
||||
RemoteProjectileData(
|
||||
CommonFieldDataWithPlacement(
|
||||
PlacementData(
|
||||
obj.Position,
|
||||
|
|
@ -38,6 +38,6 @@ class ProjectileConverter extends ObjectCreateConverter[Projectile]() {
|
|||
)
|
||||
}
|
||||
|
||||
override def DetailedConstructorData(obj : Projectile) : Try[TrackedProjectileData] =
|
||||
override def DetailedConstructorData(obj : Projectile) : Try[RemoteProjectileData] =
|
||||
Failure(new Exception("ProjectileConverter should not be used to generate detailed projectile data (nothing should)"))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ object GamePacketOpcode extends Enumeration {
|
|||
case 0x08 => game.PlayerStateMessage.decode
|
||||
case 0x09 => game.HitMessage.decode
|
||||
case 0x0a => game.HitHint.decode
|
||||
case 0x0b => noDecoder(DamageMessage)
|
||||
case 0x0b => game.DamageMessage.decode
|
||||
case 0x0c => game.DestroyMessage.decode
|
||||
case 0x0d => game.ReloadMessage.decode
|
||||
case 0x0e => game.MountVehicleMsg.decode
|
||||
|
|
@ -462,7 +462,7 @@ object GamePacketOpcode extends Enumeration {
|
|||
case 0x78 => game.OxygenStateMessage.decode
|
||||
case 0x79 => noDecoder(TradeMessage)
|
||||
case 0x7a => noDecoder(UnknownMessage122)
|
||||
case 0x7b => noDecoder(DamageFeedbackMessage)
|
||||
case 0x7b => game.DamageFeedbackMessage.decode
|
||||
case 0x7c => game.DismountBuildingMsg.decode
|
||||
case 0x7d => noDecoder(UnknownMessage125)
|
||||
case 0x7e => noDecoder(UnknownMessage126)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
// Copyright (c) 2019 PSForever
|
||||
package net.psforever.packet.game
|
||||
|
||||
import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket}
|
||||
import scodec.Codec
|
||||
import scodec.codecs._
|
||||
import shapeless.{::, HNil}
|
||||
|
||||
final case class DamageFeedbackMessage(unk1 : Int,
|
||||
unk2 : Boolean,
|
||||
unk2a : Option[PlanetSideGUID],
|
||||
unk2b : Option[String],
|
||||
unk2c : Option[Int],
|
||||
unk3 : Boolean,
|
||||
unk3a : Option[PlanetSideGUID],
|
||||
unk3b : Option[String],
|
||||
unk3c : Option[Int],
|
||||
unk3d : Option[Int],
|
||||
unk4 : Int,
|
||||
unk5 : Long,
|
||||
unk6 : Int)
|
||||
extends PlanetSideGamePacket {
|
||||
assert(
|
||||
if(unk2a.nonEmpty) unk2b.isEmpty && unk2c.isEmpty
|
||||
else if(unk2b.nonEmpty) unk2 && unk2a.isEmpty && unk2c.isEmpty
|
||||
else unk2a.isEmpty && !unk2 && unk2b.isEmpty && unk2c.nonEmpty
|
||||
)
|
||||
assert(
|
||||
if(unk3a.nonEmpty) unk3b.isEmpty && unk3c.isEmpty
|
||||
else if(unk3b.nonEmpty) unk3 && unk3a.isEmpty && unk3c.isEmpty
|
||||
else unk3a.isEmpty && !unk3 && unk3b.isEmpty && unk3c.nonEmpty
|
||||
)
|
||||
assert(unk3a.isEmpty == unk3d.nonEmpty)
|
||||
|
||||
type Packet = DamageFeedbackMessage
|
||||
def opcode = GamePacketOpcode.DamageFeedbackMessage
|
||||
def encode = DamageFeedbackMessage.encode(this)
|
||||
}
|
||||
|
||||
object DamageFeedbackMessage extends Marshallable[DamageFeedbackMessage] {
|
||||
implicit val codec : Codec[DamageFeedbackMessage] = (
|
||||
("unk1" | uint4) ::
|
||||
(bool >>:~ { u2 =>
|
||||
bool >>:~ { u3 =>
|
||||
("unk2a" | conditional(u2, PlanetSideGUID.codec)) ::
|
||||
(("unk2b" | conditional(!u2 && u3, PacketHelpers.encodedWideStringAligned(6))) >>:~ { u2b =>
|
||||
("unk2c" | conditional(!(u2 && u3), uintL(11))) ::
|
||||
(bool >>:~ { u5 =>
|
||||
bool >>:~ { u6 =>
|
||||
("unk3a" | conditional(u5, PlanetSideGUID.codec)) ::
|
||||
("unk3b" | conditional(!u5 && u6, PacketHelpers.encodedWideStringAligned( if(u2b.nonEmpty) 3 else 1 ))) ::
|
||||
("unk3c" | conditional(!(u5 && u6), uintL(11))) ::
|
||||
("unk3d" | conditional(!u5, uint2)) ::
|
||||
("unk4" | uint(3)) ::
|
||||
("unk5" | uint32L) ::
|
||||
("unk6" | uint2)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
).xmap[DamageFeedbackMessage] (
|
||||
{
|
||||
case u1 :: _ :: u2 :: u2a :: u2b :: u2c :: _ :: u3 :: u3a :: u3b :: u3c :: u3d :: u4 :: u5 :: u6 :: HNil =>
|
||||
DamageFeedbackMessage(u1, u2, u2a, u2b, u2c, u3, u3a, u3b, u3c, u3d, u4, u5, u6)
|
||||
},
|
||||
{
|
||||
case DamageFeedbackMessage(u1, u2, u2a, u2b, u2c, u3, u3a, u3b, u3c, u3d, u4, u5, u6) =>
|
||||
u1 :: u2a.nonEmpty :: u2 :: u2a :: u2b :: u2c :: u3a.nonEmpty :: u3 :: u3a :: u3b :: u3c :: u3d :: u4 :: u5 :: u6 :: HNil
|
||||
}
|
||||
)
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
// Copyright (c) 2019 PSForever
|
||||
package net.psforever.packet.game
|
||||
|
||||
import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket}
|
||||
import net.psforever.types.Angular
|
||||
import scodec.Codec
|
||||
import scodec.codecs._
|
||||
|
||||
final case class DamageMessage(guid1 : PlanetSideGUID,
|
||||
unk1 : Int,
|
||||
guid2 : PlanetSideGUID,
|
||||
unk2 : Boolean)
|
||||
extends PlanetSideGamePacket {
|
||||
type Packet = DamageMessage
|
||||
def opcode = GamePacketOpcode.DamageMessage
|
||||
def encode = DamageMessage.encode(this)
|
||||
}
|
||||
|
||||
object DamageMessage extends Marshallable[DamageMessage] {
|
||||
implicit val codec : Codec[DamageMessage] = (
|
||||
("guid1" | PlanetSideGUID.codec) ::
|
||||
("unk1" | uint8) ::
|
||||
("guid1" | PlanetSideGUID.codec) ::
|
||||
("unk2" | bool)
|
||||
).as[DamageMessage]
|
||||
}
|
||||
|
|
@ -11,7 +11,8 @@ import shapeless.{::, HNil}
|
|||
* @param player_guid1 the player
|
||||
* @param player_guid2 the player(?);
|
||||
* often matches with `player_guid1`
|
||||
* @param unk na
|
||||
* @param unk na;
|
||||
* commonly, zero
|
||||
* @param list list of detected objects;
|
||||
* normally contains at least one element
|
||||
*/
|
||||
|
|
@ -20,7 +21,7 @@ import shapeless.{::, HNil}
|
|||
BETA CLIENT DEBUG INFO:
|
||||
Detector
|
||||
Sender
|
||||
Object Count
|
||||
Object Count (not really)
|
||||
Detected Object[]
|
||||
*/
|
||||
final case class ObjectDetectedMessage(player_guid1 : PlanetSideGUID,
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ import shapeless.{::, HNil}
|
|||
* a discharged controlled projectile will not normally rotate.
|
||||
* A minor loss of lifespan may be levied.
|
||||
* @see `ProjectileDefinition`
|
||||
* @see `TrackedProjectileData`
|
||||
* @see `RemoteProjectileData`
|
||||
* @param projectile_guid when dispatched by the client, the client-specific local unique identifier of the projectile;
|
||||
* when dispatched by the server, the global unique identifier for the synchronized projectile object
|
||||
* @param shot_pos the position of the projectile
|
||||
|
|
@ -42,16 +42,18 @@ import shapeless.{::, HNil}
|
|||
* @param shot_original_orient the orientation of the projectile when it was discharged
|
||||
* @param sequence_num an incrementing index of the packet in this projectile's lifetime;
|
||||
* suggests the "time alive" and indicates a place in packet ordering
|
||||
* @param explode indicates the projectile should explode
|
||||
* @param unk na
|
||||
* @param end indicates the projectile has reached the end of its lifespan;
|
||||
* usually, it should explode
|
||||
* @param hit_target_guid the global unique identifier of the object the projwectile collided with;
|
||||
* will be 0 if it reached the end of its life naturally, without colliding with anything
|
||||
*/
|
||||
final case class ProjectileStateMessage(projectile_guid : PlanetSideGUID,
|
||||
shot_pos : Vector3,
|
||||
shot_vel : Vector3,
|
||||
shot_original_orient : Vector3,
|
||||
sequence_num : Int,
|
||||
explode : Boolean,
|
||||
unk : Int)
|
||||
end : Boolean,
|
||||
hit_target_guid : PlanetSideGUID)
|
||||
extends PlanetSideGamePacket {
|
||||
type Packet = ProjectileStateMessage
|
||||
def opcode = GamePacketOpcode.ProjectileStateMessage
|
||||
|
|
@ -67,8 +69,8 @@ object ProjectileStateMessage extends Marshallable[ProjectileStateMessage] {
|
|||
("pitch" | Angular.codec_pitch) ::
|
||||
("yaw" | Angular.codec_yaw()) ::
|
||||
("sequence_num" | uint8) ::
|
||||
("explode" | bool) ::
|
||||
("unk" | uint16L)
|
||||
("end" | bool) ::
|
||||
("hit_target" | PlanetSideGUID.codec)
|
||||
).xmap[ProjectileStateMessage] (
|
||||
{
|
||||
case guid :: pos :: vel :: roll :: pitch :: yaw :: sequence_num :: explode :: unk :: HNil =>
|
||||
|
|
|
|||
|
|
@ -1223,21 +1223,21 @@ object ObjectClass {
|
|||
case ObjectClass.portable_manned_turret_vs => ConstructorData(OneMannedFieldTurretData.codec, "field turret")
|
||||
case ObjectClass.router_telepad_deployable => DroppedItemData(TelepadDeployableData.codec, "telepad deployable")
|
||||
//projectiles
|
||||
case ObjectClass.hunter_seeker_missile_projectile => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.meteor_common => ConstructorData(TrackedProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_b_large => ConstructorData(TrackedProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_b_medium => ConstructorData(TrackedProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_b_small => ConstructorData(TrackedProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_large => ConstructorData(TrackedProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_medium => ConstructorData(TrackedProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_small => ConstructorData(TrackedProjectileData.codec, "meteor")
|
||||
case ObjectClass.phoenix_missile_guided_projectile => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.oicw_little_buddy => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.oicw_projectile => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.sparrow_projectile => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.starfire_projectile => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.striker_missile_targeting_projectile => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.wasp_rocket_projectile => ConstructorData(TrackedProjectileData.codec, "projectile")
|
||||
case ObjectClass.hunter_seeker_missile_projectile => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
case ObjectClass.meteor_common => ConstructorData(RemoteProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_b_large => ConstructorData(RemoteProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_b_medium => ConstructorData(RemoteProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_b_small => ConstructorData(RemoteProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_large => ConstructorData(RemoteProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_medium => ConstructorData(RemoteProjectileData.codec, "meteor")
|
||||
case ObjectClass.meteor_projectile_small => ConstructorData(RemoteProjectileData.codec, "meteor")
|
||||
case ObjectClass.phoenix_missile_guided_projectile => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
case ObjectClass.oicw_little_buddy => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
case ObjectClass.oicw_projectile => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
case ObjectClass.sparrow_projectile => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
case ObjectClass.starfire_projectile => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
case ObjectClass.striker_missile_targeting_projectile => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
case ObjectClass.wasp_rocket_projectile => ConstructorData(RemoteProjectileData.codec, "projectile")
|
||||
//vehicles
|
||||
case ObjectClass.ams => ConstructorData(VehicleData.codec(VehicleFormat.Utility), "ams")
|
||||
case ObjectClass.ams_destroyed => ConstructorData(DestroyedVehicleData.codec, "wreckage")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,84 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package net.psforever.packet.game.objectcreate
|
||||
|
||||
import net.psforever.packet.{Marshallable, PacketHelpers}
|
||||
import scodec.{Attempt, Codec}
|
||||
import scodec.codecs._
|
||||
import shapeless.{::, HNil}
|
||||
|
||||
object RemoteProjectiles {
|
||||
abstract class Data(val a : Int, val b : Int)
|
||||
|
||||
final case object Meteor extends Data(0, 32)
|
||||
final case object Wasp extends Data(0, 208)
|
||||
final case object Sparrow extends Data(13107, 187)
|
||||
final case object OICW extends Data(13107, 195)
|
||||
final case object Striker extends Data(26214, 134)
|
||||
final case object HunterSeeker extends Data(39577, 201)
|
||||
final case object Starfire extends Data(39577, 249)
|
||||
class OICWLittleBuddy(x : Int, y : Int) extends Data(x, y)
|
||||
}
|
||||
|
||||
object FlightPhysics extends Enumeration {
|
||||
type Type = Value
|
||||
|
||||
//valid (extremely small distance) (requires non-zero unk4, unk5)
|
||||
val State3 = Value(3)
|
||||
//valid (infinite) (if unk4 == 0 unk5 == 0, minimum distance + time)
|
||||
val State4 = Value(4)
|
||||
//valid(infinite)
|
||||
val State5 = Value(5)
|
||||
//valid (uses velocity) (infinite)
|
||||
val State6 = Value(6)
|
||||
//valid (uses velocity) (infinite)
|
||||
val State7 = Value(7)
|
||||
//valid (uses velocity) (time > 0 is infinite) (unk5 == 2)
|
||||
val State15 = Value(15)
|
||||
|
||||
implicit val codec = PacketHelpers.createEnumerationCodec(this, uint4L)
|
||||
}
|
||||
|
||||
/**
|
||||
* A representation of a projectile that the server must intentionally convey to players other than the shooter.
|
||||
* @param common_data common game object information
|
||||
* @param u1 na;
|
||||
* first part of the canned remote projectile data
|
||||
* @param u2 na;
|
||||
* second part of the canned remote projectile data
|
||||
* @param unk3 na;
|
||||
* does something to how the projectile flies
|
||||
* @param unk4 na
|
||||
* @param unk5 na
|
||||
*/
|
||||
final case class RemoteProjectileData(common_data : CommonFieldDataWithPlacement,
|
||||
u1 : Int,
|
||||
u2 : Int,
|
||||
unk3 : FlightPhysics.Value,
|
||||
unk4 : Int,
|
||||
unk5 : Int
|
||||
) extends ConstructorData {
|
||||
override def bitsize : Long = 33L + common_data.bitsize
|
||||
}
|
||||
|
||||
object RemoteProjectileData extends Marshallable[RemoteProjectileData] {
|
||||
implicit val codec : Codec[RemoteProjectileData] = (
|
||||
("data" | CommonFieldDataWithPlacement.codec) ::
|
||||
("u1" | uint16) ::
|
||||
("u2" | uint8) ::
|
||||
("unk3" | FlightPhysics.codec) ::
|
||||
("unk4" | uint(3)) ::
|
||||
("unk5" | uint2)
|
||||
).exmap[RemoteProjectileData] (
|
||||
{
|
||||
case data :: u1 :: u2 :: unk3 :: unk4 :: unk5 :: HNil =>
|
||||
Attempt.successful(RemoteProjectileData(data, u1, u2, unk3, unk4, unk5))
|
||||
|
||||
// case data =>
|
||||
// Attempt.failure(Err(s"invalid projectile data format - $data"))
|
||||
},
|
||||
{
|
||||
case RemoteProjectileData(data, u1, u2, unk3, unk4, unk5) =>
|
||||
Attempt.successful(data :: u1 :: u2 :: unk3 :: unk4 :: unk5 :: HNil)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package net.psforever.packet.game.objectcreate
|
||||
|
||||
import net.psforever.packet.{Marshallable, PacketHelpers}
|
||||
import scodec.{Attempt, Codec}
|
||||
import scodec.codecs._
|
||||
import shapeless.{::, HNil}
|
||||
|
||||
object TrackedProjectile extends Enumeration {
|
||||
type Type = Value
|
||||
|
||||
val OICWLittleBuddy = Value(-1) //?, ?
|
||||
val Meteor = Value(32) //0, 32
|
||||
val Wasp = Value(208) //0, 208
|
||||
val Sparrow = Value(3355579) //13107, 187
|
||||
val OICW = Value(3355587) //13107, 195
|
||||
val Striker = Value(6710918) //26214, 134
|
||||
val HunterSeeker = Value(10131913) //39577, 201
|
||||
val Starfire = Value(10131961) //39577, 249
|
||||
|
||||
implicit val codec = PacketHelpers.createEnumerationCodec(this, uint24)
|
||||
}
|
||||
|
||||
object TrackedProjectiles {
|
||||
abstract class Data(val is : TrackedProjectile.Value, val a : Int, val b : Int)
|
||||
|
||||
final case object Meteor extends Data(TrackedProjectile.Meteor, 0, 32)
|
||||
final case object Wasp extends Data(TrackedProjectile.Wasp, 0, 208)
|
||||
final case object Sparrow extends Data(TrackedProjectile.Sparrow, 13107, 187)
|
||||
final case object OICW extends Data(TrackedProjectile.OICW, 13107, 195)
|
||||
final case object Striker extends Data(TrackedProjectile.Striker, 26214, 134)
|
||||
final case object HunterSeeker extends Data(TrackedProjectile.HunterSeeker, 39577, 201)
|
||||
final case object Starfire extends Data(TrackedProjectile.Starfire, 39577, 249)
|
||||
class OICWLittleBuddy(x : Int, y : Int) extends Data(TrackedProjectile.OICWLittleBuddy, x, y)
|
||||
|
||||
val values: Seq[TrackedProjectiles.Data] = Seq(Meteor, Wasp, Sparrow, OICW, Striker, HunterSeeker, Starfire)
|
||||
|
||||
def apply(x : Int, y : Int) : TrackedProjectiles.Data = {
|
||||
values.find(p => p.a == x && p.b == y) match {
|
||||
case Some(projectileData) => projectileData
|
||||
case None =>
|
||||
throw new IllegalArgumentException("no combination of projectile data equates to a defined projectile type")
|
||||
}
|
||||
}
|
||||
|
||||
def apply(is : TrackedProjectile.Value) : TrackedProjectiles.Data = {
|
||||
values.find(p => p.is == is) match {
|
||||
case Some(projectileData) => projectileData
|
||||
case None =>
|
||||
throw new IllegalArgumentException("unknown projectile type")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
object FlightPhysics extends Enumeration {
|
||||
type Type = Value
|
||||
|
||||
//valid (extremely small distance) (requires non-zero unk4, unk5)
|
||||
val State3 = Value(3)
|
||||
//valid (infinite) (if unk4 == 0 unk5 == 0, minimum distance + time)
|
||||
val State4 = Value(4)
|
||||
//valid(infinite)
|
||||
val State5 = Value(5)
|
||||
//valid (uses velocity) (infinite)
|
||||
val State6 = Value(6)
|
||||
//valid (uses velocity) (infinite)
|
||||
val State7 = Value(7)
|
||||
//valid (uses velocity) (time > 0 is infinite) (unk5 == 2)
|
||||
val State15 = Value(15)
|
||||
|
||||
implicit val codec = PacketHelpers.createEnumerationCodec(this, uint4L)
|
||||
}
|
||||
|
||||
/**
|
||||
* A representation of a projectile that the server must intentionally convey to players other than the shooter.
|
||||
* @param common_data common game object information
|
||||
* @param unk3 na
|
||||
*/
|
||||
final case class TrackedProjectileData(common_data : CommonFieldDataWithPlacement,
|
||||
u1 : Int,
|
||||
u2 : Int,
|
||||
unk3 : FlightPhysics.Value,
|
||||
unk4 : Int,
|
||||
unk5 : Int
|
||||
) extends ConstructorData {
|
||||
override def bitsize : Long = 33L + common_data.bitsize
|
||||
}
|
||||
|
||||
object TrackedProjectileData extends Marshallable[TrackedProjectileData] {
|
||||
implicit val codec : Codec[TrackedProjectileData] = (
|
||||
("data" | CommonFieldDataWithPlacement.codec) ::
|
||||
("u1" | uint16) ::
|
||||
("u2" | uint8) ::
|
||||
("unk3" | FlightPhysics.codec) ::
|
||||
("unk4" | uint(3)) ::
|
||||
("unk5" | uint2)
|
||||
).exmap[TrackedProjectileData] (
|
||||
{
|
||||
case data :: u1 :: u2 :: unk3 :: unk4 :: unk5 :: HNil =>
|
||||
Attempt.successful(TrackedProjectileData(data, u1, u2, unk3, unk4, unk5))
|
||||
|
||||
// case data =>
|
||||
// Attempt.failure(Err(s"invalid projectile data format - $data"))
|
||||
},
|
||||
{
|
||||
case TrackedProjectileData(data, u1, u2, unk3, unk4, unk5) =>
|
||||
Attempt.successful(data :: u1 :: u2 :: unk3 :: unk4 :: unk5 :: HNil)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
|
@ -165,17 +165,13 @@ class AvatarService extends Actor {
|
|||
AvatarEvents.publish(
|
||||
AvatarServiceResponse(s"/$forChannel/Avatar", PlanetSideGUID(0), AvatarResponse.ProjectileAutoLockAwareness(mode))
|
||||
)
|
||||
case AvatarAction.ProjectileTrackingAwareness(guid) =>
|
||||
AvatarEvents.publish(
|
||||
AvatarServiceResponse(s"/$forChannel/Avatar", PlanetSideGUID(0), AvatarResponse.ProjectileTrackingAwareness(guid))
|
||||
)
|
||||
case AvatarAction.ProjectileExplodes(player_guid, projectile_guid, projectile) =>
|
||||
AvatarEvents.publish(
|
||||
AvatarServiceResponse(s"/$forChannel/Avatar", player_guid, AvatarResponse.ProjectileExplodes(projectile_guid, projectile))
|
||||
)
|
||||
case AvatarAction.ProjectileState(player_guid, projectile_guid, shot_pos, shot_vel, shot_orient, unk1, unk2, unk3) =>
|
||||
case AvatarAction.ProjectileState(player_guid, projectile_guid, shot_pos, shot_vel, shot_orient, sequence, end, target) =>
|
||||
AvatarEvents.publish(
|
||||
AvatarServiceResponse(s"/$forChannel/Avatar", player_guid, AvatarResponse.ProjectileState(projectile_guid, shot_pos, shot_vel, shot_orient, unk1, unk2, unk3))
|
||||
AvatarServiceResponse(s"/$forChannel/Avatar", player_guid, AvatarResponse.ProjectileState(projectile_guid, shot_pos, shot_vel, shot_orient, sequence, end, target))
|
||||
)
|
||||
case AvatarAction.PickupItem(player_guid, zone, target, slot, item, unk) =>
|
||||
janitor forward RemoverActor.ClearSpecific(List(item), zone)
|
||||
|
|
|
|||
|
|
@ -50,9 +50,8 @@ object AvatarAction {
|
|||
final case class PlayerState(player_guid : PlanetSideGUID, pos : Vector3, vel : Option[Vector3], facingYaw : Float, facingPitch : Float, facingYawUpper : Float, timestamp : Int, is_crouching : Boolean, is_jumping : Boolean, jump_thrust : Boolean, is_cloaked : Boolean, spectator : Boolean, weaponInHand : Boolean) extends Action
|
||||
final case class PickupItem(player_guid : PlanetSideGUID, zone : Zone, target : PlanetSideGameObject with Container, slot : Int, item : Equipment, unk : Int = 0) extends Action
|
||||
final case class ProjectileAutoLockAwareness(mode : Int) extends Action
|
||||
final case class ProjectileTrackingAwareness(projectile_guid : PlanetSideGUID) extends Action
|
||||
final case class ProjectileExplodes(player_guid : PlanetSideGUID, projectile_guid : PlanetSideGUID, projectile : Projectile) extends Action
|
||||
final case class ProjectileState(player_guid : PlanetSideGUID, projectile_guid : PlanetSideGUID, shot_pos : Vector3, shot_vel : Vector3, shot_orient : Vector3, unk1 : Int, unk2 : Boolean, unk3 : Int) extends Action
|
||||
final case class ProjectileState(player_guid : PlanetSideGUID, projectile_guid : PlanetSideGUID, shot_pos : Vector3, shot_vel : Vector3, shot_orient : Vector3, sequence : Int, end : Boolean, hit_target : PlanetSideGUID) extends Action
|
||||
final case class PutDownFDU(player_guid : PlanetSideGUID) extends Action
|
||||
final case class Release(player : Player, zone : Zone, time : Option[FiniteDuration] = None) extends Action
|
||||
final case class Revive(target_guid: PlanetSideGUID) extends Action
|
||||
|
|
|
|||
|
|
@ -42,9 +42,8 @@ object AvatarResponse {
|
|||
final case class PlanetsideAttributeSelf(attribute_type : Int, attribute_value : Long) extends Response
|
||||
final case class PlayerState(pos : Vector3, vel : Option[Vector3], facingYaw : Float, facingPitch : Float, facingYawUpper : Float, timestamp : Int, is_crouching : Boolean, is_jumping : Boolean, jump_thrust : Boolean, is_cloaked : Boolean, spectator : Boolean, weaponInHand : Boolean) extends Response
|
||||
final case class ProjectileAutoLockAwareness(mode : Int) extends Response
|
||||
final case class ProjectileTrackingAwareness(projectile_guid : PlanetSideGUID) extends Response
|
||||
final case class ProjectileExplodes(projectile_guid : PlanetSideGUID, projectile : Projectile) extends Response
|
||||
final case class ProjectileState(projectile_guid : PlanetSideGUID, shot_pos : Vector3, shot_vel : Vector3, shot_orient : Vector3, unk1 : Int, unk2 : Boolean, unk3 : Int) extends Response
|
||||
final case class ProjectileState(projectile_guid : PlanetSideGUID, shot_pos : Vector3, shot_vel : Vector3, shot_orient : Vector3, sequence : Int, end : Boolean, hit_target : PlanetSideGUID) extends Response
|
||||
final case class PutDownFDU(target_guid : PlanetSideGUID) extends Response
|
||||
final case class Release(player : Player) extends Response
|
||||
final case class Reload(weapon_guid : PlanetSideGUID) extends Response
|
||||
|
|
|
|||
68
common/src/test/scala/game/DamageFeedbackMessageTest.scala
Normal file
68
common/src/test/scala/game/DamageFeedbackMessageTest.scala
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package game
|
||||
|
||||
import org.specs2.mutable._
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game._
|
||||
import scodec.bits._
|
||||
|
||||
class DamageFeedbackMessageTest extends Specification {
|
||||
val string = hex"7b 3d842f610b2040000000"
|
||||
|
||||
"decode" in {
|
||||
PacketCoding.DecodePacket(string).require match {
|
||||
case DamageFeedbackMessage(unk1, unk2, unk2a, unk2b, unk2c, unk3, unk3a, unk3b, unk3c, unk3d, unk4, unk5, unk6) =>
|
||||
unk1 mustEqual 3
|
||||
unk2 mustEqual true
|
||||
unk2a.contains(PlanetSideGUID(2913)) mustEqual true
|
||||
unk2b.isEmpty mustEqual true
|
||||
unk2c.isEmpty mustEqual true
|
||||
unk3 mustEqual true
|
||||
unk3a.contains(PlanetSideGUID(2913)) mustEqual true
|
||||
unk3b.isEmpty mustEqual true
|
||||
unk3c.isEmpty mustEqual true
|
||||
unk3d.isEmpty mustEqual true
|
||||
unk4 mustEqual 1
|
||||
unk5 mustEqual 2
|
||||
unk6 mustEqual 0
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
}
|
||||
|
||||
"encode" in {
|
||||
val msg = DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0)
|
||||
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
||||
|
||||
pkt mustEqual string
|
||||
}
|
||||
|
||||
"failures" in {
|
||||
//unk2: no parameters
|
||||
DamageFeedbackMessage(3, true, None, None, None, true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
//unk2: two exclusive parameters
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), Some("error"), None, true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, Some(5), true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
DamageFeedbackMessage(3, true, None, Some("error"), Some(5), true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
//unk2: all parameters
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), Some("error"), Some(5), true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
//unk2: mismatched flag for strings
|
||||
DamageFeedbackMessage(3, true, None, None, Some(5), true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
DamageFeedbackMessage(3, false, None, Some("error"), None, true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
|
||||
//unk3: no parameters
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, None, None, None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
//unk3: two exclusive parameters
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, Some(PlanetSideGUID(2913)), Some("error"), None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, Some(PlanetSideGUID(2913)), None, Some(5), None, 1, 2, 0) must throwA[AssertionError]
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, None, Some("error"), Some(5), Some(1), 1, 2, 0) must throwA[AssertionError]
|
||||
//unk3: all parameters
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, Some(PlanetSideGUID(2913)), Some("error"), Some(5), None, 1, 2, 0) must throwA[AssertionError]
|
||||
//unk3: mismatched fields
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, Some(PlanetSideGUID(2913)), None, None, Some(5), 1, 2, 0) must throwA[AssertionError]
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, None, Some("Error"), None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
//unk3: mismatched flag for strings
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, true, None, None, Some(5), None, 1, 2, 0) must throwA[AssertionError]
|
||||
DamageFeedbackMessage(3, true, Some(PlanetSideGUID(2913)), None, None, false, None, Some("error"), None, None, 1, 2, 0) must throwA[AssertionError]
|
||||
}
|
||||
}
|
||||
30
common/src/test/scala/game/DamageMessageTest.scala
Normal file
30
common/src/test/scala/game/DamageMessageTest.scala
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
// Copyright (c) 2019 PSForever
|
||||
package game
|
||||
|
||||
import org.specs2.mutable._
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game._
|
||||
import scodec.bits._
|
||||
|
||||
class DamageMessageTest extends Specification {
|
||||
val string = hex"0b610b02610b00"
|
||||
|
||||
"decode" in {
|
||||
PacketCoding.DecodePacket(string).require match {
|
||||
case DamageMessage(guid1, unk1, guid2, unk2) =>
|
||||
guid1 mustEqual PlanetSideGUID(2913)
|
||||
unk1 mustEqual 2
|
||||
guid2 mustEqual PlanetSideGUID(2913)
|
||||
unk2 mustEqual false
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
}
|
||||
|
||||
"encode" in {
|
||||
val msg = DamageMessage(PlanetSideGUID(2913), 2, PlanetSideGUID(2913), false)
|
||||
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
||||
|
||||
pkt mustEqual string
|
||||
}
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ class ProjectileStateMessageTest extends Specification {
|
|||
orient mustEqual Vector3(0, 22.5f, 146.25f)
|
||||
sequence mustEqual 2
|
||||
explode mustEqual false
|
||||
unk mustEqual 0
|
||||
unk mustEqual PlanetSideGUID(0)
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
|
|
@ -33,7 +33,7 @@ class ProjectileStateMessageTest extends Specification {
|
|||
Vector3(0, 22.5f, 146.25f),
|
||||
2,
|
||||
false,
|
||||
0
|
||||
PlanetSideGUID(0)
|
||||
)
|
||||
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ import net.psforever.types.{PlanetSideEmpire, Vector3}
|
|||
import org.specs2.mutable._
|
||||
import scodec.bits._
|
||||
|
||||
class TrackedProjectileDataTest extends Specification {
|
||||
class RemoteProjectileDataTest extends Specification {
|
||||
val string_striker_projectile = hex"17 C5000000 A4B 009D 4C129 0CB0A 9814 00 F5 E3 040000666686400"
|
||||
val string_hunter_seeker_missile_projectile = hex"17 c5000000 ca9 ab9e af127 ec465 3723 00 15 c4 2400009a99c9400"
|
||||
|
||||
"TrackedProjectileData" should {
|
||||
"RemoteProjectileData" should {
|
||||
"decode (striker_missile_targeting_projectile)" in {
|
||||
PacketCoding.DecodePacket(string_striker_projectile).require match {
|
||||
case ObjectCreateMessage(len, cls, guid, parent, data) =>
|
||||
|
|
@ -21,7 +21,7 @@ class TrackedProjectileDataTest extends Specification {
|
|||
guid mustEqual PlanetSideGUID(40192)
|
||||
parent.isDefined mustEqual false
|
||||
data match {
|
||||
case TrackedProjectileData(CommonFieldDataWithPlacement(pos, deploy), unk2, lim, unk3, unk4, unk5) =>
|
||||
case RemoteProjectileData(CommonFieldDataWithPlacement(pos, deploy), unk2, lim, unk3, unk4, unk5) =>
|
||||
pos.coord mustEqual Vector3(4644.5938f, 5472.0938f, 82.375f)
|
||||
pos.orient mustEqual Vector3(0, 30.9375f, 171.5625f)
|
||||
deploy.faction mustEqual PlanetSideEmpire.TR
|
||||
|
|
@ -55,7 +55,7 @@ class TrackedProjectileDataTest extends Specification {
|
|||
guid mustEqual PlanetSideGUID(40619)
|
||||
parent.isDefined mustEqual false
|
||||
data match {
|
||||
case TrackedProjectileData(CommonFieldDataWithPlacement(pos, deploy), unk2, lim, unk3, unk4, unk5) =>
|
||||
case RemoteProjectileData(CommonFieldDataWithPlacement(pos, deploy), unk2, lim, unk3, unk4, unk5) =>
|
||||
pos.coord mustEqual Vector3(3621.3672f, 2701.8438f, 140.85938f)
|
||||
pos.orient mustEqual Vector3(0, 300.9375f, 258.75f)
|
||||
deploy.faction mustEqual PlanetSideEmpire.NC
|
||||
|
|
@ -82,7 +82,7 @@ class TrackedProjectileDataTest extends Specification {
|
|||
}
|
||||
|
||||
"encode (striker_missile_targeting_projectile)" in {
|
||||
val obj = TrackedProjectileData(
|
||||
val obj = RemoteProjectileData(
|
||||
CommonFieldDataWithPlacement(
|
||||
PlacementData(4644.5938f, 5472.0938f, 82.375f, 0f, 30.9375f, 171.5625f),
|
||||
CommonFieldData(PlanetSideEmpire.TR, false, false, true, None, false, None, None, PlanetSideGUID(0))
|
||||
|
|
@ -100,7 +100,7 @@ class TrackedProjectileDataTest extends Specification {
|
|||
}
|
||||
|
||||
"encode (hunter_seeker_missile_projectile)" in {
|
||||
val obj = TrackedProjectileData(
|
||||
val obj = RemoteProjectileData(
|
||||
CommonFieldDataWithPlacement(
|
||||
PlacementData(3621.3672f, 2701.8438f, 140.85938f, 0, 300.9375f, 258.75f),
|
||||
CommonFieldData(PlanetSideEmpire.NC, false, false, true, None, false, None, None, PlanetSideGUID(0))
|
||||
Loading…
Add table
Add a link
Reference in a new issue