Add steps from The Grand Tree quest to make sure you can use the glid…

…er to get to Gianne jnr.
Zoinkwiz · Oct 2, 2023 · 3c9be97 · 3c9be97
1 parent 24f1930
commit 3c9be97
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/com/questhelper/helpers/quests/thepathofglouphrie/ThePathOfGlouphrie.java b/src/main/java/com/questhelper/helpers/quests/thepathofglouphrie/ThePathOfGlouphrie.java
@@ -78,7 +78,9 @@ public class ThePathOfGlouphrie extends BasicQuestHelper
 
 	/// Zones
 	public Zone treeGnomeVillageMiddle1, treeGnomeVillageMiddle2, treeGnomeVillageMiddle3;
-	public Zone treeGnomeVillageDungeon, storeroomZone, gnomeStrongholdFloor1, longrambleZone;
+	public Zone treeGnomeVillageDungeon, storeroomZone;
+	public Zone gnomeStrongholdFloor1, gnomeStrongholdFloor2, gnomeStrongholdFloor3;
+	public Zone longrambleZone;
 	public Zone sewer1, sewer2, sewer3, sewer4Section1, sewer4Section2;
 	public Zone sewer5, sewer6Section1, sewer6Section2, bossRoom;
 
@@ -114,7 +116,7 @@ public class ThePathOfGlouphrie extends BasicQuestHelper
 	public VarbitRequirement learnedAboutChapter2;
 	public ObjectStep enterTreeGnomeVillageMazeFromMiddle;
 	public ObjectStep climbDownIntoTreeGnomeVillageDungeon;
-	public ZoneRequirement inGnomeStrongholdFloor1;
+	public ZoneRequirement inGnomeStrongholdFloor1, inGnomeStrongholdFloor2, inGnomeStrongholdFloor3;
 
 	public WidgetTextRequirement lecternWidgetActive;
 	public PrayerRequirement protectMissiles;
@@ -164,6 +166,8 @@ public void setupZones()
 		treeGnomeVillageDungeon = new Zone(new WorldPoint(2560, 4426, 0), new WorldPoint(2627, 4477, 0));
 		storeroomZone = new Zone(11074);
 		gnomeStrongholdFloor1 = new Zone(new WorldPoint(2437, 3474, 1), new WorldPoint(2493, 3511, 1));
+		gnomeStrongholdFloor2 = new Zone(new WorldPoint(2437, 3474, 2), new WorldPoint(2493, 3511, 2));
+		gnomeStrongholdFloor3 = new Zone(new WorldPoint(2437, 3474, 3), new WorldPoint(2493, 3511, 3));
 		longrambleZone = new Zone(new WorldPoint(2328, 3082, 0), new WorldPoint(2346, 3103, 0));
 		sewer1 = new Zone(new WorldPoint(1472, 4236, 0), new WorldPoint(1480, 4239, 0));
 		sewer2 = new Zone(new WorldPoint(1472, 4226, 1), new WorldPoint(1534, 4247, 1));
@@ -220,6 +224,8 @@ private void setupConditions()
 		inTreeGnomeVillageDungeon = new ZoneRequirement(treeGnomeVillageDungeon);
 		inStoreroom = new ZoneRequirement(storeroomZone);
 		inGnomeStrongholdFloor1 = new ZoneRequirement(gnomeStrongholdFloor1);
+		inGnomeStrongholdFloor2 = new ZoneRequirement(gnomeStrongholdFloor2);
+		inGnomeStrongholdFloor3 = new ZoneRequirement(gnomeStrongholdFloor3);
 		nearLongramble = new ZoneRequirement(longrambleZone);
 
 		inCutscene = new Conditions(LogicType.OR,

diff --git a/...ain/java/com/questhelper/helpers/quests/thepathofglouphrie/sections/InformKingBolren.java b/...ain/java/com/questhelper/helpers/quests/thepathofglouphrie/sections/InformKingBolren.java
@@ -69,14 +69,20 @@ public void setup(ThePathOfGlouphrie quest)
 
 		// Talk to Gianne Junior in Tree Gnome Stronghold
 		talkToGianneJnr = new NpcStep(quest, NpcID.GIANNE_JNR, new WorldPoint(2439, 3502, 1), "Talk to Gianne jnr. in Tree Gnome Stronghold to ask for Longramble's whereabouts.");
-		ObjectStep climbUpToGianneJnr = new ObjectStep(quest, ObjectID.LADDER_16683, new WorldPoint(2466, 3495, 0), "");
+		// Floor 0 to Floor 1
+		var climbUpToGianneJnr = new ObjectStep(quest, ObjectID.LADDER_16683, new WorldPoint(2466, 3495, 0), "");
+		var climbGrandTreeF3ToF2 = new ObjectStep(quest, ObjectID.LADDER_16679, new WorldPoint(2466, 3495, 3), "");
+		var climbGrandTreeF2ToF1 = new ObjectStep(quest, ObjectID.LADDER_2884, new WorldPoint(2466, 3495, 2), "");
+		climbGrandTreeF2ToF1.addDialogStep("Climb Down.");
 		climbUpToGianneJnr.setText(talkToGianneJnr.getText());
 		climbUpToGianneJnr.addTeleport(teleToStronghold);
-		talkToGianneJnr.addSubSteps(climbUpToGianneJnr);
+		talkToGianneJnr.addSubSteps(climbUpToGianneJnr, climbGrandTreeF3ToF2, climbGrandTreeF2ToF1);
 		talkToGianneJnr.addDialogSteps("I need your help finding a certain gnome.");
 
 		talkToGianneJnrStep = new ConditionalStep(quest, climbUpToGianneJnr);
 		talkToGianneJnrStep.addStep(quest.inGnomeStrongholdFloor1, talkToGianneJnr);
+		talkToGianneJnrStep.addStep(quest.inGnomeStrongholdFloor2, climbGrandTreeF2ToF1);
+		talkToGianneJnrStep.addStep(quest.inGnomeStrongholdFloor3, climbGrandTreeF3ToF2);
 	}
 
 	public List<QuestStep> getSteps()