EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually these are better default values.

Browse Source
This commit is contained in:
Olof Larsson
2014-10-08 11:19:06 +02:00
parent 7061027fc0
commit 7658b4d42a
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java
View File

@@ -92,9 +92,9 @@ public class EngineSeeChunk extends EngineAbstract
final int step = (int) (period % steps); // Example: 0, 1, 2, 3 final int step = (int) (period % steps); // Example: 0, 1, 2, 3
// Load other related config options // Load other related config options
final float offsetX = 0.2f; final float offsetX = 0.0f;
final float offsetY = MConf.get().seeChunkParticleOffsetY; final float offsetY = MConf.get().seeChunkParticleOffsetY;
final float offsetZ = 0.2f; final float offsetZ = 0.0f;
final float speed = 0; final float speed = 0;
final int amount = MConf.get().seeChunkParticleAmount; final int amount = MConf.get().seeChunkParticleAmount;
@@ -138,6 +138,12 @@ public class EngineSeeChunk extends EngineAbstract
final int zmin = chunk.getChunkZ() * 16; final int zmin = chunk.getChunkZ() * 16;
final int zmax = zmin + 15; final int zmax = zmin + 15;
int keepEvery = MConf.get().seeChunkKeepEvery;
if (keepEvery <= 0) keepEvery = Integer.MAX_VALUE;
int skipEvery = MConf.get().seeChunkSkipEvery;
if (skipEvery <= 0) skipEvery = Integer.MAX_VALUE;
int x = xmin; int x = xmin;
int z = zmin; int z = zmin;
int i = 0; int i = 0;
@@ -147,7 +153,7 @@ public class EngineSeeChunk extends EngineAbstract
{ {
x++; x++;
i++; i++;
if (i % steps == step) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5)); if (i % steps == step && (i % keepEvery == 0 && i % skipEvery != 0)) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5));
} }
// Add #2 // Add #2
@@ -155,7 +161,7 @@ public class EngineSeeChunk extends EngineAbstract
{ {
z++; z++;
i++; i++;
if (i % steps == step) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5)); if (i % steps == step && (i % keepEvery == 0 && i % skipEvery != 0)) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5));
} }
// Add #3 // Add #3
@@ -163,7 +169,7 @@ public class EngineSeeChunk extends EngineAbstract
{ {
x--; x--;
i++; i++;
if (i % steps == step) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5)); if (i % steps == step && (i % keepEvery == 0 && i % skipEvery != 0)) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5));
} }
// Add #4 // Add #4
@@ -171,7 +177,7 @@ public class EngineSeeChunk extends EngineAbstract
{ {
z--; z--;
i++; i++;
if (i % steps == step) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5)); if (i % steps == step && (i % keepEvery == 0 && i % skipEvery != 0)) ret.add(new Location(world, x + 0.5, y + 0.5, z + 0.5));
} }
// Return Ret // Return Ret

9
src/main/java/com/massivecraft/factions/entity/MConf.java
View File

@@ -316,8 +316,13 @@ public class MConf extends Entity<MConf>
// -------------------------------------------- // // -------------------------------------------- //
// Use 1 or multiple of 3, 4 or 5. // Use 1 or multiple of 3, 4 or 5.
public int seeChunkSteps = 5; public int seeChunkSteps = 1;
public long seeChunkPeriodMillis = 1000;
// White/Black List for creating sparse patterns.
public int seeChunkKeepEvery = 5;
public int seeChunkSkipEvery = 0;
public long seeChunkPeriodMillis = 500;
public int seeChunkParticleAmount = 30; public int seeChunkParticleAmount = 30;
public float seeChunkParticleOffsetY = 2; public float seeChunkParticleOffsetY = 2;
public float seeChunkParticleDeltaY = 2; public float seeChunkParticleDeltaY = 2;