From b293ad14448dc64f0750f2b4546d2d538caf7eb0 Mon Sep 17 00:00:00 2001 From: Joshua Yeager Date: Wed, 11 Mar 2026 20:35:34 -0700 Subject: [PATCH] removed inauthentic dialogue as per issue 2337 --- .../thefremenniktrials/PeerTheSeerDialogue.kt | 20 +++++++++++++------ .../kandarin/seers/dialogue/SeerDialogue.kt | 10 +--------- 2 files changed, 15 insertions(+), 15 deletions(-) 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 c30737ab4..c3af99e37 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 @@ -57,32 +57,40 @@ class PeerTheSeerDialogue(player: Player? = null) : DialoguePlugin(player) { return true } else if(player.getAttribute("PeerStarted",false) && !(player.inventory.isEmpty && player.equipment.isEmpty)){ - npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") + //npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") stage = 100 + player.dialogueInterpreter.handle(0,0) return true } else if(player.getAttribute("PeerStarted",false) && player.inventory.isEmpty && player.equipment.isEmpty){ - npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") + //npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") stage = 110 + player.dialogueInterpreter.handle(0,0) return true } else if (getQuestStage(player, Quests.THE_FREMENNIK_TRIALS) > 0 && player.getAttribute("fremtrials:peer-vote",false)) { - npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") + //npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") stage = 120 + player.dialogueInterpreter.handle(0,0) return true } else if(player.questRepository.isComplete(Quests.THE_FREMENNIK_TRIALS)){ - npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") + //npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") stage = 150 + player.dialogueInterpreter.handle(0,0) return true } else if(getQuestStage(player, Quests.THE_FREMENNIK_TRIALS) > 0){ - npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") + //npcl(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?") stage = 50 + player.dialogueInterpreter.handle(0,0) return true } if (getQuestStage(player, Quests.THE_FREMENNIK_TRIALS) == 0) { - npc(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?").also { stage = 300 } + //npc(FacialExpression.SAD,"Uuuh... What was that dark presence I felt?").also { stage = 300 } + stage = 300 + player.dialogueInterpreter.handle(0,0) + return true } return true } diff --git a/Server/src/main/content/region/kandarin/seers/dialogue/SeerDialogue.kt b/Server/src/main/content/region/kandarin/seers/dialogue/SeerDialogue.kt index e241c34f2..5c070ab40 100644 --- a/Server/src/main/content/region/kandarin/seers/dialogue/SeerDialogue.kt +++ b/Server/src/main/content/region/kandarin/seers/dialogue/SeerDialogue.kt @@ -40,18 +40,10 @@ class SeerDialogue(player: Player? = null) : DialoguePlugin(player) { const val POWER = 80 } - override fun open(vararg args: Any?): Boolean { - npc = args[0] as NPC - npcl(FacialExpression.WORRIED, "Uh, what was that dark force? I've never sensed anything like it...").also { stage = START_DIALOGUE } // https://www.youtube.com/watch?v=mYsxit46rGo May 14 2010 - return true - } - override fun handle(interfaceId: Int, buttonId: Int): Boolean { val scorpionCatcherQuestStage = getQuestStage(player, Quests.SCORPION_CATCHER) when (stage) { - START_DIALOGUE -> - npcl(FacialExpression.NEUTRAL, "Anyway, sorry about that.").also { stage++ } - START_DIALOGUE+1 -> { + START_DIALOGUE -> { if (isQuestInProgress(player, Quests.SCORPION_CATCHER, 1, 99)) { showTopics( Topic("Talk about Scorpion Catcher.", SC_QUEST, true),