diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index 5bc94ff2944f5c0f642227f188524d473142c86a..fb1509e7a7c7aa503f75c0ec8e3fbdfe9dfc901a 100644 (file)
res[0] = mid;
for (int i=1; i<width; i++) {
t = rand.nextInt(3)-1;
+ if (i>width-(max-min)) {
+ if (res[i-1]+t<res[0]) t=Math.abs(t);
+ else if (res[i-1]+t>res[0]) t=-Math.abs(t);
+ }
res[i] = res[i-1] + t;
if (res[i]<min) res[i] = min;
if (res[i]>max) res[i] = max;
return res;
}
+ private static void genOak(int x, int y) {
+ backMap[x][y] = 15;
+ backMap[x][y-1] = 15;
+ backMap[x][y-2] = 15;
+ backMap[x][y-3] = 15;
+ backMap[x][y-4] = 16;
+ backMap[x][y-5] = 16;
+ backMap[x-1][y-3] = 16;
+ backMap[x-1][y-4] = 16;
+ backMap[x+1][y-3] = 16;
+ backMap[x+1][y-4] = 16;
+ foreMap[x][y-3] = 16;
+ foreMap[x][y-4] = 16;
+ foreMap[x][y-5] = 16;
+ foreMap[x-1][y-3] = 16;
+ foreMap[x-1][y-4] = 16;
+ foreMap[x+1][y-3] = 16;
+ foreMap[x+1][y-4] = 16;
+ }
+
static void genWorld(int width, int height) {
genWorld(width, height, TimeUtils.millis());
}
- static void genWorld(int width, int height, long s) {
+ static void genWorld(int width, int height, long worldseed) {
int dirtH;
- seed = s;
+ seed = worldseed;
rand = new RandomXS128(seed);
foreMap = new int[width][height];
backMap = new int[width][height];
- hMap = genLandscape(width, height/2, height/4, height/4*3);
+ hMap = genLandscape(width, height/8*3, height/8, height/2);
for (int x=0; x<width; x++) {
dirtH = 4+rand.nextInt(2);
for (int y = height- hMap[x]; y<height; y++) {
if (y==height- hMap[x]) {
- foreMap[x][y] = 3;
- backMap[x][y] = 3;
- } else if (y<height-hMap[x]+dirtH) {
foreMap[x][y] = 2;
backMap[x][y] = 2;
- } else {
+ } else if (y<height-hMap[x]+dirtH) {
+ foreMap[x][y] = 3;
+ backMap[x][y] = 3;
+ } else if (y<height-1){
foreMap[x][y] = 1;
backMap[x][y] = 1;
+ } else {
+ foreMap[x][y] = 7;
+ backMap[x][y] = 7;
+ }
+ }
+ for (int y = height-64; y<height-1; y++) {
+ if (foreMap[x][y]==0){
+ foreMap[x][y] = 8;
+ backMap[x][y] = 8;
+ if (y==height-hMap[x]-1) {
+ foreMap[x][y+1] = 3;
+ }
+ }
+ }
+ if (x>2 && x<width-2 && rand.nextInt(100)<5){
+ if (foreMap[x][height-hMap[x]-1]==0) {
+ genOak(x,height-hMap[x]-1);
}
}
}