diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index c4655bf157c732368ec685c085af2be42ba9f819..42050e2fb2d1b06f5bf5a24d888f7ef6f76e2e0b 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.ArrayMap;
-import ru.deadsoftware.cavecraft.Items;
public class GameWorld {
public class GameWorld {
- private final int WIDTH, HEIGHT;
-
+ private int WIDTH, HEIGHT;
private int[][] foreMap;
private int[][] backMap;
private int[][] foreMap;
private int[][] backMap;
- public GameWorld(int w, int h) {
- WIDTH = w;
- HEIGHT = h;
- WorldGen.genWorld(WIDTH,HEIGHT);
- foreMap = WorldGen.getForeMap();
- backMap = WorldGen.getBackMap();
- WorldGen.clear();
- }
-
public int getWidth() {
return WIDTH;
}
public int getWidth() {
return WIDTH;
}
return HEIGHT;
}
return HEIGHT;
}
+ public int[][] getFullForeMap() {
+ return foreMap;
+ }
+
+ public int[][] getFullBackMap() {
+ return backMap;
+ }
+
+ private int transformX(int x) {
+ x = x%getWidth();
+ if (x<0) x=getWidth()-Math.abs(x);
+ return x;
+ }
+
public int getForeMap(int x, int y) {
public int getForeMap(int x, int y) {
- int ret = 0;
+ int map = 0;
try {
try {
- ret = foreMap[x][y];
+ x = transformX(x);
+ map = foreMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
} catch (ArrayIndexOutOfBoundsException e) {
- Gdx.app.error("GameWorld",e.toString());
+ //Gdx.app.error("GameWorld",e.toString());
}
}
- return ret;
+ return map;
}
public void setForeMap(int x, int y, int value) {
try {
}
public void setForeMap(int x, int y, int value) {
try {
+ x = transformX(x);
foreMap[x][y] = value;
} catch (ArrayIndexOutOfBoundsException e) {
foreMap[x][y] = value;
} catch (ArrayIndexOutOfBoundsException e) {
- Gdx.app.error("GameWorld", e.toString());
+ //Gdx.app.error("GameWorld", e.toString());
}
}
public int getBackMap(int x, int y) {
}
}
public int getBackMap(int x, int y) {
- int ret = 0;
+ int map = 0;
try {
try {
- ret = backMap[x][y];
+ x = transformX(x);
+ map = backMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
} catch (ArrayIndexOutOfBoundsException e) {
- Gdx.app.error("GameWorld",e.toString());
+ //Gdx.app.error("GameWorld",e.toString());
}
}
- return ret;
+ return map;
}
public void setBackMap(int x, int y, int value) {
try {
}
public void setBackMap(int x, int y, int value) {
try {
+ x = transformX(x);
backMap[x][y] = value;
} catch (ArrayIndexOutOfBoundsException e) {
backMap[x][y] = value;
} catch (ArrayIndexOutOfBoundsException e) {
- Gdx.app.error("GameWorld", e.toString());
+ //Gdx.app.error("GameWorld", e.toString());
}
}
public void placeToForeground(int x, int y, int value) {
}
}
public void placeToForeground(int x, int y, int value) {
- if (getForeMap(x,y) == 0 || value == 0) {
- setForeMap(x,y,value);
+ if (getForeMap(x,y) == 0 || value == 0 || !Items.BLOCKS.getValueAt(getForeMap(x, y)).collision) {
+ setForeMap(x, y, value);
+ GameProc.UPD_X = x-8;
+ GameProc.UPD_Y = y-8;
+ GameProc.DO_UPD = true;
}
}
public void placeToBackground(int x, int y, int value) {
}
}
public void placeToBackground(int x, int y, int value) {
- if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).foreground)) {
+ if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
+ (!Items.BLOCKS.getValueAt(value).transparent || value == 18)) {
setBackMap(x,y,value);
}
}
public Vector2 getSpawnPoint() {
setBackMap(x,y,value);
}
}
public Vector2 getSpawnPoint() {
- float x=0, y=0;
- boolean found = false;
- x = getWidth()/2;
- while (!found) {
- for (int i = 0; i < getHeight(); i++) {
- if (getForeMap((int)x, i)>0 &&
- Items.BLOCKS.getValueAt(getForeMap((int)x, i)).collision) {
- y = i-3;
- found = true;
- break;
- }
- }
- if (!found) x--;
+ int x=0,y=0;
+ while (true) {
+ y++;
+ if (getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(getForeMap(x,y)).collision) break;
}
x = x*16 + 4;
}
x = x*16 + 4;
- y *= 16;
+ y = y*16 - 32;
return new Vector2(x,y);
}
return new Vector2(x,y);
}
+ public void generate(int w, int h) {
+ WIDTH = w;
+ HEIGHT = h;
+ WorldGen.genWorld(WIDTH,HEIGHT);
+ foreMap = WorldGen.getForeMap();
+ backMap = WorldGen.getBackMap();
+ WorldGen.clear();
+ }
+
+ public void setMaps(int[][] foreMap, int[][] backMap) {
+ this.foreMap = foreMap.clone();
+ this.backMap = backMap.clone();
+ WIDTH = foreMap.length;
+ HEIGHT = foreMap[0].length;
+ }
+
}
}