From ee460000446e60abdd926c4fc57d86a167017ca9 Mon Sep 17 00:00:00 2001 From: Zoinkwiz Date: Sat, 28 Sep 2024 12:11:52 +0100 Subject: [PATCH] fix: Fix orb spell cast in Legends' Quest widget highlight (#1773) * fix: Fix orb spell cast in Legends' Quest widget highlight * fix: Added all charge orb spells to Legends' Quest Co-Authored-By: pajlada <962989+pajlada@users.noreply.github.com> * fix: Removed duplicate initialization of useSpellOnDoor --------- Co-authored-by: pajlada <962989+pajlada@users.noreply.github.com> --- .../helpers/quests/legendsquest/LegendsQuest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/questhelper/helpers/quests/legendsquest/LegendsQuest.java b/src/main/java/com/questhelper/helpers/quests/legendsquest/LegendsQuest.java index f9bad65f59..c3153881d0 100644 --- a/src/main/java/com/questhelper/helpers/quests/legendsquest/LegendsQuest.java +++ b/src/main/java/com/questhelper/helpers/quests/legendsquest/LegendsQuest.java @@ -67,6 +67,7 @@ import java.util.*; import com.questhelper.steps.TileStep; +import com.questhelper.steps.widget.NormalSpells; import net.runelite.api.ItemID; import net.runelite.api.NpcID; import net.runelite.api.ObjectID; @@ -960,9 +961,6 @@ private void setupSteps() searchMarkedWallToSource = new ObjectStep(this, ObjectID.MARKED_WALL, new WorldPoint(2779, 9305, 0), "Follow the cave around until you reach a marked wall. Use it."); searchMarkedWallToSource.addDialogSteps("Investigate the outline of the door.", "Yes, I'll go through!"); - useSpellOnDoor = new ObjectStep(this, ObjectID.ANCIENT_GATE_2930, new WorldPoint(2763, 9314, 0), "Cast a charge orb spell on the ancient gate.", chargeOrbRunes, unpoweredOrb, normalSpellbook); - useSpellOnDoor.addWidgetHighlight(218, 41); - useRopeOnWinch = new ObjectStep(this, ObjectID.WINCH_2934, new WorldPoint(2761, 9331, 0), "Use a rope on the winch. If you've already done so, search it instead.", ropeHighlighted); useRopeOnWinch.addIcon(ItemID.ROPE); @@ -1030,7 +1028,10 @@ private void setupSteps() useSpellOnDoor = new ObjectStep(this, ObjectID.ANCIENT_GATE_2930, new WorldPoint(2763, 9314, 0), "Cast a charge orb spell on the ancient gate.", chargeOrbRunes, unpoweredOrb, normalSpellbook); - useSpellOnDoor.addWidgetHighlight(218, 41); + useSpellOnDoor.addWidgetHighlight(218, 41); useSpellOnDoor.addSpellHighlight(NormalSpells.CHARGE_WATER_ORB); + useSpellOnDoor.addSpellHighlight(NormalSpells.CHARGE_AIR_ORB); + useSpellOnDoor.addSpellHighlight(NormalSpells.CHARGE_EARTH_ORB); + useSpellOnDoor.addSpellHighlight(NormalSpells.CHARGE_FIRE_ORB); enterMossyRockHolyForce = new ObjectStep(this, ObjectID.MOSSY_ROCK, new WorldPoint(2782, 2937, 0), "Search and then enter the Mossy Rocks in the north west of the Kharazi.", @@ -1043,7 +1044,10 @@ private void setupSteps() searchMarkedWallHolyForce = searchMarkedWallToSource.copy(); useSpellOnDoorHolyForce = new ObjectStep(this, ObjectID.ANCIENT_GATE_2930, new WorldPoint(2763, 9314, 0), "Cast a charge orb spell on the ancient gate.", chargeOrbRunes, unpoweredOrb, normalSpellbook); - useSpellOnDoorHolyForce.addWidgetHighlight(218, 41); + useSpellOnDoorHolyForce.addSpellHighlight(NormalSpells.CHARGE_WATER_ORB); + useSpellOnDoorHolyForce.addSpellHighlight(NormalSpells.CHARGE_AIR_ORB); + useSpellOnDoorHolyForce.addSpellHighlight(NormalSpells.CHARGE_EARTH_ORB); + useSpellOnDoorHolyForce.addSpellHighlight(NormalSpells.CHARGE_FIRE_ORB); climbDownWinchHolyForce = new ObjectStep(this, ObjectID.WINCH_2934, new WorldPoint(2761, 9331, 0), "Climb down the winch."); ((ObjectStep) climbDownWinchHolyForce).addAlternateObjects(ObjectID.WINCH_2935);