X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FWorldGen.java;h=b8e9aee59b953e9742366f1300b27d7b64414da4;hb=75deb67170751156f786a73d3ab8113843a7c4e9;hp=84f0ae1b7591fe64d52368e6f3bc9019223186c9;hpb=2d94431f674b2b604e03f32c9de4cf91c7fa715b;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index 84f0ae1..b8e9aee 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -5,16 +5,27 @@ import com.badlogic.gdx.utils.TimeUtils;
 
 public class WorldGen {
 
+    private static RandomXS128 rand;
+    private static long seed;
+
     private static int[][] foreMap, backMap;
-    private static int[] noise;
+    private static int[] hMap;
+
+    public static long getSeed() {
+        return seed;
+    }
 
-    static int[] genNoise(int width, int mid, int min, int max) {
-        RandomXS128 rand = new RandomXS128(TimeUtils.millis());
+    static int[] genLandscape(int width, int mid, int min, int max) {
         int[] res = new int[width];
         int t;
         res[0] = mid;
         for (int i=1; i<width; i++) {
-            t = rand.nextInt(3)-1;
+            t = rand.nextInt(7)-3;
+            if (t>-3 && t<3) t=0; else t/=Math.abs(t);
+            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;
@@ -22,21 +33,66 @@ public class WorldGen {
         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 worldseed) {
+        int dirtH;
+        seed = worldseed;
+        rand = new RandomXS128(seed);
         foreMap = new int[width][height];
         backMap = new int[width][height];
-        noise = genNoise(width, height/2, 1, height);
+        hMap = genLandscape(width, height/8*3, height/8, height/2);
         for (int x=0; x<width; x++) {
-            for (int y=height-noise[x]; y<height; y++) {
-                if (y==height-noise[x]) {
-                    foreMap[x][y] = 3;
-                    backMap[x][y] = 3;
-                } else if (y<height-noise[x]+4) {
+            dirtH = 4+rand.nextInt(2);
+            for (int y = height- hMap[x]; y<height; y++) {
+                if (y==height- hMap[x]) {
                     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);
                 }
             }
         }