diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index e091494daeec99d256544ad78bd7f22daffdf95a..da028621decbfd3cd09fde9ec7549744993944f6 100644 (file)
public transient GamePhysics physics;
public int curX, curY;
- public int invSlot;
+ public int slot;
public int ctrlMode;
public int creativeScroll, maxCreativeScroll;
public int blockDmg = 0;
public int touchDownBtn;
public long touchDownTime;
- public GameProc() {
+ public GameProc(int gameMode) {
world = new GameWorld();
world.generate(1024, 256);
- player = new Player(world.getSpawnPoint());
+ player = new Player(world.getSpawnPoint(), gameMode);
drops = new ArrayList<Drop>();
mobs = new ArrayList<Mob>();
for (int i = 0; i < 16; i++) {
private void moveCursor() {
int pastX = curX, pastY = curY;
if (ctrlMode == 0 && CaveGame.TOUCH) {
- curX = (int) (player.position.x + player.texWidth / 2) / 16;
+ curX = (int) (player.pos.x + player.texWidth / 2) / 16;
if (player.dir == 0) curX--;
else curX++;
- curY = (int) (player.position.y + player.texWidth) / 16;
+ curY = (int) (player.pos.y + player.texWidth) / 16;
if (!isAutoselectable(curX, curY)) {
curY++;
}
if (curY < 0) curY = 0;
if (curY >= world.getHeight()) curY = world.getHeight() - 1;
if (ctrlMode == 1) {
- if (curX * 16 + 8 < player.position.x + player.texWidth / 2)
+ if (curX * 16 + 8 < player.pos.x + player.texWidth / 2)
player.dir = 0;
- if (curX * 16 + 8 > player.position.x + player.texWidth / 2)
+ if (curX * 16 + 8 > player.pos.x + player.texWidth / 2)
player.dir = 1;
}
}
}
}
- if (world.getForeMap(x, y) == 59) {
+ if (world.getForeMap(x, y) > 0 && GameItems.getBlock(world.getForeMap(x, y)).rb) {
if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
- world.setForeMap(x, y, 0);
+ world.destroyForeMap(x, y, this);
updateBlock(x, y - 1);
}
}
checkCursorBounds();
if (isTouchDown && touchDownBtn == Input.Buttons.LEFT) {
- if (world.getForeMap(curX, curY) > 0 &&
- GameItems.getBlock(world.getForeMap(curX, curY)).getHp() >= 0) {// || world.getBackMap(curX, curY) > 0) {
- blockDmg++;
- if (blockDmg >= GameItems.getBlock(world.getForeMap(curX, curY)).getHp()) {
- if (GameItems.getBlock(world.getForeMap(curX, curY)).getDrop() > 0)
- drops.add(new Drop(curX * 16 + 4, curY * 16 + 4, GameItems.getBlock(world.getForeMap(curX, curY)).getDrop()));
- world.placeToForeground(curX, curY, 0);
- blockDmg = 0;
+ if ((world.getForeMap(curX, curY) > 0 && GameItems.getBlock(world.getForeMap(curX, curY)).getHp() >= 0) ||
+ world.getBackMap(curX, curY) > 0 && GameItems.getBlock(world.getBackMap(curX, curY)).getHp() >= 0) {
+ if (player.gameMode == 0) {
+ blockDmg++;
+ if (world.getForeMap(curX, curY) > 0) {
+ if (blockDmg >= GameItems.getBlock(world.getForeMap(curX, curY)).getHp()) {
+ world.destroyForeMap(curX, curY, this);
+ blockDmg = 0;
+ }
+ } else if (world.getBackMap(curX, curY) > 0) {
+ if (blockDmg >= GameItems.getBlock(world.getBackMap(curX, curY)).getHp()) {
+ world.destroyBackMap(curX, curY, this);
+ blockDmg = 0;
+ }
+ }
+ } else {
+ if (world.getForeMap(curX, curY) > 0) world.setForeMap(curX, curY, 0);
+ else if (world.getBackMap(curX, curY) > 0) world.setBackMap(curX, curY, 0);
+ isTouchDown = false;
}
}
}
if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) {
if (touchDownBtn == Input.Buttons.RIGHT) {
- useItem(curX, curY, player.inventory[invSlot], true);
+ useItem(curX, curY, player.inv[slot], true);
isTouchDown = false;
} else if (touchDownY < Assets.invBar.getRegionHeight() &&
touchDownX > renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 &&