From db43418b1e01c296c499e603a12d14e32d240209 Mon Sep 17 00:00:00 2001 From: gregf36665 Date: Sun, 22 Dec 2024 20:41:51 +0000 Subject: [PATCH] Clean up text. Fix bug with cake tin not appearing --- .../decoration/kitchen/ShelfListener.kt | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Server/src/main/content/global/skill/construction/decoration/kitchen/ShelfListener.kt b/Server/src/main/content/global/skill/construction/decoration/kitchen/ShelfListener.kt index 554257469..3559743ed 100644 --- a/Server/src/main/content/global/skill/construction/decoration/kitchen/ShelfListener.kt +++ b/Server/src/main/content/global/skill/construction/decoration/kitchen/ShelfListener.kt @@ -31,29 +31,48 @@ class ShelfListener : InteractionListener { const val NEXT = 5 const val PREV = -5 + // Source for text https://www.youtube.com/watch?v=SNuqelEft3Y + private val woodshelf_1_items = listOf( "Kettle" to Items.KETTLE_7688, "Teapot" to Items.TEAPOT_7702, - "Clay Cup" to Items.EMPTY_CUP_7728 + "Cup" to Items.EMPTY_CUP_7728 ) private val woodshelf_2_items = woodshelf_1_items + listOf( - "Empty beer glass" to Items.BEER_GLASS_1919 + "Beer glass" to Items.BEER_GLASS_1919 ) private val woodshelf_3_items = woodshelf_2_items + listOf( "Cake tin" to Items.CAKE_TIN_1887 ) - private val oakshelf_1_items = woodshelf_2_items + listOf( + private val oakshelf_1_items = woodshelf_3_items + listOf( "Bowl" to Items.BOWL_1923, ) + private val oakshelf_2_items = oakshelf_1_items.map { (name, itemId) -> + if (name == "Cup") { "Porcelain cup" to Items.PORCELAIN_CUP_7732 } + else { name to itemId} + } + listOf( "Pie dish" to Items.PIE_DISH_2313 ) + + private val teakshelf_1_items = oakshelf_2_items + listOf( + "Pot" to Items.EMPTY_POT_1931 + ) + + private val teakshelf_2_items = teakshelf_1_items.map { (name, itemId) -> + if (name == "Porcelain cup") { "Porcelain cup" to Items.PORCELAIN_CUP_7735 } + else { name to itemId } + } + listOf( "Chef's Hat" to Items.CHEFS_HAT_1949 ) + val shelves = mapOf( Scenery.SHELVES_13545 to woodshelf_1_items, Scenery.SHELVES_13546 to woodshelf_2_items, Scenery.SHELVES_13547 to woodshelf_3_items, Scenery.SHELVES_13548 to oakshelf_1_items, + Scenery.SHELVES_13549 to oakshelf_2_items, + Scenery.SHELVES_13550 to teakshelf_1_items, + Scenery.SHELVES_13551 to teakshelf_2_items, ) } @@ -118,7 +137,5 @@ class ShelfListener : InteractionListener { else -> end() } } - - } } \ No newline at end of file