From de74d29c2d2881bdfac55cefa0831d51f75625fd Mon Sep 17 00:00:00 2001 From: Zoinkwiz Date: Sat, 7 Oct 2023 23:47:04 +0100 Subject: [PATCH] Add locks to DT2 sidebar --- .../deserttreasureii/DesertTreasureII.java | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/questhelper/helpers/quests/deserttreasureii/DesertTreasureII.java b/src/main/java/com/questhelper/helpers/quests/deserttreasureii/DesertTreasureII.java index eae1a357b5..d2fb10c6f9 100644 --- a/src/main/java/com/questhelper/helpers/quests/deserttreasureii/DesertTreasureII.java +++ b/src/main/java/com/questhelper/helpers/quests/deserttreasureii/DesertTreasureII.java @@ -245,6 +245,11 @@ public Map loadSteps() steps.put(38, goOperateGolemLastTime); steps.put(40, goOperateGolemLastTime); + vardorvisSteps.setLockingCondition(finishedVardorvis); + whispererSteps.setLockingCondition(finishedWhisperer); + sucellusSteps.setLockingCondition(finishedSucellus); + perseriyaSteps.setLockingCondition(finishedPerseriya); + ConditionalStep findingTheFour = new ConditionalStep(this, vardorvisSteps); findingTheFour.addStep(and(finishedVardorvis, finishedPerseriya, finishedSucellus), whispererSteps); findingTheFour.addStep(and(finishedVardorvis, finishedPerseriya), sucellusSteps); @@ -879,14 +884,20 @@ public List getPanels() operateGolemFrostenhorn), Arrays.asList(combatGear, allBursts), Arrays.asList(senntistenTeleport))); - allSteps.add(new PanelDetails("Vardorvis", + + PanelDetails vardorvisPanel = new PanelDetails("Vardorvis", vardorvisSteps.getDisplaySteps(), Arrays.asList(combatGear), - Arrays.asList(xericTalisman, freezes))); - allSteps.add(new PanelDetails("Perseriya", + Arrays.asList(xericTalisman, freezes)); + vardorvisPanel.setLockingStep(vardorvisSteps); + allSteps.add(vardorvisPanel); + + PanelDetails perseriyaPanel = new PanelDetails("Perseriya", perseriyaSteps.getStartSteps(), Arrays.asList(combatGear, facemask), - Arrays.asList(eyeTeleport, staminaPotions, arclight))); + Arrays.asList(eyeTeleport, staminaPotions, arclight)); + perseriyaPanel.setLockingStep(perseriyaSteps); + allSteps.add(perseriyaPanel); allSteps.add(new PanelDetails("Perseriya - Room 1", perseriyaSteps.getRoom1Steps(), Arrays.asList(facemask), @@ -903,18 +914,25 @@ public List getPanels() perseriyaSteps.getBattleSteps(), Arrays.asList(rangedCombatGear, shadowBurstRunes), Arrays.asList(eyeTeleport, staminaPotions, food, prayerPotions))); - allSteps.add(new PanelDetails("Sucellus", + + PanelDetails sucellusPanel = new PanelDetails("Sucellus", sucellusSteps.getDisplaySteps(), Arrays.asList(meleeCombatGear, food), - Arrays.asList(prayerPotions, staminaPotions, icyBasalt))); - allSteps.add(new PanelDetails("The Whisperer", + Arrays.asList(prayerPotions, staminaPotions, icyBasalt)); + sucellusPanel.setLockingStep(sucellusSteps); + allSteps.add(sucellusPanel); + + PanelDetails whispererPanel = new PanelDetails("The Whisperer", whispererSteps.getDisplaySteps(), Arrays.asList(magicCombatGear, ringOfVisibility, food), - Arrays.asList(prayerPotions, staminaPotions, lassarTeleport))); + Arrays.asList(prayerPotions, staminaPotions, lassarTeleport)); + whispererPanel.setLockingStep(whispererSteps); + allSteps.add(whispererPanel); allSteps.add(new PanelDetails("The Whisperer - Choir", whispererSteps.getDisplayStepsSilentChoir(), Arrays.asList(magicCombatGear, ringOfVisibility, food), Arrays.asList(prayerPotions, staminaPotions, lassarTeleport))); + allSteps.add(new PanelDetails("Secrets", Arrays.asList(returnToDesertWithFinalMedallion, searchBedForHairClip, unlockCell, getItemsFromCell, investigateAltar, fightMysteriousFigure, pickUpMedallion, enterAncientVault,