Implant Terminals:

Implant terminals (mech) are now properly mountable and implant terminals (interface) are also properly interactive.  Player can select to equip or to remove implants properly.

Mountable:

Vehicles and implant terminal mechs now use common Mountable logic.

home3 Hart C:

All doors, save for those to the shuttle, and all implant terminals in this building are now rigged to operate.

common/src/test/scala/objects/MountableTest.scala

@@ -0,0 +1,87 @@
+// Copyright (c) 2017 PSForever
+package objects
+
+import akka.actor.{ActorRef, Props}
+import net.psforever.objects.Player
+import net.psforever.objects.definition.{ObjectDefinition, SeatDefinition}
+import net.psforever.objects.mount.{Mountable, MountableControl}
+import net.psforever.objects.serverobject.PlanetSideServerObject
+import net.psforever.objects.vehicles.Seat
+import net.psforever.types.{CharacterGender, PlanetSideEmpire}
+
+import scala.concurrent.duration.Duration
+
+class MountableControl1Test extends ActorTest() {
+  "MountableControl" should {
+    "construct" in {
+      val obj = new MountableTest.MountableTestObject
+      obj.Actor = system.actorOf(Props(classOf[MountableTest.MountableTestControl], obj), "mech")
+      assert(obj.Actor != ActorRef.noSender)
+    }
+  }
+}
+
+class MountableControl2Test extends ActorTest() {
+  "MountableControl" should {
+    "let a player mount" in {
+      val player = Player("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+      val obj = new MountableTest.MountableTestObject
+      obj.Actor = system.actorOf(Props(classOf[MountableTest.MountableTestControl], obj), "mountable")
+      val msg = Mountable.TryMount(player, 0)
+
+      obj.Actor ! msg
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[Mountable.MountMessages])
+      val reply2 = reply.asInstanceOf[Mountable.MountMessages]
+      assert(reply2.player == player)
+      assert(reply2.response.isInstanceOf[Mountable.CanMount])
+      val reply3 = reply2.response.asInstanceOf[Mountable.CanMount]
+      assert(reply3.obj == obj)
+      assert(reply3.seat_num == 0)
+    }
+  }
+}
+
+class MountableControl3Test extends ActorTest() {
+  "MountableControl" should {
+    "block a player from mounting" in {
+      val player1 = Player("test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+      val player2 = Player("test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+      val obj = new MountableTest.MountableTestObject
+      obj.Actor = system.actorOf(Props(classOf[MountableTest.MountableTestControl], obj), "mountable")
+      obj.Actor ! Mountable.TryMount(player1, 0)
+      receiveOne(Duration.create(100, "ms")) //consume reply
+
+      obj.Actor ! Mountable.TryMount(player2, 0)
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[Mountable.MountMessages])
+      val reply2 = reply.asInstanceOf[Mountable.MountMessages]
+      assert(reply2.player == player2)
+      assert(reply2.response.isInstanceOf[Mountable.CanNotMount])
+      val reply3 = reply2.response.asInstanceOf[Mountable.CanNotMount]
+      assert(reply3.obj == obj)
+      assert(reply3.seat_num == 0)
+    }
+  }
+}
+
+object MountableTest {
+  class MountableTestObject extends PlanetSideServerObject with Mountable {
+    private val seats : Map[Int, Seat] = Map( 0 -> new Seat(new SeatDefinition()) )
+    def Seats : Map[Int, Seat] = seats
+    def Seat(seatNum : Int) : Option[Seat] = seats.get(seatNum)
+    def MountPoints : Map[Int, Int] = Map(1 -> 0)
+    def GetSeatFromMountPoint(mount : Int) : Option[Int] = MountPoints.get(mount)
+    def PassengerInSeat(user : Player) : Option[Int] = {
+      if(seats(0).Occupant.contains(user)) {
+        Some(0)
+      }
+      else {
+        None
+      }
+    }
+    def Definition : ObjectDefinition = null //eh whatever
+  }
+
+  class MountableTestControl(obj : Mountable) extends MountableControl(obj)
+}

common/src/test/scala/objects/PlayerTest.scala

@@ -110,7 +110,7 @@ class PlayerTest extends Specification {
     val testplant : ImplantDefinition = ImplantDefinition(1)
     val obj = new Player("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, 5)
     obj.Implants(0).Unlocked = true
-    obj.InstallImplant(testplant) mustEqual true
+    obj.InstallImplant(testplant) mustEqual Some(0)
     obj.Implants.find({p => p.Implant == ImplantType(1)}) match { //find the installed implant
       case Some(slot) =>
         slot.Installed mustEqual Some(testplant)
@@ -126,15 +126,15 @@ class PlayerTest extends Specification {
     val obj = new Player("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, 5)
     obj.Implants(0).Unlocked = true
     obj.Implants(1).Unlocked = true
-    obj.InstallImplant(testplant1) mustEqual true
-    obj.InstallImplant(testplant2) mustEqual false
+    obj.InstallImplant(testplant1) mustEqual Some(0)
+    obj.InstallImplant(testplant2) mustEqual Some(1)
   }
 
   "uninstall implants" in {
     val testplant : ImplantDefinition = ImplantDefinition(1)
     val obj = new Player("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, 5)
     obj.Implants(0).Unlocked = true
-    obj.InstallImplant(testplant) mustEqual true
+    obj.InstallImplant(testplant) mustEqual Some(0)
     obj.Implants(0).Installed mustEqual Some(testplant)
 
     obj.UninstallImplant(testplant.Type)

common/src/test/scala/objects/ServerObjectBuilderTest.scala

@@ -0,0 +1,116 @@
+// Copyright (c) 2017 PSForever
+package objects
+
+import akka.actor.{Actor, Props}
+import net.psforever.objects.GlobalDefinitions
+import net.psforever.objects.guid.NumberPoolHub
+import net.psforever.packet.game.PlanetSideGUID
+import net.psforever.objects.serverobject.builders.ServerObjectBuilder
+
+import scala.concurrent.duration.Duration
+
+class DoorObjectBuilderTest extends ActorTest {
+  import net.psforever.objects.serverobject.doors.Door
+  import net.psforever.objects.serverobject.builders.DoorObjectBuilder
+  "DoorObjectBuilder" should {
+    "build" in {
+      val hub = ServerObjectBuilderTest.NumberPoolHub
+      val actor = system.actorOf(Props(classOf[ServerObjectBuilderTest.BuilderTestActor], DoorObjectBuilder(GlobalDefinitions.door, 1), hub), "door")
+      actor ! "!"
+
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[Door])
+      assert(reply.asInstanceOf[Door].HasGUID)
+      assert(reply.asInstanceOf[Door].GUID == PlanetSideGUID(1))
+      assert(reply == hub(1).get)
+    }
+  }
+}
+
+class IFFLockObjectBuilderTest extends ActorTest {
+  import net.psforever.objects.serverobject.locks.IFFLock
+  import net.psforever.objects.serverobject.builders.IFFLockObjectBuilder
+  "IFFLockObjectBuilder" should {
+    "build" in {
+      val hub = ServerObjectBuilderTest.NumberPoolHub
+      val actor = system.actorOf(Props(classOf[ServerObjectBuilderTest.BuilderTestActor], IFFLockObjectBuilder(GlobalDefinitions.lock_external, 1), hub), "lock")
+      actor ! "!"
+
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[IFFLock])
+      assert(reply.asInstanceOf[IFFLock].HasGUID)
+      assert(reply.asInstanceOf[IFFLock].GUID == PlanetSideGUID(1))
+      assert(reply == hub(1).get)
+    }
+  }
+}
+
+class ImplantTerminalMechObjectBuilderTest extends ActorTest {
+  import net.psforever.objects.serverobject.implantmech.ImplantTerminalMech
+  import net.psforever.objects.serverobject.builders.ImplantTerminalMechObjectBuilder
+  "IFFLockObjectBuilder" should {
+    "build" in {
+      val hub = ServerObjectBuilderTest.NumberPoolHub
+      val actor = system.actorOf(Props(classOf[ServerObjectBuilderTest.BuilderTestActor], ImplantTerminalMechObjectBuilder(GlobalDefinitions.implant_terminal_mech, 1), hub), "mech")
+      actor ! "!"
+
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[ImplantTerminalMech])
+      assert(reply.asInstanceOf[ImplantTerminalMech].HasGUID)
+      assert(reply.asInstanceOf[ImplantTerminalMech].GUID == PlanetSideGUID(1))
+      assert(reply == hub(1).get)
+    }
+  }
+}
+
+class TerminalObjectBuilderTest extends ActorTest {
+  import net.psforever.objects.serverobject.terminals.Terminal
+  import net.psforever.objects.serverobject.builders.TerminalObjectBuilder
+  "TerminalObjectBuilder" should {
+    "build" in {
+      val hub = ServerObjectBuilderTest.NumberPoolHub
+      val actor = system.actorOf(Props(classOf[ServerObjectBuilderTest.BuilderTestActor], TerminalObjectBuilder(GlobalDefinitions.order_terminal, 1), hub), "term")
+      actor ! "!"
+
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[Terminal])
+      assert(reply.asInstanceOf[Terminal].HasGUID)
+      assert(reply.asInstanceOf[Terminal].GUID == PlanetSideGUID(1))
+      assert(reply == hub(1).get)
+    }
+  }
+}
+
+class VehicleSpawnPadObjectBuilderTest extends ActorTest {
+  import net.psforever.objects.serverobject.pad.VehicleSpawnPad
+  import net.psforever.objects.serverobject.builders.VehicleSpawnPadObjectBuilder
+  "TerminalObjectBuilder" should {
+    "build" in {
+      val hub = ServerObjectBuilderTest.NumberPoolHub
+      val actor = system.actorOf(Props(classOf[ServerObjectBuilderTest.BuilderTestActor], VehicleSpawnPadObjectBuilder(GlobalDefinitions.spawn_pad, 1), hub), "pad")
+      actor ! "!"
+
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[VehicleSpawnPad])
+      assert(reply.asInstanceOf[VehicleSpawnPad].HasGUID)
+      assert(reply.asInstanceOf[VehicleSpawnPad].GUID == PlanetSideGUID(1))
+      assert(reply == hub(1).get)
+    }
+  }
+}
+
+object ServerObjectBuilderTest {
+  import net.psforever.objects.guid.source.LimitedNumberSource
+  def NumberPoolHub : NumberPoolHub = {
+    val obj = new NumberPoolHub(new LimitedNumberSource(2))
+    obj
+  }
+
+  class BuilderTestActor(builder : ServerObjectBuilder[_], hub : NumberPoolHub) extends Actor {
+    def receive : Receive = {
+      case _ =>
+        sender ! builder.Build(context, hub)
+    }
+  }
+}
+

common/src/test/scala/objects/VehicleTest.scala

@@ -128,11 +128,11 @@ class VehicleTest extends Specification {
       val fury_vehicle = Vehicle(GlobalDefinitions.fury)
       fury_vehicle.Owner mustEqual None
       fury_vehicle.Seats.size mustEqual 1
-      fury_vehicle.Seats.head.ArmorRestriction mustEqual SeatArmorRestriction.NoMax
-      fury_vehicle.Seats.head.isOccupied mustEqual false
-      fury_vehicle.Seats.head.Occupant mustEqual None
-      fury_vehicle.Seats.head.Bailable mustEqual true
-      fury_vehicle.Seats.head.ControlledWeapon mustEqual Some(1)
+      fury_vehicle.Seats(0).ArmorRestriction mustEqual SeatArmorRestriction.NoMax
+      fury_vehicle.Seats(0).isOccupied mustEqual false
+      fury_vehicle.Seats(0).Occupant mustEqual None
+      fury_vehicle.Seats(0).Bailable mustEqual true
+      fury_vehicle.Seats(0).ControlledWeapon mustEqual Some(1)
       fury_vehicle.PermissionGroup(0) mustEqual Some(VehicleLockState.Locked) //driver
       fury_vehicle.PermissionGroup(1) mustEqual Some(VehicleLockState.Empire) //gunner
       fury_vehicle.PermissionGroup(2) mustEqual Some(VehicleLockState.Empire) //passenger

common/src/test/scala/objects/ZoneTest.scala

@@ -44,6 +44,24 @@ class ZoneTest extends Specification {
       map.DoorToLock(3, 4)
       map.DoorToLock mustEqual Map(1 -> 2, 3 -> 4)
     }
+
+    "associates terminals to spawn pads (doesn't check numbers)" in {
+      val map = new ZoneMap("map13")
+      map.TerminalToSpawnPad mustEqual Map.empty
+      map.TerminalToSpawnPad(1, 2)
+      map.TerminalToSpawnPad mustEqual Map(1 -> 2)
+      map.TerminalToSpawnPad(3, 4)
+      map.TerminalToSpawnPad mustEqual Map(1 -> 2, 3 -> 4)
+    }
+
+    "associates mechanical components to implant terminals (doesn't check numbers)" in {
+      val map = new ZoneMap("map13")
+      map.TerminalToInterface mustEqual Map.empty
+      map.TerminalToInterface(1, 2)
+      map.TerminalToInterface mustEqual Map(1 -> 2)
+      map.TerminalToInterface(3, 4)
+      map.TerminalToInterface mustEqual Map(1 -> 2, 3 -> 4)
+    }
   }
 
   val map13 = new ZoneMap("map13")

common/src/test/scala/objects/terminal/ImplantTerminalInterfaceTest.scala

@@ -0,0 +1,52 @@
+// Copyright (c) 2017 PSForever
+package objects.terminal
+
+import akka.actor.ActorRef
+import net.psforever.objects.{GlobalDefinitions, Player}
+import net.psforever.objects.serverobject.terminals.Terminal
+import net.psforever.packet.game.{ItemTransactionMessage, PlanetSideGUID}
+import net.psforever.types.{CharacterGender, PlanetSideEmpire, TransactionType}
+import org.specs2.mutable.Specification
+
+class ImplantTerminalInterfaceTest extends Specification {
+  "Implant_Terminal_Interface" should {
+    val player = Player("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+
+    "construct" in {
+      val terminal = Terminal(GlobalDefinitions.implant_terminal_interface)
+      terminal.Actor mustEqual ActorRef.noSender
+    }
+
+    "player can learn an implant ('darklight_vision')" in {
+      val terminal = Terminal(GlobalDefinitions.implant_terminal_interface)
+      val msg = ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Buy, 0, "darklight_vision", 0, PlanetSideGUID(0))
+      val reply = terminal.Request(player, msg)
+      reply.isInstanceOf[Terminal.LearnImplant] mustEqual true
+      val reply2 = reply.asInstanceOf[Terminal.LearnImplant]
+      reply2.implant mustEqual GlobalDefinitions.darklight_vision
+    }
+
+    "player can not learn a fake implant ('aimbot')" in {
+      val terminal = Terminal(GlobalDefinitions.implant_terminal_interface)
+      val msg = ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Buy, 0, "aimbot", 0, PlanetSideGUID(0))
+
+      terminal.Request(player, msg) mustEqual Terminal.NoDeal()
+    }
+
+    "player can surrender an implant ('darklight_vision')" in {
+      val terminal = Terminal(GlobalDefinitions.implant_terminal_interface)
+      val msg = ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Sell, 0, "darklight_vision", 0, PlanetSideGUID(0))
+      val reply = terminal.Request(player, msg)
+      reply.isInstanceOf[Terminal.SellImplant] mustEqual true
+      val reply2 = reply.asInstanceOf[Terminal.SellImplant]
+      reply2.implant mustEqual GlobalDefinitions.darklight_vision
+    }
+
+    "player can not surrender a fake implant ('aimbot')" in {
+      val terminal = Terminal(GlobalDefinitions.implant_terminal_interface)
+      val msg = ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Sell, 0, "aimbot", 0, PlanetSideGUID(0))
+
+      terminal.Request(player, msg) mustEqual Terminal.NoDeal()
+    }
+  }
+}

common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala

@@ -0,0 +1,110 @@
+// Copyright (c) 2017 PSForever
+package objects.terminal
+
+import akka.actor.{ActorRef, Props}
+import net.psforever.objects.definition.SeatDefinition
+import net.psforever.objects.mount.Mountable
+import net.psforever.objects.serverobject.implantmech.{ImplantTerminalMech, ImplantTerminalMechControl}
+import net.psforever.objects.vehicles.Seat
+import net.psforever.objects.{GlobalDefinitions, Player}
+import net.psforever.types.{CharacterGender, PlanetSideEmpire}
+import objects.ActorTest
+import org.specs2.mutable.Specification
+
+import scala.concurrent.duration.Duration
+
+class ImplantTerminalMechTest extends Specification {
+  "Implant_Terminal_Mech" should {
+    "define" in {
+      val implant_terminal_mech = GlobalDefinitions.implant_terminal_mech
+      implant_terminal_mech.ObjectId mustEqual 410
+      implant_terminal_mech.MountPoints mustEqual Map(1 -> 0)
+      implant_terminal_mech.Seats.keySet mustEqual Set(0)
+      implant_terminal_mech.Seats(0).isInstanceOf[SeatDefinition] mustEqual true
+      implant_terminal_mech.Seats(0).ArmorRestriction mustEqual net.psforever.objects.vehicles.SeatArmorRestriction.NoMax
+      implant_terminal_mech.Seats(0).Bailable mustEqual false
+      implant_terminal_mech.Seats(0).ControlledWeapon mustEqual None
+    }
+  }
+
+  "VehicleSpawnPad" should {
+    "construct" in {
+      val obj = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech)
+      obj.Actor mustEqual ActorRef.noSender
+      obj.Definition mustEqual GlobalDefinitions.implant_terminal_mech
+      obj.Seats.keySet mustEqual Set(0)
+      obj.Seats(0).isInstanceOf[Seat] mustEqual true
+    }
+
+    "get seat from mount points" in {
+      val obj = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech)
+      obj.GetSeatFromMountPoint(0) mustEqual None
+      obj.GetSeatFromMountPoint(1) mustEqual Some(0)
+      obj.GetSeatFromMountPoint(2) mustEqual None
+    }
+
+    "get passenger in a seat" in {
+      val player = Player("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+      val obj = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech)
+      obj.PassengerInSeat(player) mustEqual None
+      obj.Seats(0).Occupant = player
+      obj.PassengerInSeat(player) mustEqual Some(0)
+      obj.Seats(0).Occupant = None
+      obj.PassengerInSeat(player) mustEqual None
+    }
+  }
+}
+
+class ImplantTerminalMechControl1Test extends ActorTest() {
+  "ImplantTerminalMechControl" should {
+    "construct" in {
+      val obj = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech)
+      obj.Actor = system.actorOf(Props(classOf[ImplantTerminalMechControl], obj), "mech")
+      assert(obj.Actor != ActorRef.noSender)
+    }
+  }
+}
+
+class ImplantTerminalMechControl2Test extends ActorTest() {
+  "ImplantTerminalMechControl" should {
+    "let a player mount" in {
+      val player = Player("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+      val obj = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech)
+      obj.Actor = system.actorOf(Props(classOf[ImplantTerminalMechControl], obj), "mech")
+      val msg = Mountable.TryMount(player, 0)
+
+      obj.Actor ! msg
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[Mountable.MountMessages])
+      val reply2 = reply.asInstanceOf[Mountable.MountMessages]
+      assert(reply2.player == player)
+      assert(reply2.response.isInstanceOf[Mountable.CanMount])
+      val reply3 = reply2.response.asInstanceOf[Mountable.CanMount]
+      assert(reply3.obj == obj)
+      assert(reply3.seat_num == 0)
+    }
+  }
+}
+
+class ImplantTerminalMechControl3Test extends ActorTest() {
+  "ImplantTerminalMechControl" should {
+    "block a player from mounting" in {
+      val player1 = Player("test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+      val player2 = Player("test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, 0)
+      val obj = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech)
+      obj.Actor = system.actorOf(Props(classOf[ImplantTerminalMechControl], obj), "mech")
+      obj.Actor ! Mountable.TryMount(player1, 0)
+      receiveOne(Duration.create(100, "ms")) //consume reply
+
+      obj.Actor ! Mountable.TryMount(player2, 0)
+      val reply = receiveOne(Duration.create(100, "ms"))
+      assert(reply.isInstanceOf[Mountable.MountMessages])
+      val reply2 = reply.asInstanceOf[Mountable.MountMessages]
+      assert(reply2.player == player2)
+      assert(reply2.response.isInstanceOf[Mountable.CanNotMount])
+      val reply3 = reply2.response.asInstanceOf[Mountable.CanNotMount]
+      assert(reply3.obj == obj)
+      assert(reply3.seat_num == 0)
+    }
+  }
+}