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

Merge branch 'diary' into 'master'

Browse source 
change 50 kudos diary to 50 quest points

See merge request 2009scape/2009scape!313
This commit is contained in:
Ceikry 2021-10-21 20:57:29 +00:00
commit 19e40759fc
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Server/src/main/java/core/game/content/quest/free/shieldofarrav/CuratorHaigHalenDialogue.java
View file

@ -4,6 +4,7 @@ import core.game.content.dialogue.DialoguePlugin;
import core.game.content.dialogue.FacialExpression; import core.game.content.dialogue.FacialExpression;
import core.game.node.entity.npc.NPC; import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player; import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.node.item.Item; import core.game.node.item.Item;
/** /**
@ -39,6 +40,11 @@ public final class CuratorHaigHalenDialogue extends DialoguePlugin {
public boolean open(Object... args) { public boolean open(Object... args) {
npc = (NPC) args[0]; npc = (NPC) args[0];
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Welcome to the museum of Varrock."); interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Welcome to the museum of Varrock.");
if (player.getQuestRepository().getPoints() >= 50) {
player.getAchievementDiaryManager().finishTask(player, DiaryType.VARROCK, 0, 12);
}
stage = 0; stage = 0;
return true; return true;
} }

2
Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java
View file

@ -98,7 +98,7 @@ public enum DiaryType {
"Spin a bowl on the pottery wheel and fire it in the oven in<br><br>Barbarian Village", "Spin a bowl on the pottery wheel and fire it in the oven in<br><br>Barbarian Village",
"Enter Edgeville Dungeon using the entrance to the south of<br><br>Edgeville", "Enter Edgeville Dungeon using the entrance to the south of<br><br>Edgeville",
"Move your player-owned house portal to a different location<br><br>using the Varrock estate agent", "Move your player-owned house portal to a different location<br><br>using the Varrock estate agent",
"Speak to Haig Halen after obtaining at least 50 kudos", //TODO need to implement kudos "Speak to Haig Halen after obtaining at least 50 quest points", //TODO need to changes this back to kudos when implemented
"Enter the Earth Altar using an earth tiara or talisman", "Enter the Earth Altar using an earth tiara or talisman",
"Have Elsie tell you a story", "Have Elsie tell you a story",
"Mine some limestone near Paterdomus, the temple to the east<br><br>of Varrock", "Mine some limestone near Paterdomus, the temple to the east<br><br>of Varrock",

3
Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java
View file

@ -99,9 +99,6 @@ public final class StallThiefPulse extends SkillPulse<Scenery> {
if (stall == Stall.SILK_STALL) { if (stall == Stall.SILK_STALL) {
player.getSavedData().getGlobalData().setSilkSteal(System.currentTimeMillis() + 1800000); player.getSavedData().getGlobalData().setSilkSteal(System.currentTimeMillis() + 1800000);
} }
if (stall == Stall.TEA_STALL && player.getLocation().withinDistance(new Location(3266, 3413, 0))) {
player.getAchievementDiaryManager().finishTask(player,DiaryType.VARROCK,0, 12);
}
if (node.isActive()) { if (node.isActive()) {
SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(stall.getEmpty(node.getId())), stall.getDelay()); SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(stall.getEmpty(node.getId())), stall.getDelay());
} }