From 45a85edd9ba8f7c1e5e8328fe73e2f9402c2314f Mon Sep 17 00:00:00 2001 From: The Saminator Date: Thu, 6 Oct 2022 15:45:16 -0400 Subject: [PATCH] Add Caliborese names to Mechyrdia faction flavor --- .../kotlin/net/starshipfights/campaign/cluster_fleets.kt | 2 +- .../kotlin/net/starshipfights/data/admiralty/admiral_names.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt b/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt index b9b7c76..8d60ef1 100644 --- a/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt +++ b/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt @@ -17,7 +17,7 @@ fun generateNPCFleet(owner: FactionFlavor, rank: AdmiralRank, sizeMult: Double): val possibleShips = ShipType.values().filter { it.faction == owner.shipSource && it.weightClass.tier <= battleSize.maxTier } val maxPoints = (battleSize.numPoints * sizeMult).roundToInt() - val chosenShipTypes = buildList { + val chosenShipTypes = buildList { while (true) this += possibleShips.filter { ship -> this.sumOf { it.pointCost } + ship.pointCost <= maxPoints diff --git a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt index 89f6eef..d95b3a7 100644 --- a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt @@ -37,7 +37,7 @@ enum class AdmiralNameFlavor { } fun forFactionFlavor(flavor: FactionFlavor) = when (flavor) { - FactionFlavor.MECHYRDIA -> setOf(MECHYRDIA, TYLA, DUTCH) + FactionFlavor.MECHYRDIA -> setOf(MECHYRDIA, TYLA, DUTCH, CALIBOR) FactionFlavor.TYLA -> setOf(TYLA) FactionFlavor.OLYMPIA -> setOf(OLYMPIA) FactionFlavor.TEXANDRIA -> setOf(DUTCH, NORSE) -- 2.25.1