From 6287e1e67f9b7d7825800d16fd86e1f188756124 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sat, 1 Jul 2017 19:01:27 +0200 Subject: [PATCH] small pollution rebalancings --- build.properties | 2 +- src/main/java/gregtech/common/GT_Pollution.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 39279f1d..5a9547bf 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.30 +gt.version=5.09.31pre1 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java index 3c0a391c..9f11e72a 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -100,11 +100,11 @@ public class GT_Pollution { //get pollution int tPollution = chunkData.get(actualPos)[GTPOLLUTION]; //remove some - tPollution = (int)(0.9945f*tPollution); - //tPollution -= 2000;//This does not really matter... + tPollution = (int)(0.99f*tPollution); + tPollution -= 2000; if(tPollution<=0) tPollution = 0;//SANity check - else if(tPollution>400000){//Spread Pollution + else if(tPollution>50000){//Spread Pollution ChunkCoordIntPair[] tNeighbors = new ChunkCoordIntPair[4];//array is faster tNeighbors[0]=(new ChunkCoordIntPair(actualPos.chunkXPos+1,actualPos.chunkZPos)); @@ -117,8 +117,8 @@ public class GT_Pollution { int neighborPollution = chunkData.get(neighborPosition)[GTPOLLUTION]; if(neighborPollution*6 < tPollution*5){//METHEMATICS... int tDiff = tPollution - neighborPollution; - tDiff = tDiff/20; - neighborPollution = GT_Utility.safeInt((long)neighborPollution+tDiff);//tNPol += tDiff; + tDiff = tDiff/10; + neighborPollution += tDiff; tPollution -= tDiff; chunkData.get(neighborPosition)[GTPOLLUTION] = neighborPollution; } @@ -126,7 +126,6 @@ public class GT_Pollution { //Create Pollution effects - //Smog filter TODO if(tPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit) { AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(actualPos.chunkXPos << 4, 0, actualPos.chunkZPos << 4, (actualPos.chunkXPos << 4) + 16, 256, (actualPos.chunkZPos << 4) + 16); List tEntitys = aWorld.getEntitiesWithinAABB(EntityLivingBase.class, chunk); @@ -144,7 +143,7 @@ public class GT_Pollution { } - // Poison effects + //Poison effects if (tPollution > GT_Mod.gregtechproxy.mPollutionPoisonLimit) { //AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(tPos.chunkPosX*16, 0, tPos.chunkPosZ*16, tPos.chunkPosX*16+16, 256, tPos.chunkPosZ*16+16); //List tEntitys = aWorld.getEntitiesWithinAABB(EntityLiving.class, chunk); @@ -164,7 +163,7 @@ public class GT_Pollution { } - // killing plants + //killing plants if (tPollution > GT_Mod.gregtechproxy.mPollutionVegetationLimit) { int f = 20; for (; f < (tPollution / 25000); f++) {