From 051283337cdf4dd4ef50bf03045950679b58b8a2 Mon Sep 17 00:00:00 2001 From: FateJH Date: Sat, 17 Feb 2018 17:57:04 -0500 Subject: [PATCH] rebase did not flag these conflicts during operation, so they had to be manually corrected --- .../net/psforever/objects/GlobalDefinitions.scala | 3 --- .../main/scala/net/psforever/objects/Vehicle.scala | 8 +------- .../objects/definition/VehicleDefinition.scala | 11 ++--------- .../psforever/objects/vehicles/VehicleControl.scala | 8 -------- 4 files changed, 3 insertions(+), 27 deletions(-) diff --git a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index e16159b5..3d1bbc0f 100644 --- a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -2347,14 +2347,11 @@ object GlobalDefinitions { ams.Seats(0).ArmorRestriction = SeatArmorRestriction.NoReinforcedOrMax ams.MountPoints += 1 -> 0 ams.MountPoints += 2 -> 0 -<<<<<<< 27d86af015d5a835f7d594aed9ccdd1de4048c53 ams.Utilities += 3 -> UtilityType.order_terminala ams.Utilities += 4 -> UtilityType.order_terminalb -======= ams.Deployment = true ams.DeployTime = 2000 ams.UndeployTime = 2000 ->>>>>>> Deployment: ams.Packet = utilityConverter val variantConverter = new VariantVehicleConverter diff --git a/common/src/main/scala/net/psforever/objects/Vehicle.scala b/common/src/main/scala/net/psforever/objects/Vehicle.scala index b15590e2..13854707 100644 --- a/common/src/main/scala/net/psforever/objects/Vehicle.scala +++ b/common/src/main/scala/net/psforever/objects/Vehicle.scala @@ -20,9 +20,7 @@ import scala.annotation.tailrec * All infantry seating, all mounted weapons, and the trunk space are considered part of the same index hierarchy. * Generally, all seating is declared first - the driver and passengers and and gunners. * Following that are the mounted weapons and other utilities. - * Trunk space starts being indexed afterwards.
- *
-<<<<<<< 27d86af015d5a835f7d594aed9ccdd1de4048c53 + * Trunk space starts being indexed afterwards. * To keep it simple, infantry seating, mounted weapons, and utilities are stored separately.
*
* Vehicles maintain a `Map` of `Utility` objects in given index positions. @@ -33,10 +31,6 @@ import scala.annotation.tailrec * The value of the negative index does not have a specific meaning. * @see `Vehicle.EquipmentUtilities` * @param vehicleDef the vehicle's definition entry'; -======= - * To keep it simple, infantry seating, mounted weapons, and utilities are stored separately. - * @param vehicleDef the vehicle's definition entry; ->>>>>>> Deployment: * stores and unloads pertinent information about the `Vehicle`'s configuration; * used in the initialization process (`loadVehicleDefinition`) */ diff --git a/common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala b/common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala index 09d8136d..4e5900d4 100644 --- a/common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala +++ b/common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala @@ -21,13 +21,9 @@ class VehicleDefinition(objectId : Int) extends ObjectDefinition(objectId) { /* key - seat index (where this weapon attaches during object construction), value - the weapon on an EquipmentSlot */ private val weapons : mutable.HashMap[Int, ToolDefinition] = mutable.HashMap[Int, ToolDefinition]() private var deployment : Boolean = false -<<<<<<< 27d86af015d5a835f7d594aed9ccdd1de4048c53 private val utilities : mutable.HashMap[Int, UtilityType.Value] = mutable.HashMap() -======= private var deploymentTime_Deploy : Int = 0 //ms private var deploymentTime_Undeploy : Int = 0 //ms - private val utilities : mutable.ArrayBuffer[Int] = mutable.ArrayBuffer[Int]() ->>>>>>> Deployment: private var trunkSize : InventoryTile = InventoryTile.None private var trunkOffset : Int = 0 private var canCloak : Boolean = false @@ -76,9 +72,9 @@ class VehicleDefinition(objectId : Int) extends ObjectDefinition(objectId) { Deployment } -<<<<<<< 27d86af015d5a835f7d594aed9ccdd1de4048c53 + def Utilities : mutable.HashMap[Int, UtilityType.Value] = utilities -======= + def DeployTime : Int = deploymentTime_Deploy def DeployTime_=(dtime : Int) : Int = { @@ -93,9 +89,6 @@ class VehicleDefinition(objectId : Int) extends ObjectDefinition(objectId) { UndeployTime } - def Utilities : mutable.ArrayBuffer[Int] = utilities ->>>>>>> Deployment: - def TrunkSize : InventoryTile = trunkSize def TrunkSize_=(tile : InventoryTile) : InventoryTile = { diff --git a/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala b/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala index cffb9030..adb2bd3a 100644 --- a/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala +++ b/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala @@ -4,12 +4,8 @@ package net.psforever.objects.vehicles import akka.actor.Actor import net.psforever.objects.Vehicle import net.psforever.objects.serverobject.mount.MountableBehavior -<<<<<<< 27d86af015d5a835f7d594aed9ccdd1de4048c53 import net.psforever.objects.serverobject.affinity.{FactionAffinity, FactionAffinityBehavior} -======= -import net.psforever.objects.serverobject.affinity.FactionAffinityBehavior import net.psforever.objects.serverobject.deploy.DeploymentBehavior ->>>>>>> Deployment: /** * An `Actor` that handles messages being dispatched to a specific `Vehicle`.
@@ -23,14 +19,10 @@ class VehicleControl(vehicle : Vehicle) extends Actor with DeploymentBehavior with MountableBehavior.Mount with MountableBehavior.Dismount { -<<<<<<< 27d86af015d5a835f7d594aed9ccdd1de4048c53 //make control actors belonging to utilities when making control actor belonging to vehicle vehicle.Utilities.foreach({case (_, util) => util.Setup }) - def MountableObject = vehicle //do not add type! -======= def MountableObject = vehicle ->>>>>>> Deployment: def FactionObject = vehicle