aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorJakub <53441451+kuba6000@users.noreply.github.com>2023-03-29 17:26:47 +0200
committerGitHub <noreply@github.com>2023-03-29 17:26:47 +0200
commit47536a5e158fcc175bba1df98bb58981c52e51b6 (patch)
treebdcd51bb2fba453cf4aaa03457c0b38bd3a77e7f /src/main/java
parent218288161fb4ae84983fe846e959730a7a7b330d (diff)
downloadGT5-Unofficial-47536a5e158fcc175bba1df98bb58981c52e51b6.tar.gz
GT5-Unofficial-47536a5e158fcc175bba1df98bb58981c52e51b6.tar.bz2
GT5-Unofficial-47536a5e158fcc175bba1df98bb58981c52e51b6.zip
Update production upgrades formula in Industrial Apiary (#1820)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/util/GT_ApiaryModifier.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java b/src/main/java/gregtech/api/util/GT_ApiaryModifier.java
index bb5c760556..b95fe437d3 100644
--- a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java
+++ b/src/main/java/gregtech/api/util/GT_ApiaryModifier.java
@@ -7,7 +7,7 @@ public class GT_ApiaryModifier {
public float territory = 1f;
public float mutation = 1f;
public float lifespan = 1f;
- public float production = 0f;
+ public float production = 2f;
public float flowering = 1f;
public float geneticDecay = 1f;
public boolean isSealed = false;
diff --git a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java
index b54697fdfc..d9f3040dd2 100644
--- a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java
+++ b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java
@@ -22,11 +22,11 @@ public enum GT_ApiaryUpgrade {
speed8(UNIQUE_INDEX.SPEED_UPGRADE, 32207, 1, (mods, n) -> mods.maxSpeed = 8),
speed8upgraded(UNIQUE_INDEX.SPEED_UPGRADE, 32208, 1, (mods, n) -> {
mods.maxSpeed = 8;
- mods.production = 2f;
+ mods.production = 17.19926784f;
mods.energy *= 14.75;
}),
production(UNIQUE_INDEX.PRODUCTION_UPGRADE, 32209, 8, (mods, n) -> {
- mods.production += 0.25f * n;
+ mods.production = 4.f * (float) Math.pow(1.2d, n);
mods.energy *= Math.pow(1.4f, n);
}),
plains(UNIQUE_INDEX.PLAINS_UPGRADE, 32210, 1, (mods, n) -> {
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
index a75876b82d..67d008c60b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
@@ -888,7 +888,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
private float terrorityMod = 1f;
private float mutationMod = 1f;
private float lifespanMod = 1f;
- private float productionMod = 0f;
+ private float productionMod = 2f;
private float floweringMod = 1f;
private float geneticDecayMod = 1f;
private float energyMod = 1f;