From 7089ea7e3de70f25c7e12e952d99d0bde5e62008 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Tue, 12 Jul 2022 15:48:42 -0400 Subject: [PATCH] Fixes 2 --- .../kotlin/net/starshipfights/data/admiralty/admirals.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admirals.kt b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admirals.kt index a8ad174..a87059f 100644 --- a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admirals.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admirals.kt @@ -247,7 +247,10 @@ fun generateFleet(admiral: Admiral, flavor: FactionFlavor = FactionFlavor.defaul }.shuffled().takeIf { it.isNotEmpty() }?.let { shipTypes -> val wcCount = (admiral.rank.maxShipTier.ordinal - swc.tier.ordinal + 1) * 2 - shipTypes.repeatForever().take(wcCount).toList() + if (wcCount > 0) + shipTypes.repeatForever().take(wcCount).toList() + else + emptyList() }.orEmpty() } .let { shipTypes -> -- 2.25.1