From 88ddab5e0af88090631f3d593d4c6a9b0732c25b Mon Sep 17 00:00:00 2001 From: FateJH Date: Sun, 15 Apr 2018 23:34:51 -0400 Subject: [PATCH] Fixing misidentified sanctuary continents and ZoneMap names --- pslogin/src/main/scala/Maps.scala | 8 ++++---- pslogin/src/main/scala/Zones.scala | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pslogin/src/main/scala/Maps.scala b/pslogin/src/main/scala/Maps.scala index ea3cfc2de..a6f8cd0ae 100644 --- a/pslogin/src/main/scala/Maps.scala +++ b/pslogin/src/main/scala/Maps.scala @@ -624,11 +624,11 @@ object Maps { } } - val map14 = new ZoneMap("map13") + val map14 = new ZoneMap("map14") - val map15 = new ZoneMap("map13") + val map15 = new ZoneMap("map15") - val map16 = new ZoneMap("map13") + val map16 = new ZoneMap("map16") val ugd01 = new ZoneMap("ugd01") @@ -642,7 +642,7 @@ object Maps { val ugd06 = new ZoneMap("ugd06") - val map96 = new ZoneMap("ugd06") + val map96 = new ZoneMap("map96") val map97 = new ZoneMap("map97") diff --git a/pslogin/src/main/scala/Zones.scala b/pslogin/src/main/scala/Zones.scala index a59db3586..1944179f9 100644 --- a/pslogin/src/main/scala/Zones.scala +++ b/pslogin/src/main/scala/Zones.scala @@ -97,8 +97,8 @@ object Zones { */ def SanctuaryZoneId(faction : PlanetSideEmpire.Value) : String = { faction match { - case PlanetSideEmpire.TR => "home1" - case PlanetSideEmpire.NC => "home2" + case PlanetSideEmpire.NC => "home1" + case PlanetSideEmpire.TR => "home2" case PlanetSideEmpire.VS => "home3" case PlanetSideEmpire.NEUTRAL => "" //invalid, not black ops } @@ -111,8 +111,8 @@ object Zones { */ def SanctuaryZoneNumber(faction : PlanetSideEmpire.Value) : Int = { faction match { - case PlanetSideEmpire.TR => 11 - case PlanetSideEmpire.NC => 12 + case PlanetSideEmpire.NC => 11 + case PlanetSideEmpire.TR => 12 case PlanetSideEmpire.VS => 13 case PlanetSideEmpire.NEUTRAL => 0 //invalid, not black ops }