From b6775d36013393673822ed435c58d6bce7af1835 Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 4 Nov 2016 10:20:10 +0100 Subject: [PATCH] Make some empty wells and nerf oildrill more --- src/main/java/gregtech/api/util/GT_Utility.java | 4 +++- .../machines/multi/GT_MetaTileEntity_OilDrill.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 6bff041c..0f6e28f0 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1568,7 +1568,9 @@ public class GT_Utility { private static FluidStack setUndergroundOil(World aWorld, int aX, int aZ,ChunkPosition tPos,int[] tInts) { XSTR tRandom = new XSTR(aWorld.getSeed() ^ ((long)(aX / 6) + (long)(7000 * (aZ / 6)))); int type=tRandom.nextInt(5);//type slowly changes - int amnt = (int)(Math.ceil(Math.pow(2D+(double)(tRandom.nextInt(48))+(new XSTR()).nextDouble(), 5D)*0.7D)); + int amnt = tRandom.nextInt(48); + if (amnt<13)amnt=0; + else amnt = ((int)(Math.ceil(Math.pow(2D+(double)(amnt)+(new XSTR()).nextDouble(), 5D)*0.7D))); //roughly uses 28 bits FluidStack tFluidStack; switch (type) {//0 is old system diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java index 77c43481..e954bc80 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java @@ -98,7 +98,7 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase } else { int minExtraction= (int)Math.pow((float)GT_Utility.getTier(getMaxInputVoltage()),3F);//tier^3 if(tFluid.amount>minExtraction) - tFluid.amount= Math.max(minExtraction,Math.min(tFluid.amount/50000,1000)); + tFluid.amount= Math.max(minExtraction,Math.min(tFluid.amount/50000,500)); extractionSpeed=tFluid.amount; GT_Utility.undergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord()>>4, getBaseMetaTileEntity().getZCoord()>>4,true,extractionSpeed); }