From 6438298ef1a7622ee33829f71b902a272349e10b Mon Sep 17 00:00:00 2001 From: MysticKoko <132279944+MysticKoko@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:30:51 +0200 Subject: [PATCH] Cleanup --- .../aquatic/entity/critter/HybridAquaticCritterEntity.kt | 7 ------- .../hybridlabs/aquatic/entity/critter/NudibranchEntity.kt | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/HybridAquaticCritterEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/HybridAquaticCritterEntity.kt index 20930e0fc..55b01e097 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/HybridAquaticCritterEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/HybridAquaticCritterEntity.kt @@ -345,12 +345,6 @@ open class HybridAquaticCritterEntity( @Suppress("UNUSED") data class VariantCollisionRules(val variants : Set, val collisionHandler: (Set, Random, ServerWorldAccess) -> String, val exclusionStatus: ExclusionStatus = INCLUSIVE) { - - /** - * INCLUSIVE - all other variants can exist within this selection swath - *
 
- * EXCLUSIVE - all other variants are excluded from this selection swath - */ enum class ExclusionStatus { INCLUSIVE, EXCLUSIVE @@ -364,7 +358,6 @@ open class HybridAquaticCritterEntity( fun weightedDistribution(weights: Set>, status: ExclusionStatus = EXCLUSIVE) : VariantCollisionRules { return VariantCollisionRules(weights.map { pair -> pair.first }.toSet(), { _, random, _ -> - // sum up weights val weightTotal = weights.sumOf { pair -> pair.second } val randomVal = random.nextFloat() * weightTotal var accumulatedWeight = 0.0 diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt index e860c7929..6e464271d 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/entity/critter/NudibranchEntity.kt @@ -48,6 +48,7 @@ class NudibranchEntity(entityType: EntityType, world: Worl } return PlayState.CONTINUE } + override fun getMaxSize() : Int { return 5 }