From 19ef8fe30900d1bffd86b27eb5daec568121e0e3 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 28 Mar 2023 07:42:16 +0200 Subject: [PATCH] Bees (#47) * New formula * Make production modifier globally additive --------- Co-authored-by: kuba6000 --- .../forestry/apiculture/BeeHousingModifier.java | 2 +- .../java/forestry/apiculture/genetics/Bee.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/forestry/apiculture/BeeHousingModifier.java b/src/main/java/forestry/apiculture/BeeHousingModifier.java index f02d53fd1..2156d5423 100644 --- a/src/main/java/forestry/apiculture/BeeHousingModifier.java +++ b/src/main/java/forestry/apiculture/BeeHousingModifier.java @@ -51,7 +51,7 @@ public class BeeHousingModifier implements IBeeModifier { public float getProductionModifier(IBeeGenome genome, final float currentModifier) { float modifierValue = 1.0f; for (IBeeModifier modifier : beeHousing.getBeeModifiers()) { - modifierValue *= modifier.getProductionModifier(genome, modifierValue * currentModifier); + modifierValue += modifier.getProductionModifier(genome, modifierValue + currentModifier); } return modifierValue; } diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 7eb92f450..aa5e4f660 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -455,12 +455,11 @@ public class Bee extends IndividualLiving implements IBee { // / PRODUCTION @Override public ItemStack[] getProduceList() { - ArrayList products = new ArrayList<>(); IAlleleBeeSpecies primary = genome.getPrimary(); IAlleleBeeSpecies secondary = genome.getSecondary(); - products.addAll(primary.getProductChances().keySet()); + ArrayList products = new ArrayList<>(primary.getProductChances().keySet()); Set secondaryProducts = secondary.getProductChances().keySet(); // Remove duplicates @@ -479,13 +478,13 @@ public class Bee extends IndividualLiving implements IBee { } } - return products.toArray(new ItemStack[products.size()]); + return products.toArray(new ItemStack[0]); } @Override public ItemStack[] getSpecialtyList() { Set specialties = genome.getPrimary().getSpecialtyChances().keySet(); - return specialties.toArray(new ItemStack[specialties.size()]); + return specialties.toArray(new ItemStack[0]); } @Override @@ -517,7 +516,6 @@ public class Bee extends IndividualLiving implements IBee { float speed = genome.getSpeed(); float prodModifier = beeHousingModifier.getProductionModifier(genome, 1f) * beeModeModifier.getProductionModifier(genome, 1f); - prodModifier /= 4f; // / Primary Products for (Map.Entry entry : primary.getProductChances().entrySet()) { @@ -541,7 +539,7 @@ public class Bee extends IndividualLiving implements IBee { } } - ItemStack[] productsArray = products.toArray(new ItemStack[products.size()]); + ItemStack[] productsArray = products.toArray(new ItemStack[0]); ChunkCoordinates housingCoordinates = housing.getCoordinates(); return genome.getFlowerProvider().affectProducts( housing.getWorld(), @@ -554,9 +552,9 @@ public class Bee extends IndividualLiving implements IBee { public static float getFinalChance(float chance, float beeSpeed, float productionModifier, float t) { chance *= 100f; - return (float) (((1f + t / 6f) * Math.sqrt(chance) * 2f * (1f + beeSpeed) - + Math.pow(productionModifier, Math.cbrt(chance)) - - 3f) / 100f); + return (float) (2.8 * Math.pow(chance, 0.52) + * Math.pow((productionModifier + t), 0.52) + * Math.pow(beeSpeed, 0.37)) / 100.f; } /* REPRODUCTION */