Removing overworked bees mechanic, cap production modifier at 16x (#1946)

This commit is contained in:
temp1011 authored and mezz committed 2018-01-14 12:15:45 -08:00
1 parent 1fc56c3b20
commit 8eea336fdb
3 files changed
+12 -22

No files matched your search

@@ -37,10 +37,15 @@ public interface IBeekeepingMode {
*/
boolean isFatigued(IBee queen, IBeeHousing housing);
/**
* @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect.
/**
* @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect.
* @deprecated bees max out at 16x productivity instead of being overworked.
* TODO remove this method in 1.13
*/
boolean isOverworked(IBee queen, IBeeHousing housing);
@Deprecated
default boolean isOverworked(IBee queen, IBeeHousing housing) {
return false;
}
/**
* @return true if the genetic structure of the queen is breaking down during spawning of the offspring (with chance). will trigger a negative effect.
@@ -476,11 +476,6 @@ public class Bee extends IndividualLiving implements IBee {
IAlleleBeeSpecies primary = genome.getPrimary();
IAlleleBeeSpecies secondary = genome.getSecondary();
// All work and no play makes queen a dull girl.
if (mode.isOverworked(this, housing)) {
setIsNatural(false);
}
IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
IBeeModifier beeModeModifier = mode.getBeeModifier();
@@ -93,20 +93,6 @@ public class BeekeepingMode implements IBeekeepingMode {
rand.nextFloat() < 0.02f * beeModifier.getGeneticDecay(queen.getGenome(), 1f);
}
@Override
public boolean isOverworked(IBee queen, IBeeHousing housing) {
IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
float productionModifier = beeModifier.getProductionModifier(queen.getGenome(), 1f);
if (productionModifier > 16) {
if (housing.getWorldObj().rand.nextFloat() * 100 < 0.01 * (productionModifier * productionModifier - 100)) {
return true;
}
}
return false;
}
@Override
public boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing) {
IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
@@ -159,6 +145,10 @@ public class BeekeepingMode implements IBeekeepingMode {
@Override
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
if(this.speedModifier>16.0f)
{
return 16.0f;
}
return this.speedModifier;
}
}