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

Various bugfixes

Browse Source
This commit is contained in:
Ceikry
2021-03-16 21:53:58 -05:00
parent 96f38e4a0c
commit 85f4c973f5
9 changed files with 106 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java
+13 -11
View File
@@ -9,6 +9,8 @@ import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.Item;
import static rs09.tools.DialogueConstKt.END_DIALOGUE;
/**
* Handles the LadyOfTheLake dialogue.
*
@@ -52,7 +54,7 @@ public class TheLadyOfTheLake extends DialoguePlugin {
public boolean handle(int interfaceId, int buttonId) {
final Quest quest = player.getQuestRepository().getQuest("Merlin's Crystal");
switch (stage) {
case 999:
case END_DIALOGUE:
end();
break;
case 0:
@@ -75,13 +77,13 @@ public class TheLadyOfTheLake extends DialoguePlugin {
break;
case 3:
player("Good day.");
stage = 999;
stage = END_DIALOGUE;
break;
}
break;
case 250:
npc("I am afraid I do not know what you are talking about.");
stage = 171;
stage = END_DIALOGUE;
break;
case 100:
npc("I am the Lady of the Lake.");
@@ -131,7 +133,7 @@ public class TheLadyOfTheLake extends DialoguePlugin {
break;
case 117:
player("Thanks!");
stage = 999;
stage = END_DIALOGUE;
break;
case 145:
options("I seek the sword Excalibur.", "Good day.");
@@ -145,7 +147,7 @@ public class TheLadyOfTheLake extends DialoguePlugin {
break;
case 2:
player("Good day.");
stage = 999;
stage = END_DIALOGUE;
break;
}
break;
@@ -181,12 +183,12 @@ public class TheLadyOfTheLake extends DialoguePlugin {
break;
case 167:
npc("Well, come back when you do.");
stage = 999;
stage = END_DIALOGUE;
break;
case 168:
if (player.getInventory().freeSlots() == 0) {
player("Sorry, I don't seem to have enough inventory space.");
stage = 999;
stage = END_DIALOGUE;
} else if (player.getInventory().contains(995, 500)) {
player.getInventory().remove(new Item(995, 500));
player.getInventory().add(new Item(35, 1));
@@ -199,7 +201,7 @@ public class TheLadyOfTheLake extends DialoguePlugin {
break;
case 170:
interpreter.sendDialogue("The lady of the Lake hands you Excalibur.");
stage = 999;
stage = END_DIALOGUE;
break;
case 300:
npc("'Tis very valuable, and not an artefact to be given", "away lightly.");
@@ -224,7 +226,7 @@ public class TheLadyOfTheLake extends DialoguePlugin {
case 305:
player("Ok. That seems easy enough.");
quest.setStage(player, 60);
stage = 171;
stage = END_DIALOGUE;
break;
case 699:
options("Who are you?", "Good day.");
@@ -238,13 +240,13 @@ public class TheLadyOfTheLake extends DialoguePlugin {
break;
case 2:
player("Good day.");
stage = 999;
stage = END_DIALOGUE;
break;
}
break;
case 720:
npc("I am the Lady of the Lake.");
stage = 999;
stage = END_DIALOGUE;
break;
}
return true;
Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java
+2 -2
View File
@@ -154,10 +154,10 @@ public class Fletching {
this.animation = animation;
switch(indicator & 0xFF){
case 1:
this.string = 1777;
this.string = org.rs09.consts.Items.BOW_STRING_1777;
break;
case 2:
this.string = 9438;
this.string = org.rs09.consts.Items.CROSSBOW_STRING_9438;
break;
}
}
Server/src/main/java/core/tools/RandomFunction.java
+4
View File
@@ -97,6 +97,10 @@ public class RandomFunction {
return RANDOM.nextInt(maxValue);
}
public static final double randomDouble(double maxValue) {
return ThreadLocalRandom.current().nextDouble(0.0,maxValue);
}
public static final double randomDouble(double min, double max){
return ThreadLocalRandom.current().nextDouble(min,max);
}