diff --git a/Server/data/configs/door_configs.json b/Server/data/configs/door_configs.json index 9608881e7..ec17288a2 100644 --- a/Server/data/configs/door_configs.json +++ b/Server/data/configs/door_configs.json @@ -312,7 +312,7 @@ "metal": "false" }, { - "id": "2036", + "id": "1530", "replaceId": "1531", "fence": "false", "metal": "false" diff --git a/Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt b/Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt index 3796fac17..4790a8550 100644 --- a/Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt +++ b/Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt @@ -58,7 +58,7 @@ class QuizMasterDialogueFile : DialogueFile() { // Random Item should be "Mystery Box", but the current MYSTERY_BOX_6199 is already inauthentically used by Giftmas. val tableRoll = WeightBasedTable.create( - WeightedItem(Items.LAMP_6796, 1, 1, 1.0, false), + WeightedItem(Items.LAMP_2528, 1, 1, 1.0, false), WeightedItem(Items.CABBAGE_1965, 1, 1, 1.0, false), WeightedItem(Items.DIAMOND_1601, 1, 1, 1.0, false), WeightedItem(Items.BUCKET_1925, 1, 1, 1.0, false), diff --git a/Server/src/main/content/region/misthalin/digsite/dialogue/ExaminerDialogue.kt b/Server/src/main/content/region/misthalin/digsite/dialogue/ExaminerDialogue.kt index f97b20425..d9f94dfba 100644 --- a/Server/src/main/content/region/misthalin/digsite/dialogue/ExaminerDialogue.kt +++ b/Server/src/main/content/region/misthalin/digsite/dialogue/ExaminerDialogue.kt @@ -45,7 +45,18 @@ class ExaminerDialogueFile : DialogueBuilderFile() { } b.onQuestStages(Quests.THE_DIG_SITE, 6, 7, 8, 9, 10, 11, 12) - .npcl(FacialExpression.FRIENDLY, "Well, what are you doing here? Get digging!") + .branch { player -> if(inInventory(player, Items.TROWEL_676)) { 0 } else { 1 } } + .let{ branch -> + branch.onValue(0) + .npcl(FacialExpression.FRIENDLY, "Well, what are you doing here? Get digging!") + .end() + branch.onValue(1) + .playerl("I have lost my trowel.") + .npcl("Deary me. That was a good one as well. It's a good job I have another. Here you go...") + .endWith { _, player -> + addItemOrDrop(player, Items.TROWEL_676) + } + } b.onQuestStages(Quests.THE_DIG_SITE, 5) .playerl(FacialExpression.FRIENDLY, "Hello.")