Fully normalize positive frames to -1

This commit is contained in:
Gabriel Eiseman committed 2023-07-18 09:44:01 -04:00
1 parent 137784f76d
commit 991c4fff5e
5 files changed
+17 -18

No files matched your search

@@ -6,9 +6,8 @@ import magicbees.main.utils.LocalizationManager;
public enum HiveFrameType implements IBeeModifier {
MAGIC("Magic", 240, 1f, 1f, 1f, 1.1f, 0.6f), // production was 2x, now +1.1 (slightly less nerfed than other frames
// due to being a pain)
RESILIENT("Resilient", 800, 1f, 1f, 1f, 1.2f, 0.5f), // production was 2x, now +1.2
MAGIC("Magic", 240, 1f, 1f, 1f, 1f, 0.6f), // production was 2x, now +1
RESILIENT("Resilient", 800, 1f, 1f, 1f, 1f, 0.5f), // production was 2x, now +1
GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 0.4f, 0.01f), // production was 1.4x, now +0.4
METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 0.2f, 1f), // production was 1.2x, now +1.2
NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, -0.25f, 1.2f), // production was 0.75x, now -0.25
@@ -34,27 +34,27 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame {
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1;
return 1f;
}
@Override
public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1;
return 1f;
}
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
return 2;
return 1f;
}
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1;
return 1f;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return (float) 0.8;
return 0.8f;
}
@Override
@@ -79,7 +79,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame {
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return 1;
return 1f;
}
}
@@ -34,7 +34,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame {
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 1;
return 1f;
}
@Override
@@ -49,12 +49,12 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame {
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 1;
return 1f;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1;
return 1f;
}
@Override
@@ -79,7 +79,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame {
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return 1;
return 1f;
}
}
@@ -34,7 +34,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame {
@Override
public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
return 10;
return 10f;
}
@Override
@@ -49,12 +49,12 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame {
@Override
public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
return 0;
return 0f;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 10;
return 10f;
}
@Override
@@ -79,7 +79,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame {
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return 1;
return 1f;
}
}
@@ -660,7 +660,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
float mod = -0.1f;// was 0.9x, now -0.1
if (magicApiary.isProductionBoosted()) {
mod = 1.4f;// was 1.8x, now +1.4, only nerfed slightly because it forces botania
mod = 1.8f;// was 1.8x, now +1.8
}
return mod;
}