From e56e056c5dcf58faaed1b739be346e411ae261fe Mon Sep 17 00:00:00 2001 From: Gabriel Eiseman Date: Fri, 14 Jul 2023 16:05:06 -0400 Subject: [PATCH] Fixed production modifiers to be additive --- src/main/java/magicbees/item/types/HiveFrameType.java | 6 +++--- .../java/magicbees/tileentity/TileEntityMagicApiary.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index 247ac53..831ffa7 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -10,9 +10,9 @@ public enum HiveFrameType implements IBeeModifier { RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f, 0.5f), GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.01f), METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f, 1f), - NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 1.2f), - TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f), - OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f); + NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, -0.25f, 1.2f), // production was 0.75x, now -0.25 + TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 0f, 0.8f), // production was 1x, now +0 + OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, -9001f, 1f);// production was 0.0001x, now -9001 private final String frameName; public final int maxDamage; diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 4dad701..d690374 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -658,9 +658,9 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - float mod = 0.9f; + float mod = -0.1f;// was 0.9x, now -0.1 if (magicApiary.isProductionBoosted()) { - mod = mod * 2f; + mod = 1.8f;// was 1.8x, now "remains" as +1.8 } return mod; }