From 8144faa37b73325574a82d518643084986efb6d1 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 20 Mar 2022 23:33:36 +0000 Subject: [PATCH] No longer take thirst damage while doing the tutorial Survival Expert can now correctly return your axe if you somehow manage to lose it Fixed a hint arrow location in tutorial --- Server/src/main/java/core/game/content/zone/DesertZone.java | 2 +- .../kotlin/rs09/game/content/tutorial/SurvivalExpertDialogue.kt | 1 + .../src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Server/src/main/java/core/game/content/zone/DesertZone.java b/Server/src/main/java/core/game/content/zone/DesertZone.java index 07bce01fd..ab4bfa796 100644 --- a/Server/src/main/java/core/game/content/zone/DesertZone.java +++ b/Server/src/main/java/core/game/content/zone/DesertZone.java @@ -54,7 +54,7 @@ public final class DesertZone extends MapZone implements Plugin { @Override public boolean pulse() { for (Player player : PLAYERS) { - if (player.getInterfaceManager().isOpened() || player.getInterfaceManager().hasChatbox() || player.getLocks().isMovementLocked()) { + if (!player.getAttribute("tutorial:complete", false) || player.getInterfaceManager().isOpened() || player.getInterfaceManager().hasChatbox() || player.getLocks().isMovementLocked()) { continue; } if (player.getAttribute("desert-delay", -1) < GameWorld.getTicks()) { diff --git a/Server/src/main/kotlin/rs09/game/content/tutorial/SurvivalExpertDialogue.kt b/Server/src/main/kotlin/rs09/game/content/tutorial/SurvivalExpertDialogue.kt index 4e59e1be2..ecc58c600 100644 --- a/Server/src/main/kotlin/rs09/game/content/tutorial/SurvivalExpertDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/tutorial/SurvivalExpertDialogue.kt @@ -59,6 +59,7 @@ class SurvivalExpertDialogue(player: Player? = null) : DialoguePlugin(player) { if(!inInventory(player, Items.TINDERBOX_590)) { player.dialogueInterpreter.sendItemMessage(Items.TINDERBOX_590, "The Survival Expert gives you a spare tinderbox.") + addItem(player, Items.TINDERBOX_590) } return false } diff --git a/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt b/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt index 22ba967fc..bcf472d3c 100644 --- a/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt +++ b/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt @@ -645,7 +645,7 @@ object TutorialStage { 38 -> { hideTabs(player, login) removeHintIcon(player) - registerHintIcon(player, Location.create(3071, 9496), 75) + registerHintIcon(player, Location.create(3079, 9496), 75) Component.setUnclosable( player, player.dialogueInterpreter.sendPlaneMessageWithBlueTitle(