2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-11 17:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity

More dialogue work

Browse source
This commit is contained in:
Ceikry 2021-03-10 11:00:01 -06:00
parent 9df72a579a
commit a0b2ae5fb8
5 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Server/src/main/java/Server/core/game/content/dialogue/DialogueFile.kt
View file

@ -10,7 +10,7 @@ abstract class DialogueFile {
var player: Player? = null var player: Player? = null
var npc: NPC? = null var npc: NPC? = null
var interpreter: DialogueInterpreter? = null var interpreter: DialogueInterpreter? = null
var stage = START_DIALOGUE open var stage = START_DIALOGUE
abstract fun handle(componentID: Int, buttonID: Int) abstract fun handle(componentID: Int, buttonID: Int)
fun load(player: Player, npc: NPC, interpreter: DialogueInterpreter): DialogueFile{ fun load(player: Player, npc: NPC, interpreter: DialogueInterpreter): DialogueFile{
this.player = player this.player = player
@ -80,4 +80,8 @@ abstract class DialogueFile {
player("Huh. Nevermind.") player("Huh. Nevermind.")
} }
open fun getCurrentStage(): Int{
return stage
}
} }

6
Server/src/main/java/Server/core/game/content/dialogue/DialogueInterpreter.java
View file

@ -174,8 +174,10 @@ public final class DialogueInterpreter {
return; return;
} }
player.setAttribute("chatbox-buttonid",buttonId); player.setAttribute("chatbox-buttonid",buttonId);
if(player.getDialogueInterpreter().getDialogue().stage == END_DIALOGUE){ if((player.getDialogueInterpreter().getDialogue().file != null && player.getDialogueInterpreter().getDialogue().file.getCurrentStage() == END_DIALOGUE) || player.getDialogueInterpreter().getDialogue().stage == END_DIALOGUE){
dialogue.close(); player.getInterfaceManager().closeChatbox();
player.getInterfaceManager().openChatbox(137);
player.getDialogueInterpreter().dialogue.finished = true;
close(); close();
return; return;
} }

24
Server/src/main/java/Server/core/game/content/dialogue/SigmundDialogue.java
View file

@ -26,6 +26,18 @@ public class SigmundDialogue extends DialoguePlugin {
return new int[] { 2082, 2083, 2090, 3713, 3716, 3717, 3718, 3719, 3720, 4328, 4331, 4332, 4333, 4334, 4335 }; return new int[] { 2082, 2083, 2090, 3713, 3716, 3717, 3718, 3719, 3720, 4328, 4331, 4332, 4333, 4334, 4335 };
} }
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Can I help you?");
if(player.getQuestRepository().getQuest("Lost Tribe").getStage(player) > 0 && player.getQuestRepository().getQuest("Lost Tribe").getStage(player) < 100){
npc("Have you found out what it was?");
stage = 34;
}
stage = 0;
return true;
}
@Override @Override
public boolean handle(int interfaceId, int buttonId) { public boolean handle(int interfaceId, int buttonId) {
switch (stage) { switch (stage) {
@ -108,16 +120,4 @@ public class SigmundDialogue extends DialoguePlugin {
return new SigmundDialogue(player); return new SigmundDialogue(player);
} }
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Can I help you?");
if(player.getQuestRepository().getQuest("Lost Tribe").getStage(player) > 0 && player.getQuestRepository().getQuest("Lost Tribe").getStage(player) < 100){
npc("Have you found out what it was?");
stage = 34;
}
stage = 0;
return true;
}
} }

2
Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt
View file

@ -13,7 +13,7 @@ class DukeHoracioDSDialogue(val questStage: Int) : DialogueFile() {
if(questStage >= 20 && !hasShield(player!!)){ if(questStage >= 20 && !hasShield(player!!)){
when(stage){ when(stage){
START_DIALOGUE -> player("I seek a shield that will protect me from dragonbreath.") START_DIALOGUE -> player("I seek a shield that will protect me from dragonbreath.").also { stage++ }
1 -> npc("A knight going on a dragon quest, hmm? What", "dragon do you intend to slay?").also{ stage++ } 1 -> npc("A knight going on a dragon quest, hmm? What", "dragon do you intend to slay?").also{ stage++ }
2 -> player("Elvarg, the dragon of Crandor island!").also { stage++ } 2 -> player("Elvarg, the dragon of Crandor island!").also { stage++ }
3 -> npc("Elvarg? Are you sure?").also { stage++ } 3 -> npc("Elvarg? Are you sure?").also { stage++ }

2
Server/src/main/java/Server/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt
View file

@ -46,7 +46,7 @@ class DukeHoracioRMDialogue(val questStage: Int) : DialogueFile() {
when(stage){ when(stage){
START_DIALOGUE -> npc("The only task remotely approaching a quest is the", "delivery of the talisman I gave you to the head wizard", "of the Wizards' Tower,").also { stage++ } START_DIALOGUE -> npc("The only task remotely approaching a quest is the", "delivery of the talisman I gave you to the head wizard", "of the Wizards' Tower,").also { stage++ }
2 -> npc("south-west of here. I suggest you deliver it to him as", "soon as possible. I have the oddest feeling that is", "important...").also { stage = END_DIALOGUE } 1 -> npc("south-west of here. I suggest you deliver it to him as", "soon as possible. I have the oddest feeling that is", "important...").also { stage = END_DIALOGUE }
} }
} }