Another round of dialogue fixes
Fixed grammatical errors with: Duke of Lumbridge, Falador Squire, poison salesman, slayer masters, Varrock East bartender, mage of Zamorack, Sedridor, trader Stan, Varrock information clerk Fixed animation for Varrock East bartender Fixed some stuck dialogues
This commit is contained in:
Skal Fate
Ryan
@@ -425,7 +425,7 @@ public final class ZamorakMageDialogue extends DialoguePlugin {
|
||||
stage = 8;
|
||||
break;
|
||||
case 20:
|
||||
npc("Well, the creates there ARE particularly offensive...");
|
||||
npc("Well, the creatures there ARE particularly offensive...");
|
||||
stage = 8;
|
||||
break;
|
||||
case 30:
|
||||
|
||||
@@ -335,7 +335,7 @@ public final class SlayerMasterDialogue extends DialoguePlugin {
|
||||
case 502:
|
||||
if (!master.hasRequirements(player)) {
|
||||
interpreter.sendDialogues(master.getNpc(), getExpression(master), "Sorry, but you're not strong enough to be taught by", "me.");
|
||||
stage = 99;
|
||||
stage = 999;
|
||||
break;
|
||||
}
|
||||
interpreter.sendDialogues(master.getNpc(), getExpression(master), "Oh, okay then; you twisted my arm. You'll have to", "train against specific groups of creatures.");
|
||||
@@ -477,7 +477,7 @@ public final class SlayerMasterDialogue extends DialoguePlugin {
|
||||
case 701:
|
||||
if (!master.hasRequirements(player)) {
|
||||
interpreter.sendDialogues(master.getNpc(), getExpression(master), "Sorry, but you're not strong enough to be taught by", "me.");
|
||||
stage = 99;
|
||||
stage = 999;
|
||||
break;
|
||||
}
|
||||
if (!SlayerManager.getInstance(player).hasTask()) {
|
||||
|
||||
@@ -39,7 +39,7 @@ public enum Tasks {
|
||||
DAGANNOTHS(75, new int[] { 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 2454, 2455, 2456, 2881, 2882, 2883, 2887, 2888, 3591, }, new String[] { "There are many types of Dagannoth, the most powerful being the three Dagannoth Kings." }, 1, false),
|
||||
DARK_BEASTS(90, new int[] { 2783 }, new String[] { "A dark beast can attack using magic or melee." }, 90, false),
|
||||
DESERT_LIZARDS(15, new int[] { 2803, 2804, 2805, 2806, 2807 }, new String[] { "Desert lizards are big Slayer monsters found in the Kharidian Desert." }, 22, false),
|
||||
DOG(15, new int[] { 98, 99, 3582, 6374, 1994, 1593, 1594, 3582, 6374 }, new String[] { "Dogs are much like Wolves, they are pack creatures which will hunt in groups." }, 1, false),
|
||||
DOG(15, new int[] { 98, 99, 3582, 6374, 1994, 1593, 1594, 3582, 6374 }, new String[] { "Dogs are much like Wolves, they are", "pack creatures which will hunt in groups." }, 1, false),
|
||||
DUST_DEVILS(70, new int[] { 1624 }, new String[] { "Dust Devils use clouds of dust, sand, ash and whatever", "else they can inhale to blind and disorientate", "their victims." }, 65, false),
|
||||
DWARF(6, new int[] { 118, 120, 121, 382, 3219, 3220, 3221, 3268, 3269, 3270, 3271, 3272, 3273, 3274, 3275, 3294, 3295, 4316, 5880, 5881, 5882, 5883, 5884, 5885, 2130, 2131, 2132, 2133, 3276, 3277, 3278, 3279, 119, 2423 }, new String[] { "They are slightly resistant to Magic attacks, and", "are not recommended for low levels." }, 1, false),
|
||||
EARTH_WARRIORS(35, new int[] { 124 }, new String[] { "An Earth warrior is a monster made of earth which fights using melee." }, 1, false),
|
||||
|
||||
@@ -2,6 +2,7 @@ package content.global.travel.ship;
|
||||
|
||||
import content.global.travel.ship.ShipCharter.Destination;
|
||||
import core.game.dialogue.DialoguePlugin;
|
||||
import core.game.dialogue.FacialExpression;
|
||||
import core.game.node.entity.npc.NPC;
|
||||
import core.game.node.entity.player.Player;
|
||||
import core.game.node.item.Item;
|
||||
@@ -54,41 +55,41 @@ public class TraderCrewmemberDialogue extends DialoguePlugin {
|
||||
case 1:
|
||||
switch (buttonId) {
|
||||
case 1:
|
||||
player("Yes, who are you?");
|
||||
interpreter.sendDialogues(player, FacialExpression.ASKING,"Yes, who are you?");
|
||||
stage = 100;
|
||||
break;
|
||||
case 2:
|
||||
player("Yes, I would like to charter a ship.");
|
||||
interpreter.sendDialogues(player, FacialExpression.FRIENDLY,"Yes, I would like to charter a ship.");
|
||||
stage = 2000;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 100:
|
||||
npc("I'm one of the Trader Stan's crew; we are all part of the", "largest fleet of trading and sailing vessels to ever sail the", "seven seas.");
|
||||
interpreter.sendDialogues(npc, FacialExpression.FRIENDLY,"I'm one of the Trader Stan's crew; we are all part of the", "largest fleet of trading and sailing vessels to ever sail the", "seven seas.");
|
||||
stage = 101;
|
||||
break;
|
||||
case 101:
|
||||
npc("If you want to get to a port in a hurry then you can", "charter one of our ships to take you there - if the price", "is right...");
|
||||
interpreter.sendDialogues(npc, FacialExpression.FRIENDLY,"If you want to get to a port in a hurry then you can", "charter one of our ships to take you there - if the price", "is right...");
|
||||
stage = 102;
|
||||
break;
|
||||
case 102:
|
||||
player("So, where exactly can I go with your ships?");
|
||||
interpreter.sendDialogues(player, FacialExpression.HALF_ASKING,"So, where exactly can I go with your ships?");
|
||||
stage = 103;
|
||||
break;
|
||||
case 103:
|
||||
npc("We run ships from Port Phasmatys over to Port Tyras,", "stopping at Port Sarim, Catherby, Jaramja,", "the Shipyard and Port Khazard.");
|
||||
interpreter.sendDialogues(npc, FacialExpression.NEUTRAL,"We run ships from Port Phasmatys over to Port Tyras,", "stopping at Port Sarim, Catherby, Karamja,", "the Shipyard and Port Khazard.");
|
||||
stage = 104;
|
||||
break;
|
||||
case 104:
|
||||
player("Wow, that's a lot of ports. I take it you have some exotic", "stuff to trade?");
|
||||
interpreter.sendDialogues(player, FacialExpression.FRIENDLY,"Wow, that's a lot of ports. I take it you have some exotic", "stuff to trade?");
|
||||
stage = 105;
|
||||
break;
|
||||
case 105:
|
||||
npc("We certainly do! We have access to items", "bought and sold from around the world.");
|
||||
interpreter.sendDialogues(npc, FacialExpression.HAPPY,"We certainly do! We have access to items", "bought and sold from around the world.");
|
||||
stage = 106;
|
||||
break;
|
||||
case 106:
|
||||
npc("Would you like to take a look?");
|
||||
interpreter.sendDialogues(npc, FacialExpression.HALF_ASKING,"Would you like to take a look?");
|
||||
stage = 107;
|
||||
break;
|
||||
case 107:
|
||||
@@ -98,7 +99,7 @@ public class TraderCrewmemberDialogue extends DialoguePlugin {
|
||||
case 108:
|
||||
switch (buttonId) {
|
||||
case 1:
|
||||
player("Yes.");
|
||||
interpreter.sendDialogues(player, FacialExpression.FRIENDLY,"Yes.");
|
||||
stage = 1000;
|
||||
break;
|
||||
case 2:
|
||||
@@ -112,7 +113,7 @@ public class TraderCrewmemberDialogue extends DialoguePlugin {
|
||||
npc.openShop(player);
|
||||
break;
|
||||
case 2000:
|
||||
npc("Certainly sir, where would you like to go?");
|
||||
interpreter.sendDialogues(npc, FacialExpression.HAPPY,"Certainly sir, where would you like to go?");
|
||||
stage = 2001;
|
||||
break;
|
||||
case 2001:
|
||||
@@ -136,7 +137,7 @@ public class TraderCrewmemberDialogue extends DialoguePlugin {
|
||||
return true;
|
||||
}
|
||||
if (!player.getInventory().remove(new Item(995, cost))) {
|
||||
interpreter.sendDialogues(player, null, "I don't have the money for that.");
|
||||
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "I don't have the money for that.");
|
||||
stage = 30002;
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user