diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 4ed875de4e4f87b705d7301f6c80645293948fe1..073c3d56a384df2df41f097a78fbbf195ad6c8bf 100644 (file)
package ru.deadsoftware.cavecraft.game;
package ru.deadsoftware.cavecraft.game;
-import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.Items;
public class GameWorld {
private int WIDTH, HEIGHT;
public class GameWorld {
private int WIDTH, HEIGHT;
-
private int[][] foreMap;
private int[][] backMap;
private int[][] foreMap;
private int[][] backMap;
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) {
int map = 0;
try {
public int getForeMap(int x, int y) {
int map = 0;
try {
- if (x<0) {
- x = x % (getWidth());
- x = getWidth()- Math.abs(x);
- } else if (x>0) {
- x = x % (getWidth());
- }
+ x = transformX(x);
map = foreMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
map = foreMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
- Gdx.app.error("GameWorld",e.toString());
+ //Gdx.app.error("GameWorld",e.toString());
}
return map;
}
public void setForeMap(int x, int y, int value) {
try {
}
return map;
}
public void setForeMap(int x, int y, int value) {
try {
- if (x<0) {
- x = x % (getWidth());
- x = getWidth()- Math.abs(x);
- } else if (x>0) {
- x = x % (getWidth());
- }
+ 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) {
int map = 0;
try {
}
}
public int getBackMap(int x, int y) {
int map = 0;
try {
- if (x<0) {
- x = x % (getWidth());
- x = getWidth()- Math.abs(x);
- } else if (x>0) {
- x = x % (getWidth());
- }
+ x = transformX(x);
map = backMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
map = backMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
- Gdx.app.error("GameWorld",e.toString());
+ //Gdx.app.error("GameWorld",e.toString());
}
return map;
}
public void setBackMap(int x, int y, int value) {
try {
}
return map;
}
public void setBackMap(int x, int y, int value) {
try {
- if (x<0) {
- x = x % (getWidth());
- x = getWidth()- Math.abs(x);
- } else if (x>0) {
- x = x % (getWidth());
- }
+ 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());
+ }
+ }
+
+ private void placeSlab(int x, int y, int value) {
+ switch (value) {
+ case 51:
+ setForeMap(x, y, 52);
+ break;
+ case 53:
+ setForeMap(x, y, 21);
+ break;
+ case 54:
+ setForeMap(x, y, 5);
+ break;
+ case 55:
+ setForeMap(x, y, 4);
+ break;
+ case 56:
+ setForeMap(x, y, 28);
+ break;
+ case 58:
+ setForeMap(x, y, 57);
+ break;
}
}
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 || !GameItems.getBlock(getForeMap(x, y)).coll) {
+ setForeMap(x, y, value);
+ } else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
+ placeSlab(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)) {
- setBackMap(x,y,value);
+ if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).coll) &&
+ (!GameItems.getBlock(value).tp || value == 18)) {
+ setBackMap(x, y, value);
}
}
}
}
- public Vector2 getSpawnPoint(int x) {
- int y=0;
+ public Vector2 getSpawnPoint() {
+ int x = 0, y = 0;
while (true) {
y++;
while (true) {
y++;
- if (getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(getForeMap(x,y)).collision) break;
+ if (getForeMap(x, y) > 0 && GameItems.getBlock(getForeMap(x, y)).coll) break;
}
}
- x = x*16 + 4;
- y = y*16 - 32;
- return new Vector2(x,y);
+ x = x * 16 + 4;
+ y = y * 16 - 32;
+ return new Vector2(x, y);
}
public void generate(int w, int h) {
WIDTH = w;
HEIGHT = h;
}
public void generate(int w, int h) {
WIDTH = w;
HEIGHT = h;
- WorldGen.genWorld(WIDTH,HEIGHT);
+ WorldGen.genWorld(WIDTH, HEIGHT);
foreMap = WorldGen.getForeMap();
backMap = WorldGen.getBackMap();
WorldGen.clear();
foreMap = WorldGen.getForeMap();
backMap = WorldGen.getBackMap();
WorldGen.clear();
- save();
- }
-
- public void save() {
- WorldSaver.save(foreMap, backMap);
}
}
- public void load() {
- WorldSaver.load();
- foreMap = WorldSaver.getLoadedForeMap();
- backMap = WorldSaver.getLoadedBackMap();
+ public void setMaps(int[][] foreMap, int[][] backMap) {
+ this.foreMap = foreMap.clone();
+ this.backMap = backMap.clone();
WIDTH = foreMap.length;
HEIGHT = foreMap[0].length;
}
WIDTH = foreMap.length;
HEIGHT = foreMap[0].length;
}