Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

small pollution rebalancings

Browse source
This commit is contained in:
Blood-Asp 2017-07-01 19:01:27 +02:00
parent caa4b8a1a7
commit 6287e1e67f
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,7 +1,7 @@
minecraft.version=1.7.10 minecraft.version=1.7.10
forge.version=10.13.4.1566-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 ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407 applecore.version=1.7.10-1.2.1+107.59407

15
src/main/java/gregtech/common/GT_Pollution.java
View file

@ -100,11 +100,11 @@ public class GT_Pollution {
//get pollution //get pollution
int tPollution = chunkData.get(actualPos)[GTPOLLUTION]; int tPollution = chunkData.get(actualPos)[GTPOLLUTION];
//remove some //remove some
tPollution = (int)(0.9945f*tPollution); tPollution = (int)(0.99f*tPollution);
//tPollution -= 2000;//This does not really matter... tPollution -= 2000;
if(tPollution<=0) tPollution = 0;//SANity check 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 ChunkCoordIntPair[] tNeighbors = new ChunkCoordIntPair[4];//array is faster
tNeighbors[0]=(new ChunkCoordIntPair(actualPos.chunkXPos+1,actualPos.chunkZPos)); tNeighbors[0]=(new ChunkCoordIntPair(actualPos.chunkXPos+1,actualPos.chunkZPos));
@ -117,8 +117,8 @@ public class GT_Pollution {
int neighborPollution = chunkData.get(neighborPosition)[GTPOLLUTION]; int neighborPollution = chunkData.get(neighborPosition)[GTPOLLUTION];
if(neighborPollution*6 < tPollution*5){//METHEMATICS... if(neighborPollution*6 < tPollution*5){//METHEMATICS...
int tDiff = tPollution - neighborPollution; int tDiff = tPollution - neighborPollution;
tDiff = tDiff/20; tDiff = tDiff/10;
neighborPollution = GT_Utility.safeInt((long)neighborPollution+tDiff);//tNPol += tDiff; neighborPollution += tDiff;
tPollution -= tDiff; tPollution -= tDiff;
chunkData.get(neighborPosition)[GTPOLLUTION] = neighborPollution; chunkData.get(neighborPosition)[GTPOLLUTION] = neighborPollution;
} }
@ -126,7 +126,6 @@ public class GT_Pollution {
//Create Pollution effects //Create Pollution effects
//Smog filter TODO
if(tPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit) { 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); 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); 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) { 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); //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); //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) { if (tPollution > GT_Mod.gregtechproxy.mPollutionVegetationLimit) {
int f = 20; int f = 20;
for (; f < (tPollution / 25000); f++) { for (; f < (tPollution / 25000); f++) {