Add helper for the The Curse of Arrav quest #1833

pajlada · 2024-11-09T14:35:02Z

Is the difficulty correct?
Are the skill requirements correct?
Is the position in the optimal quest guide & optimal ironman quest guide correct?
(optimal ironman guide doesn't have curse of arrav so i just added it where it felt good)
Are the monsters you have to fight correctly listed?
Are the rewards correct?
Does the "RuneScape Wiki" link work?

Unrelated changes I've made:

Added display text to ConditionForStep. This was useful in the RubbleSolver steps
Tried to consolidate the BasicQuestHelper step loading. the setupStep function is currently called twice when a quest is initialized. However, no logic has actually changed for now (as is explained in the added comment)
Added a new ObjectCondition ctor that accepts a list of valid ObjectIDs. This is useful for the RubbleSolver since stones that have 1, 2, or 3 hits on them have multiple different objectIDs for each "hits left" variant. I left the logic in the ObjectCondition check function that returns true if objectIDs is -1
Made it possible to post-construction update the Model ID we look for in the WidgetModelRequirement, and the text we look for in WidgetTextRequirement. I use this in the metal door puzzle solver to update what we're looking for depending on the code the user needs to enter.
Made it possible to add a custom "post process" function to WidgetStep's makeWidgetOverlayHint. This is used in the metal door puzzle solver to render text for how many steps are left
Added a ctor for WidgetDetails for group id + child id for convenience

Zoinkwiz

Lots of puzzles, well done on getting through them all, solutons all look solid!

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/TheCurseOfArrav.java

Zoinkwiz · 2024-11-12T11:17:00Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/TheCurseOfArrav.java

+		// If the user has not already put the key in the south lever, and does not have the key
+		((ConditionalStep) unsortedStep6).addStep(and(needToInsertKeyInSouthLever, not(hasSecondKey)), getSecondKey);
+		// If the user has not already put the key in the north lever, and does not have the key
+		((ConditionalStep) unsortedStep6).addStep(and(needToInsertKeyInNorthLever, not(hasFirstKey)), getFirstKey);


Step marked as not sorted, but to ensure it's highlighted it currently directs to get key 2 before key 1.

This has been resolved in my refactors (no commit hash sorry)

Zoinkwiz · 2024-11-12T11:21:00Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/TheCurseOfArrav.java

+		pullSouthLever.addDialogStep("Yes.");
+		var getToSouthLever = new ObjectStep(this, ObjectID.ODD_MARKINGS_50207, new WorldPoint(3891, 4554, 0), "Search the Odd markings to the south to get to the south lever. Search the markings again if you fail.");
+		var needToInsertKeyInSouthLever = new VarbitRequirement(11482, 0);
+		var needToFlipSouthLever = new VarbitRequirement(11482, 1);


Need to flip it if it's 1 or 0.

This should have been fixed, but its logic is kind of weird. I've added unit tests to try to make it sane.

Zoinkwiz · 2024-11-12T11:24:18Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/TheCurseOfArrav.java

+
+		var insideTomb = new Zone(new WorldPoint(3842, 4603, 0), new WorldPoint(3900, 4547, 0));
+		var insideTombReq = new ZoneRequirement(insideTomb);
+		var hasFirstKey = new ItemRequirement("Mastaba Key", ItemID.MASTABA_KEY);


Can add conditional show on steps for if used on lever.

I decided not to add this because:

It messes with the conditional step logic if the key is used as a condition

I think either key works for either lever (but I could be wrong with this)

Zoinkwiz · 2024-11-12T11:25:03Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/TheCurseOfArrav.java

+		var getToNorthLever = new ObjectStep(this, ObjectID.ODD_MARKINGS_50208, new WorldPoint(3891, 4597, 0), "Search the Odd markings to the north to get to the north lever. Search the markings again if you fail.");
+		pullNorthLever = new ObjectStep(this, ObjectID.LEVER_50205, new WorldPoint(3894, 4598, 0), "Pull the lever to the north-east.", hasFirstKey);
+		pullNorthLever.addDialogStep("Yes.");
+		var needToInsertKeyInNorthLever = new VarbitRequirement(11481, 0);


Needs using if making its own step. Else can just make a the 'need to pull' check, where the key hides itself if used.

This has been cleaned up

Zoinkwiz · 2024-11-12T11:35:57Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/TheCurseOfArrav.java

+		)));
+		panels.add(new PanelDetails("Fort Invasion", List.of(
+			unsortedStep20,
+			rubbleMiner1,


All as one substep of a single one I think as it's the same text, or if not more distinguished text.

Zoinkwiz · 2024-11-12T11:41:40Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/rubblesolvers/RubbleSolverTwo.java

+		this.addMineRubbleStep(2767, 10278, RubbleType.One, Direction.WEST); // 12
+		this.addMineRubbleStep(2767, 10279, RubbleType.Two, Direction.WEST); // 13
+		this.addMineRubbleStep(2768, 10279, RubbleType.One, Direction.WEST); // 14
+		this.addMineRubbleStep(2767, 10279, RubbleType.One, Direction.SOUTH); // 15


Step 15 needs to come before 14, as 15 is blocking 14.

Zoinkwiz · 2024-11-12T11:45:11Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/rubblesolvers/RubbleSolverTwo.java

+
+	@Override
+	protected void setupRubbleSteps() {
+		this.addMineRubbleStep(2766, 10279, RubbleType.Three, Direction.WEST); // 5


I like this as a clean solution! Players will be able to break it by deciding to mine from a non-directed direction, but it shouldn't hopefully ever be too problematic and 99% of people almost certainly won't.

Zoinkwiz · 2024-11-12T11:51:27Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/TheCurseOfArrav.java

+			rubbleMiner2,
+			rubbleMiner3,
+			rubbleMiner4,
+			unsortedStep30,


This and below 3 steps need to be changed to actual steps.

This has been cleaned up

Zoinkwiz · 2024-11-12T12:03:39Z

src/main/java/com/questhelper/helpers/quests/thecurseofarrav/MetalDoorSolver.java

+	 * The third column is for strip 1
+	 * The fourth column is for strip 3
+	 */
+	private static final int[][] CODE_MAPPING = new int[][]{


Would be good for this to have a few extra features:

Arrow highlight to have number of times you still need to click it.

Overlay saying what the answer is

Allow for down arrow to be used if it's closer to answer

The existing door solvers from like Tribal Totem and SOTN should provide templates for those bits.

This has been done, but in a bit of a unique way since I I'm using a DetailedOwnerStep instead of a straight up QuestStep

The new solution assumes that the key 30308 always goes with lever 50204, and 30309 goes with 50205. This makes the conditional logic a lot simpler.

pajlada added 5 commits November 9, 2024 15:34

progress

bf8b0b6

progress 2

2da24ea

why lag

19f6d68

only pass once conditions with list of requirements / logictype

65e3f38

progress

59f0ef8

pajlada changed the title ~~progress~~ Add quest helper for the The Curse of Arrav quest Nov 9, 2024

pajlada changed the title ~~Add quest helper for the The Curse of Arrav quest~~ Add helper for the The Curse of Arrav quest Nov 9, 2024

more progress

7cb8b34

pajlada marked this pull request as ready for review November 10, 2024 18:56

Zoinkwiz requested changes Nov 12, 2024

View reviewed changes

pajlada added 20 commits November 12, 2024 14:59

test: Add puzzle test from Avsynthe

6df98b5

test: Add puzzle test from Zoinkwiz

bd54ee7

fix: Add teleport requirement to start

dfd64d0

random refactor

1780ce6

refactor: make free inv requirement a class member

73cff5e

refactor: don't use triple-slash comments for sections

074134e

refactor: make insideTomb ZoneRequirement a class member

df77636

nit: Supress the field can be local lint

80e7c3c

fix: Quest step types

bda646c

fix: remove unused variables

20ec362

nit: remove commented out code

29969be

Reword the Protect from Melee phrasing from Arrav boss fight

506d032

nit: reword directions in "Tomb Raiding"

a8484bb

nit: remove some empty lines

25a7430

nit: ungender the golem

76a6a45

refactor: make insideTombSecondFloorReq a class member

99f5fbe

nit: Reword combat gear/prayer recommendation texts

56db84c

refactor: make finishedTilePuzzle a class member

8e262dc

refactor: Clean up step 12

11ea4e7

refactor: cleanup/clarify early tomb steps

cb47460

pajlada and others added 28 commits November 16, 2024 18:16

remove some more unused imports

96d981d

better document BasicQuestHelper's setupStep

15653a7

Remove conditionforstep comment for getDisplayText

45eb9a1

undo step-highlight-checker

6031038

Remove unused imports from BasicQuestHelper

c0e1e28

Add optimal quest order, optimal ironman order, and release order

86d93ec

wiki link now works without a redirect

8b21fcb

remove previously-added-but-now-unused Conditions ctor

58d8c96

more asserts for new ObjectCondition ctor

ecf59f5

remove some test declarations

9420028

Undo change to the shortestPath logic

7bdcdeb

remove custom ObjectStep toString function

57a085c

undo reformat

9da19c1

Undo import changes to QuestStep

9fcc422

remove unused imports, function & did some formatting in tests

d54e418

add antivenom recommendation

9b574dd

remove some comments

9fe58c4

make varbit constant for lever states (since it's used in tests)

353358e

clean up KeysAndLevers test

3afeccf

reformat tests

1241f54

last refactors/requirement polishes

207fcb2

fix: Simplify mastaba door solution

c7a457b

The new solution assumes that the key 30308 always goes with lever 50204, and 30309 goes with 50205. This makes the conditional logic a lot simpler.

fix: Simplify tile puzzle in CoA

99891dd

Remove now-unused tests in KeysAndLeversTest.java

cc16c1f

replace log.info with log.debug

598a17a

Clean up teleport recommendations in sections

f872332

fix NPE on launch

0977c73

final polish

18b2d00

Zoinkwiz approved these changes Nov 18, 2024

View reviewed changes

Zoinkwiz merged commit 3125e28 into Zoinkwiz:master Nov 18, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add helper for the The Curse of Arrav quest #1833

Add helper for the The Curse of Arrav quest #1833

pajlada commented Nov 9, 2024 •

edited

Loading

Zoinkwiz left a comment

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Zoinkwiz Nov 12, 2024

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Zoinkwiz Nov 12, 2024

pajlada Nov 16, 2024

Add helper for the The Curse of Arrav quest #1833

Add helper for the The Curse of Arrav quest #1833

Conversation

pajlada commented Nov 9, 2024 • edited Loading

Zoinkwiz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pajlada commented Nov 9, 2024 •

edited

Loading