giving VehicleFormat its own file; fixing imports

This commit is contained in:
Fate-JH 2023-05-30 02:18:56 -04:00
parent 734a0b97a1
commit 2cd72d3a7f
10 changed files with 31 additions and 26 deletions

View file

@ -4,7 +4,7 @@ package net.psforever.objects.definition.converter
import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.equipment.{Equipment, EquipmentSlot}
import net.psforever.objects.vehicles.VehicleSubsystemEntry import net.psforever.objects.vehicles.VehicleSubsystemEntry
import net.psforever.objects.{PlanetSideGameObject, Vehicle} import net.psforever.objects.{PlanetSideGameObject, Vehicle}
import net.psforever.types.PlanetSideGUID import net.psforever.types.{PlanetSideGUID, VehicleFormat}
import net.psforever.packet.game.objectcreate._ import net.psforever.packet.game.objectcreate._
import scala.util.{Failure, Success, Try} import scala.util.{Failure, Success, Try}

View file

@ -4,7 +4,7 @@ package net.psforever.objects.definition.converter
import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.equipment.{Equipment, EquipmentSlot}
import net.psforever.objects.vehicles.VehicleSubsystemEntry import net.psforever.objects.vehicles.VehicleSubsystemEntry
import net.psforever.objects.{PlanetSideGameObject, Vehicle} import net.psforever.objects.{PlanetSideGameObject, Vehicle}
import net.psforever.types.PlanetSideGUID import net.psforever.types.{PlanetSideGUID, VehicleFormat}
import net.psforever.packet.game.objectcreate._ import net.psforever.packet.game.objectcreate._
import scala.util.{Failure, Success, Try} import scala.util.{Failure, Success, Try}

View file

@ -2,7 +2,8 @@
package net.psforever.objects.definition.converter package net.psforever.objects.definition.converter
import net.psforever.objects.Vehicle import net.psforever.objects.Vehicle
import net.psforever.packet.game.objectcreate.{UtilityVehicleData, VehicleFormat} import net.psforever.packet.game.objectcreate.UtilityVehicleData
import net.psforever.types.VehicleFormat
class UtilityVehicleConverter extends VehicleConverter { class UtilityVehicleConverter extends VehicleConverter {
override protected def SpecificFormatModifier: VehicleFormat = VehicleFormat.Utility override protected def SpecificFormatModifier: VehicleFormat = VehicleFormat.Utility

View file

@ -2,7 +2,8 @@
package net.psforever.objects.definition.converter package net.psforever.objects.definition.converter
import net.psforever.objects.Vehicle import net.psforever.objects.Vehicle
import net.psforever.packet.game.objectcreate.{VariantVehicleData, VehicleFormat} import net.psforever.packet.game.objectcreate.VariantVehicleData
import net.psforever.types.VehicleFormat
class VariantVehicleConverter extends VehicleConverter { class VariantVehicleConverter extends VehicleConverter {
override protected def SpecificFormatModifier: VehicleFormat = VehicleFormat.Variant override protected def SpecificFormatModifier: VehicleFormat = VehicleFormat.Variant

View file

@ -4,7 +4,7 @@ package net.psforever.objects.definition.converter
import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.equipment.{Equipment, EquipmentSlot}
import net.psforever.objects.{PlanetSideGameObject, Vehicle} import net.psforever.objects.{PlanetSideGameObject, Vehicle}
import net.psforever.packet.game.objectcreate._ import net.psforever.packet.game.objectcreate._
import net.psforever.types.{DriveState, PlanetSideGUID} import net.psforever.types.{DriveState, PlanetSideGUID, VehicleFormat}
import scala.util.{Failure, Success, Try} import scala.util.{Failure, Success, Try}

View file

@ -2,6 +2,7 @@
package net.psforever.packet.game.objectcreate package net.psforever.packet.game.objectcreate
import net.psforever.packet.Marshallable import net.psforever.packet.Marshallable
import net.psforever.types.VehicleFormat
import scodec.{Attempt, Codec, Err} import scodec.{Attempt, Codec, Err}
import shapeless.HNil import shapeless.HNil
import scodec.codecs._ import scodec.codecs._

View file

@ -2,7 +2,7 @@
package net.psforever.packet.game.objectcreate package net.psforever.packet.game.objectcreate
import net.psforever.packet.PacketHelpers import net.psforever.packet.PacketHelpers
import net.psforever.types.PlanetSideGUID import net.psforever.types.{PlanetSideGUID, VehicleFormat}
import scodec.Attempt.{Failure, Successful} import scodec.Attempt.{Failure, Successful}
import scodec.{Codec, Err} import scodec.{Codec, Err}
import scodec.codecs._ import scodec.codecs._
@ -118,7 +118,7 @@ object MountableInventory {
accumulative: Long accumulative: Long
): Player_Data = { ): Player_Data = {
val appearance = basic_appearance(CumulativeSeatedPlayerNamePadding(accumulative)) val appearance = basic_appearance(CumulativeSeatedPlayerNamePadding(accumulative))
Player_Data.apply(None, appearance, character_data(appearance.b.backpack, true), None, drawn_slot)(position_defined = false) Player_Data.apply(None, appearance, character_data(false, true), None, drawn_slot)(position_defined = false)
} }
/** /**

View file

@ -1,6 +1,7 @@
// Copyright (c) 2017 PSForever // Copyright (c) 2017 PSForever
package net.psforever.packet.game.objectcreate package net.psforever.packet.game.objectcreate
import net.psforever.types.VehicleFormat
import scodec.{Attempt, Codec, Err} import scodec.{Attempt, Codec, Err}
import scodec.codecs._ import scodec.codecs._

View file

@ -6,25 +6,7 @@ import scodec.Attempt.{Failure, Successful}
import scodec.{Attempt, Codec, Err} import scodec.{Attempt, Codec, Err}
import shapeless.HNil import shapeless.HNil
import scodec.codecs._ import scodec.codecs._
import net.psforever.types.DriveState import net.psforever.types.{DriveState, VehicleFormat}
import enumeratum.values.{IntEnum, IntEnumEntry}
/**
* An enumeration of the various formats that known structures that the stream of bits for `VehicleData` can assume.
*/
sealed abstract class VehicleFormat(val value: Int) extends IntEnumEntry
object VehicleFormat extends IntEnum[VehicleFormat] {
val values = findValues
case object Normal extends VehicleFormat(value = 0)
case object Battleframe extends VehicleFormat(value = 1)
case object BattleframeFlight extends VehicleFormat(value = 2)
case object Utility extends VehicleFormat(value = 6)
case object Variant extends VehicleFormat(value = 8)
//val Battleframe, BattleframeFlight, Normal, Utility, Variant = Value
}
/** /**
* A basic `Trait` connecting all of the vehicle data formats (excepting `Normal`/`None`). * A basic `Trait` connecting all of the vehicle data formats (excepting `Normal`/`None`).

View file

@ -0,0 +1,19 @@
// Copyright (c) 2023 PSForever
package net.psforever.types
import enumeratum.values.{IntEnum, IntEnumEntry}
/**
* An enumeration of the various formats that known structures that the stream of bits for `VehicleData` can assume.
*/
sealed abstract class VehicleFormat(val value: Int) extends IntEnumEntry
object VehicleFormat extends IntEnum[VehicleFormat] {
val values: IndexedSeq[VehicleFormat] = findValues
case object Normal extends VehicleFormat(value = 0)
case object Battleframe extends VehicleFormat(value = 1)
case object BattleframeFlight extends VehicleFormat(value = 2)
case object Utility extends VehicleFormat(value = 6)
case object Variant extends VehicleFormat(value = 8)
}