Fix wackiness

diff --git a/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt b/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt
index 3769fbfe0370fe9b55bb0c8a59d4196f55010c17..33fae42c095f239055e20c55164dcf2b3c7b6e4a 100644 (file)
--- a/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt
+++ b/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt
@@ -88,7 +88,7 @@ value class ClusterFactions private constructor(private val factions: Map<Factio
                val Default: ClusterFactions
                        get() = ClusterFactions(FactionFlavor.values().associateWith { ClusterFactionMode.ALLOW })
                
-               operator fun invoke(factions: Map<FactionFlavor, ClusterFactionMode>) = Default + ClusterFactions(factions)
+               fun of(factions: Map<FactionFlavor, ClusterFactionMode>) = Default + ClusterFactions(factions)
        }
 }
 

diff --git a/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt b/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt
index 956245c8b30ff43115f48fa25c17f3363ea1656c..4ac30b7aa310e75b2cd5ac7558a204d613890c69 100644 (file)
--- a/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt
+++ b/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt
@@ -203,7 +203,7 @@ fun Routing.installCampaign() {
                val corruption = ClusterCorruption.values().valueOfOrRedirect(parameters.getOrFail("corruption")) { "Invalid value chosen for eldritch corruption" }
                val contention = ClusterContention.values().valueOfOrRedirect(parameters.getOrFail("contention")) { "Invalid value chosen for factional contention" }
                val factions = try {
-                       ClusterFactions(FactionFlavor.values().mapNotNull { faction ->
+                       ClusterFactions.of(FactionFlavor.values().mapNotNull { faction ->
                                parameters["factions[${faction.toUrlSlug()}]"]
                                        ?.let { ClusterFactionMode.values().valueOfOrNull(it) }
                                        ?.let { faction to it }