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

Cleaned up achievement diary code

Browse Source 
Previous-tier rewards are now automatically removed from the player when they claim the next tier
Players can no longer claim rewards from previous tiers of the diary
Fixed a bug in Red Beard Frank's dialogue that prevented him from granting a replacement if you lose your main item for that tier
Added safety checks to ensure the player can only claim or reclaim (after losing) items from the highest tier of the diary that they have completed
This commit is contained in:
Ceikry
2022-09-04 08:14:58 +00:00
committed by Ryan
parent edb9c6ace0
commit 9cfa635f0a
17 changed files with 242 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/kotlin/rs09/game/node/entity/player/link/diary/dialogues/NedDiaryDialogue.kt
+5 -8
View File
@@ -1,19 +1,19 @@
package rs09.game.node.entity.player.link.diary.dialogues
import core.game.node.entity.player.link.diary.AchievementDiary
import core.game.node.entity.player.link.diary.DiaryType
import rs09.game.content.dialogue.DialogueFile
class NedDiaryDialogue : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
val diary = player!!.achievementDiaryManager.getDiary(DiaryType.LUMBRIDGE)
val level = 2
when(stage) {
0 -> {
if (diary.isComplete(level, true) && !diary.isLevelRewarded(level)) {
if (AchievementDiary.canClaimLevelRewards(player, DiaryType.LUMBRIDGE, level)) {
player("I've done all the medium tasks in my Lumbridge", "Achievement Diary.")
stage = 50
}
else if (diary.isLevelRewarded(level) && diary.isComplete(level, true) && !player!!.hasItem(diary.type.getRewards(level)[0])) {
else if (AchievementDiary.canReplaceReward(player, DiaryType.LUMBRIDGE, level)) {
player("I've seemed to have lost my explorer's ring...")
stage = 60
}
@@ -106,10 +106,7 @@ class NedDiaryDialogue : DialogueFile() {
stage++
}
52 -> {
diary.setLevelRewarded(level)
for (i in diary.type.getRewards(level)) {
player!!.inventory.add(i, player)
}
AchievementDiary.grantReplacement(player, DiaryType.LUMBRIDGE, level)
npc("This ring is a representation of the adventures you", "went on to complete your tasks.")
stage++
}
@@ -118,7 +115,7 @@ class NedDiaryDialogue : DialogueFile() {
stage = 0
}
60 -> {
player!!.inventory.add(diary.type.getRewards(level)[0], player)
AchievementDiary.grantReplacement(player, DiaryType.LUMBRIDGE, level);
npc("You better be more careful this time.")
stage = 0
}
Server/src/main/kotlin/rs09/game/node/entity/player/link/diary/dialogues/RatBurgissDiaryDialogue.kt
+6 -7
View File
@@ -4,6 +4,7 @@ import api.addItemOrDrop
import api.getAttribute
import api.setAttribute
import core.game.content.dialogue.FacialExpression
import core.game.node.entity.player.link.diary.AchievementDiary
import core.game.node.entity.player.link.diary.DiaryType
import rs09.game.content.dialogue.DialogueFile
import rs09.game.content.dialogue.IfTopic
@@ -12,17 +13,16 @@ import rs09.tools.END_DIALOGUE
class RatBurgissDiaryDialogue : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
val diary = player!!.achievementDiaryManager.getDiary(DiaryType.VARROCK)
val easyDiaryComplete = diary.isComplete(0)
val easyDiaryComplete = AchievementDiary.hasCompletedLevel(player, DiaryType.VARROCK, 0)
val alternateTeleport = getAttribute(player!!, "diaries:varrock:alttele", false)
when(stage) {
0 -> {
if (easyDiaryComplete && !diary.isLevelRewarded(0)) {
if (AchievementDiary.canClaimLevelRewards(player, DiaryType.VARROCK, 0)) {
playerl(FacialExpression.FRIENDLY, "I think I've finished all of the tasks in my Varrock Achievement Diary.")
stage = 40
return
}
else if (diary.isLevelRewarded(0) && !player!!.hasItem(diary.type.getRewards(0)[0])) {
else if (AchievementDiary.canReplaceReward(player, DiaryType.VARROCK, 0)) {
playerl(FacialExpression.ANNOYED, "I seem to have lost my armor.")
stage = 50
return
@@ -50,8 +50,7 @@ class RatBurgissDiaryDialogue : DialogueFile() {
41 -> playerl(FacialExpression.FRIENDLY, "Thank you. Uh... can I have the reward?").also { stage++ }
42 -> npcl(FacialExpression.FRIENDLY, "Reward? Ah yes! Of course. Your reward, it's right here.").also { stage++ }
43 -> {
diary.setLevelRewarded(0)
diary.type.getRewards(0).forEach { addItemOrDrop(player!!, it.id, it.amount) }
AchievementDiary.flagRewarded(player, DiaryType.VARROCK, 0)
npcl(FacialExpression.FRIENDLY, "Now, this body armour is magically enhanced to help you with your Smithing and Mining. There is a furnace, not far from here, in Edgeville. Use this armour there and, when smelting ores up to and")
stage++
}
@@ -63,7 +62,7 @@ class RatBurgissDiaryDialogue : DialogueFile() {
49 -> npcl(FacialExpression.FRIENDLY, "If you should lose this armour, come back and see me for another set.").also { stage = 0 }
50 -> {
addItemOrDrop(player!!, diary.type.getRewards(0)[0].id, 1)
AchievementDiary.grantReplacement(player, DiaryType.VARROCK, 0)
npcl(FacialExpression.ANNOYED, "You better be more careful this time.").also { stage = END_DIALOGUE }
}