Skip to content

Commit

Permalink
Fix some minor typos in the "Hazeel Cult" quest (#1344)
Browse files Browse the repository at this point in the history 
* Hazeel Cult: Fix typo "Almone" -> "Alomone"

* Hazeel Cult: Fix typo "Clocktower" -> "Clock Tower"

* Secrets of the North: Fix typo "Almone" -> "Alomone"

* Secrets of the North: Fix typo "assasin" -> "assassin"
  • Loading branch information
@pajlada
pajlada authored Nov 29, 2023
1 parent eff6cca commit 73eee91
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
44 changes: 22 additions & 22 deletions src/main/java/com/questhelper/helpers/quests/hazeelcult/HazeelCult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ public class HazeelCult extends BasicQuestHelper

ItemRequirement hazeelScroll, poison, carnilleanArmour, key, hazeelMark;

Requirement inCultEntrance, inCultRoom, inManorBasement, inManorF1, inManorF2, talkedToCerilAfterPoison, armourNearby, hasHazeelItem, receivedMark, onStep7, givenAlmoneScroll;
Requirement inCultEntrance, inCultRoom, inManorBasement, inManorF1, inManorF2, talkedToCerilAfterPoison, armourNearby, hasHazeelItem, receivedMark, onStep7, givenAlomoneScroll;

QuestStep talkToCeril, enterCave, talkToClivet, leaveCaveForValves;

// Hazeel side
QuestStep leaveCaveForPoison, enterKitchen, usePoisonOnRange, leaveKitchen, talkToCerilAfterPoison,
enterCaveAfterPoison,
talkToClivetAfterPoison, boardRaftAfterPoison, talkToAlomone, returnOnRaftAfterAlmone, leaveCaveAfterAlmone,
talkToClivetAfterPoison, boardRaftAfterPoison, talkToAlomone, returnOnRaftAfterAlomone, leaveCaveAfterAlomone,
enterKitchenAfterButler, searchCrateForKey, leaveKitchenWithKey, goToF1WithKey,
climbLadderWithKey, searchChestForScroll, goF2ToF1WithScroll, goF1ToF0WithScroll, enterCaveWithScroll,
boardRaftWithScroll, giveAlmoneScroll;
boardRaftWithScroll, giveAlomoneScroll;

// Ceril side
QuestStep enterCaveAfterValvesForCeril, boardRaftToKill, killAlomone, pickupArmour, returnOnRaftAfterKilling,
Expand Down Expand Up @@ -132,9 +132,9 @@ public Map<Integer, QuestStep> loadSteps()
goTalkToClivetAfterPoison.addStep(valveStepsHazeel.solved, enterCaveAfterPoison);
goTalkToClivetAfterPoison.addStep(talkedToCerilAfterPoison, valveStepsHazeel);

Conditions hadScroll = new Conditions(LogicType.OR, hazeelScroll.alsoCheckBank(questBank), givenAlmoneScroll);
Conditions hadScroll = new Conditions(LogicType.OR, hazeelScroll.alsoCheckBank(questBank), givenAlomoneScroll);
ConditionalStep goGetScroll = new ConditionalStep(this, enterKitchenAfterButler);
goGetScroll.addStep(new Conditions(inCultRoom, hadScroll), giveAlmoneScroll);
goGetScroll.addStep(new Conditions(inCultRoom, hadScroll), giveAlomoneScroll);
goGetScroll.addStep(new Conditions(inCultEntrance, hadScroll), boardRaftWithScroll);
goGetScroll.addStep(new Conditions(inManorF1, hadScroll), goF1ToF0WithScroll);
goGetScroll.addStep(new Conditions(inManorF2, hadScroll), goF2ToF1WithScroll);
Expand All @@ -144,8 +144,8 @@ public Map<Integer, QuestStep> loadSteps()
goGetScroll.addStep(new Conditions(inManorBasement, key), leaveKitchenWithKey);
goGetScroll.addStep(new Conditions(key), goToF1WithKey);
goGetScroll.addStep(inManorBasement, searchCrateForKey);
goGetScroll.addStep(inCultEntrance, leaveCaveAfterAlmone);
goGetScroll.addStep(inCultRoom, returnOnRaftAfterAlmone);
goGetScroll.addStep(inCultEntrance, leaveCaveAfterAlomone);
goGetScroll.addStep(inCultRoom, returnOnRaftAfterAlomone);

// Ceril side
cerilSteps = new ConditionalStep(this, valveStepsCeril);
Expand Down Expand Up @@ -187,14 +187,14 @@ public Map<Integer, QuestStep> loadSteps()
@Override
public void setupRequirements()
{
givenAlmoneScroll = new VarbitRequirement(14780, 1);
givenAlomoneScroll = new VarbitRequirement(14780, 1);

ardougneCloak = new ItemRequirement("Ardougne cloak for Monastery teleport", ItemID.ARDOUGNE_CLOAK_1).isNotConsumed();
ardougneCloak.addAlternates(ItemID.ARDOUGNE_CLOAK_2, ItemID.ARDOUGNE_CLOAK_3, ItemID.ARDOUGNE_CLOAK_4);

poison = new ItemRequirement("Poison", ItemID.POISON);
poison.setTooltip("You can get another from Clivet");
hazeelScroll = new ItemRequirement("Hazeel scroll", ItemID.HAZEEL_SCROLL).hideConditioned(givenAlmoneScroll);
hazeelScroll = new ItemRequirement("Hazeel scroll", ItemID.HAZEEL_SCROLL).hideConditioned(givenAlomoneScroll);
carnilleanArmour = new ItemRequirement("Carnillean armour", ItemID.CARNILLEAN_ARMOUR);
key = new ItemRequirement("Chest key", ItemID.CHEST_KEY_2404);
hazeelMark = new ItemRequirement("Hazeel's mark", ItemID.HAZEELS_MARK);
Expand Down Expand Up @@ -232,7 +232,7 @@ public void setupSteps()
"Talk to Ceril Carnillean in the south west of East Ardougne.");
talkToCeril.addDialogSteps("What's wrong?", "Yes.");
enterCave = new ObjectStep(this, ObjectID.CAVE_ENTRANCE_2852, new WorldPoint(2587, 3235, 0),
"Enter the cave south east of the Clocktower.");
"Enter the cave south east of the Clock Tower.");
talkToClivet = new NpcStep(this, NpcID.CLIVET_12095, new WorldPoint(2569, 9682, 0),
"Talk to Clivet. You can choose to either side with him or with the Carnilleans.");
talkToClivet.addDialogSteps("Alright, I've made my decision.", "I have no more questions.", "What do you mean?");
Expand Down Expand Up @@ -270,15 +270,15 @@ public void setupSteps()
"Board the raft.");
talkToAlomone = new NpcStep(this, NpcID.ALOMONE, new WorldPoint(2607, 9673, 0),
"Talk to Alomone.");
returnOnRaftAfterAlmone = new ObjectStep(this, ObjectID.RAFT, new WorldPoint(2607, 9693, 0),
returnOnRaftAfterAlomone = new ObjectStep(this, ObjectID.RAFT, new WorldPoint(2607, 9693, 0),
"Search a crate in the Carnillean's kitchen for a key.");
leaveCaveAfterAlmone = new ObjectStep(this, ObjectID.STAIRS_2853, new WorldPoint(2571, 9684, 0),
leaveCaveAfterAlomone = new ObjectStep(this, ObjectID.STAIRS_2853, new WorldPoint(2571, 9684, 0),
"Search a crate in the Carnillean's kitchen for a key.");
enterKitchenAfterButler = new ObjectStep(this, ObjectID.LADDER_46717, new WorldPoint(2570, 3267, 0),
"Search a crate in the Carnillean's basement kitchen for a key.");
searchCrateForKey = new ObjectStep(this, ObjectID.CRATE_2858, new WorldPoint(2545, 9696, 0),
"Search a crate in the Carnillean's basement kitchen for a key.");
searchCrateForKey.addSubSteps(returnOnRaftAfterAlmone, leaveCaveAfterAlmone, enterKitchenAfterButler);
searchCrateForKey.addSubSteps(returnOnRaftAfterAlomone, leaveCaveAfterAlomone, enterKitchenAfterButler);

leaveKitchenWithKey = new ObjectStep(this, ObjectID.LADDER_46716, new WorldPoint(2544, 9694, 0),
"Go back upstairs from the kitchen.", key);
Expand All @@ -291,17 +291,17 @@ public void setupSteps()
"Open the chest.", key.highlighted());
searchChestForScroll.addIcon(ItemID.CHEST_KEY_2404);
goF2ToF1WithScroll = new ObjectStep(this, ObjectID.LADDER_16679, new WorldPoint(2573, 3271, 2),
"Return to Almone with the scroll.", hazeelScroll);
"Return to Alomone with the scroll.", hazeelScroll);
goF1ToF0WithScroll = new ObjectStep(this, ObjectID.STAIRCASE_46705, new WorldPoint(2569, 3269, 1),
"Return to Almone with the scroll.", hazeelScroll);
"Return to Alomone with the scroll.", hazeelScroll);
enterCaveWithScroll = new ObjectStep(this, ObjectID.CAVE_ENTRANCE_2852, new WorldPoint(2587, 3235, 0),
"Return to Almone with the scroll.", hazeelScroll);
"Return to Alomone with the scroll.", hazeelScroll);
boardRaftWithScroll = new ObjectStep(this, ObjectID.RAFT, new WorldPoint(2568, 9679, 0),
"Return to Almone with the scroll. If the raft doesn't go to Alomone, repeat the prior valve steps first.",
"Return to Alomone with the scroll. If the raft doesn't go to Alomone, repeat the prior valve steps first.",
hazeelScroll);
giveAlmoneScroll = new NpcStep(this, NpcID.ALOMONE, new WorldPoint(2607, 9673, 0),
"Return to Almone with the scroll.", hazeelScroll);
giveAlmoneScroll.addSubSteps(goF2ToF1WithScroll, goF1ToF0WithScroll, enterCaveWithScroll, boardRaftWithScroll);
giveAlomoneScroll = new NpcStep(this, NpcID.ALOMONE, new WorldPoint(2607, 9673, 0),
"Return to Alomone with the scroll.", hazeelScroll);
giveAlomoneScroll.addSubSteps(goF2ToF1WithScroll, goF1ToF0WithScroll, enterCaveWithScroll, boardRaftWithScroll);


// Ceril side
Expand All @@ -310,7 +310,7 @@ public void setupSteps()
boardRaftToKill = new ObjectStep(this, ObjectID.RAFT, new WorldPoint(2568, 9679, 0),
"Board the raft.");
killAlomone = new NpcStep(this, NpcID.ALOMONE, new WorldPoint(2607, 9673, 0),
"Kill Almone.");
"Kill Alomone.");
pickupArmour = new ObjectStep(this, ObjectID.CHEST_46713, new WorldPoint(2611, 9674, 0),
"Retrieve armour from the chest.", carnilleanArmour);
returnOnRaftAfterKilling = new ObjectStep(this, ObjectID.RAFT, new WorldPoint(2607, 9693, 0),
Expand Down Expand Up @@ -392,7 +392,7 @@ public List<PanelDetails> getPanels()
hazeelSteps.addAll(valveStepsHazeel.getDisplaySteps());
hazeelSteps.addAll(Arrays.asList(talkToClivetAfterPoison, boardRaftAfterPoison, talkToAlomone,
searchCrateForKey, leaveKitchenWithKey, goToF1WithKey, climbLadderWithKey, searchChestForScroll,
giveAlmoneScroll));
giveAlomoneScroll));
allSteps.add(new PanelDetails("Siding with Hazeel", hazeelSteps));

return allSteps;
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/questhelper/helpers/quests/secretsofthenorth/SecretsOfTheNorth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ public class SecretsOfTheNorth extends BasicQuestHelper
combineShards, openIcyChest, openSouthGate, enterCrevice, defeatMuspah,
moveToWeissCaveEnd, enterCreviceEnd, enterWeissCaveEnd, talkToJhallan, continueCutscene;

NpcStep talkToAlmoneOrClivet, talkToHazeel, finishQuest;
NpcStep talkToAlomoneOrClivet, talkToHazeel, finishQuest;

Requirement notTalkedToGuard, notGoneUpstairs, notInspectCeril, notInspectWall, notInspectWindow, notInspectChest,
inspectedCrimeScene, toldWindow, toldCeril, toldWall, checkedBarrel, checkedBoulder, checkedBush, checkedStump,
checkedBoulder2, checkedBush2, evelotDefeated, talkedToAlmoneOrClivet, talkedToHazeel, talkedToGuard, talkedToClaus, buttonPressed,
checkedBoulder2, checkedBush2, evelotDefeated, talkedToAlomoneOrClivet, talkedToHazeel, talkedToGuard, talkedToClaus, buttonPressed,
chestPicked, scrollInspected, handedInScroll, hadDustyScroll, talkedNorth, talkedToSnowflake, questioned1, questioned2, assassinFight,
assassinDefeated, talkedToKhazard, puzzleStart, centreGateUnlocked, nwBrazier, seBrazier, neBrazier, swBrazier, brazierFin,
northGateUnlocked, fixedLever, leverPulled, southGateOpened, jhallanTalkedTo, returnToGuard, gottenIcyKey;
Expand Down Expand Up @@ -177,8 +177,8 @@ public Map<Integer, QuestStep> loadSteps()
questionsForHazeel.addStep(new Conditions(inRaftZone, talkedToHazeel), returnStairs);
questionsForHazeel.addStep(new Conditions(inHazeelZone, talkedToHazeel), returnRaft);
questionsForHazeel.addStep(talkedToHazeel, returnGuard);
questionsForHazeel.addStep(new Conditions(talkedToAlmoneOrClivet, inHazeelZone), talkToHazeel);
questionsForHazeel.addStep(inHazeelZone, talkToAlmoneOrClivet);
questionsForHazeel.addStep(new Conditions(talkedToAlomoneOrClivet, inHazeelZone), talkToHazeel);
questionsForHazeel.addStep(inHazeelZone, talkToAlomoneOrClivet);
questionsForHazeel.addStep(inRaftZone, boardRaft);

steps.put(30, questionsForHazeel);
Expand Down Expand Up @@ -311,7 +311,7 @@ public void setupRequirements()
checkedBush2 = new VarbitRequirement(14738, 1);

evelotDefeated = new VarbitRequirement(14722, 28, Operation.GREATER_EQUAL);
talkedToAlmoneOrClivet = new VarbitRequirement(14722, 32, Operation.GREATER_EQUAL);
talkedToAlomoneOrClivet = new VarbitRequirement(14722, 32, Operation.GREATER_EQUAL);
talkedToHazeel = new VarbitRequirement(14722, 36, Operation.GREATER_EQUAL);

talkedToGuard = new VarbitRequirement(14722, 38, Operation.GREATER_EQUAL);
Expand Down Expand Up @@ -450,8 +450,8 @@ public void setupSteps()
boardRaft = new ObjectStep(this, ObjectID.RAFT, new WorldPoint(2567, 9679, 0),
"Board the raft.");
// TODO check if player killed Alomone and direct accordingly
talkToAlmoneOrClivet = new NpcStep(this, NpcID.ALOMONE, new WorldPoint(2607, 9671, 0), "Talk to Almone or Clivet inside the cult area.");
talkToAlmoneOrClivet.addAlternateNpcs(NpcID.ALOMONE_12093, NpcID.ALOMONE_12094, NpcID.CLIVET, NpcID.CLIVET_12095);
talkToAlomoneOrClivet = new NpcStep(this, NpcID.ALOMONE, new WorldPoint(2607, 9671, 0), "Talk to Alomone or Clivet inside the cult area.");
talkToAlomoneOrClivet.addAlternateNpcs(NpcID.ALOMONE_12093, NpcID.ALOMONE_12094, NpcID.CLIVET, NpcID.CLIVET_12095);
talkToHazeel = new NpcStep(this, NpcID.HAZEEL_12050, new WorldPoint(2607, 9672, 0),
"Talk to Hazeel.");
returnRaft = new ObjectStep(this, ObjectID.RAFT, new WorldPoint(2606, 9693, 0),
Expand Down Expand Up @@ -512,7 +512,7 @@ public void setupSteps()
"Talk to General Khazard.");
talkToHazeelWeiss = new NpcStep(this, NpcID.HAZEEL_12051, new WorldPoint(2903, 10335, 0), "Talk to Hazeel to the west and tell him about what happened.");
searchBarrel = new ObjectStep(this, ObjectID.BARREL_46609, new WorldPoint(2923, 10322, 0),
"Search the barrel south of the room you fought the assasin.");
"Search the barrel south of the room you fought the assassin.");
openCentreGate = new ObjectStep(this, ObjectID.GATE_46602, new WorldPoint(2924, 10329, 0),
"Enter the centre room. Use the code \"BLOOD\" to unlock the gate.");
solveCenterGate = new SolveDoorCode(this);
Expand Down Expand Up @@ -648,7 +648,7 @@ public List<PanelDetails> getPanels()
speakToEvelot), coins, combatGear));

allSteps.add(new PanelDetails("The Mysterious Benefactor",
Arrays.asList(enterCave, boardRaft, talkToAlmoneOrClivet, talkToHazeel, returnGuard, ladderToClaus, talkToClaus,
Arrays.asList(enterCave, boardRaft, talkToAlomoneOrClivet, talkToHazeel, returnGuard, ladderToClaus, talkToClaus,
examineShelves, examineWall, lockpickChest, inspectScroll, returnToHazeel), lockpick));

allSteps.add(new PanelDetails("In The North",
Expand Down

0 comments on commit 73eee91

Please sign in to comment.