HotColdLocation: Center some location spots

Center some hot-cold locations as reported and verified from the mega
issue.

Note: Because this commit makes adjustments to some locations relied
upon in the hot-cold solver class test, some tests must be adjusted in
order to keep passing.

Ref: #9601
This commit is contained in:
Jordan Atwood
2020-03-06 19:46:55 -08:00
parent 92c588c348
commit af7647e204
2 changed files with 9 additions and 8 deletions

View File

@@ -109,11 +109,13 @@ public class HotColdSolverTest
final HotColdSolver solver = createHotColdSolver();
final Set<HotColdLocation> firstLocationsSet = Sets.immutableEnumSet(
HotColdLocation.FELDIP_HILLS_GNOME_GLITER,
HotColdLocation.FELDIP_HILLS_RANTZ,
HotColdLocation.FELDIP_HILLS_RED_CHIN,
HotColdLocation.KARAMJA_KHARAZI_NE,
HotColdLocation.KARAMJA_CRASH_ISLAND);
final Set<HotColdLocation> secondLocationsSet = firstLocationsSet.stream()
.filter(location -> location != HotColdLocation.FELDIP_HILLS_GNOME_GLITER)
.filter(location -> location != HotColdLocation.FELDIP_HILLS_GNOME_GLITER
&& location != HotColdLocation.FELDIP_HILLS_RANTZ)
.collect(Collectors.toSet());
final Set<HotColdLocation> thirdLocationSet = secondLocationsSet.stream()
.filter(location -> location != HotColdLocation.FELDIP_HILLS_RED_CHIN)
@@ -139,7 +141,6 @@ public class HotColdSolverTest
HotColdLocation.KARAMJA_KHARAZI_SW,
HotColdLocation.KARAMJA_CRASH_ISLAND,
HotColdLocation.FELDIP_HILLS_SW,
HotColdLocation.FELDIP_HILLS_RANTZ,
HotColdLocation.FELDIP_HILLS_RED_CHIN,
HotColdLocation.FELDIP_HILLS_SE));