From b81896885d37df64ec01d39a9adbb59a269e387c Mon Sep 17 00:00:00 2001 From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> Date: Sat, 6 Jul 2024 08:42:04 +0200 Subject: Improvement + Fix: FF exporting (#2194) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- .../features/garden/fortuneguide/CarrolynTable.kt | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/main/java/at') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt index b7163768b..c6b6895cf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt @@ -10,27 +10,36 @@ enum class CarrolynTable(val crop: CropType, val label: String, completeMessage: CropType.CARROT, "Exportable Carrots", "CARROTS EXPORTATION COMPLETE!", - "[NPC] Carrolyn: Thank you for the carrots." + "[NPC] Carrolyn: Thank you for the carrots.", ), EXPIRED_PUMPKIN( CropType.PUMPKIN, "Expired Pumpkin", "PUMPKINS EXPORTATION COMPLETE!", - "[NPC] Carrolyn: Thank you for the pumpkins." + "[NPC] Carrolyn: Thank you for the pumpkins.", ), SUPREME_CHOCOLATE_BAR( CropType.COCOA_BEANS, "Supreme Chocolate Bar", - "CHOCOLATE BARS EXPORTATION COMPLETE!", - "[NPC] Carrolyn: Thank you for the chocolate." + "COCOA BEANSS EXPORTATION COMPLETE!", + "[NPC] Carrolyn: Thank you for the chocolate.", + ), + FINE_FLOUR( + CropType.WHEAT, + "Fine Flour", + "WHEATS EXPORTATION COMPLETE!", + "[NPC] Carrolyn: Thank you for the flour.", // TODO confirm this, since this is only a estimate ), ; + /** Pattern without colour codes */ val completeMessagePattern by RepoPattern.pattern( - "garden.ff.carrolyn.complete.${crop.patternKeyName}", completeMessage + "garden.ff.carrolyn.complete.${crop.patternKeyName}", completeMessage, ) + + /** Pattern without colour codes */ val thxMessagePattern by RepoPattern.pattern( - "garden.ff.carrolyn.thx.${crop.patternKeyName}", thxMessage + "garden.ff.carrolyn.thx.${crop.patternKeyName}", thxMessage, ) val thxResponse = "§aYou have already given Carrolyn enough $label." -- cgit