From 345a24b1edbac57ec570891e9176d72376e2c6d2 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 31 Jan 2022 12:00:38 +0700 Subject: [PATCH] Some initial complexity balancing --- .../ru/dbotthepony/mc/otm/matter/MatterData.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterData.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterData.kt index 9a6338bbd..56bdd8d56 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterData.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterData.kt @@ -12,14 +12,16 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.registry.MItems import ru.dbotthepony.mc.otm.registry.MRecipes +import kotlin.math.pow +import kotlin.math.sqrt /** * baselineComplexityReplicateTicks * complexity = replicate ticks * baselineComplexityDecomposeTicks * complexity = decompose ticks */ -const val baselineComplexityReplicateTicks = 2000.0 +const val baselineComplexityReplicateTicks = 1000.0 const val baselineComplexityDecomposeTicks = 400.0 -const val baselineComplexityScanTicks = 12000.0 +const val baselineComplexityScanTicks = 4000.0 @JvmField val BASELINE = ImpreciseFraction(0.001) @JvmField val DIRT = BASELINE @@ -75,7 +77,13 @@ private val mappedOutputs = HashMap>>() private val mappedInputs = HashMap>>() private fun defaultComplexity(value: ImpreciseFraction): Double { - return value.toDouble() + val double = value.toDouble() + + if (double < 1.0) { + return sqrt(double) + } + + return double.pow(1.4) } private fun make(item: Item, value: ImpreciseFraction, complexity: Double = defaultComplexity(value)) {