X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FWorldGen.java;h=bf9eadf8cb3f81847f6cca80f0e5a4ac1287e18b;hb=7f1f702250f9cd05c1d7f5492e09ba16a56270ae;hp=8c0f4ca7eec7cd7ae6d038ce688fb32872d9fc74;hpb=c938382b1332c47e7119f742711960c7cc4c75ca;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index 8c0f4ca..bf9eadf 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -23,7 +23,6 @@ public class WorldGen {
         int t;
         res[0] = mid;
         for (int i=1; i<width; i++) {
-            bMap[i] = i/(width/2);
             t = rand.nextInt(7)-3;
             if (t>-3 && t<3) t=0; else t/=Math.abs(t);
             if (i>width-(max-min)) {
@@ -33,7 +32,14 @@ public class WorldGen {
             res[i] = res[i-1] + t;
             if (res[i]<min) res[i] = min;
             if (res[i]>max) res[i] = max;
+            if (i>=width/2) {
+                bMap [i] = 1;
+                if (res[i] < 60) res[i] = 60;
+            } else {
+                bMap[i] = 0;
+            }
         }
+        if (res[0]<res[width-1]) res[width-1] = res[0];
         return res;
     }
 
@@ -73,7 +79,7 @@ public class WorldGen {
         rand = new RandomXS128(seed);
         foreMap = new int[width][height];
         backMap = new int[width][height];
-        hMap = genLandscape(width, height/8*3, height/8, height/2);
+        hMap = genLandscape(width, height/4, 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++) {
@@ -106,27 +112,58 @@ public class WorldGen {
                     foreMap[x][y] = 1;
                     backMap[x][y] = 1;
                 } else {
-                    if (bMap[x]==0) {
-                        foreMap[x][y] = 7;
-                        backMap[x][y] = 7;
-                    }
+                    foreMap[x][y] = 7;
+                    backMap[x][y] = 7;
                 }
             }
             for (int y = height-60; y<height-1; y++) {
                 if (foreMap[x][y]==0 && bMap[x]!=1){
                     foreMap[x][y] = 8;
-                    backMap[x][y] = 8;
+                    if (bMap[x] == 0) {
+                        if (y==height-60) {
+                            backMap[x][y] = 2;
+                        } else {
+                            backMap[x][y] = 3;
+                        }
+                    }
                     if (y==height-hMap[x]-1) {
                         foreMap[x][y+1] = 3;
+                        backMap[x][y+1] = 3;
                     }
                 }
             }
-            if (x>2 && x<width-2 && rand.nextInt(100)<5){
+            if (x>2 && x<width-2){
                 if (foreMap[x][height-hMap[x]-1]==0 && foreMap[x][height-hMap[x]]==2) {
-                    genOak(x,height-hMap[x]-1);
+                    switch (rand.nextInt(50)) {
+                        case 0:
+                            genOak(x, height - hMap[x] - 1);
+                            break;
+                        case 1:
+                            foreMap[x][height-hMap[x]-1] = 26;
+                            break;
+                        case 2:
+                            foreMap[x][height-hMap[x]-1] = 29;
+                            break;
+                        case 3:
+                            foreMap[x][height-hMap[x]-1] = 30;
+                            break;
+                        case 4:
+                            foreMap[x][height-hMap[x]-1] = 31;
+                            break;
+                        case 5:
+                            foreMap[x][height-hMap[x]-1] = 32;
+                            break;
+                    }
                 }
                 if (foreMap[x][height-hMap[x]-1]==0 && foreMap[x][height-hMap[x]]==10) {
-                    genCactus(x,height-hMap[x]-1);
+                    switch(rand.nextInt(20)) {
+                        case 0:
+                            genCactus(x,height-hMap[x]-1);
+                            break;
+                        case 1:
+                            foreMap[x][height-hMap[x]-1] = 27;
+                            break;
+                    }
                 }
             }
         }
@@ -143,5 +180,7 @@ public class WorldGen {
     static void clear() {
         foreMap = null;
         backMap = null;
+        hMap = null;
+        bMap = null;
     }
 }