Fix bugs

[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..954bdffd799366b314056582e8043d4949d9de3a 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -1,15 +1,23 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.RandomXS128;
+import com.badlogic.gdx.utils.ArrayMap;
 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;
@@ -22,23 +30,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/4, 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);
+            }
         }
     }