Add desert

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index b528972d71e342a39227b1a8bb65fb02b132fed1..58564bf3300e5a301c7a3969a83573e81a4abf5b 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -123,7 +123,7 @@ public class GameRenderer extends Renderer {
         spriteBatch.draw(Assets.creativeInv, x, y);
         spriteBatch.draw(Assets.creativeScroll, x+156,
                 y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll)));
-        for (int i=gameProc.creativeScroll*8; i<(gameProc.creativeScroll+1)*40; i++) {
+        for (int i=gameProc.creativeScroll*8; i<gameProc.creativeScroll*8+40; i++) {
             if (i>0 && i<Items.BLOCKS.size)
                 spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(i).getTexture()],
                         x+8+((i-gameProc.creativeScroll*8)%8)*18,

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 4a14c7123f7935203a6206f9ff5559475a20e862..65c9d0300f354eb94aa182de4b1635cc0eed7634 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -78,7 +78,8 @@ public class GameWorld {
     }
 
     public void placeToBackground(int x, int y, int value) {
-        if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision)) {
+        if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
+                (!Items.BLOCKS.getValueAt(value).transparent || value == 18)) {
             setBackMap(x,y,value);
         }
     }

diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index b8e9aee59b953e9742366f1300b27d7b64414da4..8c0f4ca7eec7cd7ae6d038ce688fb32872d9fc74 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -1,5 +1,6 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.RandomXS128;
 import com.badlogic.gdx.utils.TimeUtils;
 
@@ -10,6 +11,7 @@ public class WorldGen {
 
     private static int[][] foreMap, backMap;
     private static int[] hMap;
+    private static int[] bMap; //biomes, 0-plains, 1-desert
 
     public static long getSeed() {
         return seed;
@@ -17,9 +19,11 @@ public class WorldGen {
 
     static int[] genLandscape(int width, int mid, int min, int max) {
         int[] res = new int[width];
+        bMap = new int[width];
         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,6 +37,12 @@ public class WorldGen {
         return res;
     }
 
+    private static void genCactus(int x, int y) {
+        foreMap[x][y] = 59;
+        foreMap[x][y-1] = 59;
+        foreMap[x][y-2] = 59;
+    }
+
     private static void genOak(int x, int y) {
         backMap[x][y] = 15;
         backMap[x][y-1] = 15;
@@ -68,21 +78,42 @@ public class WorldGen {
             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;
+                    switch (bMap[x]) {
+                        case 0:
+                            foreMap[x][y] = 2;
+                            backMap[x][y] = 2;
+                            break;
+                        case 1:
+                            foreMap[x][y] = 10;
+                            backMap[x][y] = 10;
+                            break;
+                    }
                 } else if (y<height-hMap[x]+dirtH) {
-                    foreMap[x][y] = 3;
-                    backMap[x][y] = 3;
+                    switch (bMap[x]) {
+                        case 0:
+                            foreMap[x][y] = 3;
+                            backMap[x][y] = 3;
+                            break;
+                        case 1:
+                            foreMap[x][y] = 10;
+                            backMap[x][y] = 10;
+                            break;
+                    }
+                } else if (bMap[x]==1 && y<height-hMap[x]+dirtH+3) {
+                    foreMap[x][y] = 21;
+                    backMap[x][y] = 21;
                 } else if (y<height-1){
                     foreMap[x][y] = 1;
                     backMap[x][y] = 1;
                 } else {
-                    foreMap[x][y] = 7;
-                    backMap[x][y] = 7;
+                    if (bMap[x]==0) {
+                        foreMap[x][y] = 7;
+                        backMap[x][y] = 7;
+                    }
                 }
             }
-            for (int y = height-64; y<height-1; y++) {
-                if (foreMap[x][y]==0){
+            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 (y==height-hMap[x]-1) {
@@ -91,9 +122,12 @@ public class WorldGen {
                 }
             }
             if (x>2 && x<width-2 && rand.nextInt(100)<5){
-                if (foreMap[x][height-hMap[x]-1]==0) {
+                if (foreMap[x][height-hMap[x]-1]==0 && foreMap[x][height-hMap[x]]==2) {
                     genOak(x,height-hMap[x]-1);
                 }
+                if (foreMap[x][height-hMap[x]-1]==0 && foreMap[x][height-hMap[x]]==10) {
+                    genCactus(x,height-hMap[x]-1);
+                }
             }
         }
     }