diff --git a/src/main/java/binnie/core/genetics/BeeModifierLogic.java b/src/main/java/binnie/core/genetics/BeeModifierLogic.java index 27c884fb..a7f8e813 100644 --- a/src/main/java/binnie/core/genetics/BeeModifierLogic.java +++ b/src/main/java/binnie/core/genetics/BeeModifierLogic.java @@ -16,24 +16,40 @@ public class BeeModifierLogic { } public float getModifier(EnumBeeModifier modifier, float currentModifier) { - if (!modifiers.containsKey(modifier)) { - return 1.0f; - } - - Float[] values = modifiers.get(modifier); - float mult = values[0]; - float max = values[1]; - if (max >= 1.0f) { - if (max <= currentModifier) { + if (modifier == EnumBeeModifier.PRODUCTION) { + if (!modifiers.containsKey(modifier)) { + return 0.0f; + } + Float[] values = modifiers.get(modifier); + float offset = values[0], max = values[1]; + if (offset < 0) {// negative modifiers should always apply + return offset; + } + if (currentModifier >= max) {// don't decrease modifiers already over the max, just skip increasing it + return 0.0f; + } + return Math.min(offset, max - currentModifier); + } else { + if (!modifiers.containsKey(modifier)) { return 1.0f; } - return Math.min(max / currentModifier, mult); + + Float[] values = modifiers.get(modifier); + float mult = values[0]; + float max = values[1]; + if (max >= 1.0f) { + if (max <= currentModifier) { + return 1.0f; + } + return Math.min(max / currentModifier, mult); + } + + if (max >= currentModifier) { + return 1.0f; + } + return Math.max(max / currentModifier, mult); } - if (max >= currentModifier) { - return 1.0f; - } - return Math.max(max / currentModifier, mult); } public boolean getModifier(EnumBeeBooleanModifier modifier) { diff --git a/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java b/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java index 0d0d2a30..ac128f4e 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java @@ -1,8 +1,15 @@ package binnie.core.genetics; +import binnie.core.util.I18N; + public enum EnumBeeBooleanModifier { + SEALED, SELF_LIGHTED, SUNLIGHT_STIMULATED, - HELLISH + HELLISH; + + public String getName() { + return I18N.localise("binniecore.beebooleanmodifier." + name().toLowerCase()); + } } diff --git a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java index cae2187a..f8d44ad1 100644 --- a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java +++ b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java @@ -33,7 +33,7 @@ public class ComponentBeeModifier extends MachineComponent implements IBeeModifi @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 1.0f; + return 0.0f; } @Override diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java index 316e4240..6b6983da 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java @@ -39,14 +39,14 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f); EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.TERRITORY, 0.5f, 0.1f); EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f); - EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.5f); + EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.25f, 0.0f);// was 0.75x lim 0.5x EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f); EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f); - EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.25f, 0.1f); + EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.75f, 0.0f);// was 0.25x lim 0.1x EnumHiveFrame.Soul.setMaxDamage(80); EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f); EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.MUTATION, 0.5f, 0.2f); - EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.2f); + EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.25f, 0.0f);// was 0.75x lim 0.2x EnumHiveFrame.Debug.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.0E-4f, 1.0E-4f); GameRegistry.addRecipe( diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 50c5c400..76d271b4 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -152,7 +152,7 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { if (getBeeModifier() == null) { - return 1.0f; + return 0.0f; } return getBeeModifier().getProductionModifier(genome, currentModifier); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java index d0e594e2..881aac2b 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java @@ -72,7 +72,7 @@ public class FrameComponentModifier extends ComponentBeeModifier implements IBee public float getProductionModifier(IBeeGenome genome, float currentModifier) { IHiveFrame frame = getHiveFrame(); if (frame == null) { - return 1.0f; + return 0.0f; } return frame.getBeeModifier().getProductionModifier(genome, currentModifier); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java index 8ff94892..e9a1bc19 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java @@ -28,7 +28,9 @@ public enum CircuitType implements IBeeModifier { CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH); CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f); CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f); - CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.9f, 0.5f); + CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.1f, 0.0f);// was 0.9x, now -0.1. limit + // was 0.5x, now it's 0, but + // currently ignored CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f); for (CircuitType type : values()) { type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f); @@ -48,18 +50,34 @@ public enum CircuitType implements IBeeModifier { public void createCircuit(ICircuitLayout layout) { StimulatorCircuit circuit = new StimulatorCircuit(this, layout); - for (EnumBeeModifier modifier : EnumBeeModifier.values()) { - float mod = logic.getModifier(modifier, 1.0f); - if (mod == 1.0f) { - continue; + for (EnumBeeBooleanModifier modifier : EnumBeeBooleanModifier.values()) { + if (logic.getModifier(modifier)) { + circuit.addTooltipString("Enables " + modifier.getName()); } - - if (mod > 1.0f) { - int increase = (int) ((mod - 1.0f) * 100.0f); - circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%"); + } + for (EnumBeeModifier modifier : EnumBeeModifier.values()) { + if (modifier == EnumBeeModifier.PRODUCTION) { + float mod = logic.getModifier(modifier, 0.0f); + if (mod == 0.0f) { + continue; + } + if (mod > 0.0f) { + circuit.addTooltipString("Increases " + modifier.getName() + " by +" + mod); + } else { + circuit.addTooltipString("Increases " + modifier.getName() + " by " + mod); + } } else { - int decrease = (int) ((1.0f - mod) * 100.0f); - circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%"); + float mod = logic.getModifier(modifier, 1.0f); + if (mod == 1.0f) { + continue; + } + if (mod > 1.0f) { + int increase = (int) ((mod - 1.0f) * 100.0f); + circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%"); + } else { + int decrease = (int) ((1.0f - mod) * 100.0f); + circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%"); + } } } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java index 94e2d499..38741434 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java @@ -100,13 +100,14 @@ public class StimulatorModifierComponent extends ComponentBeeModifier implements @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - float mod = 1.0f; + float mod = 0.0f;// production modifiers are now additive, and the "base" value of 1 comes in forestry's + // Bee.java and BeeKeepingMode.java if (!powered) { return mod; } for (IBeeModifier beeMod : modifiers) { - mod *= beeMod.getProductionModifier(genome, mod); + mod += beeMod.getProductionModifier(genome, mod); } return mod; } diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index dad1540c..ddcdf214 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -182,7 +182,12 @@ binniecore.beemodifier.mutation=Mutation binniecore.beemodifier.lifespan=Lifespan binniecore.beemodifier.production=Production binniecore.beemodifier.flowering=Flowering -binniecore.beemodifier.geneticdecay=Genetic Decay +binniecore.beemodifier.genetic_decay=Genetic Decay + +binniecore.beebooleanmodifier.sealed=Rain Protection +binniecore.beebooleanmodifier.self_lighted=Self Lighting +binniecore.beebooleanmodifier.sunlight_stimulated=Sunlight Stimulation +binniecore.beebooleanmodifier.hellish=Hellish Emulation binniecore.gui.breedingmessage.species=Species Discovered binniecore.gui.breedingmessage.branch=Branch Discovered diff --git a/src/main/resources/assets/binniecore/lang/ru_RU.lang b/src/main/resources/assets/binniecore/lang/ru_RU.lang index dae9daae..727936be 100644 --- a/src/main/resources/assets/binniecore/lang/ru_RU.lang +++ b/src/main/resources/assets/binniecore/lang/ru_RU.lang @@ -182,7 +182,7 @@ binniecore.beemodifier.mutation=Мутация binniecore.beemodifier.lifespan=Время жизни binniecore.beemodifier.production=Продукция binniecore.beemodifier.flowering=Цветы -binniecore.beemodifier.geneticdecay=Склонность к вырождению +binniecore.beemodifier.genetic_decay=Склонность к вырождению binniecore.gui.breedingmessage.species=Видов обнаружено binniecore.gui.breedingmessage.branch=Семейств обнаружено diff --git a/src/main/resources/assets/binniecore/lang/zh_CN.lang b/src/main/resources/assets/binniecore/lang/zh_CN.lang index acabd2a8..6140a2b2 100644 --- a/src/main/resources/assets/binniecore/lang/zh_CN.lang +++ b/src/main/resources/assets/binniecore/lang/zh_CN.lang @@ -182,7 +182,7 @@ binniecore.beemodifier.mutation=变异 binniecore.beemodifier.lifespan=寿命 binniecore.beemodifier.production=产物 binniecore.beemodifier.flowering=授粉速度 -binniecore.beemodifier.geneticdecay=基因衰变 +binniecore.beemodifier.genetic_decay=基因衰变 binniecore.gui.breedingmessage.species=已发现品种 binniecore.gui.breedingmessage.branch=已发现分支