From b383aab5560171f87a338f25e8610cd3f96053f8 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Tue, 27 Jun 2023 16:45:47 -0400 Subject: [PATCH] Ruins or SDR driven by config. --- src/engine/Enum.java | 9 ++++++++- src/engine/gameManager/ZoneManager.java | 4 ++++ src/engine/objects/PlayerCharacter.java | 3 --- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/engine/Enum.java b/src/engine/Enum.java index a5a1684b..8ef8f3ec 100644 --- a/src/engine/Enum.java +++ b/src/engine/Enum.java @@ -9,6 +9,7 @@ package engine; import ch.claude_martin.enumbitset.EnumBitSetHelper; +import engine.gameManager.ConfigManager; import engine.gameManager.PowersManager; import engine.gameManager.ZoneManager; import engine.math.Vector2f; @@ -433,7 +434,13 @@ public class Enum { Zone ruinZone; Vector3fImmutable spawnLocation; - ruinZone = ZoneManager.getZoneByUUID(this.zoneUUID); + // Send to SDR if so configured + + if (ConfigManager.MB_USE_RUINS.getValue().equalsIgnoreCase("true")) + ruinZone = ZoneManager.getZoneByUUID(this.zoneUUID); + else + ruinZone = ZoneManager.getZoneByName("Sea Dog's Rest"); + spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30); return spawnLocation; diff --git a/src/engine/gameManager/ZoneManager.java b/src/engine/gameManager/ZoneManager.java index 896c8fd1..be9f5dde 100644 --- a/src/engine/gameManager/ZoneManager.java +++ b/src/engine/gameManager/ZoneManager.java @@ -144,6 +144,10 @@ public enum ZoneManager { return ZoneManager.zonesByID.get(zoneID); } + public static Zone getZoneByName(final String zoneName) { + return ZoneManager.zonesByName.get(zoneName); + } + public static final Collection getAllZones() { return ZoneManager.zonesByUUID.values(); } diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index f225c1be..80c8ab3b 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -879,14 +879,11 @@ public class PlayerCharacter extends AbstractCharacter { //handle rented room binds. - if (bindBuilding == null){ bindLocation = Enum.Ruins.getRandomRuin().getLocation(); return bindLocation; } - - bindLocation = BuildingManager.GetBindLocationForBuilding(bindBuilding); if (bindLocation == null)