X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FWorldGen.java;h=d4635fd158f989307afa57ecd1127fbb94b0dcc6;hb=daa549056b125bac9dec16f86204a25671916466;hp=9f6e693886a11db7386bebeb2b9a3f7f4ced59dc;hpb=48de33432d9615967da21b22b950bd526b330572;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index 9f6e693..d4635fd 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -1,15 +1,22 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.RandomXS128;
 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[] hMap;
 
+    public static long getSeed() {
+        return seed;
+    }
+
     static int[] genLandscape(int width, int mid, int min, int max) {
-        RandomXS128 rand = new RandomXS128(TimeUtils.millis());
         int[] res = new int[width];
         int t;
         res[0] = mid;
@@ -22,23 +29,61 @@ 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 s) {
+        int dirtH;
+        seed = s;
+        rand = new RandomXS128(seed);
         foreMap = new int[width][height];
         backMap = new int[width][height];
         hMap = genLandscape(width, height/2, height/4, height/4*3);
         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]+4) {
                     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/4*3; y<height- hMap[x]; y++) {
+                if (foreMap[x][y]==0){
+                    foreMap[x][y] = 8;
+                    backMap[x][y] = 8;
                 }
             }
+            if (x>2 && x<width-2 && rand.nextInt(100)<5) genOak(x,height-hMap[x]-1);
         }
     }