diff --git a/Server/src/main/content/global/handlers/item/withnpc/GCItemOnCat.kt b/Server/src/main/content/global/handlers/item/withnpc/GCItemOnCat.kt index 415a47c9e..3209b4f45 100644 --- a/Server/src/main/content/global/handlers/item/withnpc/GCItemOnCat.kt +++ b/Server/src/main/content/global/handlers/item/withnpc/GCItemOnCat.kt @@ -17,7 +17,7 @@ class GCItemOnCat : InteractionListener { val BEND_DOWN = 827 onUseWith(IntType.NPC, Items.BUCKET_OF_MILK_1927, NPCs.GERTRUDES_CAT_2997) { player, used, with -> - if(questStage(player, GERTCAT) == 20 && removeItem(player, used.asItem())){ + if(getQuestStage(player, GERTCAT) == 20 && removeItem(player, used.asItem())){ addItem(player, Items.BUCKET_1925) animate(player, BEND_DOWN) //bend down sendChat(with.asNpc(), "Mew!") @@ -27,7 +27,7 @@ class GCItemOnCat : InteractionListener { } onUseWith(IntType.NPC, Items.DOOGLE_SARDINE_1552, NPCs.GERTRUDES_CAT_2997){ player, used, with -> - if(questStage(player, GERTCAT) == 30 && removeItem(player, used.asItem())){ + if(getQuestStage(player, GERTCAT) == 30 && removeItem(player, used.asItem())){ animate(player, BEND_DOWN) sendChat(with.asNpc(), "Mew!") setQuestStage(player, GERTCAT, 40) diff --git a/Server/src/main/content/global/handlers/item/withnpc/RopeOnLadyKeli.kt b/Server/src/main/content/global/handlers/item/withnpc/RopeOnLadyKeli.kt index 9a4e05f04..dab9e0c12 100644 --- a/Server/src/main/content/global/handlers/item/withnpc/RopeOnLadyKeli.kt +++ b/Server/src/main/content/global/handlers/item/withnpc/RopeOnLadyKeli.kt @@ -11,14 +11,14 @@ class RopeOnLadyKeli : InteractionListener { val PAR = "Prince Ali Rescue" onUseWith(IntType.NPC, Items.ROPE_954, NPCs.LADY_KELI_919) { player, used, with -> - if(questStage(player, PAR) in 40..50 && getAttribute(player, "guard-drunk", false)){ + if(getQuestStage(player, PAR) in 40..50 && getAttribute(player, "guard-drunk", false)){ if(removeItem(player, used.asItem())){ sendDialogue(player, "You overpower Keli, tie her up, and put her in a cupboard.") setQuestStage(player, PAR, 50) setAttribute(player, "keli-gone", getWorldTicks() + 350) } } else { - if (questStage(player, PAR) == 40){ + if (getQuestStage(player, PAR) == 40){ sendMessage(player, "You need to do something about the guard first.") } } diff --git a/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java b/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java index de6d7ccba..3af68e890 100644 --- a/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java +++ b/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java @@ -9,7 +9,6 @@ import core.plugin.Initializable; import core.game.node.entity.player.Player; import static core.api.ContentAPIKt.isQuestComplete; -import static core.api.ContentAPIKt.questStage; import static core.tools.DialogueConstKt.END_DIALOGUE; /** diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt index c29e6f81a..4484ab5ac 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt @@ -4,7 +4,6 @@ import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau import content.region.asgarnia.burthorpe.quest.deathplateau.DunstanDialogueFile import core.api.isQuestInProgress import core.api.openDialogue -import core.api.questStage import core.game.dialogue.DialoguePlugin import core.game.dialogue.FacialExpression import core.game.dialogue.Topic diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt index 102ea6115..e9ccfc492 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt @@ -2,8 +2,8 @@ package content.region.asgarnia.burthorpe.dialogue import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau import content.region.asgarnia.burthorpe.quest.deathplateau.EohricDialogueFile +import core.api.getQuestStage import core.api.openDialogue -import core.api.questStage import core.game.dialogue.DialoguePlugin import core.game.dialogue.FacialExpression import core.game.node.entity.player.Player @@ -19,7 +19,7 @@ import org.rs09.consts.NPCs @Initializable class EohricDialogue(player: Player? = null) : DialoguePlugin(player) { override fun handle(interfaceId: Int, buttonId: Int): Boolean { - if (questStage(player!!, DeathPlateau.questName) >= 5) { + if (getQuestStage(player!!, DeathPlateau.questName) >= 5) { // Call the dialogue file for Eohric from the deathplateau quest folder. openDialogue(player!!, EohricDialogueFile(), npc) return true diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt index fa4584bfc..e0db1a73d 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt @@ -1,7 +1,7 @@ package content.region.asgarnia.burthorpe.quest.deathplateau +import core.api.getQuestStage import core.api.getScenery -import core.api.questStage import core.api.sendDialogue import core.game.dialogue.DialogueFile import core.game.dialogue.FacialExpression @@ -26,7 +26,7 @@ class DeathPlateauDoorDialogueFile(val door: Int) : DialogueFile() { if(door == 2) { npc = NPC(NPCs.TENZING_1071) - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { in 0 .. 19 -> { when (stage) { 0 -> sendDialogue(player!!, "You knock on the door.").also { stage++ } @@ -53,7 +53,7 @@ class DeathPlateauDoorDialogueFile(val door: Int) : DialogueFile() { } if(door == 3) { npc = NPC(NPCs.TENZING_1071) - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { in 0..24 -> { when (stage) { 0 -> npcl(FacialExpression.FRIENDLY, "Where do you think you're going? This is private property!").also { stage = END_DIALOGUE } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt index cd6f0eff7..ed6850780 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt @@ -77,7 +77,7 @@ class DeathPlateauInteractionListener : InteractionListener { GroundItemManager.get(Items.STONE_BALL_3111, location(2895, 3562, 0), player) != null && GroundItemManager.get(Items.STONE_BALL_3112, location(2895, 3563, 0), player) != null && GroundItemManager.get(Items.STONE_BALL_3113, location(2895, 3564, 0), player) != null) { - if (questStage(player, DeathPlateau.questName) == 16) { + if (getQuestStage(player, DeathPlateau.questName) == 16) { sendMessage(player, "The equipment room door has unlocked.") setQuestStage(player, DeathPlateau.questName, 19) } @@ -86,7 +86,7 @@ class DeathPlateauInteractionListener : InteractionListener { } on(Scenery.LARGE_DOOR_3743, SCENERY, "open") { player, node -> - if (questStage(player, DeathPlateau.questName) > 16) { + if (getQuestStage(player, DeathPlateau.questName) > 16) { DoorActionHandler.handleAutowalkDoor(player, node as core.game.node.scenery.Scenery) } else { sendMessage(player, "The door is locked.") diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt index c2de14f8c..87cc9f20f 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt @@ -20,7 +20,7 @@ import org.rs09.consts.NPCs class DenulthDialogueFile : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { in 0..4 -> { when (stage) { 0 -> playerl(FacialExpression.FRIENDLY, "Hello!").also { stage++ } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt index d0983eacb..2567c54c8 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt @@ -13,7 +13,7 @@ import org.rs09.consts.NPCs class DunstanDialogueFile : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { 21 -> { when (stage) { START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage++ } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt index 1c1b68629..426f4846a 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt @@ -1,9 +1,6 @@ package content.region.asgarnia.burthorpe.quest.deathplateau -import core.api.getAttribute -import core.api.questStage -import core.api.setAttribute -import core.api.setQuestStage +import core.api.* import core.game.dialogue.DialogueFile import core.game.dialogue.FacialExpression import core.game.dialogue.Topic @@ -20,7 +17,7 @@ import org.rs09.consts.NPCs */ class EohricDialogueFile : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { in 5..9 -> { when (stage) { START_DIALOGUE -> player(FacialExpression.FRIENDLY, "Hi!").also { stage++ } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt index 30e8663d5..e96eb48f6 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt @@ -38,7 +38,7 @@ class HaroldDialogueFile : DialogueFile() { setAttribute(player!!, ATTRIBUTE_JUMPSTAGE, 0) } println(getAttribute(player!!, ATTRIBUTE_HAROLD_MONEY, -1)) - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { 10 -> { // First time meeting. when (stage) { START_DIALOGUE -> player(FacialExpression.FRIENDLY, "Hello there.").also { stage++ } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt index 20ef8b718..0d44bc767 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt @@ -9,7 +9,7 @@ import org.rs09.consts.Items class IOUNoteDialogueFile : DialogueFile() { var a = 0 override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { in 15..16 -> { when (stage) { 0 -> player(FacialExpression.NEUTRAL, "The IOU says that Harold owes me some money.").also { stage++ } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt index a3aba342a..3c1c90632 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt @@ -9,7 +9,7 @@ import core.tools.END_DIALOGUE class SabaDialogueFile : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { 19 -> { when (stage) { 0 -> player(FacialExpression.FRIENDLY, "Hello!").also { stage++ } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt index 6019e3715..3a078a77d 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt @@ -11,7 +11,7 @@ class SecretWayLocation : MapArea { } override fun areaEnter(entity: Entity) { - if (entity is Player && questStage(entity, DeathPlateau.questName) == 25) { + if (entity is Player && getQuestStage(entity, DeathPlateau.questName) == 25) { sendPlayerDialogue(entity, "I think this is far enough, I can see Death Plateau and it looks like the trolls haven't found the path. I'd better go and tell Denulth.") setQuestStage(entity, DeathPlateau.questName, 26) } diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt index 4f482280e..aacba1673 100644 --- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt +++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt @@ -12,7 +12,7 @@ import org.rs09.consts.Items class TenzingDialogueFile : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, DeathPlateau.questName)) { + when (getQuestStage(player!!, DeathPlateau.questName)) { 20 -> { when (stage) { START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hello!").also { stage++ } diff --git a/Server/src/main/content/region/asgarnia/trollheim/dialogue/SabaDialogue.kt b/Server/src/main/content/region/asgarnia/trollheim/dialogue/SabaDialogue.kt index a0c659f47..f904fe12e 100644 --- a/Server/src/main/content/region/asgarnia/trollheim/dialogue/SabaDialogue.kt +++ b/Server/src/main/content/region/asgarnia/trollheim/dialogue/SabaDialogue.kt @@ -2,8 +2,8 @@ package content.region.asgarnia.trollheim.dialogue import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau import content.region.asgarnia.burthorpe.quest.deathplateau.SabaDialogueFile +import core.api.getQuestStage import core.api.openDialogue -import core.api.questStage import core.game.dialogue.DialoguePlugin import core.game.dialogue.FacialExpression import core.game.node.entity.player.Player @@ -20,7 +20,7 @@ import org.rs09.consts.NPCs @Initializable class SabaDialogue(player: Player? = null) : DialoguePlugin(player) { override fun handle(interfaceId: Int, buttonId: Int): Boolean { - if (questStage(player!!, DeathPlateau.questName) >= 19) { + if (getQuestStage(player!!, DeathPlateau.questName) >= 19) { openDialogue(player!!, SabaDialogueFile(), npc) return true } diff --git a/Server/src/main/content/region/desert/nardah/dialogue/ZahurDialoguePlugin.java b/Server/src/main/content/region/desert/nardah/dialogue/ZahurDialoguePlugin.java index 2907db505..591e33009 100644 --- a/Server/src/main/content/region/desert/nardah/dialogue/ZahurDialoguePlugin.java +++ b/Server/src/main/content/region/desert/nardah/dialogue/ZahurDialoguePlugin.java @@ -1,4 +1,4 @@ -package content.region.desert.nardah.handlers; +package content.region.desert.nardah.dialogue; import core.game.node.item.Item; import core.cache.def.impl.NPCDefinition; diff --git a/Server/src/main/content/region/desert/quest/thegolem/TheGolemQuest.kt b/Server/src/main/content/region/desert/quest/thegolem/TheGolemQuest.kt index c44ceb432..85be1c4ad 100644 --- a/Server/src/main/content/region/desert/quest/thegolem/TheGolemQuest.kt +++ b/Server/src/main/content/region/desert/quest/thegolem/TheGolemQuest.kt @@ -72,7 +72,7 @@ class TheGolemQuest : Quest("The Golem", 70, 69, 1, 437, 0, 1, 10) { line(player, "The demon doesn't think its task is complete.", ln++, stage > 7) } if(stage >= 100) { - line(player, "QUEST COMPLETE", ln++, false) + line(player, "%%QUEST COMPLETE!&&", ln++, false) } } diff --git a/Server/src/main/content/region/fremennik/rellekka/dialogue/CouncilWorkerDialogue.kt b/Server/src/main/content/region/fremennik/rellekka/dialogue/CouncilWorkerDialogue.kt index 1659cac86..8e6434f54 100644 --- a/Server/src/main/content/region/fremennik/rellekka/dialogue/CouncilWorkerDialogue.kt +++ b/Server/src/main/content/region/fremennik/rellekka/dialogue/CouncilWorkerDialogue.kt @@ -1,7 +1,7 @@ package content.region.fremennik.rellekka.dialogue import content.region.fremennik.rellekka.quest.thefremenniktrials.CouncilWorkerFTDialogue -import core.api.questStage +import core.api.getQuestStage import core.game.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player @@ -12,7 +12,7 @@ import core.plugin.Initializable class CouncilWorkerDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin(player){ override fun open(vararg args: Any?): Boolean { npc = args[0] as NPC - if(questStage(player, "Fremennik Trials") in 1..99){ + if(getQuestStage(player, "Fremennik Trials") in 1..99){ player.dialogueInterpreter.open((CouncilWorkerFTDialogue(1))) } else if(player.achievementDiaryManager.getDiary(DiaryType.FREMENNIK).isComplete(0, true)){ diff --git a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/CouncilWorkerFTDialogue.kt b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/CouncilWorkerFTDialogue.kt index 0258fc945..f3cb507fd 100644 --- a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/CouncilWorkerFTDialogue.kt +++ b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/CouncilWorkerFTDialogue.kt @@ -32,7 +32,7 @@ class CouncilWorkerFTDialogue(val questStage: Int, var isBeerInteraction: Boolea else if(questStage in 1..99){ when(stage){ START_DIALOGUE -> - if(questStage(player!!, "Fremennik Trials") > 0) { + if(getQuestStage(player!!, "Fremennik Trials") > 0) { player("I know this is an odd question, but are you","a member of the elder council?"); stage = 1 } else { end() diff --git a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/PeerTheSeerDialogue.kt b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/PeerTheSeerDialogue.kt index d464c4500..88ea2456b 100644 --- a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/PeerTheSeerDialogue.kt +++ b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/PeerTheSeerDialogue.kt @@ -2,10 +2,8 @@ package content.region.fremennik.rellekka.quest.thefremenniktrials import core.api.addItem import core.api.dumpContainer -import core.api.questStage +import core.api.getQuestStage import core.api.removeItem -import core.game.dialogue.DialoguePlugin -import core.game.dialogue.FacialExpression import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.plugin.Initializable @@ -81,7 +79,7 @@ class PeerTheSeerDialogue(player: Player? = null) : core.game.dialogue.DialogueP stage = 50 return true } - if (questStage(player, "Fremennik Trials") == 0) { + if (getQuestStage(player, "Fremennik Trials") == 0) { npc(core.game.dialogue.FacialExpression.SAD,"Uuuh... What was that dark presence I felt?").also { stage = 300 } } return true diff --git a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt index 39612f0ac..1ed6dfa9d 100644 --- a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt +++ b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt @@ -167,7 +167,7 @@ class TFTInteractionListeners : InteractionListener { on(LYRE_IDs, IntType.ITEM, "play"){ player, lyre -> if(getAttribute(player,"onStage",false) && !getAttribute(player,"lyreConcertPlayed",false)){ Pulser.submit(LyreConcertPulse(player,lyre.id)) - } else if(questStage(player, "Fremennik Trials") < 20 || !isQuestComplete(player, "Fremennik Trials")){ + } else if(getQuestStage(player, "Fremennik Trials") < 20 || !isQuestComplete(player, "Fremennik Trials")){ sendMessage(player,"You lack the knowledge to play this.") } else if(LYRE_IDs.isLast(lyre.id)){ sendMessage(player,"Your lyre is out of charges!") @@ -378,7 +378,7 @@ class TFTInteractionListeners : InteractionListener { "I've joined the Legends' Guild!" ) var counter = 0 - val questPoints = getQP(player) + val questPoints = getQuestPoints(player) val champGuild = player.achievementDiaryManager?.hasCompletedTask(DiaryType.VARROCK, 1, 1)?: false val legGuild = questPoints >= 111 val heroGuild = questPoints >= 5 diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/AlrenaDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/AlrenaDialogue.kt index bdcbe5ae1..1577dd348 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/AlrenaDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/AlrenaDialogue.kt @@ -24,7 +24,7 @@ class AlrenaDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { 0 -> when (stage) { 1 -> npcl(FacialExpression.NEUTRAL, "Oh, hello there.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/BravekDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/BravekDialogue.kt index 8cd7a5631..bdee4777d 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/BravekDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/BravekDialogue.kt @@ -30,7 +30,7 @@ class BravekDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { 13 -> when (stage) { 1 -> playerl(FacialExpression.FRIENDLY, "This is really important though!").also { stage = 2 } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/ClerkDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/ClerkDialogue.kt index 64b27d87f..3f44c539e 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/ClerkDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/ClerkDialogue.kt @@ -1,6 +1,6 @@ package content.region.kandarin.ardougne.plaguecity.quest.elena -import core.api.questStage +import core.api.getQuestStage import core.api.sendNPCDialogue import core.api.setQuestStage import core.game.dialogue.DialoguePlugin @@ -21,7 +21,7 @@ class ClerkDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { 11 -> when (stage) { 0 -> options("Who is through that door?", "I'm just looking thanks.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/EdmondDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/EdmondDialogue.kt index f51a9a9f5..9d77ce77b 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/EdmondDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/EdmondDialogue.kt @@ -26,7 +26,7 @@ class EdmondDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { 0 -> when (stage) { 1 -> npcl(FacialExpression.NEUTRAL, "Sorry, I can't stop to talk...").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/HeadMournerDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/HeadMournerDialogue.kt index 3a5dc0668..d3e8c6d48 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/HeadMournerDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/HeadMournerDialogue.kt @@ -1,6 +1,6 @@ package content.region.kandarin.ardougne.plaguecity.quest.elena -import core.api.questStage +import core.api.getQuestStage import core.api.setQuestStage import core.game.dialogue.DialogueFile import core.game.dialogue.FacialExpression @@ -13,7 +13,7 @@ import org.rs09.consts.NPCs class HeadMournerDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.HEAD_MOURNER_716) - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { in 8..10 -> when (stage) { 0 -> npcl(FacialExpression.FRIENDLY, "Hmmm, how did you get over here? You're not one of this rabble. Ah well, you'll have to stay. Can't risk you going back now.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/JethickDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/JethickDialogue.kt index b9f93f466..598354db4 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/JethickDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/JethickDialogue.kt @@ -24,7 +24,7 @@ class JethickDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { in 0..1 -> when (stage) { 1 -> npcl(FacialExpression.FRIENDLY, "Well King Tyras has wandered off into the west kingdom. He doesn't care about the mess he's left here. The city warder Bravek is in charge at the moment... He's not much better.").also { stage = END_DIALOGUE } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MarthaRehnisonDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MarthaRehnisonDialogue.kt index 270b87921..79a130c2d 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MarthaRehnisonDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MarthaRehnisonDialogue.kt @@ -1,6 +1,6 @@ package content.region.kandarin.ardougne.plaguecity.quest.elena -import core.api.questStage +import core.api.getQuestStage import core.game.dialogue.DialoguePlugin import core.game.dialogue.FacialExpression import core.game.node.entity.npc.NPC @@ -23,7 +23,7 @@ class MarthaRehnisonDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { 9 -> when (stage) { 1 -> npcl(FacialExpression.FRIENDLY, "Yes she was staying here, but slightly over a week ago she was getting ready to go back.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MilliRehnisonDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MilliRehnisonDialogue.kt index 39e7db2ef..811f069d7 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MilliRehnisonDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MilliRehnisonDialogue.kt @@ -1,6 +1,6 @@ package content.region.kandarin.ardougne.plaguecity.quest.elena -import core.api.questStage +import core.api.getQuestStage import core.api.setQuestStage import core.game.dialogue.DialoguePlugin import core.game.dialogue.FacialExpression @@ -24,7 +24,7 @@ class MilliRehnisonDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { 9 -> when(stage) { 1 -> npcl(FacialExpression.NEUTRAL, "*sniff* Yes I was near the south east corner when I saw Elena walking by. I was about to run to greet her when some men jumped out. They shoved a sack over her head and dragged her into a building.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MournerDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MournerDialogue.kt index b19ffd6ec..7dc148c27 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MournerDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/MournerDialogue.kt @@ -14,7 +14,7 @@ import org.rs09.consts.NPCs class MournerDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.MOURNER_3216) - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { in 0..6 -> when (stage) { 0 -> playerl(FacialExpression.FRIENDLY, "Hello.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/TedRehnisonDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/TedRehnisonDialogue.kt index 5de22390a..f7534526d 100644 --- a/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/TedRehnisonDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/plaguecity/quest/elena/TedRehnisonDialogue.kt @@ -1,6 +1,6 @@ package content.region.kandarin.ardougne.plaguecity.quest.elena -import core.api.questStage +import core.api.getQuestStage import core.game.dialogue.DialoguePlugin import core.game.dialogue.FacialExpression import core.game.node.entity.npc.NPC @@ -25,7 +25,7 @@ class TedRehnisonDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, PlagueCity.PlagueCityQuest)) { + when (getQuestStage(player!!, PlagueCity.PlagueCityQuest)) { 9 -> when (stage) { 1 -> npcl(FacialExpression.FRIENDLY, "Yes she was staying here, but slightly over a week ago she was getting ready to go back. However she never managed to leave. My daughter Milli was playing near the west wall when she saw some shadowy figures jump").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/FightArena.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/FightArena.kt index b3b7b0dbd..0c38b8e72 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/FightArena.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/FightArena.kt @@ -81,7 +81,7 @@ class FightArena : Quest("Fight Arena", 61, 60, 2, 17, 0, 1, 14) { } if (stage == 100) { line++ - line(player, "!!QUEST COMPLETE??", line) + line(player, "%%QUEST COMPLETE!&&", line) } } diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/ALazyGuardDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/ALazyGuardDialogue.kt index a08e30ace..945a4826b 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/ALazyGuardDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/ALazyGuardDialogue.kt @@ -15,7 +15,7 @@ import org.rs09.consts.NPCs class ALazyGuardDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.A_LAZY_KHAZARD_GUARD_8498) - when (questStage(player!!, FightArena.FightArenaQuest)) { + when (getQuestStage(player!!, FightArena.FightArenaQuest)) { in 40..49 -> when (stage) { 0 -> { diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/GeneralKhazardDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/GeneralKhazardDialogue.kt index 3295cd137..a7eb7248f 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/GeneralKhazardDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/GeneralKhazardDialogue.kt @@ -16,7 +16,7 @@ import org.rs09.consts.NPCs class GeneralKhazardDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.GENERAL_KHAZARD_258) - when (questStage(player!!, FightArena.FightArenaQuest)) { + when (getQuestStage(player!!, FightArena.FightArenaQuest)) { in 68..70 -> when(stage){ 0 -> npcl(FacialExpression.FRIENDLY, "Out of the way, guard! I don't tolerate disruption when I'm watching slaves being slaughtered.").also { stage = END_DIALOGUE } diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/HengradDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/HengradDialogue.kt index b53d5dfbe..8d6eccb01 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/HengradDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/HengradDialogue.kt @@ -11,7 +11,7 @@ import org.rs09.consts.NPCs class HengradDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.HENGRAD_263) - when (questStage(player!!, FightArena.FightArenaQuest)) { + when (getQuestStage(player!!, FightArena.FightArenaQuest)) { in 72..87 -> when (stage) { 0 -> { diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilADialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilADialogue.kt index 9c04aa60c..026f61151 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilADialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilADialogue.kt @@ -13,7 +13,7 @@ class JeremyServilADialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.JEREMY_SERVIL_265) - when (questStage(player!!, FightArena.FightArenaQuest)) { + when (getQuestStage(player!!, FightArena.FightArenaQuest)) { 20 -> when (stage) { 0 -> { diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilBDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilBDialogue.kt index 51ca0beb1..7e4260779 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilBDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JeremyServilBDialogue.kt @@ -12,7 +12,7 @@ class JeremyServilBDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.JEREMY_SERVIL_266) - when (questStage(player!!, FightArena.FightArenaQuest)) { + when (getQuestStage(player!!, FightArena.FightArenaQuest)) { in 1..84 -> when (stage) { 0 -> { diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JustinServilDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JustinServilDialogue.kt index c1e5a43d2..a761d2b1e 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JustinServilDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/JustinServilDialogue.kt @@ -3,7 +3,7 @@ package content.region.kandarin.ardougne.quest.arena.dialogue import content.region.kandarin.ardougne.quest.arena.FightArena import core.api.face import core.api.findNPC -import core.api.questStage +import core.api.getQuestStage import core.api.sendNPCDialogue import core.game.dialogue.DialogueFile import core.game.dialogue.FacialExpression @@ -14,7 +14,7 @@ import org.rs09.consts.NPCs class JustinServilDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.JUSTIN_SERVIL_267) - when (questStage(player!!, FightArena.FightArenaQuest)) { + when (getQuestStage(player!!, FightArena.FightArenaQuest)) { in 1..68 -> when (stage) { 0 -> playerl(FacialExpression.FRIENDLY, "Hello.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/KhazardBarmanDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/KhazardBarmanDialogue.kt index 02288d1e4..d10c13e6a 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/KhazardBarmanDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/KhazardBarmanDialogue.kt @@ -2,7 +2,7 @@ package content.region.kandarin.ardougne.quest.arena.dialogue import content.region.kandarin.ardougne.quest.arena.FightArena import core.api.addItem -import core.api.questStage +import core.api.getQuestStage import core.api.removeItem import core.api.setQuestStage import core.game.dialogue.DialogueFile @@ -17,7 +17,7 @@ import org.rs09.consts.NPCs class KhazardBarmanDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { npc = NPC(NPCs.KHAZARD_BARMAN_259) - when (questStage(player!!, FightArena.FightArenaQuest)) { + when (getQuestStage(player!!, FightArena.FightArenaQuest)) { in 0..49 -> { when (stage) { 0 -> playerl(FacialExpression.HAPPY, "Hello. I'll have a beer please.").also { stage = 1 } diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/LadyServilDialogue.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/LadyServilDialogue.kt index 202d8d589..afaadc7fe 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/LadyServilDialogue.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/dialogue/LadyServilDialogue.kt @@ -1,7 +1,7 @@ package content.region.kandarin.ardougne.quest.arena.dialogue import content.region.kandarin.ardougne.quest.arena.FightArena.Companion.FightArenaQuest -import core.api.questStage +import core.api.getQuestStage import core.api.setQuestStage import core.game.dialogue.DialoguePlugin import core.game.dialogue.FacialExpression @@ -29,7 +29,7 @@ class LadyServilDialogue(player: Player? = null) : DialoguePlugin(player) { } override fun handle(componentID: Int, buttonID: Int): Boolean { - when (questStage(player!!, FightArenaQuest)) { + when (getQuestStage(player!!, FightArenaQuest)) { 0 -> when (stage) { 0 -> npcl(FacialExpression.SAD, "Oh I wish this broken cart was my only problem. *sob* I've got to find my family.. **sob**").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/BouncerNPC.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/BouncerNPC.kt index 66b34d999..f61475d19 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/BouncerNPC.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/BouncerNPC.kt @@ -53,7 +53,7 @@ class BouncerNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, loca override fun finalizeDeath(killer: Entity?) { if (killer is Player) { val quest = "Fight Arena" - if (questStage(killer, quest) >= 89) { + if (getQuestStage(killer, quest) >= 89) { setQuestStage(killer, FightArena.FightArenaQuest, 91) } removeAttribute(killer, "spawn-bouncer") diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/GeneralNPC.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/GeneralNPC.kt index f1c05c495..20e75588a 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/GeneralNPC.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/GeneralNPC.kt @@ -4,7 +4,7 @@ import content.region.kandarin.ardougne.quest.arena.FightArena import content.region.kandarin.ardougne.quest.arena.FightArenaListeners.Companion.General import content.region.kandarin.ardougne.quest.arena.dialogue.JeremyServilBDialogue import core.api.openDialogue -import core.api.questStage +import core.api.getQuestStage import core.api.setQuestStage import core.game.node.entity.Entity import core.game.node.entity.npc.AbstractNPC @@ -32,7 +32,7 @@ class GeneralNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, loca override fun finalizeDeath(killer: Entity?) { if (killer is Player) { val quest = "Fight Arena" - if (questStage(killer, quest) == 97) { + if (getQuestStage(killer, quest) == 97) { setQuestStage(killer, FightArena.FightArenaQuest, 98) } openDialogue(killer, JeremyServilBDialogue()) diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/OgreNPC.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/OgreNPC.kt index 5f7b1caf5..51010d3e4 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/OgreNPC.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/OgreNPC.kt @@ -54,7 +54,7 @@ class OgreNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, locatio override fun finalizeDeath(killer: Entity?) { if (killer is Player) { val quest = "Fight Arena" - if (questStage(killer, quest) == 68 || questStage(killer, quest) == 88) { + if (getQuestStage(killer, quest) == 68 || getQuestStage(killer, quest) == 88) { setQuestStage(killer, FightArena.FightArenaQuest, 72) } clearHintIcon(killer) diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/ScorpionNPC.kt b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/ScorpionNPC.kt index 37bfa828d..17910e77b 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/ScorpionNPC.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/arena/npc/ScorpionNPC.kt @@ -53,7 +53,7 @@ class ScorpionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, loc override fun finalizeDeath(killer: Entity?) { if (killer is Player) { val quest = "Fight Arena" - if (questStage(killer, quest) == 88) { + if (getQuestStage(killer, quest) == 88) { setQuestStage(killer, FightArena.FightArenaQuest, 89) } removeAttribute(killer, "spawn-scorpion") diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherCedricNPC.kt b/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherCedricNPC.kt index 0f2e6b52b..3ae7c7dc4 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherCedricNPC.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherCedricNPC.kt @@ -1,6 +1,6 @@ package content.region.kandarin.ardougne.quest.monksfriend -import core.api.questStage +import core.api.getQuestStage import core.api.sendItemDialogue import core.api.setQuestStage import core.game.node.entity.npc.NPC @@ -19,7 +19,7 @@ import core.tools.END_DIALOGUE class BrotherCedricDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { val questName = "Monk's Friend" - val questStage = questStage(player!!, questName) + val questStage = getQuestStage(player!!, questName) when { questStage < 30 -> { when(stage) { diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherOmadNPC.kt b/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherOmadNPC.kt index 868eae3e2..74b322344 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherOmadNPC.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/BrotherOmadNPC.kt @@ -23,7 +23,7 @@ import core.tools.END_DIALOGUE class BrotherOmadDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { val questName = "Monk's Friend" - val questStage = questStage(player!!, questName) + val questStage = getQuestStage(player!!, questName) when (questStage) { 0 -> { when(stage) { diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/MonksFriend.kt b/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/MonksFriend.kt index 8b20528b7..cf38a3a18 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/MonksFriend.kt +++ b/Server/src/main/content/region/kandarin/ardougne/quest/monksfriend/MonksFriend.kt @@ -48,6 +48,8 @@ class MonksFriend: Quest("Monk's Friend", 89, 88, 1, 30, 0, 1, 80) { } if(stage == 100){ line(player, "I had a party with the Monks. There were party balloons and we danced the night away!", line++, true) + line++ + line(player, "%%QUEST COMPLETE!&&", line++) } } diff --git a/Server/src/main/content/region/kandarin/ardougne/quest/sheepherder/SheepHerder.java b/Server/src/main/content/region/kandarin/ardougne/quest/sheepherder/SheepHerder.java index e3941023f..f7a28c03b 100644 --- a/Server/src/main/content/region/kandarin/ardougne/quest/sheepherder/SheepHerder.java +++ b/Server/src/main/content/region/kandarin/ardougne/quest/sheepherder/SheepHerder.java @@ -66,7 +66,7 @@ public class SheepHerder extends Quest { case 100: line(player,"I helped Councillor Halgrive by putting down",line++,true); line(player,"plague-bearing sheep.",line++,true); - line(player,"!!QUEST COMPLETE",line++); + line(player,"%%QUEST COMPLETE!&&",line++); break; } } diff --git a/Server/src/main/content/region/kandarin/feldip/quest/chompybird/ChompyBird.kt b/Server/src/main/content/region/kandarin/feldip/quest/chompybird/ChompyBird.kt index 8b48ff43e..63df68706 100644 --- a/Server/src/main/content/region/kandarin/feldip/quest/chompybird/ChompyBird.kt +++ b/Server/src/main/content/region/kandarin/feldip/quest/chompybird/ChompyBird.kt @@ -103,7 +103,7 @@ class ChompyBird : Quest("Big Chompy Bird Hunting", 35, 34, 2, Vars.VARP_QUEST_C line(player, "- ${if(getAttribute(player, ATTR_FYCIE_ASKED, false)) "Fycie wants: !!${getItemName(getAttribute(player, ATTR_ING_FYCIE, -1))}??" else "I still need to ask !!Fycie??."}", ln++, false) } else if (stage > 70) { line(player, "I seasoned and cooked the chompy bird for Rantz and his kids.", ln++, true) - line(player, "!!QUEST COMPLETE!??", ln++, false) + line(player, "%%QUEST COMPLETE!&&", ln++, false) } } } diff --git a/Server/src/main/content/region/kandarin/quest/fishingcontest/FishingContest.java b/Server/src/main/content/region/kandarin/quest/fishingcontest/FishingContest.java index 62a62682d..1e87b8df7 100644 --- a/Server/src/main/content/region/kandarin/quest/fishingcontest/FishingContest.java +++ b/Server/src/main/content/region/kandarin/quest/fishingcontest/FishingContest.java @@ -37,7 +37,7 @@ public class FishingContest extends Quest { line(player,"I should return to !!Austri?? or !!Vestri??.",line++); if(stage >= 100){ - line(player,"!!QUEST COMPLETE",line++); + line(player,"%%QUEST COMPLETE!&&",line++); } } } diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/AnitaDialogue.kt b/Server/src/main/content/region/kandarin/quest/grandtree/AnitaDialogue.kt index ea85f4131..00aa223ea 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/AnitaDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/AnitaDialogue.kt @@ -1,7 +1,7 @@ package content.region.kandarin.quest.grandtree import core.api.addItemOrDrop -import core.api.questStage +import core.api.getQuestStage import core.api.sendDialogue import core.game.dialogue.DialogueFile import core.game.node.item.Item @@ -10,7 +10,7 @@ import org.rs09.consts.Items class AnitaDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - when(questStage(player!!, TheGrandTree.questName)){ + when(getQuestStage(player!!, TheGrandTree.questName)){ 60 -> { if(player!!.hasItem(Item(Items.GLOUGHS_KEY_788)) && stage < 12){ when(stage){ diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/CaptainErrdoDialogue.kt b/Server/src/main/content/region/kandarin/quest/grandtree/CaptainErrdoDialogue.kt index 29853c9d0..2eac91105 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/CaptainErrdoDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/CaptainErrdoDialogue.kt @@ -1,8 +1,7 @@ package content.region.kandarin.quest.grandtree import content.global.travel.glider.Gliders -import core.api.questStage -import core.api.setQuestStage +import core.api.getQuestStage import core.api.teleport import core.game.component.Component import core.game.dialogue.DialogueFile @@ -11,7 +10,7 @@ import core.tools.END_DIALOGUE class CaptainErrdoDialogue: DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - when(questStage(player!!, TheGrandTree.questName)){ + when(getQuestStage(player!!, TheGrandTree.questName)){ 55 -> { if(player!!.location.regionId == 11567){ when(stage){ diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/CharlieDialogue.kt b/Server/src/main/content/region/kandarin/quest/grandtree/CharlieDialogue.kt index ebc7e024e..df7f4965d 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/CharlieDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/CharlieDialogue.kt @@ -1,28 +1,23 @@ package content.region.kandarin.quest.grandtree import content.region.kandarin.quest.grandtree.TheGrandTree.Companion.questName -import content.region.misthalin.varrock.quest.familycrest.doDoor import core.api.* import core.game.dialogue.DialogueFile -import core.game.dialogue.FacialExpression import core.game.global.action.DoorActionHandler import core.game.node.entity.npc.NPC import core.game.node.item.Item -import core.game.node.scenery.SceneryBuilder import core.game.system.task.Pulse import core.game.world.GameWorld import core.game.world.map.Direction import core.game.world.map.Location -import core.game.world.update.flag.context.Animation import core.tools.END_DIALOGUE import org.rs09.consts.Items import org.rs09.consts.NPCs -import org.rs09.consts.Scenery class CharlieDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, questName)) { + when (getQuestStage(player!!, questName)) { 46 -> { when (stage) { 0 -> playerl("Tell me. Why would you want to kill the Grand Tree?").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt b/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt index 841cc8599..e4aa6e8c5 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt @@ -12,14 +12,9 @@ import core.plugin.Initializable import org.rs09.consts.Items import org.rs09.consts.NPCs import core.game.interaction.InteractionListener -import core.game.interaction.MovementPulse -import core.game.node.entity.impl.PulseType -import core.game.node.entity.npc.NPC import core.game.system.task.Pulse import core.game.world.GameWorld -import core.game.world.map.Direction import core.game.world.map.RegionManager -import core.game.world.map.path.Pathfinder import core.tools.END_DIALOGUE import org.rs09.consts.Components @@ -42,7 +37,7 @@ class ForemanNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id,locat } override fun finalizeDeath(killer: Entity?) { - if(questStage(killer as Player, TheGrandTree.questName) == 55) { + if(getQuestStage(killer as Player, TheGrandTree.questName) == 55) { sendMessage(killer,"The foreman drops a piece of paper as he dies.") produceGroundItem(killer, Items.LUMBER_ORDER_787, 1, this.location) } diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/GloughDialogue.kt b/Server/src/main/content/region/kandarin/quest/grandtree/GloughDialogue.kt index 91d8399d2..2b19ae4ff 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/GloughDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/GloughDialogue.kt @@ -4,27 +4,18 @@ import content.region.kandarin.quest.grandtree.TheGrandTree.Companion.questName import core.api.* import core.game.dialogue.DialogueFile import core.game.dialogue.FacialExpression -import core.game.interaction.MovementPulse -import core.game.node.entity.impl.PulseType import core.game.node.entity.npc.NPC -import core.game.node.item.Item -import core.game.node.scenery.Scenery -import core.game.node.scenery.SceneryBuilder import core.game.system.task.Pulse import core.game.world.GameWorld import core.game.world.map.Direction import core.game.world.map.Location -import core.game.world.map.RegionManager -import core.game.world.map.path.Pathfinder import core.game.world.update.flag.context.Animation import core.tools.END_DIALOGUE -import org.rs09.consts.Items -import org.rs09.consts.NPCs class GloughDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, questName)) { + when (getQuestStage(player!!, questName)) { 40 -> { when (stage) { 0 -> playerl("Hello.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/GrandTreeListeners.kt b/Server/src/main/content/region/kandarin/quest/grandtree/GrandTreeListeners.kt index d221dd12b..273547ae4 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/GrandTreeListeners.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/GrandTreeListeners.kt @@ -114,7 +114,7 @@ class GrandTreeListeners: InteractionListener { SceneryBuilder.replace(Scenery(2436, Location(2482,3462,1)),Scenery(2437, Location(2482,3462,1)),2) sendDialogue(player,"You found a scroll!") addItemOrDrop(player, Items.INVASION_PLANS_794) - if(questStage(player!!, questName) < 60) + if(getQuestStage(player!!, questName) < 60) setQuestStage(player!!, questName, 60) return@onUseWith true } @@ -164,7 +164,7 @@ class GrandTreeListeners: InteractionListener { return@on true } on(2435, IntType.SCENERY, "search"){ player, _ -> - if(questStage(player, questName) == 47){ + if(getQuestStage(player, questName) == 47){ sendItemDialogue(player, Items.GLOUGHS_JOURNAL_785,"You've found Glough's Journal!") addItemOrDrop(player, Items.GLOUGHS_JOURNAL_785) } @@ -173,7 +173,7 @@ class GrandTreeListeners: InteractionListener { // Roots for Daconia rock on(32319, IntType.SCENERY, "search"){ player, node -> - if(questStage(player, questName) < 99 || player.hasItem(Item(Items.DACONIA_ROCK_793))){ return@on true; } + if(getQuestStage(player, questName) < 99 || player.hasItem(Item(Items.DACONIA_ROCK_793))){ return@on true; } // RNG for which root the rock is under if(node.location == roots[getAttribute(player,"grandtree:rock",1)]){ sendItemDialogue(player, Item(Items.DACONIA_ROCK_793), "You've found a Daconia rock!") diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/HazelmereDialogue.kt b/Server/src/main/content/region/kandarin/quest/grandtree/HazelmereDialogue.kt index f8331207c..9edb39423 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/HazelmereDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/HazelmereDialogue.kt @@ -3,26 +3,14 @@ package content.region.kandarin.quest.grandtree import content.region.kandarin.quest.grandtree.TheGrandTree.Companion.questName import core.api.* import core.game.dialogue.DialogueFile -import core.game.interaction.MovementPulse -import core.game.node.entity.impl.PulseType import core.game.node.item.Item -import core.game.node.scenery.Scenery -import core.game.node.scenery.SceneryBuilder -import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.game.world.map.Direction -import core.game.world.map.Location -import core.game.world.map.RegionManager -import core.game.world.map.path.Pathfinder -import core.game.world.update.flag.context.Animation import core.tools.END_DIALOGUE import org.rs09.consts.Items -import org.rs09.consts.NPCs class HazelmereDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, questName)) { + when (getQuestStage(player!!, questName)) { 10 -> { if(player!!.hasItem(Item(Items.BARK_SAMPLE_783))){ when (stage) { diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/KingNarnodeDialogue.kt b/Server/src/main/content/region/kandarin/quest/grandtree/KingNarnodeDialogue.kt index 609b53751..558e06571 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/KingNarnodeDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/KingNarnodeDialogue.kt @@ -67,7 +67,7 @@ class KingNarnodeDialogue : DialogueFile() { }) } override fun handle(componentID: Int, buttonID: Int) { - when (questStage(player!!, questName)) { + when (getQuestStage(player!!, questName)) { 0 -> { when (stage) { 0 -> npcl("Welcome Traveller. I am King Narnode. It's nice to see an outsider.").also { stage++ } @@ -383,7 +383,7 @@ class KingNarnodeUnderGroundDialogue : DialogueFile() { }) } override fun handle(componentID: Int, buttonID: Int) { - when(questStage(player!!, questName)) { + when(getQuestStage(player!!, questName)) { 98 -> when (stage) { 0 -> npcl("Traveller, you're wounded! What happened?").also { stage++ } 1 -> playerl("It's Glough! He set a demon on me!").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/ShipyardWorkerDialogue.kt b/Server/src/main/content/region/kandarin/quest/grandtree/ShipyardWorkerDialogue.kt index d109f5bff..a2a1fa0ea 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/ShipyardWorkerDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/ShipyardWorkerDialogue.kt @@ -1,7 +1,7 @@ package content.region.kandarin.quest.grandtree import core.api.getAttribute -import core.api.questStage +import core.api.getQuestStage import core.api.setAttribute import core.game.dialogue.DialogueFile import core.game.global.action.DoorActionHandler @@ -13,7 +13,7 @@ class ShipyardWorkerDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { when(stage){ 0 -> npcl("Hey you! What are you up to?").also { - if(questStage(player!!, TheGrandTree.questName) == 55) { + if(getQuestStage(player!!, TheGrandTree.questName) == 55) { setAttribute(player!!, "/save:grandtree:opt1", false) setAttribute(player!!, "/save:grandtree:opt2", false) setAttribute(player!!, "/save:grandtree:opt3", false) diff --git a/Server/src/main/content/region/kandarin/quest/tree/BallistaDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/BallistaDialogue.kt index f4f477d60..eb707dbf5 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/BallistaDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/BallistaDialogue.kt @@ -6,7 +6,7 @@ import core.tools.END_DIALOGUE class BallistaDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, TreeGnomeVillage.questName) + val questStage = getQuestStage(player!!, TreeGnomeVillage.questName) if (questStage > 30) { when (stage) { 0 -> sendDialogue(player!!, "The Khazard stronghold has already been breached.").also { stage = END_DIALOGUE } diff --git a/Server/src/main/content/region/kandarin/quest/tree/CommanderMontaiDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/CommanderMontaiDialogue.kt index 7a4541651..083066d20 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/CommanderMontaiDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/CommanderMontaiDialogue.kt @@ -7,7 +7,7 @@ import core.tools.END_DIALOGUE class CommanderMontaiDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, TreeGnomeVillage.questName) + val questStage = getQuestStage(player!!, TreeGnomeVillage.questName) if (questStage == 10) { when(stage) { 0 -> playerl("Hello.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/quest/tree/ElkoyDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/ElkoyDialogue.kt index 135a7e179..c00eedbed 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/ElkoyDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/ElkoyDialogue.kt @@ -38,7 +38,7 @@ class ElkoyDialogue : DialogueFile(){ }) } override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, questName) + val questStage = getQuestStage(player!!, questName) val locY = player!!.location.y val followLocation = if(locY > 3161) "village" else "exit" when { diff --git a/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordDialogue.kt index 1e1f3c715..a4d3df749 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordDialogue.kt @@ -1,12 +1,12 @@ package content.region.kandarin.quest.tree -import core.api.questStage +import core.api.getQuestStage import core.game.dialogue.DialogueFile import core.tools.END_DIALOGUE class KhazardWarlordDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, TreeGnomeVillage.questName) + val questStage = getQuestStage(player!!, TreeGnomeVillage.questName) if(questStage == 31){ when(stage) { 0 -> playerl("Hello there.").also { stage++ } diff --git a/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordNPC.kt b/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordNPC.kt index 526acfc06..f1a246287 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordNPC.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/KhazardWarlordNPC.kt @@ -1,7 +1,7 @@ package content.region.kandarin.quest.tree import core.api.addItemOrDrop -import core.api.questStage +import core.api.getQuestStage import core.api.sendDialogue import core.game.node.entity.Entity import core.game.node.entity.npc.AbstractNPC @@ -27,7 +27,7 @@ class KhazardWarlordNPC(id: Int = 0, location: Location? = null) : AbstractNPC(i } override fun finalizeDeath(killer: Entity?) { - if(questStage(killer as Player, TreeGnomeVillage.questName) == 40) { + if(getQuestStage(killer as Player, TreeGnomeVillage.questName) == 40) { sendDialogue(killer,"As the warlord falls to the ground, a ghostly vapour floats upwards from his battle-worn armour. You search his satchel and find the orbs of protection.") addItemOrDrop(killer, Items.ORBS_OF_PROTECTION_588) } diff --git a/Server/src/main/content/region/kandarin/quest/tree/KingBolrenDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/KingBolrenDialogue.kt index f0cd48ed2..169f6b016 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/KingBolrenDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/KingBolrenDialogue.kt @@ -15,7 +15,7 @@ import core.tools.END_DIALOGUE class KingBolrenDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, questName) + val questStage = getQuestStage(player!!, questName) when { questStage < 10 -> { when (stage) { diff --git a/Server/src/main/content/region/kandarin/quest/tree/RemsaiDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/RemsaiDialogue.kt index dc1ac4c7e..f8cfde14e 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/RemsaiDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/RemsaiDialogue.kt @@ -1,14 +1,14 @@ package content.region.kandarin.quest.tree import core.api.inInventory -import core.api.questStage +import core.api.getQuestStage import org.rs09.consts.Items import core.game.dialogue.DialogueFile import core.tools.END_DIALOGUE class RemsaiDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, TreeGnomeVillage.questName) + val questStage = getQuestStage(player!!, TreeGnomeVillage.questName) when { inInventory(player!!,Items.ORBS_OF_PROTECTION_588) -> { when(stage) { diff --git a/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeOneDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeOneDialogue.kt index fb84466a1..b9b22bd34 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeOneDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeOneDialogue.kt @@ -7,7 +7,7 @@ import core.tools.END_DIALOGUE class TrackerGnomeOneDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, TreeGnomeVillage.questName) + val questStage = getQuestStage(player!!, TreeGnomeVillage.questName) when { questStage >= 40 -> { when (stage) { diff --git a/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeThreeDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeThreeDialogue.kt index 8c1776707..607e087d5 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeThreeDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeThreeDialogue.kt @@ -13,7 +13,7 @@ class TrackerGnomeThreeDialogue : DialogueFile(){ 4 to "My legs and your legs.") override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, TreeGnomeVillage.questName) + val questStage = getQuestStage(player!!, TreeGnomeVillage.questName) when { questStage == 30 -> { when(stage) { diff --git a/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeTwoDialogue.kt b/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeTwoDialogue.kt index 88dfce52b..f17211fd2 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeTwoDialogue.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/TrackerGnomeTwoDialogue.kt @@ -7,7 +7,7 @@ import core.tools.END_DIALOGUE class TrackerGnomeTwoDialogue : DialogueFile(){ override fun handle(componentID: Int, buttonID: Int) { - val questStage = questStage(player!!, TreeGnomeVillage.questName) + val questStage = getQuestStage(player!!, TreeGnomeVillage.questName) when { questStage == 30 -> { when (stage) { diff --git a/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillage.kt b/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillage.kt index cccce11d8..a87e2ca96 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillage.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillage.kt @@ -85,7 +85,7 @@ class TreeGnomeVillage: Quest("Tree Gnome Village", 125, 124, 2, 111, 0, 1, 9) line++ } if (stage == 100) { - line(player,"QUEST COMPLETE", line, stage > 99) + line(player,"%%QUEST COMPLETE!&&", line, stage > 99) } } companion object { diff --git a/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillageListeners.kt b/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillageListeners.kt index c753602c1..f57509046 100644 --- a/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillageListeners.kt +++ b/Server/src/main/content/region/kandarin/quest/tree/TreeGnomeVillageListeners.kt @@ -1,7 +1,6 @@ package content.region.kandarin.quest.tree import core.api.* -import core.game.node.entity.impl.ForceMovement import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import content.global.skill.agility.AgilityHandler @@ -133,7 +132,7 @@ class TreeGnomeVillageListeners : InteractionListener { val climbAnimation = Animation(839) val wallLoc = Location(2509,3253,0) override fun handle(componentID: Int, buttonID: Int) { - if(questStage(player!!, TreeGnomeVillage.questName) > 30){ + if(getQuestStage(player!!, TreeGnomeVillage.questName) > 30){ val northSouth = if (player!!.location.y <= wallLoc.y) Direction.NORTH else Direction.SOUTH when(stage){ 0 -> sendDialogue(player!!,"The wall has been reduced to rubble. It should be possible to climb over the remains").also{ stage++ } diff --git a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/EWListeners.kt b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/EWListeners.kt index fda3e2fe5..d5d8f4c04 100644 --- a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/EWListeners.kt +++ b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/EWListeners.kt @@ -17,7 +17,6 @@ import content.region.kandarin.seers.quest.elementalworkshop.EWUtils.currentStag import core.game.interaction.InteractionListener import core.game.interaction.IntType import core.tools.Log -import core.tools.SystemLogger /** * Listeners for the Elemental Workshop I quest @@ -179,7 +178,7 @@ class EWListeners : InteractionListener { return@on true } // Increment quest stage - if (questStage(player, "Elemental Workshop I") < 5) { + if (getQuestStage(player, "Elemental Workshop I") < 5) { setQuestStage(player, "Elemental Workshop I", 5) } // Allow player through the wall diff --git a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/ElementalWorkshopQuest.kt b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/ElementalWorkshopQuest.kt index 523020ec3..aa5fce866 100644 --- a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/ElementalWorkshopQuest.kt +++ b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/ElementalWorkshopQuest.kt @@ -86,7 +86,7 @@ class ElementalWorkshopQuest : Quest("Elemental Workshop I", 52, 51, 1), Command line(player, "---After fixing up the old workshop machinery, collecting ore", line++) line(player, "---and smelting it I was able to create an Elemental Shield./--", line++) line++ - line(player, "!!QUEST COMPLETE!??", line++) + line(player, "%%QUEST COMPLETE!&&", line++) } } } diff --git a/Server/src/main/content/region/kandarin/seers/quest/merlinsquest/MerlinListeners.kt b/Server/src/main/content/region/kandarin/seers/quest/merlinsquest/MerlinListeners.kt index ab153b6e9..f7a5e87ad 100644 --- a/Server/src/main/content/region/kandarin/seers/quest/merlinsquest/MerlinListeners.kt +++ b/Server/src/main/content/region/kandarin/seers/quest/merlinsquest/MerlinListeners.kt @@ -8,14 +8,13 @@ import core.game.global.action.DropListener import core.game.node.entity.npc.NPC import core.game.node.entity.impl.ForceMovement import org.rs09.consts.Items -import org.rs09.consts.NPCs class MerlinListeners : InteractionListener { private val BONE_DROP_LOCATION = Location(2780, 3515, 0) override fun defineListeners() { on (Items.BAT_BONES_530, IntType.ITEM, "drop") { player, node -> - val merlinStage = questStage(player, "Merlin's Crystal") + val merlinStage = getQuestStage(player, "Merlin's Crystal") var doingQuest = player.location == BONE_DROP_LOCATION && merlinStage == 80 var hasAuxiliaryRequirements = inInventory(player, Items.LIT_BLACK_CANDLE_32) && getAttribute(player, "thrantax_npc", null) == null diff --git a/Server/src/main/content/region/misthalin/dorgeshuun/quest/thelosttribe/LostTribe.kt b/Server/src/main/content/region/misthalin/dorgeshuun/quest/thelosttribe/LostTribe.kt index eb3227cc7..fec111418 100644 --- a/Server/src/main/content/region/misthalin/dorgeshuun/quest/thelosttribe/LostTribe.kt +++ b/Server/src/main/content/region/misthalin/dorgeshuun/quest/thelosttribe/LostTribe.kt @@ -83,7 +83,7 @@ class LostTribe : Quest("Lost Tribe",84,83,1) { line(player,"the cave goblins. I should do so at once!",line++,stage >= 51) } if(stage >= 100){ - line(player,"!!QUEST COMPLETE!??",line++) + line(player,"%%QUEST COMPLETE!&&",line++) } } diff --git a/Server/src/main/content/region/misthalin/lumbridge/dialogue/FredTheFarmerDialogue.kt b/Server/src/main/content/region/misthalin/lumbridge/dialogue/FredTheFarmerDialogue.kt index 604b9e4fb..151f8e034 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/dialogue/FredTheFarmerDialogue.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/dialogue/FredTheFarmerDialogue.kt @@ -20,8 +20,8 @@ class FredTheFarmerDialogue(player: Player? = null) : DialoguePlugin(player) { override fun open(vararg args: Any): Boolean { npc = args[0] as NPC - if (questStage(player, "Sheep Shearer") in 1..99) { - openDialogue(player, SSFredTheFarmerDialogue(questStage(player, "Sheep Shearer")), npc) + if (getQuestStage(player, "Sheep Shearer") in 1..99) { + openDialogue(player, SSFredTheFarmerDialogue(getQuestStage(player, "Sheep Shearer")), npc) } else { npc(FacialExpression.ANGRY, "What are you doing on my land? You're not the one", "who keeps leaving all my gates open and letting out all", "my sheep are you?").also { stage = START_DIALOGUE } } @@ -31,7 +31,7 @@ class FredTheFarmerDialogue(player: Player? = null) : DialoguePlugin(player) { override fun handle(interfaceId: Int, buttonId: Int): Boolean { when (stage) { START_DIALOGUE -> showTopics( - IfTopic(FacialExpression.NEUTRAL, "I'm looking for a quest.", 1000, questStage(player!!, "Sheep Shearer") == 0), + IfTopic(FacialExpression.NEUTRAL, "I'm looking for a quest.", 1000, getQuestStage(player!!, "Sheep Shearer") == 0), Topic(FacialExpression.HALF_GUILTY, "I'm looking for something to kill.", 100), Topic(FacialExpression.HALF_GUILTY, "I'm lost.", 200) ) @@ -40,7 +40,7 @@ class FredTheFarmerDialogue(player: Player? = null) : DialoguePlugin(player) { 200 -> npc(FacialExpression.HALF_GUILTY, "How can you be lost? Just follow the road east and", "south. You'll end up in Lumbridge fairly quickly.").also { stage = END_DIALOGUE } - 1000 -> openDialogue(player, SSFredTheFarmerDialogue(questStage(player, "Sheep Shearer")), npc) + 1000 -> openDialogue(player, SSFredTheFarmerDialogue(getQuestStage(player, "Sheep Shearer")), npc) } return true } diff --git a/Server/src/main/content/region/misthalin/lumbridge/diary/LumbridgeAchivementDiary.kt b/Server/src/main/content/region/misthalin/lumbridge/diary/LumbridgeAchivementDiary.kt index 6620d18ee..af65c278c 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/diary/LumbridgeAchivementDiary.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/diary/LumbridgeAchivementDiary.kt @@ -3,7 +3,7 @@ package content.region.misthalin.lumbridge.diary import content.global.skill.magic.TeleportMethod import content.global.skill.magic.spellconsts.Modern import core.api.inBorders -import core.api.questStage +import core.api.getQuestStage import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType @@ -346,7 +346,7 @@ class LumbridgeAchivementDiary : DiaryEventHookBase(DiaryType.LUMBRIDGE) { override fun onDialogueOptionSelected(player: Player, event: DialogueOptionSelectionEvent) { when (event.dialogue) { is DukeHoracioDSDialogue -> { - val dragonSlayerStage = questStage(player, "Dragon Slayer") + val dragonSlayerStage = getQuestStage(player, "Dragon Slayer") if ((dragonSlayerStage == 100 && event.currentStage == 4) || event.currentStage == 12) { diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/DramenTreeListener.kt b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/DramenTreeListener.kt index cefb58d12..735e384d7 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/DramenTreeListener.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/DramenTreeListener.kt @@ -7,7 +7,7 @@ import core.game.world.map.Location import org.rs09.consts.NPCs import org.rs09.consts.Scenery as Sceneries import core.game.interaction.InteractionListener -import core.api.questStage +import core.api.getQuestStage import core.api.sendMessage import core.game.interaction.IntType @@ -16,7 +16,7 @@ class DramenTreeListener : InteractionListener { override fun defineListeners() { on(Sceneries.DRAMEN_TREE_1292, IntType.SCENERY, "chop down"){ player, node -> - val questStage = questStage(player,"Lost City") + val questStage = getQuestStage(player,"Lost City") if (SkillingTool.getHatchet(player) == null) { sendMessage(player,"You do not have an axe which you have the level to use.") return@on true diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/LostCityListeners.kt b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/LostCityListeners.kt index 143070cf5..7e00163eb 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/LostCityListeners.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/LostCityListeners.kt @@ -28,7 +28,7 @@ class LostCityListeners : InteractionListener { core.game.global.action.DoorActionHandler.handleAutowalkDoor(player,node as Scenery) val quest = "Lost City" val isOutsideShed = player.location.x < node.location.x - val canDramenTeleport = inEquipment(player,Items.DRAMEN_STAFF_772) && ( questStage(player,quest) > 20 ) && isOutsideShed + val canDramenTeleport = inEquipment(player,Items.DRAMEN_STAFF_772) && ( getQuestStage(player,quest) > 20 ) && isOutsideShed if(canDramenTeleport) { var count = 0 // pulser to handle the teleport. after 2 ticks it checks if the player hasnt completed lost city; if so, then it finishes the quest after the teleport diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/ShamusDialogue.kt b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/ShamusDialogue.kt index c6726cffb..8a3e0baf2 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/ShamusDialogue.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/ShamusDialogue.kt @@ -1,11 +1,9 @@ package content.region.misthalin.lumbridge.quest.lostcity -import core.game.dialogue.DialoguePlugin -import core.game.dialogue.FacialExpression import core.game.node.entity.player.Player import core.plugin.Initializable import org.rs09.consts.NPCs -import core.api.questStage +import core.api.getQuestStage import core.api.setQuestStage /** @@ -25,7 +23,7 @@ class ShamusDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin } override fun handle(interfaceId: Int, buttonId: Int): Boolean { - when(questStage(player,quest)) { + when(getQuestStage(player,quest)) { 0 -> when(stage++) { 0 -> playerl(core.game.dialogue.FacialExpression.THINKING, "I'm not sure.") 1 -> npcl(core.game.dialogue.FacialExpression.ANNOYED,"Well you'll have to be catchin' me again when yer are, elephant!") diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt index 7bdba52c6..b808c812a 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player import core.game.world.map.Location import core.plugin.Initializable import org.rs09.consts.NPCs -import core.api.questStage +import core.api.getQuestStage import core.api.sendDialogue import core.api.setQuestStage @@ -48,7 +48,7 @@ class TreeSpiritNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, l super.finalizeDeath(killer) if (killer is Player) { val quest = "Lost City" - if (questStage(killer,quest) == 20) { + if (getQuestStage(killer,quest) == 20) { setQuestStage(killer,quest,21) sendDialogue(killer, "With the Tree Spirit defeated you can now chop the tree.") } diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/WarriorDialogue.kt b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/WarriorDialogue.kt index ce337ef88..a82989f47 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/WarriorDialogue.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/WarriorDialogue.kt @@ -1,13 +1,11 @@ package content.region.misthalin.lumbridge.quest.lostcity -import core.game.dialogue.DialoguePlugin -import core.game.dialogue.FacialExpression import core.game.node.entity.player.Player import core.plugin.Initializable import org.rs09.consts.NPCs import core.game.dialogue.Topic import core.tools.END_DIALOGUE -import core.api.questStage +import core.api.getQuestStage import core.api.startQuest /** @@ -19,7 +17,7 @@ import core.api.startQuest class WarriorDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin(player) { override fun open(vararg args: Any?): Boolean { - when(questStage(player,"Lost City")) { + when(getQuestStage(player,"Lost City")) { 10 -> playerl(core.game.dialogue.FacialExpression.THINKING,"So let me get this straight: I need to search the trees around here for a leprechaun; and then when I find him, he will tell me where this 'Zanaris' is?").also { stage = 1000 } 20, 21 -> playerl(core.game.dialogue.FacialExpression.HAPPY,"Have you found anything yet?").also { stage = 2000 } 100 -> playerl(core.game.dialogue.FacialExpression.HAPPY,"Hey, thanks for all the information. It REALLY helped me out in finding the lost city of Zanaris and all.").also { stage = 3000 } diff --git a/Server/src/main/content/region/misthalin/varrock/quest/dragonslayer/DragonSlayer.kt b/Server/src/main/content/region/misthalin/varrock/quest/dragonslayer/DragonSlayer.kt index 9fdcd88b7..8b6bb5ec5 100644 --- a/Server/src/main/content/region/misthalin/varrock/quest/dragonslayer/DragonSlayer.kt +++ b/Server/src/main/content/region/misthalin/varrock/quest/dragonslayer/DragonSlayer.kt @@ -4,7 +4,7 @@ import content.global.skill.agility.AgilityHandler import content.region.misthalin.lumbridge.dialogue.DukeHoracioDialogue import core.api.Event import core.api.LoginListener -import core.api.questStage +import core.api.getQuestStage import core.game.component.Component import core.game.event.EventHook import core.game.event.PickUpEvent @@ -323,7 +323,7 @@ class DragonSlayer : Quest("Dragon Slayer", 18, 17, 2, 176, 0, 1, 10), LoginList } override fun login(player: Player) { - if (questStage(player, this.name) == 20) { + if (getQuestStage(player, this.name) == 20) { player.hook(Event.SpellCast, SpellCastHook) player.hook(Event.PickedUp, PickedUpHook) } diff --git a/Server/src/main/content/region/misthalin/varrock/quest/familycrest/DimintheisDialogue.kt b/Server/src/main/content/region/misthalin/varrock/quest/familycrest/DimintheisDialogue.kt index b45b24023..18dcf61ac 100644 --- a/Server/src/main/content/region/misthalin/varrock/quest/familycrest/DimintheisDialogue.kt +++ b/Server/src/main/content/region/misthalin/varrock/quest/familycrest/DimintheisDialogue.kt @@ -2,7 +2,6 @@ package content.region.misthalin.varrock.quest.familycrest import core.api.* -import core.game.dialogue.DialoguePlugin import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable @@ -23,7 +22,7 @@ class DimintheisDialogue(player: Player? = null): core.game.dialogue.DialoguePlu override fun open(vararg args: Any?): Boolean { npc = (args[0] as NPC).getShownNPC(player) - val questStage = questStage(player, questName) + val questStage = getQuestStage(player, questName) val questComplete = isQuestComplete(player, questName) if (questStage == 20 && inInventory(player, Items.FAMILY_CREST_782)) { diff --git a/Server/src/main/content/region/misthalin/varrock/quest/familycrest/FamilyCrest.kt b/Server/src/main/content/region/misthalin/varrock/quest/familycrest/FamilyCrest.kt index a8b82735a..0303ba3f8 100644 --- a/Server/src/main/content/region/misthalin/varrock/quest/familycrest/FamilyCrest.kt +++ b/Server/src/main/content/region/misthalin/varrock/quest/familycrest/FamilyCrest.kt @@ -88,7 +88,7 @@ class FamilyCrest: Quest("Family Crest", 59, 58, 1, 148, 0, 1, 11) { line(player, "and would always return to !!Dimintheis??", line++) line(player, "for me to reclaim if I ever lost them.", line++) line++ - line(player, "!!QUEST COMPLETE!??.", line++) + line(player, "%%QUEST COMPLETE!&&.", line++) } diff --git a/Server/src/main/content/region/misthalin/varrock/quest/familycrest/JohnathonAntiPoisonInteraction.kt b/Server/src/main/content/region/misthalin/varrock/quest/familycrest/JohnathonAntiPoisonInteraction.kt index 29e5a615c..2ed748bab 100644 --- a/Server/src/main/content/region/misthalin/varrock/quest/familycrest/JohnathonAntiPoisonInteraction.kt +++ b/Server/src/main/content/region/misthalin/varrock/quest/familycrest/JohnathonAntiPoisonInteraction.kt @@ -14,7 +14,7 @@ class JohnathonAntiPosionInteraction: InteractionListener { onUseWith(IntType.NPC, poisons, NPCs.JOHNATHON_668){ player, used, with -> val npc = with.asNpc() val antip = used.asItem() - val stage = questStage(player, "Family Crest") + val stage = getQuestStage(player, "Family Crest") val index = poisons.indexOf(used.id) val returnItem = if(index + 1 == poisons.size) Items.VIAL_229 else poisons[index + 1] diff --git a/Server/src/main/content/region/morytania/quest/naturespirit/NatureSpiritQuest.kt b/Server/src/main/content/region/morytania/quest/naturespirit/NatureSpiritQuest.kt index a1d6b7ada..026a4c04e 100644 --- a/Server/src/main/content/region/morytania/quest/naturespirit/NatureSpiritQuest.kt +++ b/Server/src/main/content/region/morytania/quest/naturespirit/NatureSpiritQuest.kt @@ -100,7 +100,7 @@ class NatureSpiritQuest : Quest("Nature Spirit", 95, 94, 2, 307, 0, 1, 110 ) { } if(stage >= 100){ - line(player,"!!QUEST COMPLETE!??",line++) + line(player,"%%QUEST COMPLETE!&&",line++) } } } diff --git a/Server/src/main/core/api/ContentAPI.kt b/Server/src/main/core/api/ContentAPI.kt index 912822b8a..acd2eae3f 100644 --- a/Server/src/main/core/api/ContentAPI.kt +++ b/Server/src/main/core/api/ContentAPI.kt @@ -66,6 +66,7 @@ import core.game.world.repository.Repository import core.game.consumable.* import core.ServerConstants import core.api.utils.Vector +import core.game.node.entity.player.link.quest.Quest import core.tools.* import core.game.world.update.flag.* import core.game.world.update.flag.context.* @@ -1478,6 +1479,18 @@ fun sendItemOnInterface(player: Player, iface: Int, child: Int, item: Int, amoun player.packetDispatch.sendItemOnInterface(item, amount, iface, child) } +/** + * Sends a zoomed item to a specific child on an interface + * @param player the player to send the packet to + * @param iface the ID of the interface to send the item onto + * @Param child the index of the child on the interface to send the item onto + * @param item the ID of the item to send + * @param zoom the amount of zoom to apply to the item - defaults to 230 + */ +fun sendItemZoomOnInterface(player: Player, iface: Int, child: Int, item: Int, zoom: Int = 230) { + player.packetDispatch.sendItemZoomOnInterface(item, zoom, iface, child) +} + /** * Sends a dialogue box with a single item and some text * @param player the player to send it to @@ -1588,14 +1601,14 @@ fun runTask(entity: Entity, delay: Int = 0, repeatTimes: Int = 1, task: () -> Un * @param player the player to get the QP for * @return the number of QP the player has */ -fun getQP(player: Player): Int { +fun getQuestPoints(player: Player): Int { return player.questRepository.points } /** * Gets the stage for the given quest for the given player */ -fun questStage(player: Player, quest: String): Int { +fun getQuestStage(player: Player, quest: String): Int { return player.questRepository.getStage(quest) } @@ -1621,7 +1634,6 @@ fun isQuestComplete(player: Player, quest: String): Boolean { return player.questRepository.getStage(quest) == 100 } - /** * Check if a player meets the requirements to start a quest, and then starts it if they do. Returns success bool */ diff --git a/Server/src/main/core/game/node/entity/player/link/quest/Quest.java b/Server/src/main/core/game/node/entity/player/link/quest/Quest.java index a88d0338c..6851b7078 100644 --- a/Server/src/main/core/game/node/entity/player/link/quest/Quest.java +++ b/Server/src/main/core/game/node/entity/player/link/quest/Quest.java @@ -21,6 +21,11 @@ public abstract class Quest implements Plugin { */ public static final String RED = ""; + /** + * Represents the bright red string. + */ + public static final String BRIGHT_RED = ""; + /** * Represents the blue string. */ @@ -151,7 +156,7 @@ public abstract class Quest implements Plugin { line++; } } else { - send = send.replace("!!",RED).replace("??",BLUE).replace("---",BLACK + "").replace("/--", BLUE); + send = send.replace("!!", RED).replace("??", BLUE).replace("---", BLACK + "").replace("/--", BLUE).replace("%%", BRIGHT_RED).replace("&&", BLUE); line(player, send, line, false); } } @@ -164,12 +169,13 @@ public abstract class Quest implements Plugin { * @param crossed True if the message should be crossed out. */ public void line(Player player, String message, int line, final boolean crossed) { - String send = message; + String send; if(!crossed){ send = BLUE + "" + message.replace("", "

").replace("", BLUE).replace("", RED); - send = send.replace("!!",RED).replace("??",BLUE); + send = send.replace("!!", RED).replace("??", BLUE).replace("%%", BRIGHT_RED).replace("&&", BLUE); } else { - send = BLUE + "" + message.replace("??","").replace("!!",""); + send = BLACK + "" + message.replace("", "

").replace("", "").replace("", "RED"); + send = send.replace("!!", "").replace("??", "").replace("%%", "").replace("&&", ""); } player.getPacketDispatch().sendString(crossed ? "" + send + "" : send, JOURNAL_COMPONENT, line); } diff --git a/Server/src/main/core/game/shops/Shops.kt b/Server/src/main/core/game/shops/Shops.kt index 3b5697306..bbd2b56f1 100644 --- a/Server/src/main/core/game/shops/Shops.kt +++ b/Server/src/main/core/game/shops/Shops.kt @@ -14,7 +14,6 @@ import core.ServerConstants import core.game.interaction.InteractionListener import core.game.interaction.IntType import core.game.interaction.InterfaceListener -import core.tools.SystemLogger import core.game.system.command.Privilege import java.io.FileReader import core.tools.* @@ -138,7 +137,7 @@ class Shops : StartupListener, TickListener, InteractionListener, InterfaceListe } on(NPCs.SIEGFRIED_ERKLE_933, IntType.NPC, "trade"){ player, node -> - val points = getQP(player) + val points = getQuestPoints(player) if(points < 40){ sendNPCDialogue(player, NPCs.SIEGFRIED_ERKLE_933, "I'm sorry, adventurer, but you need 40 quest points to buy from me.") return@on true