mirror of
https://github.com/2revoemag/PSF-BotServer.git
synced 2026-02-28 10:43:37 +00:00
added utility filtering so that only valid indexed utilities are assigned GUIDs and are translated into OCM
This commit is contained in:
parent
860edf9a97
commit
62b2c54b67
7 changed files with 61 additions and 6 deletions
|
|
@ -3,7 +3,7 @@ package objects
|
|||
|
||||
import akka.actor.Props
|
||||
import net.psforever.objects.{GlobalDefinitions, Player, Vehicle}
|
||||
import net.psforever.objects.definition.SeatDefinition
|
||||
import net.psforever.objects.definition.{SeatDefinition, VehicleDefinition}
|
||||
import net.psforever.objects.serverobject.mount.Mountable
|
||||
import net.psforever.objects.vehicles._
|
||||
import net.psforever.packet.game.PlanetSideGUID
|
||||
|
|
@ -256,6 +256,26 @@ class VehicleTest extends Specification {
|
|||
harasser_vehicle.WeaponControlledFromSeat(0) mustEqual None
|
||||
harasser_vehicle.WeaponControlledFromSeat(1) mustEqual chaingun_p
|
||||
}
|
||||
|
||||
"can filter utilities with indices that are natural numbers" in {
|
||||
val objDef = VehicleDefinition(1)
|
||||
objDef.Utilities += -1 -> UtilityType.order_terminala
|
||||
objDef.Utilities += 0 -> UtilityType.order_terminalb
|
||||
objDef.Utilities += 2 -> UtilityType.order_terminalb
|
||||
val obj = Vehicle(objDef)
|
||||
|
||||
obj.Utilities.size mustEqual 3
|
||||
obj.Utilities(-1).UtilType mustEqual UtilityType.order_terminala
|
||||
obj.Utilities(0).UtilType mustEqual UtilityType.order_terminalb
|
||||
obj.Utilities.get(1) mustEqual None
|
||||
obj.Utilities(2).UtilType mustEqual UtilityType.order_terminalb
|
||||
|
||||
val filteredMap = Vehicle.EquipmentUtilities(obj.Utilities)
|
||||
filteredMap.size mustEqual 2
|
||||
filteredMap.get(-1) mustEqual None
|
||||
filteredMap(0).UtilType mustEqual UtilityType.order_terminalb
|
||||
filteredMap(2).UtilType mustEqual UtilityType.order_terminalb
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue