diff --git a/Server/data/configs/door_configs.json b/Server/data/configs/door_configs.json index 50cf42836..8da3736ee 100644 --- a/Server/data/configs/door_configs.json +++ b/Server/data/configs/door_configs.json @@ -943,7 +943,7 @@ }, { "id": "4148", - "replaceId": "4248", + "replaceId": "4246", "fence": "false", "metal": "false" }, @@ -1759,7 +1759,7 @@ }, { "id": "14245", - "replaceId": "14248", + "replaceId": "14246", "fence": "true", "metal": "false" }, diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt index ed6850780..dde461532 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt @@ -24,22 +24,19 @@ class DeathPlateauInteractionListener : InteractionListener { ) } override fun defineListeners() { - on(Scenery.DOOR_3747, SCENERY, "open") { player, _ -> - // Harold's Door - if (player.location == location(2906, 3543, 1)) { - openDialogue(player, DeathPlateauDoorDialogueFile(1)) - } else { - DoorActionHandler.handleAutowalkDoor(player, getScenery(2906, 3543, 1)) + on(Scenery.DOOR_3747, SCENERY, "open") { player, node -> + // Harold's door + when (player.location) { + location(2906, 3543, 1), location(2905, 3543, 1), location(2907, 3543, 1) -> openDialogue(player, DeathPlateauDoorDialogueFile(1)) + else -> DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) } return@on true } on(Scenery.DOOR_3745, SCENERY, "open") { player, node -> - if (node.location == location(2823, 3555, 0)) { - // 1st Door to Tenzing - openDialogue(player, DeathPlateauDoorDialogueFile(2)) - } else if (node.location == location(2820, 3558, 0)) { - // 2nd Door to chicken pen - openDialogue(player, DeathPlateauDoorDialogueFile(3)) + when (node.location) { + location(2823, 3555, 0) -> openDialogue(player, DeathPlateauDoorDialogueFile(2)) //1st door to Tenzing + location(2820, 3558, 0) -> openDialogue(player, DeathPlateauDoorDialogueFile(3)) //2nd door to chicken pen + else -> DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) } return@on true } @@ -94,4 +91,4 @@ class DeathPlateauInteractionListener : InteractionListener { return@on true } } -} \ No newline at end of file +} diff --git a/Server/src/main/content/region/karamja/tzhaar/handlers/TzhaarCityPlugin.java b/Server/src/main/content/region/karamja/tzhaar/handlers/TzhaarCityPlugin.java index b4b23b029..669df926a 100644 --- a/Server/src/main/content/region/karamja/tzhaar/handlers/TzhaarCityPlugin.java +++ b/Server/src/main/content/region/karamja/tzhaar/handlers/TzhaarCityPlugin.java @@ -27,12 +27,11 @@ public final class TzhaarCityPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - SceneryDefinition.forId(31284).getHandlers().put("option:enter", this);// karamja - // cave. - SceneryDefinition.forId(9359).getHandlers().put("option:enter", this);// tzhaar - // exit + SceneryDefinition.forId(31284).getHandlers().put("option:enter", this); //karamja cave. + SceneryDefinition.forId(9359).getHandlers().put("option:enter", this); //tzhaar exit SceneryDefinition.forId(9356).getHandlers().put("option:enter", this); SceneryDefinition.forId(9369).getHandlers().put("option:pass", this); + SceneryDefinition.forId(31292).getHandlers().put("option:go-through", this); //unimplemented door near fairy ring new TzhaarDialogue().init(); return this; } @@ -65,6 +64,12 @@ public final class TzhaarCityPlugin extends OptionHandler { break; } break; + case "go-through": + switch (id) { + case 31292: + return false; + } + break; } return true; }