From 78c2601ff17a0f9bd83dd84240f01a3768cd3540 Mon Sep 17 00:00:00 2001 From: andersenalan <85694335+andersenalan@users.noreply.github.com> Date: Sun, 24 Nov 2024 15:08:36 -0600 Subject: [PATCH] Update kandarin easy achievement diary steps per issue #1087 (#1563) * feat: update kandarin easy achievement diary steps per issue #1087 * fix: Update Kandarin Easy steps order --------- Co-authored-by: Zoinkwiz --- .../kandarin/KandarinEasy.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/questhelper/helpers/achievementdiaries/kandarin/KandarinEasy.java b/src/main/java/com/questhelper/helpers/achievementdiaries/kandarin/KandarinEasy.java index c47554cb05..2a91d6e065 100644 --- a/src/main/java/com/questhelper/helpers/achievementdiaries/kandarin/KandarinEasy.java +++ b/src/main/java/com/questhelper/helpers/achievementdiaries/kandarin/KandarinEasy.java @@ -92,9 +92,6 @@ public QuestStep loadStep() ConditionalStep doEasy = new ConditionalStep(this, claimReward); - plantJuteTask = new ConditionalStep(this, plantJute); - doEasy.addStep(notPlantJute, plantJuteTask); - catchMackerelTask = new ConditionalStep(this, catchMackerel); doEasy.addStep(notCatchMackerel, catchMackerelTask); @@ -108,11 +105,17 @@ public QuestStep loadStep() buyCandleTask = new ConditionalStep(this, buyCandle); doEasy.addStep(notBuyCandle, buyCandleTask); + talkSherlockTask = new ConditionalStep(this, talkSherlock); + doEasy.addStep(notTalkSherlock, talkSherlockTask); + collectFlaxTask = new ConditionalStep(this, collectFlax); doEasy.addStep(notCollectFlax, collectFlaxTask); - talkSherlockTask = new ConditionalStep(this, talkSherlock); - doEasy.addStep(notTalkSherlock, talkSherlockTask); + playOrganTask = new ConditionalStep(this, playOrgan); + doEasy.addStep(notPlayOrgan, playOrganTask); + + buyStewTask = new ConditionalStep(this, buyStew); + doEasy.addStep(notBuyStew, buyStewTask); killEleTask = new ConditionalStep(this, moveToWorkshop); killEleTask.addStep(new Conditions(inWorkshop, killedFire, killedEarth, killedWater), killAir); @@ -122,11 +125,8 @@ public QuestStep loadStep() killEleTask.addStep(inWorkshop, killEle); doEasy.addStep(notKillEle, killEleTask); - playOrganTask = new ConditionalStep(this, playOrgan); - doEasy.addStep(notPlayOrgan, playOrganTask); - - buyStewTask = new ConditionalStep(this, buyStew); - doEasy.addStep(notBuyStew, buyStewTask); + plantJuteTask = new ConditionalStep(this, plantJute); + doEasy.addStep(notPlantJute, plantJuteTask); cupTeaTask = new ConditionalStep(this, cupTea); doEasy.addStep(notCupTea, cupTeaTask); @@ -309,12 +309,6 @@ public List getPanels() { List allSteps = new ArrayList<>(); - PanelDetails plantJuteSteps = new PanelDetails("Plant Jute", Collections.singletonList(plantJute), - new SkillRequirement(Skill.FARMING, 13, true), juteSeed.quantity(3), seedDibber, rake); - plantJuteSteps.setDisplayCondition(notPlantJute); - plantJuteSteps.setLockingStep(plantJuteTask); - allSteps.add(plantJuteSteps); - PanelDetails catchMackSteps = new PanelDetails("Catch a Mackerel", Collections.singletonList(catchMackerel), new SkillRequirement(Skill.FISHING, 16, true), bigFishingNet); catchMackSteps.setDisplayCondition(notCatchMackerel); @@ -333,21 +327,15 @@ public List getPanels() buyCandleSteps.setLockingStep(buyCandleTask); allSteps.add(buyCandleSteps); - PanelDetails collectFlaxSteps = new PanelDetails("Collect 5 Flax", Collections.singletonList(collectFlax)); - collectFlaxSteps.setDisplayCondition(notCollectFlax); - collectFlaxSteps.setLockingStep(collectFlaxTask); - allSteps.add(collectFlaxSteps); - PanelDetails talkSherlockSteps = new PanelDetails("Talk to Sherlock", Collections.singletonList(talkSherlock)); talkSherlockSteps.setDisplayCondition(notTalkSherlock); talkSherlockSteps.setLockingStep(talkSherlockTask); allSteps.add(talkSherlockSteps); - PanelDetails killElesSteps = new PanelDetails("Defeat Elementals", Arrays.asList(moveToWorkshop, killEle), - eleWorkI, batteredKey, combatGear, food); - killElesSteps.setDisplayCondition(notKillEle); - killElesSteps.setLockingStep(killEleTask); - allSteps.add(killElesSteps); + PanelDetails collectFlaxSteps = new PanelDetails("Collect 5 Flax", Collections.singletonList(collectFlax)); + collectFlaxSteps.setDisplayCondition(notCollectFlax); + collectFlaxSteps.setLockingStep(collectFlaxTask); + allSteps.add(collectFlaxSteps); PanelDetails playOrganSteps = new PanelDetails("Play the Church Organ", Collections.singletonList(playOrgan)); playOrganSteps.setDisplayCondition(notPlayOrgan); @@ -360,6 +348,18 @@ public List getPanels() buyStewSteps.setLockingStep(buyStewTask); allSteps.add(buyStewSteps); + PanelDetails killElesSteps = new PanelDetails("Defeat Elementals", Arrays.asList(moveToWorkshop, killEle), + eleWorkI, batteredKey, combatGear, food); + killElesSteps.setDisplayCondition(notKillEle); + killElesSteps.setLockingStep(killEleTask); + allSteps.add(killElesSteps); + + PanelDetails plantJuteSteps = new PanelDetails("Plant Jute", Collections.singletonList(plantJute), + new SkillRequirement(Skill.FARMING, 13, true), juteSeed.quantity(3), seedDibber, rake); + plantJuteSteps.setDisplayCondition(notPlantJute); + plantJuteSteps.setLockingStep(plantJuteTask); + allSteps.add(plantJuteSteps); + PanelDetails getTeaSteps = new PanelDetails("Cup of Tea with Galahad", Collections.singletonList(cupTea)); getTeaSteps.setDisplayCondition(notCupTea); getTeaSteps.setLockingStep(cupTeaTask);