aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-07-01 19:01:27 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2017-07-01 19:01:27 +0200
commit6287e1e67f9b7d7825800d16fd86e1f188756124 (patch)
tree6ff45a61adaee9db70ebe042321067f0277211da /src/main/java/gregtech/common
parentcaa4b8a1a731b7e4320d5d67430d75fa4c49b9fb (diff)
downloadGT5-Unofficial-6287e1e67f9b7d7825800d16fd86e1f188756124.tar.gz
GT5-Unofficial-6287e1e67f9b7d7825800d16fd86e1f188756124.tar.bz2
GT5-Unofficial-6287e1e67f9b7d7825800d16fd86e1f188756124.zip
small pollution rebalancings
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Pollution.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java
index 3c0a391c29..9f11e72a92 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<EntityLivingBase> 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<EntityLiving> 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++) {