yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ceikry
2021-08-22 16:53:09 -05:00
parent 9e23e0d243 c9124497af
commit 7d9562476c
9 changed files with 480 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/content/dialogue/DrezelDialogue.java
+18 -22
View File
@@ -69,11 +69,11 @@ public final class DrezelDialogue extends DialoguePlugin {
final Quest quest = player.getQuestRepository().getQuest("Priest in Peril");
switch (stage) {
case 0:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Oh! You do not appear to be on of those Zamorkians", "who imprisoned me here! Who are you and why are", "you here?");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Oh! You do not appear to be on of those Zamorakians", "who imprisoned me here! Who are you and why are", "you here?");
stage = 1;
break;
case 1:
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "My name's " + player.getUsername() + ". King Roald sent me to find out", "what was going on at the temple. I take it you are", "Drezel?");
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "My name's " + player.getUsername() + ". King Roald sent me to find", "out what was going on at the temple. I take it you are", "Drezel?");
stage = 2;
break;
case 2:
@@ -99,7 +99,7 @@ public final class DrezelDialogue extends DialoguePlugin {
case 7:
switch (buttonId) {
case 1:
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Tell me anyway.");
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Tell me anyway. I'd like to know the full facts before","acting any further.");
stage = 8;
break;
case 2:
@@ -109,7 +109,7 @@ public final class DrezelDialogue extends DialoguePlugin {
}
break;
case 8:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "d, Saradomin has granted you wisdom I see. Well, the", "story of the river Salve and of how it protects Mithsalin", "is the story of this temple,");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Ah, Saradomin has granted you wisdom I see. Well, the", "story of the river Salve and of how it protects Mithsalin", "is the story of this temple,");
stage = 9;
break;
case 9:
@@ -137,7 +137,7 @@ public final class DrezelDialogue extends DialoguePlugin {
stage = 15;
break;
case 15:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "that he could find, and the seven of them rode here to", "make a final stand. The enemies swarmed across the", "Salve but they did not yield");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "that he could find, and the seven of them rode here to", "make a final stand. The enemies swarmed across the", "Salve but they did not yield.");
stage = 16;
break;
case 16:
@@ -145,7 +145,7 @@ public final class DrezelDialogue extends DialoguePlugin {
stage = 17;
break;
case 17:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "On the eleventh day they were to be joined by", "reinforcements from a neighbouring encampment, but", "then those reinforecements arrived all they found");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "On the eleventh day they were to be joined by", "reinforcements from a neighbouring encampment, but", "then those reinforcements arrived all they found");
stage = 18;
break;
case 18:
@@ -153,7 +153,7 @@ public final class DrezelDialogue extends DialoguePlugin {
stage = 19;
break;
case 19:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "The men were saddend at the loss of such pure and", "mighty warriors, yet their sacrifice had not been in", "vain; for the water of the Salve");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "The men were saddened at the loss of such pure and", "mighty warriors, yet their sacrifice had not been in", "vain; for the water of the Salve");
stage = 20;
break;
case 20:
@@ -189,37 +189,33 @@ public final class DrezelDialogue extends DialoguePlugin {
stage = 28;
break;
case 28:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "I fear that should those Zamorakians somehow pollute", "the Salve and desecrate his blessing, his power might not", "be able to stop.");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "I fear that should those Zamorakians somehow pollute", "the Salve and desecrate his blessing, his power might not", "be able to stop");
stage = 29;
break;
case 29:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "the army of evil that lurks to the east, longing for the", "opportunity to invade and destroy us all!");
stage = 30;
break;
case 31:
interpreter.sendOptions("Select an Option", "Yes.", "No.");
stage = 503;
break;
case 30:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "So what do you say adventurer? Will you aid me and", "all of Misthalin in foiling this Zamorakian plot?");
stage = 31;
break;
case 31:
interpreter.sendOptions("Select an Option", "Yes.", "No.");
stage = 503;
break;
case 500:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Well, let's just say if we cannot undo whatever damage", "has been done here the entire land is in grave peril!");
stage = 501;
break;
case 501:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "So what do you say adventurer? Will you aid me and", "all of Misthalin in foiling this Zamorakian plot?");
stage = 502;
break;
case 502:
interpreter.sendOptions("Select an Option", "Yes.", "No.");
stage = 503;
stage = 31;
break;
case 503:
switch (buttonId) {
case 1:
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Yes, ofcourse. Any threat to Misthalin must be", "neutralised immediately. So what can I do to help?");
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Yes, of course. Any threat to Misthalin must be", "neutralised immediately. So what can I do to help?");
stage = 506;
break;
case 2:
@@ -236,11 +232,11 @@ public final class DrezelDialogue extends DialoguePlugin {
end();
break;
case 506:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Well, the immediate problem is that I am trapped in this", "cell. I know that they key to free me is nearby, for none", "of the Zamorakians");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Well, the immediate problem is that I am trapped in this", "cell. I know that the key to free me is nearby, for none", "of the Zamorakians");
stage = 507;
break;
case 507:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "who imprisoned me here were ever gone for long", "periods of time, Should you find the key however, as", "you may have noticed,");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "who imprisoned me here were ever gone for long", "periods of time. Should you find the key however, as", "you may have noticed,");
stage = 508;
break;
case 508:
@@ -276,7 +272,7 @@ public final class DrezelDialogue extends DialoguePlugin {
stage = 516;
break;
case 516:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have done both of those I will be able to", "inspect the damage which those Zamorakians have done", "to the purity of the Salve");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have done both of those I will be able to", "inspect the damage which those Zamorakians have done", "to the purity of the Salve.");
stage = 517;
break;
case 517:
@@ -352,7 +348,7 @@ public final class DrezelDialogue extends DialoguePlugin {
player.getPacketDispatch().sendMessage("The priest blesses the water for you.");
break;
case 730:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "well, the water of the salve should still have enough", "power to work against the vampie despite what those", "Zamorakians might have done to it...");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "well, the water of the salve should still have enough", "power to work against the vampire despite what those", "Zamorakians might have done to it...");
stage = 731;
break;
case 731:
Server/src/main/java/core/game/content/dialogue/DrezelMonumentDialogue.java
+1 -1
View File
@@ -211,7 +211,7 @@ public final class DrezelMonumentDialogue extends DialoguePlugin {
stage = 901;
break;
case 901:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "From what I can tell, after you killed the guard dog", "who protected the entrance to the mouments, those", "Zamorakians forced the door into the main chamber");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "From what I can tell, after you killed the guard dog", "who protected the entrance to the monuments, those", "Zamorakians forced the door into the main chamber");
stage = 902;
break;
case 902:
Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java
+2 -2
View File
@@ -136,8 +136,8 @@ public class PriestInPerilUsePlugin extends UseWithHandler {
Quest quest = player.getQuestRepository().getQuest("Priest in Peril");
quest.setStage(player, 15);
player.getPacketDispatch().sendMessage("You have unlocked the cell door.");
NPC npc = NPC.create(1047, player.getLocation());
npc.setName("Dezel");
NPC npc = NPC.create(7690, player.getLocation());
npc.setName("Drezel");
player.getDialogueInterpreter().sendDialogues(npc, FacialExpression.HALF_GUILTY, "Oh! Thank you! You have found the key!");
}
}
Server/src/main/kotlin/rs09/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt
+5 -5
View File
@@ -17,10 +17,10 @@ class KingRoaldPIPDialogue(val questStage: Int) : DialogueFile() {
when(stage){
1 -> player("I am looking for a quest!").also { stage++ }
2 -> npc("A quest you say? Hmm, what an odd request to make", "of the king. It's funny you should mention it though, as", "there is something you can do for me.").also { stage++ }
3 -> npc("Are you aware of the temple easy of here? It stands on", "the river Salve and guards the entrance to the lands of", "Morytania?").also { stage++ }
3 -> npc("Are you aware of the temple east of here? It stands on", "the river Salve and guards the entrance to the lands of", "Morytania?").also { stage++ }
4 -> player("No, I don't think I know it...").also { stage++ }
5 -> npc("Hmm, how strange that you don't. Well anyway, it has", "been some days since last I heard from Drezel, the", "priest who lives there.").also { stage++ }
6 -> npc("Be a sport and go make sure that nothing untoward", "has happend to the silly old codger for me, would you?").also { stage++ }
6 -> npc("Be a sport and go make sure that nothing untoward", "has happened to the silly old codger for me, would you?").also { stage++ }
7 -> options("Sure.", "No, that sounds boring.").also { stage++ }
8 -> when(buttonID){
1 -> {
@@ -49,11 +49,11 @@ class KingRoaldPIPDialogue(val questStage: Int) : DialogueFile() {
when(stage){
1 -> npc("You have news of Drezel for me?").also { stage++ }
2 -> player("Yeah, I spoke to the guys at the temple and they said", "they were being bothered by that dog in the crypt, so I", "went and killed it for them. No problem.").also { stage++ }
3 -> npc("YOU DID WHAT??").also { stage++ }
3 -> npc("YOU DID WHAT???").also { stage++ }
4 -> npc("Are you mentally deficient??? That guard dog was", "protecting the route to Morytania! Without it we could", "be in severe peril of attack!").also { stage++ }
5 -> player("Did I make a mistake?").also { stage++ }
6 -> npc("YES YOU DID!!!!! You need to get there", "and find out what is happening! Before it is too late for", "us all!").also { stage++ }
7 -> player("B-but Drezel TOLD me to..!").also { stage++ }
6 -> npc("YES YOU DID!!!!! You need to get there right now", "and find out what is happening! Before it is too late for", "us all!").also { stage++ }
7 -> player("B-but Drezel TOLD me to...!").also { stage++ }
8 -> npc("No, you absolute cretin! Obviously some fiend has done", "something to Drezel and tricked your feeble intellect", "into helping them kill that guard dog!").also { stage++ }
9 -> npc("You get back there and do whatever is necessary to", "safeguard my kingdom from attack, or I will see you", "beheaded for high treason!").also { stage++ }
10 -> {