diff --git a/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java b/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java index c9a2834b7..19c1e2d55 100644 --- a/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java +++ b/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java @@ -24,7 +24,7 @@ public class DefaultBeeModifier implements IBeeModifier { } public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 1.0f; + return 0.0f; } public float getFloweringModifier(IBeeGenome genome, float currentModifier) { diff --git a/src/main/java/forestry/apiculture/ApiaryBeeModifier.java b/src/main/java/forestry/apiculture/ApiaryBeeModifier.java index 4b516bb17..1b6887e6f 100644 --- a/src/main/java/forestry/apiculture/ApiaryBeeModifier.java +++ b/src/main/java/forestry/apiculture/ApiaryBeeModifier.java @@ -15,6 +15,6 @@ public class ApiaryBeeModifier extends DefaultBeeModifier { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 0.1f; + return -0.9f; // results in 0.1 with no frames, see BeeHousingModifier,java } } diff --git a/src/main/java/forestry/apiculture/BeehouseBeeModifier.java b/src/main/java/forestry/apiculture/BeehouseBeeModifier.java index f4db9bd7a..bf5feb949 100644 --- a/src/main/java/forestry/apiculture/BeehouseBeeModifier.java +++ b/src/main/java/forestry/apiculture/BeehouseBeeModifier.java @@ -20,7 +20,7 @@ public class BeehouseBeeModifier extends DefaultBeeModifier { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 0.25f; + return -0.75f;// results in 0.25 with no frames, see BeeHousingModifier,java } @Override diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index ca2954901..6627313c9 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -24,11 +24,19 @@ import forestry.api.apiculture.IBeekeepingMode; public class BeekeepingMode implements IBeekeepingMode { - public static final IBeekeepingMode easy = new BeekeepingMode("EASY", 2.0f, 1.0f, 1.0f, false, false); - public static final IBeekeepingMode normal = new BeekeepingMode("NORMAL", 1.0f, 1.0f, 1.0f, false, true); - public static final IBeekeepingMode hard = new BeekeepingMode("HARD", 0.75f, 1.5f, 1.0f, false, true); - public static final IBeekeepingMode hardcore = new BeekeepingMode("HARDCORE", 0.5f, 5.0f, 0.8f, true, true); - public static final IBeekeepingMode insane = new BeekeepingMode("INSANE", 0.2f, 10.0f, 0.6f, true, true); + public static final IBeekeepingMode easy = new BeekeepingMode("EASY", 2.0f, 1.0f, 0.0f, false, false);// original + // multiplicative + // modifier is + // 1x + public static final IBeekeepingMode normal = new BeekeepingMode("NORMAL", 1.0f, 1.0f, 0.0f, false, true);// orig 1x + public static final IBeekeepingMode hard = new BeekeepingMode("HARD", 0.75f, 1.5f, 0.0f, false, true);// orig 1x; + // this is the + // default in + // gtnh + public static final IBeekeepingMode hardcore = new BeekeepingMode("HARDCORE", 0.5f, 5.0f, -0.2f, true, true);// orig + // 0.8x + public static final IBeekeepingMode insane = new BeekeepingMode("INSANE", 0.2f, 10.0f, -0.4f, true, true);// orig + // 0.6x private final Random rand; private final String name; diff --git a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java index 25bdb4943..5ec3c41bf 100755 --- a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java +++ b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java @@ -56,7 +56,7 @@ public class ItemHiveFrame extends ItemForestry implements IHiveFrame { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return (currentModifier < 10f) ? 2f : 1f; + return (currentModifier < 10.0f) ? 2.0f : 0.0f; } @Override