Minor enhancements

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / WorldGen.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index 84f0ae1b7591fe64d52368e6f3bc9019223186c9..5bc94ff2944f5c0f642227f188524d473142c86a 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -5,11 +5,17 @@ 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;
@@ -23,15 +29,23 @@ public class WorldGen {
     }
 
     static void genWorld(int width, int height) {
+        genWorld(width, height, TimeUtils.millis());
+    }
+
+    static void genWorld(int width, int height, long s) {
+        int dirtH;
+        seed = s;
+        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/2, height/4, height/4*3);
         for (int x=0; x<width; x++) {
-            for (int y=height-noise[x]; y<height; y++) {
-                if (y==height-noise[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-noise[x]+4) {
+                } else if (y<height-hMap[x]+dirtH) {
                     foreMap[x][y] = 2;
                     backMap[x][y] = 2;
                 } else {