From 335b40cdfc55c7daa3e83c215747e93e1e07a85b Mon Sep 17 00:00:00 2001 From: FateJH Date: Sat, 30 Dec 2017 21:44:10 -0500 Subject: [PATCH] correction for LoadoutTest --- .../scala/net/psforever/objects/GlobalDefinitions.scala | 6 +++--- common/src/test/scala/objects/LoadoutTest.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index aef64f37..30395f27 100644 --- a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -755,11 +755,11 @@ object GlobalDefinitions { */ def isFactionEquipment(edef : EquipmentDefinition) : PlanetSideEmpire.Value = { edef match { - case `chainblade` | `repeater` | `anniversary_guna` | `cycler` | `mini_chaingun` | `striker` | `striker_missile_ammo` | `trhev_dualcycler` | `trhev_pounder` | `trhev_burster` => + case `chainblade` | `repeater` | `anniversary_guna` | `cycler` | `mini_chaingun` | `striker` | `striker_missile_ammo` | `trhev_dualcycler` | `trhev_pounder` | `trhev_burster` | `dualcycler_ammo` | `pounder_ammo` | `burster_ammo` => PlanetSideEmpire.TR - case `magcutter` | `isp` | `anniversary_gun` | `gauss` | `r_shotgun` | `hunterseeker` | `hunter_seeker_missile` | `nchev_scattercannon` | `nchev_falcon` | `nchev_sparrow` => + case `magcutter` | `isp` | `anniversary_gun` | `gauss` | `r_shotgun` | `hunterseeker` | `hunter_seeker_missile` | `nchev_scattercannon` | `nchev_falcon` | `nchev_sparrow` | `scattercannon_ammo` | `falcon_ammo` | `sparrow_ammo` => PlanetSideEmpire.NC - case `forceblade` | `beamer` | `anniversary_gunb` | `pulsar` | `lasher` | `lancer` | `energy_cell` | `lancer_cartridge` | `vshev_quasar` | `vshev_comet` | `vshev_starfire` => + case `forceblade` | `beamer` | `anniversary_gunb` | `pulsar` | `lasher` | `lancer` | `energy_cell` | `lancer_cartridge` | `vshev_quasar` | `vshev_comet` | `vshev_starfire` | `quasar_ammo` | `comet_ammo` | `starfire_ammo` => PlanetSideEmpire.VS case _ => PlanetSideEmpire.NEUTRAL diff --git a/common/src/test/scala/objects/LoadoutTest.scala b/common/src/test/scala/objects/LoadoutTest.scala index b67ba932..db0bd0f0 100644 --- a/common/src/test/scala/objects/LoadoutTest.scala +++ b/common/src/test/scala/objects/LoadoutTest.scala @@ -173,7 +173,7 @@ class LoadoutTest extends Specification { "distinguish MAX subtype information" in { val obj : Player = CreatePlayer() - val slot = obj.Slot(2) + val slot = obj.Slot(0) slot.Equipment = None //only an unequipped slot can have its Equipment Size changed (Rifle -> Max) Player.SuitSetup(obj, ExoSuitType.MAX) obj.SaveLoadout("generic", 0) //weaponless