From d68930a6241f001aeb9a1dac51dd03c053633397 Mon Sep 17 00:00:00 2001 From: Denys Date: Sat, 10 May 2025 23:42:40 +1200 Subject: [PATCH 01/17] New branch --- Kotlin/src/main/kotlin/com/gildedrose/Item.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt b/Kotlin/src/main/kotlin/com/gildedrose/Item.kt index 1a99ec73..f12a11af 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/Item.kt @@ -5,4 +5,5 @@ open class Item(var name: String, var sellIn: Int, var quality: Int) { override fun toString(): String { return this.name + ", " + this.sellIn + ", " + this.quality } -} \ No newline at end of file +} + From 85de84bb8bbe8bab3263289eab4cd325a75b0a80 Mon Sep 17 00:00:00 2001 From: Denys Date: Sat, 10 May 2025 23:43:24 +1200 Subject: [PATCH 02/17] Data Class --- Kotlin/src/main/kotlin/com/gildedrose/Item.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt b/Kotlin/src/main/kotlin/com/gildedrose/Item.kt index f12a11af..418397f2 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/Item.kt @@ -1,9 +1,10 @@ package com.gildedrose //Check git works -open class Item(var name: String, var sellIn: Int, var quality: Int) { - override fun toString(): String { - return this.name + ", " + this.sellIn + ", " + this.quality - } -} +//open class Item(var name: String, var sellIn: Int, var quality: Int) { +// override fun toString(): String { +// return this.name + ", " + this.sellIn + ", " + this.quality +// } +//} +data class Item(var name: String, var sellIn: Int, var quality: Int) From 071bd8fb99df1a2909c7ffe745951f438871b0ab Mon Sep 17 00:00:00 2001 From: Denys Date: Sat, 10 May 2025 23:53:03 +1200 Subject: [PATCH 03/17] Print for data class --- Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt index c58b48eb..58c2db75 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt @@ -29,7 +29,7 @@ fun main(args: Array) { println("-------- day $i --------") println("name, sellIn, quality") for (item in items) { - println(item) + println("${item.name}, ${item.sellIn}, ${item.quality}") } println() app.updateQuality() From 4f4d0243a0865f44312ab123952352792275b287 Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 00:05:22 +1200 Subject: [PATCH 04/17] ItemRepository Separate Data from main func --- .../kotlin/com/gildedrose/TexttestFixture.kt | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt index 58c2db75..57c95ca5 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt @@ -1,24 +1,26 @@ package com.gildedrose +object ItemRepository { + val items = listOf( + Item("+5 Dexterity Vest", 10, 20), // + Item("Aged Brie", 2, 0), // + Item("Elixir of the Mongoose", 5, 7), // + Item("Sulfuras, Hand of Ragnaros", 0, 80), // + Item("Sulfuras, Hand of Ragnaros", -1, 80), + Item("Backstage passes to a TAFKAL80ETC concert", 15, 20), + Item("Backstage passes to a TAFKAL80ETC concert", 10, 49), + Item("Backstage passes to a TAFKAL80ETC concert", 5, 49), + // this conjured item does not work properly yet + Item("Conjured Mana Cake", 3, 6) + ) +} + //asd fun main(args: Array) { println("OMGHAI!") - val items = listOf( - Item("+5 Dexterity Vest", 10, 20), // - Item("Aged Brie", 2, 0), // - Item("Elixir of the Mongoose", 5, 7), // - Item("Sulfuras, Hand of Ragnaros", 0, 80), // - Item("Sulfuras, Hand of Ragnaros", -1, 80), - Item("Backstage passes to a TAFKAL80ETC concert", 15, 20), - Item("Backstage passes to a TAFKAL80ETC concert", 10, 49), - Item("Backstage passes to a TAFKAL80ETC concert", 5, 49), - // this conjured item does not work properly yet - Item("Conjured Mana Cake", 3, 6) - ) - - val app = GildedRose(items) + val app = GildedRose(ItemRepository.items) var days = 2 if (args.size > 0) { @@ -28,7 +30,7 @@ fun main(args: Array) { for (i in 0..days - 1) { println("-------- day $i --------") println("name, sellIn, quality") - for (item in items) { + for (item in app.items) { println("${item.name}, ${item.sellIn}, ${item.quality}") } println() From b5b7ffc8706e49c8cf8c33f61d46fe233d767846 Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 10:40:06 +1200 Subject: [PATCH 05/17] Refactor: Separate packages\files --- Kotlin/src/main/kotlin/com/gildedrose/Item.kt | 10 ---------- .../kotlin/com/gildedrose/TexttestFixture.kt | 16 ++-------------- .../data/constants/ItemRepository.kt | 18 ++++++++++++++++++ .../kotlin/com/gildedrose/data/model/Item.kt | 3 +++ .../kotlin/com/gildedrose/GildedRoseTest.kt | 1 + 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 Kotlin/src/main/kotlin/com/gildedrose/Item.kt create mode 100644 Kotlin/src/main/kotlin/com/gildedrose/data/constants/ItemRepository.kt create mode 100644 Kotlin/src/main/kotlin/com/gildedrose/data/model/Item.kt diff --git a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt b/Kotlin/src/main/kotlin/com/gildedrose/Item.kt deleted file mode 100644 index 418397f2..00000000 --- a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.gildedrose - -//Check git works -//open class Item(var name: String, var sellIn: Int, var quality: Int) { -// override fun toString(): String { -// return this.name + ", " + this.sellIn + ", " + this.quality -// } -//} - -data class Item(var name: String, var sellIn: Int, var quality: Int) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt index 57c95ca5..2dacca6c 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt @@ -1,19 +1,7 @@ package com.gildedrose -object ItemRepository { - val items = listOf( - Item("+5 Dexterity Vest", 10, 20), // - Item("Aged Brie", 2, 0), // - Item("Elixir of the Mongoose", 5, 7), // - Item("Sulfuras, Hand of Ragnaros", 0, 80), // - Item("Sulfuras, Hand of Ragnaros", -1, 80), - Item("Backstage passes to a TAFKAL80ETC concert", 15, 20), - Item("Backstage passes to a TAFKAL80ETC concert", 10, 49), - Item("Backstage passes to a TAFKAL80ETC concert", 5, 49), - // this conjured item does not work properly yet - Item("Conjured Mana Cake", 3, 6) - ) -} +import com.gildedrose.data.constants.ItemRepository + //asd fun main(args: Array) { diff --git a/Kotlin/src/main/kotlin/com/gildedrose/data/constants/ItemRepository.kt b/Kotlin/src/main/kotlin/com/gildedrose/data/constants/ItemRepository.kt new file mode 100644 index 00000000..55a18ba3 --- /dev/null +++ b/Kotlin/src/main/kotlin/com/gildedrose/data/constants/ItemRepository.kt @@ -0,0 +1,18 @@ +package com.gildedrose.data.constants + +import com.gildedrose.data.model.Item + +object ItemRepository { + val items = listOf( + Item("+5 Dexterity Vest", 10, 20), // + Item("Aged Brie", 2, 0), // + Item("Elixir of the Mongoose", 5, 7), // + Item("Sulfuras, Hand of Ragnaros", 0, 80), // + Item("Sulfuras, Hand of Ragnaros", -1, 80), + Item("Backstage passes to a TAFKAL80ETC concert", 15, 20), + Item("Backstage passes to a TAFKAL80ETC concert", 10, 49), + Item("Backstage passes to a TAFKAL80ETC concert", 5, 49), + // this conjured item does not work properly yet + Item("Conjured Mana Cake", 3, 6) + ) +} \ No newline at end of file diff --git a/Kotlin/src/main/kotlin/com/gildedrose/data/model/Item.kt b/Kotlin/src/main/kotlin/com/gildedrose/data/model/Item.kt new file mode 100644 index 00000000..1c84f5a3 --- /dev/null +++ b/Kotlin/src/main/kotlin/com/gildedrose/data/model/Item.kt @@ -0,0 +1,3 @@ +package com.gildedrose.data.model + +data class Item(var name: String, var sellIn: Int, var quality: Int) \ No newline at end of file diff --git a/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt b/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt index c5216d8a..0f9aacba 100644 --- a/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt +++ b/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt @@ -1,5 +1,6 @@ package com.gildedrose +import com.gildedrose.data.model.Item import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test From fc6124b535e6c48966ec5ecd139338a999c828be Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 10:40:36 +1200 Subject: [PATCH 06/17] Delete redundant if --- Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 7ede7cee..059b7796 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -1,14 +1,18 @@ package com.gildedrose +import com.gildedrose.data.model.Item + class GildedRose(var items: List) { fun updateQuality() { for (i in items.indices) { - if (items[i].name != "Aged Brie" && items[i].name != "Backstage passes to a TAFKAL80ETC concert") { + if ( + items[i].name != "Aged Brie" && + items[i].name != "Backstage passes to a TAFKAL80ETC concert" && + items[i].name != "Sulfuras, Hand of Ragnaros" + ) { if (items[i].quality > 0) { - if (items[i].name != "Sulfuras, Hand of Ragnaros") { - items[i].quality = items[i].quality - 1 - } + items[i].quality = items[i].quality - 1 } } else { if (items[i].quality < 50) { From e9beffa99ca6059496c3787b1fe1742b653a8dca Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 11:02:08 +1200 Subject: [PATCH 07/17] func upgradeQuality --- .../main/kotlin/com/gildedrose/GildedRose.kt | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 059b7796..d98092c6 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -15,23 +15,19 @@ class GildedRose(var items: List) { items[i].quality = items[i].quality - 1 } } else { - if (items[i].quality < 50) { - items[i].quality = items[i].quality + 1 + items[i].quality = upgradeQuality(items[i].quality) - if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") { - if (items[i].sellIn < 11) { - if (items[i].quality < 50) { - items[i].quality = items[i].quality + 1 - } - } + if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") { - if (items[i].sellIn < 6) { - if (items[i].quality < 50) { - items[i].quality = items[i].quality + 1 - } - } + if (items[i].sellIn < 11) { + items[i].quality = upgradeQuality(items[i].quality) + } + + if (items[i].sellIn < 6) { + items[i].quality = upgradeQuality(items[i].quality) } } + } if (items[i].name != "Sulfuras, Hand of Ragnaros") { @@ -58,5 +54,10 @@ class GildedRose(var items: List) { } } + private fun upgradeQuality(quality: Int): Int { + if (quality < 50) return quality + 1 + return quality + } } + From 8ad8a0696c6ee22f081fdfd94bc09284ac83608f Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 11:04:48 +1200 Subject: [PATCH 08/17] Redundant if --- Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index d98092c6..afe10b76 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -46,9 +46,7 @@ class GildedRose(var items: List) { items[i].quality = items[i].quality - items[i].quality } } else { - if (items[i].quality < 50) { - items[i].quality = items[i].quality + 1 - } + items[i].quality = upgradeQuality(items[i].quality) } } } From dcbb2aeb4af1ae0b06d839f38ff3374c952ccb18 Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 11:08:38 +1200 Subject: [PATCH 09/17] Refactor --- Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index afe10b76..6090641b 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -12,7 +12,7 @@ class GildedRose(var items: List) { items[i].name != "Sulfuras, Hand of Ragnaros" ) { if (items[i].quality > 0) { - items[i].quality = items[i].quality - 1 + items[i].quality -= 1 } } else { items[i].quality = upgradeQuality(items[i].quality) From 7fc2fe96ebd1dc653c364fdc16ed8230a34b3486 Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 11:12:21 +1200 Subject: [PATCH 10/17] Refactor --- .../src/main/kotlin/com/gildedrose/GildedRose.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 6090641b..64da6e14 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -18,13 +18,14 @@ class GildedRose(var items: List) { items[i].quality = upgradeQuality(items[i].quality) if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") { - - if (items[i].sellIn < 11) { - items[i].quality = upgradeQuality(items[i].quality) - } - - if (items[i].sellIn < 6) { - items[i].quality = upgradeQuality(items[i].quality) + when { + items[i].sellIn < 6 -> { + items[i].quality = upgradeQuality(items[i].quality) + items[i].quality = upgradeQuality(items[i].quality) + } + items[i].sellIn < 11 -> { + items[i].quality = upgradeQuality(items[i].quality) + } } } From e3cd8fe4d85320c2adf402b9b524db89d24506ab Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 11:47:37 +1200 Subject: [PATCH 11/17] When instead of if --- .../main/kotlin/com/gildedrose/GildedRose.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 64da6e14..38a92990 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -23,12 +23,12 @@ class GildedRose(var items: List) { items[i].quality = upgradeQuality(items[i].quality) items[i].quality = upgradeQuality(items[i].quality) } + items[i].sellIn < 11 -> { items[i].quality = upgradeQuality(items[i].quality) } } } - } if (items[i].name != "Sulfuras, Hand of Ragnaros") { @@ -36,18 +36,20 @@ class GildedRose(var items: List) { } if (items[i].sellIn < 0) { - if (items[i].name != "Aged Brie") { - if (items[i].name != "Backstage passes to a TAFKAL80ETC concert") { + when (items[i].name) { + "Aged Brie" -> { + items[i].quality = upgradeQuality(items[i].quality) + } + "Backstage passes to a TAFKAL80ETC concert" -> { + items[i].quality -= items[i].quality + } + else -> { if (items[i].quality > 0) { if (items[i].name != "Sulfuras, Hand of Ragnaros") { - items[i].quality = items[i].quality - 1 + items[i].quality -= 1 } } - } else { - items[i].quality = items[i].quality - items[i].quality } - } else { - items[i].quality = upgradeQuality(items[i].quality) } } } From 5edd974d0f2c6e92c613599646bd99e23f28cafa Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 11:56:40 +1200 Subject: [PATCH 12/17] downGradeQuality func --- .../main/kotlin/com/gildedrose/GildedRose.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 38a92990..220e7dca 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -11,9 +11,7 @@ class GildedRose(var items: List) { items[i].name != "Backstage passes to a TAFKAL80ETC concert" && items[i].name != "Sulfuras, Hand of Ragnaros" ) { - if (items[i].quality > 0) { - items[i].quality -= 1 - } + items[i].quality = downGradeQuality(items[i].quality) } else { items[i].quality = upgradeQuality(items[i].quality) @@ -40,14 +38,14 @@ class GildedRose(var items: List) { "Aged Brie" -> { items[i].quality = upgradeQuality(items[i].quality) } + "Backstage passes to a TAFKAL80ETC concert" -> { items[i].quality -= items[i].quality } + else -> { - if (items[i].quality > 0) { - if (items[i].name != "Sulfuras, Hand of Ragnaros") { - items[i].quality -= 1 - } + if (items[i].name != "Sulfuras, Hand of Ragnaros") { + items[i].quality = downGradeQuality(items[i].quality) } } } @@ -55,6 +53,11 @@ class GildedRose(var items: List) { } } + private fun downGradeQuality(quality: Int): Int { + if (quality > 0) return quality - 1 + return quality + } + private fun upgradeQuality(quality: Int): Int { if (quality < 50) return quality + 1 return quality From 5bcf4e83f43e1759b64edf0c89105d7e1a91022c Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 12:10:28 +1200 Subject: [PATCH 13/17] sellItem --- Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 220e7dca..eb7d09f3 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -29,9 +29,7 @@ class GildedRose(var items: List) { } } - if (items[i].name != "Sulfuras, Hand of Ragnaros") { - items[i].sellIn = items[i].sellIn - 1 - } + sellItem(i) if (items[i].sellIn < 0) { when (items[i].name) { @@ -53,6 +51,12 @@ class GildedRose(var items: List) { } } + private fun sellItem(i: Int) { + if (items[i].name != "Sulfuras, Hand of Ragnaros") { + items[i].sellIn -= 1 + } + } + private fun downGradeQuality(quality: Int): Int { if (quality > 0) return quality - 1 return quality From edb63434fd0d94c868014e79d03acd0940f1750b Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 12:12:05 +1200 Subject: [PATCH 14/17] Refactor downGradeQuality --- Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index eb7d09f3..49b7e99e 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -11,7 +11,7 @@ class GildedRose(var items: List) { items[i].name != "Backstage passes to a TAFKAL80ETC concert" && items[i].name != "Sulfuras, Hand of Ragnaros" ) { - items[i].quality = downGradeQuality(items[i].quality) + downGradeQuality(i) } else { items[i].quality = upgradeQuality(items[i].quality) @@ -43,7 +43,7 @@ class GildedRose(var items: List) { else -> { if (items[i].name != "Sulfuras, Hand of Ragnaros") { - items[i].quality = downGradeQuality(items[i].quality) + downGradeQuality(i) } } } @@ -57,9 +57,10 @@ class GildedRose(var items: List) { } } - private fun downGradeQuality(quality: Int): Int { - if (quality > 0) return quality - 1 - return quality + private fun downGradeQuality(i: Int) { + if (items[i].quality > 0) { + items[i].quality =- 1 + } } private fun upgradeQuality(quality: Int): Int { From 37969bfce3bd32f495516c48248f4f2b141dc861 Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 12:13:29 +1200 Subject: [PATCH 15/17] Refactor typo downGradeQuality --- Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 49b7e99e..9645131f 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -59,7 +59,7 @@ class GildedRose(var items: List) { private fun downGradeQuality(i: Int) { if (items[i].quality > 0) { - items[i].quality =- 1 + items[i].quality -= 1 } } From bdfb5f18e69912766f5ec18039ec92f31949511e Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 12:15:01 +1200 Subject: [PATCH 16/17] Refactor upgradeQuality --- .../main/kotlin/com/gildedrose/GildedRose.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index 9645131f..b149bb6f 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -13,17 +13,17 @@ class GildedRose(var items: List) { ) { downGradeQuality(i) } else { - items[i].quality = upgradeQuality(items[i].quality) + upgradeQuality(i) if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") { when { items[i].sellIn < 6 -> { - items[i].quality = upgradeQuality(items[i].quality) - items[i].quality = upgradeQuality(items[i].quality) + upgradeQuality(i) + upgradeQuality(i) } items[i].sellIn < 11 -> { - items[i].quality = upgradeQuality(items[i].quality) + upgradeQuality(i) } } } @@ -34,7 +34,7 @@ class GildedRose(var items: List) { if (items[i].sellIn < 0) { when (items[i].name) { "Aged Brie" -> { - items[i].quality = upgradeQuality(items[i].quality) + upgradeQuality(i) } "Backstage passes to a TAFKAL80ETC concert" -> { @@ -63,9 +63,10 @@ class GildedRose(var items: List) { } } - private fun upgradeQuality(quality: Int): Int { - if (quality < 50) return quality + 1 - return quality + private fun upgradeQuality(i: Int) { + if (items[i].quality < 50) { + items[i].quality += 1 + } } } From 18b0712b9069bd019683775b63ee0a03aaf50471 Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 11 May 2025 12:15:38 +1200 Subject: [PATCH 17/17] Refactor sellItem downGradeQuality upgradeQuality --- Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index b149bb6f..b74cfd03 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -52,21 +52,16 @@ class GildedRose(var items: List) { } private fun sellItem(i: Int) { - if (items[i].name != "Sulfuras, Hand of Ragnaros") { - items[i].sellIn -= 1 - } + if (items[i].name != "Sulfuras, Hand of Ragnaros") items[i].sellIn -= 1 } private fun downGradeQuality(i: Int) { - if (items[i].quality > 0) { - items[i].quality -= 1 - } + if (items[i].quality > 0) items[i].quality -= 1 } private fun upgradeQuality(i: Int) { - if (items[i].quality < 50) { - items[i].quality += 1 - } + if (items[i].quality < 50) items[i].quality += 1 + } }